mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-19 03:54:06 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
9885 commits 249 branches 440 tags 660 MiB
Commit graph

9885 commits

This branch
This branch
All branches
Author SHA1 Message Date
beorn7 94d70e76cd Merge branch 'master' into beorn7/release-2.24 2021-01-20 02:09:25 +01:00
beorn7 e448727485 Cut v2.24.1 
Signed-off-by: beorn7 <beorn@grafana.com>
 2021-01-19 22:48:10 +01:00
beorn7 806a799195 Update exporter-toolkit dependency to 0.5.1 
Signed-off-by: beorn7 <beorn@grafana.com>
 2021-01-19 22:21:20 +01:00
Julien Pivotto b7fe028740
Merge pull request #8373 from hs0210/work 
Fix a typo in docs/configuration/configuration.md
 2021-01-18 08:24:05 +01:00
Hu Shuai 2d8738c947 Fix a typo in docs/configuration/configuration.md 
Signed-off-by: Hu Shuai <hus.fnst@cn.fujitsu.com>
 2021-01-18 10:14:47 +08:00
Julien Pivotto c83e4a7b1c
Merge pull request #8370 from prometheus/superq/force_security.md 
Enforce SECURITY.md updates
 2021-01-16 22:12:03 +01:00
Ben Kochie 2fd1243b0e
Enforce SECURITY.md updates 
Add SECURITY.md to the enforced repo sync updates.

Signed-off-by: Ben Kochie <superq@gmail.com>
 2021-01-16 20:07:55 +01:00
Julien Pivotto e483cff61f
Merge pull request #8249 from prometheus/add-codeql 
Add CodeQL Security Scanning
 2021-01-15 10:13:16 +01:00
Julien Pivotto 5bd7145e55
Merge pull request #8327 from roidelapluie/tlsexemple 
https: Add example configuration file
 2021-01-15 09:50:52 +01:00
