mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-12 00:24:04 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity
7926 commits 250 branches 438 tags 654 MiB
Commit graph

7926 commits

This branch
This branch
All branches
Author SHA1 Message Date
Goutham Veeramachaneni 9b8bbe3246
Merge pull request #5187 from prometheus/beorn7/release 
Merge v2.7 bugfixes into master
 2019-02-06 21:32:06 +01:00
Krasi Georgiev 776769377e fix merr logic. 
Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2019-02-06 16:59:28 +02:00
beorn7 d26e134bd4 Merge branch 'release-2.7' into beorn7/release 
Signed-off-by: beorn7 <beorn@soundcloud.com>
 2019-02-06 15:22:40 +01:00
Björn Rabenstein 3db36f34ec
Merge pull request #5186 from prometheus/beorn7/metrics 
Fix prometheus_rule_group_last_evaluation_timestamp_seconds
 2019-02-06 15:19:08 +01:00
Krasi Georgiev 08e7bc8ee8 always remove tmp 
Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2019-02-06 16:09:42 +02:00
Krasi Georgiev 45acaadd81 review changes 
Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2019-02-06 14:07:35 +02:00
beorn7 2db1eeb4ec Fix prometheus_rule_group_last_evaluation_timestamp_seconds 
It should be a unix timestamp, not the seconds in the minute.

Signed-off-by: beorn7 <beorn@soundcloud.com>
 2019-02-06 11:02:49 +01:00
