Commit graph

8396 commits

Author SHA1 Message Date
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
beorn7 da1ca868d1 Update dependencies prior to releasing v2.24
Signed-off-by: beorn7 <beorn@grafana.com>
2020-12-28 17:53:35 +01:00
Björn Rabenstein 4154f6bc7d
Merge pull request #8321 from prometheus/beorn7/promtool
promtool: Print block meta-data slightly more nicely
2020-12-28 17:51:02 +01:00
beorn7 6bfa33308e promtool: Print block meta-data slightly more nicely
I initially thought I could somehow rescue the current column layout
by recycling the tabwriter, but flushing completely blanks
it. However, by setting a minimum width of 13, we get a slightly
broader DURATION column but otherwise nice formatting, unless numbers
get really big, but that's OK, I guess.

Before:

```
BLOCK ULID                  MIN TIME                       MAX TIME                       DURATION  NUM SAMPLES  NUM CHUNKS  NUM SERIES  SIZE
01ETN0KGNP5WWK9T5QMQGBG9F1  2020-11-19 07:39:17 +0000 UTC  2020-11-19 07:44:17 +0000 UTC  5m0.001s  8            2           2           624B
01ETN0KGQSFF0AB2QDZVQG3CWC  2020-11-19 10:25:57 +0000 UTC  2020-11-19 10:30:57 +0000 UTC  5m0.001s  8  2  2  622B
01ETN0KGSW8KYP3YPG4X20P60Z  2020-11-19 13:12:37 +0000 UTC  2020-11-19 13:17:37 +0000 UTC  5m0.001s  8  2  2  625B
```

After:

```
BLOCK ULID                  MIN TIME                       MAX TIME                       DURATION     NUM SAMPLES  NUM CHUNKS   NUM SERIES   SIZE
01ETN0R72SXN9A1FG732P7KFFN  2020-11-19 07:39:17 +0000 UTC  2020-11-19 07:44:17 +0000 UTC  5m0.001s     8            2            2            624B
01ETN0R74Y9AG1A1MKN4MZK7WM  2020-11-19 10:25:57 +0000 UTC  2020-11-19 10:30:57 +0000 UTC  5m0.001s     8            2            2            622B
01ETN0R76KXZ5VQECMDNES49J6  2020-11-19 13:12:37 +0000 UTC  2020-11-19 13:17:37 +0000 UTC  5m0.001s     8            2            2            625B
```

After without the `-r` flag:

```
BLOCK ULID                  MIN TIME       MAX TIME       DURATION     NUM SAMPLES  NUM CHUNKS   NUM SERIES   SIZE
01ETN0RFFJ42274NWR1GH0RTV6  1605771557000  1605771857001  5m0.001s     8            2            2            624
01ETN0RFJ1MZCHHS2SBZS8XC27  1605781557000  1605781857001  5m0.001s     8            2            2            622
01ETN0RFM98N3V4KD2DZXFGHGN  1605791557000  1605791857001  5m0.001s     8            2            2            625
```

Signed-off-by: beorn7 <beorn@grafana.com>
2020-12-28 16:55:12 +01:00
beorn7 97f9bcb243 Merge branch 'review' 2020-12-28 16:18:32 +01:00
beorn7 651b57b9ab Merge branch 'backfillhr' of git://github.com/roidelapluie/prometheus into review 2020-12-28 16:18:00 +01:00
Frederic Branczyk 611fa967cd
Merge pull request #8285 from ashumkin/label-selector
discovery/kubernetes: Fix valid label selector causing config error
2020-12-28 16:00:06 +01:00
Björn Rabenstein 7889bdf16e
Merge pull request #8313 from pracucci/lower-compactor-overlapping-blocks-log
Lowered 'Found overlapping blocks during compaction' log level
2020-12-28 14:59:59 +01:00
Björn Rabenstein ffb3ef6765
Merge pull request #8315 from yeya24/create-dir
Create output directory before backfilling
2020-12-28 14:36:00 +01:00
Julien Pivotto a033845d87
Merge pull request #8317 from ArthurSens/fuzzit_todo
Change seconds()*1000 to milliseconds()
2020-12-25 17:03:49 +01:00
arthursens 8493704b9b Change seconds()*1000 to milliseconds()
Signed-off-by: arthursens <arthursens2005@gmail.com>
2020-12-25 10:45:23 -03:00
yeya24 cedd2dbec9 create output directory before backfilling
Signed-off-by: yeya24 <yb532204897@gmail.com>
2020-12-24 23:36:36 -05:00
Bartlomiej Plotka 70c69aaa6c
Small cleanup of API code. (#8258)
* Small cleanup of API code.

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

* Fixed typo spotted by Julien.

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
2020-12-24 00:27:13 +00:00
Julien Pivotto 53480c168d Backfill: print created blocks only, add human-readable option
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-12-23 20:42:30 +01:00
AdaephonBen dca6954b0a
promtool: Add URL scheme when not provided (#7956)
Signed-off-by: AdaephonBen <ma18btech11011@iith.ac.in>
2020-12-23 19:52:04 +01:00
Marco Pracucci 2b4b138244
Lowered 'Found overlapping blocks during compaction' log level
Signed-off-by: Marco Pracucci <marco@pracucci.com>
2020-12-23 17:23:04 +01:00
Julien Pivotto 3e8a96e652
Merge pull request #8294 from prometheus/dependabot/npm_and_yarn/web/ui/react-app/ini-1.3.8
Bump ini from 1.3.5 to 1.3.8 in /web/ui/react-app
2020-12-23 15:12:11 +01:00