Commit Graph

1624 Commits

Author SHA1 Message Date
beorn7 b7a540a1b2 Fix test
Signed-off-by: beorn7 <beorn@grafana.com>
2021-05-03 16:09:28 +02:00
beorn7 a9df0bac89 Update prometheus/client_model
(now using sparsehistogram branch)

Signed-off-by: beorn7 <beorn@grafana.com>
2021-04-30 21:45:23 +02:00
beorn7 ce36ee3182 Merge branch 'master' into beorn7/histogram 2021-04-30 21:43:19 +02:00
Björn Rabenstein 54867648f2
Merge pull request #861 from yeya24/add-exemplars
Add exemplars API support
2021-04-27 20:06:19 +02:00
yeya24 7a147c1bdf add exemplars API support
Signed-off-by: yeya24 <yb532204897@gmail.com>
2021-04-24 00:32:14 -04:00
Björn Rabenstein 0400fc44d4
Merge pull request #857 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2021-04-14 19:57:22 +02:00
prombot 20b22fe964 Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2021-04-14 00:01:26 +00:00
Björn Rabenstein 4a22844c5d
Merge pull request #856 from yeya24/targets-field
Add missing fields to targets API
2021-04-12 22:30:20 +02:00
Björn Rabenstein 28ea8c27c8
Merge pull request #855 from gouthamve/add-new-elements-to-rules
Add newer fields to Rules API
2021-04-12 14:31:02 +02:00
yeya24 45efe82b46 add missing fields to targets API
Signed-off-by: yeya24 <yb532204897@gmail.com>
2021-04-11 12:05:08 -04:00
Goutham Veeramachaneni 629f64ab3f
Add newer fields to Rules API
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
2021-04-11 12:17:26 +02:00
beorn7 d6983369d2 Merge branch 'master' into beorn7/histogram 2021-04-03 17:28:55 +02:00
Björn Rabenstein 17e98a7e4f
Merge pull request #853 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2021-03-31 20:15:34 +02:00
prombot 78eb8b854b Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2021-03-31 00:01:21 +00:00
Björn Rabenstein 9ef86855d4
Merge pull request #849 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2021-03-23 21:24:11 +01:00
prombot 0df87794a4 Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2021-03-22 00:01:45 +00:00
Björn Rabenstein 75560f1d20
Merge pull request #846 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2021-03-21 19:47:44 +01:00
Björn Rabenstein efe7aa7302
Merge pull request #845 from prometheus/beorn7/release
Cut v1.10.0
2021-03-18 12:30:43 +01:00
beorn7 853777d20b Cut v1.10.0
Signed-off-by: beorn7 <beorn@grafana.com>
2021-03-18 12:14:25 +01:00
prombot b7a5327d5a Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2021-03-18 00:01:39 +00:00
Björn Rabenstein 4fbf74e2ce
Merge pull request #844 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2021-03-16 17:53:53 +01:00
beorn7 e92283d644 Fix linter ignores
Signed-off-by: beorn7 <beorn@grafana.com>
2021-03-16 17:19:03 +01:00
prombot fbc3e40366
Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2021-03-16 00:21:09 +01:00
Björn Rabenstein 3cd398565b
Merge pull request #843 from prometheus/beorn7/release
Update dependencies
2021-03-13 18:46:33 +01:00
Björn Rabenstein e8b72d0bd8
Merge pull request #841 from ntk148v/buildinfo-api
Add buildinfo method
2021-03-12 15:12:58 +01:00
Kien Nguyen 4c24ae8b13 Add buildinfo method
Co-authored-by: Lili Cosic <cosiclili@gmail.com>
Signed-off-by: Kien Nguyen <kiennt2609@gmail.com>
2021-03-12 08:36:23 +07:00
beorn7 6635a8f35b Bump minumim required Go version to 1.13
Since 1.16 is out, we still support the last four minor releases.

The bump was required by the prometheus/procfs package using the new
`%w` printf directives. However, it also allows us to remove some
special casing about build info.