Krasi Georgiev 77cc2ea210
Update index.md(format of series entry) (#515) 
* Update index.md
* more clear format representation
* move dots to the bottom
* update #labels count, #chunks count
* use correct variable types.

Signed-off-by: naivewong <867245430@qq.com>
 2019-02-06 12:13:38 +03:00
naivewong 9b227d27e7 update labels count, chunks count 
Signed-off-by: naivewong <867245430@qq.com>
 2019-02-06 10:00:18 +08:00
naivewong 8e7e2041d3 update #labels count, #chunks count 
Signed-off-by: naivewong <867245430@qq.com>
 2019-02-06 00:48:25 +08:00
naivewong 42ee59689b move dots to the bottom 
Signed-off-by: naivewong <867245430@qq.com>
 2019-02-06 00:34:15 +08:00
naivewong 0649dfddf0 more clear format representation 
Signed-off-by: naivewong <867245430@qq.com>
 2019-02-06 00:05:30 +08:00
naivewong 1f723a8eb5 update #labels and #chunks 
Signed-off-by: naivewong <867245430@qq.com>
 2019-02-05 23:20:43 +08:00
Alec 8e589474c6 Update index.md 
Signed-off-by: naivewong <867245430@qq.com>
 2019-02-05 10:34:25 +08:00
Alec 2b6bc9fb32 Update index.md 
Signed-off-by: naivewong <867245430@qq.com>
 2019-02-05 10:34:25 +08:00
zhulongcheng fd964426a7 web: predeclare and reuse errors (#5180) 
Predeclare and reuse errors to reduce duplicate code

Signed-off-by: zhulongcheng <zhulongcheng.me@gmail.com>
 2019-02-04 13:06:26 +01:00
Alec 1bcda9d23f Update tombstones.md (format of tombstone) (#511) 2019-02-04 12:30:47 +03:00
Krasi Georgiev ce4a2083fb nit 
Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2019-02-04 11:15:08 +02:00
Krasi Georgiev 752ab86e4e change the test block series for more stable tests 
Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2019-02-04 11:14:39 +02:00
zhulongcheng a75f8a8e05 update error message in extractTimeRange (#5179) 
Update error message in the extractTimeRange function
to match function's logic

Signed-off-by: zhulongcheng <zhulongcheng.me@gmail.com>
 2019-02-03 09:29:23 +00:00
JoeWrightss e158c53fa9 Fix some typos in comment (#5175) 
Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>
 2019-02-01 14:35:32 +00:00
Brian Brazil c66aeb3fff
In histogram_quantile merge buckets with equivalent le values (#5158) 
This makes things generally more resilient, and will
help with OpenMetrics transitions (and inconsistencies).

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2019-02-01 10:22:44 +00:00
Simon Pasquier a60431f3cd Merge v2.7.1 into master (#5170) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-02-01 09:54:12 +01:00
Vishnunarayan K I 108b9b0e5f Limit number of merics in prometheus UI (#5139) 
Signed-off-by: Vishnunarayan K I <appukuttancr@gmail.com>
 2019-01-31 17:03:50 +00:00
Frederic Branczyk 50e1228f88
Merge pull request #5147 from prometheus/brancz-patch-1 
docs: Add filesystem POSIX requirement
 2019-01-31 16:20:46 +01:00
Frederic Branczyk 32079f351f
docs: Specifically call out NFS and POSIX 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2019-01-31 12:57:48 +01:00
Goutham Veeramachaneni 62e591f928
*: cut 2.7.1 (#5164) 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2019-01-31 12:13:25 +01:00
Goutham Veeramachaneni b03d6f6eff
Remove custom highlight code, it's not needed. (#5163) 
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2019-01-31 11:27:18 +01:00
Ganesh Vernekar 10ae00ab9d Fix bug from #4898 (#5161) 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2019-01-31 11:14:14 +01:00
Ganesh Vernekar 787eb1e904 Set rule_group_last_duration_seconds to seconds (#5153) 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2019-01-31 11:07:58 +01:00
Krasi Georgiev 00d5e19baf Merge remote-tracking branch 'upstream/master' into shutdown-during-compaction 
Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2019-01-30 13:47:50 +02:00
Krasi Georgiev 6c34eb8b63 nits 
Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2019-01-30 12:17:15 +02:00
Krasi Georgiev 315de4c782 fix windows tests 
Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2019-01-30 11:40:40 +02:00
Krasi Georgiev 1603222bbc small refactor of openTestDB to handle errors properly. 
Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2019-01-30 11:40:12 +02:00
Krasi Georgiev 7245c6dc33 Merge remote-tracking branch 'upstream/master' into delete-compact-block-on-reload-error 
Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2019-01-30 11:39:19 +02:00
Krasi Georgiev ee99718ff6
rename chunk reader vars to make it easier to follow. (#508) 
* rename chunk reader vars to make it easyer to understand.

Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2019-01-29 20:46:12 +03:00
Frederic Branczyk 3de734d8de
docs: Add filesystem POSIX requirement 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2019-01-29 13:51:16 +01:00
radek_lesniewski eb5034d5b0 Additional logging in compact.go - logged time needed for writing blocks (#505) 
* Additional logging in compact.go - logged time needed for writing blocks to disk

Signed-off-by: Radoslaw Lesniewski <Radoslaw.Lesniewski@sabre.com>

* Additional logging in compact.go - code formatted

Signed-off-by: Radoslaw Lesniewski <Radoslaw.Lesniewski@sabre.com>
 2019-01-29 16:53:53 +05:30
Krasi Georgiev 3ec08eac50 use camelcase for rangeToTriggerCompaction 
Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2019-01-29 10:32:59 +02:00
Krasi Georgiev 53c18e7a41 use a global indexFilename constant 
Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2019-01-29 10:32:32 +02:00
Krasi Georgiev b521559c3b do a proper cleanup for a failed reload after a compaction 
a failed reload immediately after a compaction should delete the
resulting block to avoid creating blocks with the same time range.

Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2019-01-29 10:31:54 +02:00
Ganesh Vernekar a29ab50a20
Merge pull request #510 from yeya24/patch/fixtypo 
fix two typos in db_test
 2019-01-29 11:51:03 +05:30
Ganesh Vernekar a2ef8cf2f5
Merge pull request #5146 from tariq1890/ineff 
fix ineffectual assignment in dns.go
 2019-01-29 11:50:34 +05:30
yeya24 6181d1f18f fix two typos in db_test 
Signed-off-by: yeya24 <ben.ye@daocloud.io>
 2019-01-29 10:25:12 +08:00
tariqibrahim b173de0c26 fix ineffectual assignment in dns.go 
Signed-off-by: tariqibrahim <tariq181290@gmail.com>
 2019-01-28 17:15:43 -08:00
Jannick Fahlbusch ฏ๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎ 63f375e80a [FIX] Azure DS: Return error when request failed (#4719) 
This fixes the issue that the error is swallowed when the request failed.

Signed-off-by: Jannick Fahlbusch <git@jf-projects.de>
 2019-01-28 21:31:45 +00:00
Brian Brazil 1dd57765b4
Reduce time that alertmanagers are in flux when reloaded. (#5126) 
This no longer waits for all of the scrape reload to complete
before getting a list of AMs again.

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2019-01-28 18:34:12 +00:00
Bryan Boreham 8841692a63 Use the context associated with the inner evaluation span (#5130) 
Signed-off-by: Bryan Boreham <bryan@weave.works>
 2019-01-28 18:33:30 +00:00
Tariq Ibrahim f4275d2352 Use the latest versions of azure go sdk and go-autorest (#5015) 
Signed-off-by: tariqibrahim <tariq181290@gmail.com>
 2019-01-28 18:30:29 +00:00
Tariq Ibrahim bfcdba211f remove the prepended watch reactor from the fake k8s client (#5140) 
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
 2019-01-28 16:42:25 +01:00