Li Zhijian 9602933db2
Cleanup tempfiles in tests (#8179) 
* test: cleanup tempdir for TestBlockWriter

Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>

* test: cleanup tempdir for TestLogPartialWrite

Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
 2021-01-15 13:49:57 +05:30
Julien Pivotto 08c259cda6 https: Add example configuration file 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-01-15 01:37:50 +01:00
Julien Pivotto b82d76faec
Merge pull request #8363 from roidelapluie/toolkit-update 
Update exporter-toolkit to 0.5.0
 2021-01-14 01:08:18 +01:00
Julien Pivotto ac2626757c Update exporter-toolkit to 0.5.0 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-01-13 21:49:54 +01:00
Nguyen Le Vu Long fbe960f2c1
fix: remove pre-2.21 tmp blocks on start (#8353) 
* fix: remove pre-2.21 tmp blocks on start

Signed-off-by: Nguyen Le Vu Long <vulongvn98@gmail.com>

* fix: commenting

Signed-off-by: Nguyen Le Vu Long <vulongvn98@gmail.com>
 2021-01-09 10:02:26 +01:00
Julien Pivotto fd022965c0
Add SECURITY.md file (#8292) 
* Add SECURITY.md file

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-01-09 09:58:53 +01:00
Julien Pivotto 34656bbf8e
PromQL parser: fastpath for non-empty matchers and metric name (#8345) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-01-07 11:38:38 +01:00
Guangwen Feng 2df1a482da
Fix misspelled word in comment (#8348) 
Signed-off-by: Guangwen Feng <fenggw-fnst@cn.fujitsu.com>
 2021-01-07 10:01:08 +00:00
Arthur Silva Sens 7e932637e3
Reload tsdb blocks every minute (#8340) 
* Reload tsdb blocks every minute

Signed-off-by: ArthurSens <arthursens2005@gmail.com>

* Proteced tsdb with mutex locks

Signed-off-by: ArthurSens <arthursens2005@gmail.com>
 2021-01-07 13:00:08 +05:30
Nguyen Le Vu Long cd1dafc2fd
tsdb: Expose total number of label pairs in head in TSDB stats page (#8343) 
* tsdb: Expose total number of label pairs in head

Signed-off-by: Nguyen Le Vu Long <vulongvn98@gmail.com>

* fix: add comment for NumLabelPairs

Signed-off-by: Nguyen Le Vu Long <vulongvn98@gmail.com>

* fix: remove comment

Signed-off-by: Nguyen Le Vu Long <vulongvn98@gmail.com>
 2021-01-07 12:11:32 +05:30
Björn Rabenstein 0954026b9a
Merge pull request #8347 from prometheus/release-2.24 
Merge release branch back into master after 2.24.0 is done
 2021-01-06 19:26:03 +01:00
Björn Rabenstein 02e92236a8
Merge pull request #8346 from prometheus/beorn7/release 
Cut final v2.24.0
 2021-01-06 14:44:34 +01:00
beorn7 a6d4e8c636 Cut final v2.24.0 
Signed-off-by: beorn7 <beorn@grafana.com>
 2021-01-06 14:25:43 +01:00
Julien Pivotto 8dfbad7a88
Merge pull request #8344 from fenggw-fnst/work 
Fix golint issue caused by typo
 2021-01-06 09:28:08 +01:00
Guangwen Feng e2cd6c5f57 Fix golint issue caused by typo 
Signed-off-by: Guangwen Feng <fenggw-fnst@cn.fujitsu.com>
 2021-01-06 15:54:35 +08:00
Björn Rabenstein 997bb7134f
Merge pull request #8338 from prometheus/release-2.24 
Merge release back (or forward?) into master.
 2021-01-04 18:13:09 +01:00
Björn Rabenstein de4fbed840
Merge pull request #8337 from prometheus/beorn7/sd 
prevent adding empty target when CNAME is encountered
 2021-01-04 17:52:04 +01:00
Frederic Branczyk 19b0ec3baf
Merge pull request #8273 from fcddk/fcddk-k8s-enpoints-label 
K8s SD: add endpoints labels metadata
 2021-01-04 17:25:27 +01:00
Matt Berther 31e86ed4bc prevent adding empty target when CNAME is encountered 
Signed-off-by: Matt Berther <mattberther@users.noreply.github.com>
 2021-01-04 15:51:41 +01:00
Julien Pivotto 0fd5ed0648
Merge pull request #8336 from roidelapluie/dochttp 
Add https to navbar and fix link in it
 2021-01-04 11:27:43 +01:00
Ganesh Vernekar 063154eab7
Automate part of TestMaxQuerySamples (#8314) 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2021-01-04 14:33:36 +05:30
Julien Pivotto 438ab463ad Fix link in documentation 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-01-04 01:12:47 +01:00
Julien Pivotto c04284ff90 Add https and authentication to the navbar 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-01-04 01:12:47 +01:00
Frederic Branczyk 83c5fa1ea5
Merge pull request #8332 from brancz/fix-grafana-config 
mixin: Scope grafana config
 2020-12-30 19:47:31 +01:00
Frederic Branczyk 62bc755733
mixin: Scope grafana config 
In its current form this configuration clashes in one of the most widely
used configurations (kube-prometheus). This patch scopes the
configuration to prevent this.

Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2020-12-30 17:50:34 +01:00
Björn Rabenstein 32d8dee872
Merge pull request #8331 from prometheus/release-2.24 
Cut v2.24.0-rc.0
 2020-12-30 16:22:50 +01:00
beorn7 0cb133aaa5 Remove CHANGELOG entry about logging 
This happens against the explicit objection of the release shepherd.

Signed-off-by: beorn7 <beorn@grafana.com>
 2020-12-30 14:14:08 +01:00
beorn7 d9ab154fbe More CHANGELOG tweaks 
Signed-off-by: beorn7 <beorn@grafana.com>
 2020-12-30 14:12:12 +01:00
beorn7 94bcfe3b91 Tweak CHANGELOG.md 
Signed-off-by: beorn7 <beorn@grafana.com>
 2020-12-30 12:50:11 +01:00
beorn7 e5ba7878ab Cut v2.24.0-rc.0 
Signed-off-by: beorn7 <beorn@grafana.com>
 2020-12-30 12:17:37 +01:00
Björn Rabenstein 4d7e798632
Merge pull request #8329 from prometheus/beorn7/vendoring 
Update  React dependencies prior to v2.24 release
 2020-12-30 11:33:10 +01:00
Julien Pivotto bc9f9ee3aa
Backfilling: fast-path for non-consecutive blocks (#8324) 
* Backfilling: optimize for non-consecutive blocks

When you have missing data for > 2 hours, you spend a lot of time
re-reading the complete file. It is not optimal.

This introduces a fastpath for this scenario.

Next, we do parse the metric even when we know we will not use it, based
on its timestamp. This only computes the metric when we know its
timestamp is right.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-12-30 02:06:41 +01:00
beorn7 2346fd934c Update React dependencies prior to v2.24 release 
Signed-off-by: beorn7 <beorn@grafana.com>
 2020-12-30 00:15:12 +01:00
Julien Pivotto 0de83bfa14
Merge pull request #8319 from roidelapluie/promtooltls 
Promtool: add web config validation
 2020-12-29 21:14:52 +01:00
Julien Pivotto 003d6451fc Promtool: add web config validation 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-12-29 16:55:29 +01:00
Julien Pivotto 2f54aa0604
Merge pull request #8316 from roidelapluie/newtls 
Add TLS and basic authentication
 2020-12-29 13:43:57 +01:00
Julien Pivotto bb0316ed70
Merge pull request #8325 from roidelapluie/rp25 
Add roidelapluie as 2.25 release shepherd
 2020-12-28 21:35:34 +01:00
Julien Pivotto 5b4f46a348 Add TLS and basic authentication 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-12-28 21:33:44 +01:00
Julien Pivotto 60fddc3b37 Add roidelapluie as 2.25 release shepherd 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-12-28 20:36:16 +01:00
Ben Kochie 5055dfbbe4 Listen on web early in startup 
Avoid starting up components like the TSDB if we can't bind
to the web listening port.

Signed-off-by: Ben Kochie <superq@gmail.com>
 2020-12-28 20:13:05 +01:00
Julien Pivotto d54352f00d
Merge pull request #8323 from prometheus/beorn7/vendoring 
Update dependencies prior to releasing v2.24
 2020-12-28 20:12:48 +01:00