Commit Graph

929 Commits

Author SHA1 Message Date
Björn Rabenstein deade0365a
Merge pull request #558 from prometheus/makefile_common
Synchronize Makefile.common from prometheus/prometheus
2019-04-25 12:40:51 +02:00
Simon Pasquier 6894bb3c7c Add .golangci.yml
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-04-25 10:38:07 +02:00
prombot 53800fb9d3 makefile: update Makefile.common with newer version
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2019-04-25 00:00:38 +00:00
Björn Rabenstein 65d3a96fba
Merge pull request #556 from prometheus/makefile_common
Synchronize Makefile.common from prometheus/prometheus
2019-04-16 10:58:48 +02:00
prombot 9a98fd8405 makefile: update Makefile.common with newer version
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2019-04-16 00:00:39 +00:00
Björn Rabenstein b8ed8f100e
Merge pull request #555 from prometheus/beorn7/modules
Update dependencies
2019-04-15 13:21:11 +02:00
Bjoern Rabenstein 2d69188b26 Update dependencies
Mostly to use the new module support for prometheus/common and
beorn7/perks.

Signed-off-by: Bjoern Rabenstein <bjoern@rabenste.in>
2019-04-15 00:16:44 +02:00
Björn Rabenstein 5a3ec6a883
Merge pull request #554 from prometheus/makefile_common
Synchronize Makefile.common from prometheus/prometheus
2019-04-12 02:37:33 +02:00
prombot deac34f26f makefile: update Makefile.common with newer version
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2019-04-12 00:00:36 +00:00
Björn Rabenstein 8b8c870c30
Merge pull request #553 from simonpasquier/remove-x-net-context
*: replace golang.org/x/net/context by context
2019-04-10 00:42:05 +02:00
Simon Pasquier 15da21f1e4 *: replace golang.org/x/net/context by context
The context package is available since Go 1.7 which is the minimal version
supported by client_golang.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-04-09 15:10:51 +02:00
Roald Nefs 7490f0a745 Add alerts endpoint to API client (#552)
Add alerts endpoint to API client. The alerts endpoint returns a list of all active alerts.

Signed-off-by: Roald Nefs <info@roaldnefs.com>
2019-03-25 10:23:28 +02:00
Björn Rabenstein fa4aa9000d
Merge pull request #548 from simonpasquier/update-makefilecommon
Update Makefile.common
2019-03-13 12:21:43 +01:00
Simon Pasquier a2c4da068f Update Makefile.common
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-03-13 09:43:07 +01:00
Björn Rabenstein c5e14697ea
Merge pull request #544 from s-urbaniak/observe-example
prometheus/promhttp: actually observe values in trace in example
2019-03-07 15:53:37 +01:00
Sergiusz Urbaniak 60728f445d prometheus/promhttp: actually observe values in trace in example
This is similar to
https://github.com/prometheus/client_golang/pull/535 fixing ExampleInstrumentRoundTripperDuration.

Signed-off-by: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
2019-03-06 13:59:53 +01:00
Björn Rabenstein 9a369d2d38
Merge pull request #541 from simonpasquier/add-go-1.12
Add Go 1.12 to Travis CI
2019-03-05 14:46:41 +01:00
Simon Pasquier e490cf5202 Add Go 1.12 to Travis CI
Also update to the latest version of Makefile.common.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-03-04 14:17:42 +01:00
Björn Rabenstein 2daed26f63
Merge pull request #540 from FrankSpitulski/feat/push/add-format-parameter
feat(push): add format builder option
2019-02-25 13:35:56 +01:00
Frank Spitulski 10e34c668f fix(push): incorporate changes from review
Signed-off-by: Frank Spitulski <fspituls@ucsd.edu>
2019-02-24 15:15:35 -08:00
Frank Spitulski 7b127b3fe5 feat(push): add format builder option
Allow users to specify which format the pusher should push in.

Signed-off-by: Frank Spitulski <fspituls@ucsd.edu>
2019-02-24 12:51:45 -08:00
beorn7 4c99dd6630 Port histogram improvements into noObjectivesSummary
Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-02-11 19:10:17 +01:00
beorn7 295f7e4861 Fix some comment and naming nits as leftover from #536
Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-02-11 18:52:52 +01:00
Pascal S. de Kloe 19ff277483 Save memory on histograms: slightly faster with less code (#536)
Use the highest bit for buffer switch tracking in histograms

Signed-off-by: Pascal S. de Kloe <pascal@quies.net>
2019-02-11 18:29:02 +01:00
Björn Rabenstein df7545b48d
Merge pull request #538 from prometheus/beorn7/ci
Pull in new Makefile.common from prometheus/prometheus
2019-02-11 16:30:49 +01:00
beorn7 069235ab8c Pull in new Makefile.common from prometheus/prometheus
This should fix the currently broken Travis builds for Go versions
before 1.11.

Signed-off-by: beorn7 <beorn@soundcloud.com>
2019-02-11 16:24:22 +01:00
Björn Rabenstein 7190de1ef2
Merge pull request #535 from kklipsch/client_example_fix
fix client trace examples to actually capture metrics
2019-02-05 00:33:00 +01:00
kklipsch a11607d7ae fix client trace examples to actually capture metrics
Signed-off-by: kklipsch <kklipsch@example.com>
2019-02-04 20:30:19 +00:00
Louis DeLosSantos 12af604cf2 wait for done before writing to shared resp body (#532)
Signed-off-by: Louis Delossantos <ldelossa.ld@gmail.com>
2019-01-28 11:53:16 +03:00
Björn Rabenstein fc06704084
Merge pull request #533 from prometheus/beorn7/vendoring
Re-adjust to the old float formatting in prometheus/common
2019-01-28 00:02:28 +01:00
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