Commit Graph

949 Commits

Author SHA1 Message Date
beorn7 8785922956 Revert "Fix tests to adhere to the recent change in prometheus/common"
This reverts commit 2c9811f88e.

This is necessary because the changes in prometheus/common got reverted.

Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-01-27 23:18:44 +01:00
beorn7 3c4408c8b8 Update dependencies
This includes the infamous rollback of prometheus/common

Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-01-27 23:13:11 +01:00
Oleksandr Kushchenko d5f63107bf Use a map to describe discovered labels, as they are not validated by the server (#529)
Signed-off-by: Oleksandr Kushchenko <okushchenko@palantir.com>
2019-01-23 18:39:45 +03:00
Björn Rabenstein 26e258bb9c
Merge pull request #527 from prometheus/mdl-no-cursing
prometheus: reword comment to avoid cursing
2019-01-17 00:08:44 +01:00
Matt Layher da7d5640a2 prometheus: reword comment to avoid cursing
Signed-off-by: Matt Layher <mdlayher@gmail.com>
2019-01-16 17:03:06 -05:00
Bob Shannon 18d13eacc9 Add support for fetching rules with API client (#508)
This PR adds support for fetching [rules](https://prometheus.io/docs/prometheus/latest/querying/api/#rules) via the `/api/v1/rules` endpoint using the API client. Currently, the API client exposes no way to do this and it would be nice to have for external systems that wish to retrieve this information.
2019-01-16 00:34:51 +03:00
Björn Rabenstein d2ead25884
Merge pull request #526 from prometheus/beorn7/ci
Update Makefile.common to current upstream version
2019-01-06 17:50:22 +01:00
beorn7 b3d6096432 Improve testutil error messages
This also satisfy newer staticcheck versions.

Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-01-06 00:22:03 +01:00
beorn7 91b385db44 Fix staticcheck errors in push_test.go
Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-01-05 22:11:07 +01:00
beorn7 1749edba40 Update Makefile.common to current upstream version
This should fix the staticcheck test failures with Go 1.10

Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-01-05 21:56:06 +01:00
Björn Rabenstein 2945395678
Merge pull request #525 from RomanKrasavtsev/patch-1
fix typo
2019-01-05 21:35:34 +01:00
Björn Rabenstein cf7da0f496
Merge pull request #521 from prometheus/beorn7/summary
Lock-free summaries without objectives
2019-01-05 21:23:43 +01:00
Roman Krasavtsev c51ed6941c fix typo
Signed-off-by: Roman Krasavtsev <mr.krasavtsev@gmail.com>
2019-01-04 21:14:10 +01:00
JoeWrightss fb3d5cb2ad Fix some spelling errors (#523)
* Fix some spelling errors

Signed-off-by: JoeWrightss <zhoulin.xie@daocloud.io>
2018-12-30 21:31:21 +01:00
Björn Rabenstein 3ba18b2033
Merge pull request #519 from gkze/master
Fix typo
2018-12-27 10:43:24 +01:00
gkze ee4e5e071e Fix typo again
Signed-off-by: gkze <george.kontridze@gmail.com>
2018-12-26 17:39:47 -08:00
beorn7 226b83ac2e Provide lock-free implementation for Summary without objectives
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-12-24 11:23:13 +01:00
beorn7 a006a7550a Remove unused constants and fields
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-12-24 11:22:57 +01:00
gkze 67bb2a7be3 Fix typo
Signed-off-by: gkze <george.kontridze@gmail.com>
2018-12-21 15:40:57 -08:00
Björn Rabenstein ec7db558bc
Merge pull request #517 from prometheus/beorn7/vendoring
Adjust to breaking change in prometheus/common
2018-12-18 17:45:56 +01:00
beorn7 2c9811f88e Fix tests to adhere to the recent change in prometheus/common
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-12-18 17:20:25 +01:00
beorn7 cb063c2bf2 Update vendoring
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-12-18 17:11:19 +01:00
beorn7 000ceb266b Fix doc comment typo
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-12-18 16:30:34 +01:00
Björn Rabenstein 505eaef017
Merge pull request #514 from prometheus/beorn7/release
Cut v0.9.2
2018-12-07 11:51:17 +01:00
beorn7 e3fab98d54 Cut v0.9.2
At this time, also update dependencies in go.mod (which I didn't
explicitly mention in the CHANGELOG as this is the first release with
Go modulie support anyway).

Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-12-06 22:25:53 +01:00
Björn Rabenstein 3c1fbfb44a
Merge pull request #513 from prometheus/beorn7/registry
Fix the race in the registry
2018-12-06 18:41:01 +01:00
beorn7 619eb595ba Simplify an `append` to `copy`
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-12-06 11:37:34 +01:00
beorn7 fae889635c Fix #512
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-12-06 11:35:30 +01:00
beorn7 9542e4005c Expose #512
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-12-06 11:22:30 +01:00
Björn Rabenstein 2df5ba38ef
Merge pull request #510 from prometheus/beorn7/timer
Return observed duration from Timer.ObserveDuration
2018-12-04 18:36:03 +01:00
beorn7 48d3ae798b Return observed duration from Timer.ObserveDuration
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-12-03 21:10:34 +01:00
Julius Volz 32b1bb4674
Merge pull request #506 from prometheus/beorn7/ci
Propagate Makefile.common fix
2018-11-21 12:29:56 +08:00
beorn7 19f3737c33 Propagate Makefile.common fix
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-11-20 19:39:44 +01:00
beorn7 8d9c21f0cf Nitpicking a doc comment
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-11-20 13:41:38 +01:00
Björn Rabenstein f6443e74d4
Merge pull request #495 from SvenDowideit/add-extra-hints-to-clustermanager-example
Add the last few lines needed to show a new user how the Collector/Gatherer fits together
2018-11-20 13:35:42 +01:00
Björn Rabenstein 9d73466fbe
Merge pull request #505 from peterj/master
Update the label is not valid error message to include the fqName
2018-11-20 13:33:30 +01:00
Dowideit, Sven (O&A, St. Lucia) 8324e65597 Add the last few lines needed to show a new user how the Collector/Gatherer fits together
Signed-off-by: Dowideit, Sven (O&A, St. Lucia) <Sven.Dowideit@csiro.au>
2018-11-20 15:46:27 +10:00
Peter Jausovec a199184c14 Update the label is not valid error message to include the fqName
Fixes #504.

Signed-off-by: Peter Jausovec <peter.jausovec@oracle.com>
2018-11-19 16:51:57 -08:00
Björn Rabenstein 3fb53dff76
Merge pull request #501 from simonpasquier/go-modules
*: support Go modules
2018-11-16 16:18:17 +01:00
Simon Pasquier f626bd2850 *: support Go modules
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2018-11-16 15:09:33 +01:00
Björn Rabenstein 7e9098b20f
Merge pull request #502 from prometheus/beorn7/testing
Remove accidental gogo/protobuf import
2018-11-16 14:08:16 +01:00
beorn7 8c67c139e2 Remove accidental gogo/protobuf import
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-11-16 13:23:08 +01:00
beorn7 c4c1f3461e Fix tiny punctuation issue in doc comment
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-11-15 18:40:33 +01:00
Björn Rabenstein 220bcf5e32
Merge pull request #499 from PhilipGough/fixes-498
Fixes 498
2018-11-15 18:39:11 +01:00
PhilipGough f9739b3d97
Compare text strings directly in testutil
Signed-off-by: PhilipGough <philip.p.gough@gmail.com>
2018-11-15 16:03:57 +00:00
PhilipGough 30503fe98e
Exposes bug #498 - unexpected results for Histograms in testutil
Signed-off-by: PhilipGough <philip.p.gough@gmail.com>
2018-11-14 11:58:43 +00:00
Björn Rabenstein ca9acd2391
Merge pull request #497 from prometheus/beorn7/testing
Fix testutil metric comparison
2018-11-13 16:56:41 +01:00
beorn7 86702ea6b4 Fix metric comparison for empty labels
reflect.DeepEqual is not suitable for zero occurrences of repeated
proto messages. This changes the comparison to act on the string
representation of proto messages.

Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-11-13 16:25:02 +01:00
beorn7 1db43792db Expose bug #494
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-11-13 15:48:48 +01:00
Björn Rabenstein abad2d1bd4
Merge pull request #490 from prometheus/beorn7/release
Cut v0.9.1
2018-11-03 15:23:28 +01:00