Signed-off-by: beorn7 <beorn@grafana.com>
2021-03-11 20:45:00 +01:00
beorn7 a60c63e313 Update dependencies
Signed-off-by: beorn7 <beorn@grafana.com>
2021-03-11 20:22:47 +01:00
Björn Rabenstein babeb356a5
Merge pull request #828 from yeya24/support-label-matchers
Support matchers in labels API
2021-02-11 21:19:29 +01:00
Björn Rabenstein d3e175d2f1
Merge pull request #835 from debiandebiandebian/fix-typo-in-comments
Fix typo in comments
2021-02-08 12:03:09 +01:00
debiandebiandebian 9443f4449b Fix typo in comments
Signed-off-by: debiandebiandebian <debiandebiandebiandebian@gmail.com>
2021-02-08 08:58:51 +09:00
yeya24 595a1d580c update comment
Signed-off-by: yeya24 <yb532204897@gmail.com>
2021-02-03 19:44:12 -05:00
beorn7 08104a0ef9 Minor doc comment fixes
Signed-off-by: beorn7 <beorn@grafana.com>
2021-01-29 22:24:27 +01:00
Björn Rabenstein b8fcd28885
Merge pull request #833 from zhsj/riscv64
Bump prometheus/procfs to 0.3.0 to fix building on riscv64
2021-01-25 17:58:41 +01:00
Shengjing Zhu 0c0d90feb9 Bump prometheus/procfs to 0.3.0 to fix building on riscv64
This picks up https://github.com/prometheus/procfs/pull/325

Signed-off-by: Shengjing Zhu <i@zhsj.me>
2021-01-23 01:47:50 +08:00
Björn Rabenstein b7799362e0
Merge pull request #831 from roidelapluie/security-dot-md
Add SECURITY.md
2021-01-16 14:34:46 +01:00
Julien Pivotto b6ac49fc59 Add SECURITY.md
This commit adds a security policy to this repository. SECURITY.md files
are threated in a special way by GitHub, helping users to know how to
best submit security issues for the projects.

In this case, we simply point to our existing documentation on
prometheus.io.

The content of this file will be synced automatically with the
prometheus/prometheus repository, as our security policy covers all the
repositories. This sync is automated with prombot, like other files
(LICENSE, Makefile.common).

https://docs.github.com/en/free-pro-team@latest/github/managing-security-vulnerabilities/adding-a-security-policy-to-your-repository
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-01-16 13:57:42 +01:00
yeya24 75d7516f2a support matchers in labels API
Signed-off-by: yeya24 <yb532204897@gmail.com>
2020-12-29 13:49:42 -05:00
Björn Rabenstein d89cf5af88
Merge pull request #826 from prometheus/beorn7/release
 Cut release 1.9.0
2020-12-17 01:21:22 +01:00
beorn7 80ca9cdc4e Cut release 1.9.0
Signed-off-by: beorn7 <beorn@grafana.com>
2020-12-16 20:46:50 +01:00
beorn7 8d16199dea Update dependencies
Signed-off-by: beorn7 <beorn@grafana.com>
2020-12-16 20:46:34 +01:00
Björn Rabenstein 8b73bd904c
Merge pull request #823 from prometheus/beorn7/promhttp
promhttp: Correctly detect invalid metric and label names
2020-12-09 20:16:33 +01:00
beorn7 98eb6cbf7c promhttp: Correctly detect invalid metric and label names
Without this fix, the `InstrumentHandler...` middlewares get locked in
an endless loop in case of an invalid Collector, eating all the memory.

Signed-off-by: beorn7 <beorn@grafana.com>
2020-12-09 17:58:53 +01:00
Björn Rabenstein 37c26edd5b
Merge pull request #821 from prometheus/beorn7/multierror
Be more explicit about the multi-line properties of MultiError
2020-12-03 18:03:41 +01:00
beorn7 34ca120377 Be more explicit about the multi-line properties of MultiError
Signed-off-by: beorn7 <beorn@grafana.com>
2020-12-02 19:53:38 +01:00
Björn Rabenstein fd6d368676
Merge pull request #819 from jubalh/sp
Correct spelling: possibilites -> possibilities
2020-12-01 23:14:58 +01:00
Michael Vetter cf6dc82780 Correct spelling: possibilites -> possibilities
Signed-off-by: Michael Vetter <jubalh@iodoru.org>
2020-12-01 21:20:26 +01:00
Bartlomiej Plotka 39b478e90c
Added example api code showing how to add auth tokens and user agents to prom client. (#817)
* Added example api code showing how to add auth tokens and user agents to prom client.

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

* Ran go mod tidy.

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
2020-11-20 19:58:16 +00:00
Björn Rabenstein 06b1a0a6ae
Merge pull request #811 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2020-11-04 15:37:38 +01:00
prombot c2caa7a1e9 Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2020-11-04 00:08:58 +00:00