mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-17 19:14:04 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
7062 commits 248 branches 440 tags 658 MiB
Commit graph

7062 commits

This branch
This branch
All branches
Author SHA1 Message Date
Simon Pasquier e1fd96db25 cmd: fix help text (#3989) 2018-03-20 15:58:19 +00:00
Warren Fernandes d49a3df55b Parser test cleanup (#3977) 
* parser test cleanup

- Test against the exported package functions instead of the private functions.

* Improves readability of TestParseSeries

- Moves package function closer to parser function
 2018-03-20 14:30:52 +00:00
Jeeyoung Kim 5b962c5748 Revert "Feature: Allow getting credentials via EC2 role (#3343)" (#3985) 
This reverts commit 808f79f00a.
 2018-03-20 12:34:54 +00:00
Goutham Veeramachaneni 195bc0d286
Merge pull request #303 from Bplotka/bp/better-compact-logging 
repair + compact: Improved logging for easier future debug purposes.
 2018-03-16 00:45:47 +05:30
Bartek Plotka fada85a83c repair + compact: Improved logging for easier future debug purposes. 
This is based on my experience while debugging https://github.com/prometheus/prometheus/issues/3943.

I needed to deduct few things, and all that would be just bit easier with these two logs:
- new block's ULID on each compaction.
- actual list of Blocks (ulid + time range) on Prometheus startup (easy to log that while repairing blocks).

We don't really need blocks that takes part in compaction - that can be deducted easily based on time ranges of blocks we have currently in system.

What do you think?

Signed-off-by: Bartek Plotka <bwplotka@gmail.com>
 2018-03-15 14:59:32 +00:00
Warren Fernandes 58e2a31db8 Cleans up test by removing unused function (#3969) 2018-03-15 08:59:19 +00:00
zjwzte b7a37a1604 Fix magic number. 2018-03-15 10:15:35 +08:00
Fabian Reinartz e87c6c8b28
Merge pull request #3963 from mz-techops/fix-query-err-scope 
promql: propagate storage errors
 2018-03-14 11:04:02 -04:00
Anton Tereshchenkov 18bbec050c promql: propagate storage errors 2018-03-14 15:19:22 +01:00
Fabian Reinartz bc6058c812
Merge pull request #3952 from prometheus/cut221 
*: cut 2.2.1
 2018-03-14 10:12:35 -04:00
Fabian Reinartz f22e5dce1a *: cut 2.2.1 2018-03-14 10:02:06 -04:00
Fabian Reinartz a947750dd6 vendor: update tsdb 2018-03-14 10:01:44 -04:00
Fabian Reinartz 659ed64429
Merge pull request #302 from Gouthamve/fix-prom-3957 
Add architecture specific map sizes
 2018-03-14 09:49:50 -04:00
Goutham Veeramachaneni 6e5164fe44
Add architecture specific map sizes 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2018-03-14 18:59:20 +05:30
Goutham Veeramachaneni 902e1ffad4
Merge pull request #301 from Gouthamve/fix-prom-3957 
Use the right sized byte array for large indexes
 2018-03-14 18:17:08 +05:30
Goutham Veeramachaneni fb65e3daf4
Use the right sized byte array for large indexes 
Fixes: https://github.com/prometheus/prometheus/issues/3957

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2018-03-14 16:47:37 +05:30
Fabian Reinartz 7a62f6a0f8
Merge pull request #300 from Gouthamve/fix-prom-3956 
Close file for windows platform
 2018-03-14 07:17:19 -04:00
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
Goutham Veeramachaneni 9744de20cc
Close file for windows platform 
Windows needs files that are being deleted to be closed.

Fixes: https://github.com/prometheus/prometheus/issues/3956

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2018-03-14 13:08:40 +05:30
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
Fabian Reinartz 00404ae5ab
Merge pull request #299 from Bplotka/fix/issue3943 
compact: Assume fresh block to ignore by minTime not ULID order. Added tests.
 2018-03-13 21:20:03 +01:00
Bartek Plotka 2aceac0a12 Fixed some comments. 
Signed-off-by: Bartek Plotka <bwplotka@gmail.com>
 2018-03-13 15:30:00 +00:00
Bartek Plotka 328c0ff5b0 Simplified the flow and tests. 
Signed-off-by: Bartek Plotka <bwplotka@gmail.com>
 2018-03-13 14:12:32 +00: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
Bartek Plotka 483da43660 compact: Exclude last block with shortest range instead of newest one by ULID. 
Fixes https://github.com/prometheus/prometheus/issues/3943 issue.

Added tests.

Signed-off-by: Bartek Plotka <bwplotka@gmail.com>
 2018-03-13 12:30:27 +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