mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-13 09:04:06 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
5348 commits 247 branches 438 tags 656 MiB
Commit graph

5348 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabian Reinartz 0847a605a7
Merge pull request #3959 from prometheus/22-pick-ring 
Cherrypick #3942 onto release 2.2
 2018-03-14 07:02:37 -04:00
Brian Brazil a8e3d0fc4b Correctly handle pruning wraparound after ring expansion (#3942) 
Fixes #3939
 2018-03-14 08:25:53 +00:00
Fabian Reinartz fcb8e9ac95
Merge pull request #3951 from prometheus/tsdbup3 
vendor: update prometheus/tsdb
 2018-03-13 21:47:55 +01:00
Fabian Reinartz 5fb1e27b43 vendor: update prometheus/tsdb 2018-03-13 16:24:37 -04:00
Tom Wilkie d8cfd8f108
Merge pull request #3950 from prometheus/cherrypick-3941 
Cherrypick #3941 "Correctly stop the timer used in the remote write path."
 2018-03-13 13:38:15 +00:00
Tom Wilkie 597c17d3e9 Fix nit. 2018-03-13 09:30:51 +00:00
Tom Wilkie 731259afd0 Test sample timeout delivery. 2018-03-13 09:30:50 +00:00
Tom Wilkie fdb574b608 Review feedback. 2018-03-13 09:30:50 +00:00
Tom Wilkie 97a5fc8cbb Correctly stop the timer used in the remote write path. 2018-03-13 09:30:50 +00:00
Tom Wilkie 02a154ced6
Merge pull request #3941 from prometheus/3809-correctly-stop-timer 
Correctly stop the timer used in the remote write path.
 2018-03-13 09:05:52 +00:00
Tom Wilkie dc860e7d0e Fix nit. 2018-03-12 16:48:51 +00:00
Tom Wilkie 390b018c90 Test sample timeout delivery. 2018-03-12 15:35:43 +00:00
Tom Wilkie 22d820ef8e Review feedback. 2018-03-12 14:27:48 +00:00
Brian Brazil a8c22c85cc
Correctly handle pruning wraparound after ring expansion (#3942) 
Fixes #3939
 2018-03-12 13:16:59 +00:00
Paul Gier 85a3c974b7 minor yaml indentation consistency fix in example configs (#3946) 2018-03-11 23:06:13 +00:00
James Turnbull 4486ef013b Make show annotations checkbox match query history checkbox (#3936) 
After removing the checkbox in #3913 the only remaining element that
looked like it was the new Show Annotations checkbox on the Alerts page.
Which in turn didn't look like the Enable query history checkout on the
graph page. So:

1. This takes the Enable query history button as canonical.
2. Updates the show annotations button code to match it.
3. Simplifies the JS for the checkbox.
 2018-03-09 14:39:28 +01:00
James Turnbull 50e6aff3fd Make job heading on service discovery consistent (#3937) 
The new Service Discovery page uses the CSS/JS from the Targets page but
used slightly differently. This makes the job header match in the
Service Discovery page for a more consistent look-n-feel.
 2018-03-09 14:33:53 +01:00
Tom Wilkie f8c9d375b6 Correctly stop the timer used in the remote write path. 2018-03-09 12:00:26 +00:00
Matt Palmer 042090a6d3 [dns_sd] Send an EDNS0 query by default (#3586) 
Based on https://groups.google.com/d/topic/prometheus-users/02kezHbuea4/discussion

Does not attempt to handle a situation where the server does not understand
EDNS0, however that is an unlikely case, and the behaviour of such ancient
systems is hard to predict in advance, so if it does come up, it will need
to be handled on a case-by-case basis.
 2018-03-09 10:21:58 +00:00
James Turnbull c3f4f2204f Refactor/redesign Unhealthy checkbox on Targets page (#3913) 
* Added only healthy to Targets

This adds a "Only heathly" button to supplement the "Only unhealthy"
button. The two are mutually exclusive.

I've also added a red/green text color to the buttons.

Arguably this could be a toggle instead if folks think this is
worthwhile... Happy to modify it.

* Moved functions above init

* Simplifed code and made prettier

* Appeased codeacy

* Made buttons square
 2018-03-09 11:19:09 +01:00
Yecheng Fu 56ed29fbf7 Map target infos of endpoints to prometheus meta labels. (#3770) 2018-03-09 10:07:00 +00:00
Brian Brazil bf7d87aed2 Cleanup storage from all tests. 
Fixed #3299
 2018-03-09 07:53:35 +00:00
Brian Brazil c0ce35d2d3 Only show debug output on test failure 2018-03-09 07:53:35 +00:00
Brian Brazil e6ea146c81 Make benchmark tests pass 
A new query object is needed for each evaulation,
as the iterators would otherwise be shared across evaluations.
 2018-03-09 07:53:35 +00:00
Nikunj Aggarwal 998dfcbac6 Expose itemtype outside the package (#3933) 2018-03-08 16:52:44 +00:00
Fabian Reinartz f63e7db4cb
Merge pull request #3931 from prometheus/cut200 
*: cut v2.2.0
 2018-03-08 17:37:57 +01:00
Fabian Reinartz 6b9cbacf52 *: cut v2.2.0 2018-03-08 15:37:46 +01:00
Fabian Reinartz 60edc2b6d5
Merge pull request #3928 from prometheus/snaphead 
Add option to skip head on snapshots
 2018-03-08 13:25:22 +01:00
Fabian Reinartz 3e6c890aea api: add flag to skip head on snapshots 2018-03-08 13:07:12 +01:00
Fabian Reinartz 07299cec17 vendor: update tsdb 2018-03-08 10:49:35 +01:00
Marek Siarkowicz 1f71caf23f Add golang runtime information to status page. (#3914) 2018-03-07 15:14:46 +00:00
Marek Siarkowicz 86011047ca Validate required fields in sd configuration (#3911) 2018-03-05 19:27:54 +00:00
Krasi Georgiev 5bda3a8ded Check for unused vendored packages (#3892) 
* add check for unused vendor packages
* cleanup unused vendor packages
* run unused check before the tests
 2018-03-02 10:20:45 +00:00
Julien Pivotto 155faab7a2 Display annotations on Alerts page (#3900) 
Fixes #1219

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2018-03-01 15:26:36 +00:00
Fabian Reinartz 7b7e3506ac
Merge pull request #3899 from krasi-georgiev/gogofast 
revert to using the gogofast plugin and regenerate grpc server
 2018-03-01 11:10:51 +01:00
Krasi Georgiev 99e717ad18 revert ot using the gogofast plugin and regenerate grpc server 2018-03-01 11:57:31 +02:00
Fabian Reinartz ef567ceb7d
Merge pull request #3835 from krasi-georgiev/pool-package-generalize 
Pool package generalize
 2018-02-28 14:30:46 +01:00
Krasi Georgiev 6b0e9ef183 Validate json parse for TargetGroup Unmarshal (#3614) 
Using DisallowUnknownFields in golang 1.10 to forbid unknown fields in targetGroups
added the license header for the targetGroup test
 2018-02-27 12:33:27 +00:00
Ben Kochie e392b9a18b Cleanup licence check script (#3893) 
* Cleanup licence check script

* `echo -e` is not supported by POSIX shell.
* Add a license to the check script.
* Split out license check loop into function for clarity.

* Exit 1
 2018-02-27 10:06:38 +00:00
Krasi Georgiev 0f00d77661 enable race detection for the tests (#3884) 2018-02-26 23:27:59 +00:00
Frederic Branczyk b9e836c7b7
Merge pull request #3102 from pgier/unset-gobin-during-build 
Unset GOBIN in Makefile
 2018-02-26 11:24:07 +01:00
Krasi Georgiev 4fa7e719f4 race in Triton SD Test (#3885) 2018-02-26 10:03:50 +00:00
Krasi Georgiev 7af69ad988 bump to golang 1.10 (#3856) 2018-02-26 09:42:49 +00:00
ferhat elmas ffa673f7d8 General simplifications (#3887) 
Another try as in #1516
 2018-02-26 07:58:10 +00:00
Callum Jones 090e7e0959 Place Service Discovery labels inline (#3872) 
Fixes #3739
 2018-02-24 19:44:37 +00:00
Jeffrey Zhang 21f96caab3 Fix wrong syntax for alert field templates (#3883) 2018-02-24 09:37:43 +00:00
Conor Broderick 99006d3baf Added dropped targets API to targets endpoint (#3870) 2018-02-21 17:26:18 +00:00
Fabian Reinartz cd5e2fe687
Merge pull request #3874 from prometheus/22rc1 
*: cut 2.2.0-rc.1
 2018-02-21 17:28:18 +01:00
Fabian Reinartz 3669c1e476 *: cut 2.2.0-rc.1 2018-02-21 16:40:29 +01:00
pasquier-s fc8cf08f42 Prevent invalid label names with labelmap (#3868) 
This change ensures that the relabeling configurations using labelmap
can't generate invalid label names.
 2018-02-21 10:02:22 +00:00