Commit Graph

7061 Commits

Author SHA1 Message Date
Björn Rabenstein
70ce3df23c
Merge pull request #5860 from tariq1890/variadic
pass multiple args to Registerer.MustRegister method
2019-08-13 13:22:30 +02:00
Bartek Płotka
32be514845
Merge pull request #5805 from codesome/merge-tsdb
Merge tsdb into prometheus
2019-08-13 11:39:41 +01:00
Brian Brazil
e62f30d497
Correctly handle empty labels from alert templates. (#5845)
Fixes https://github.com/prometheus/common/issues/36

Move logic handling this into the labels package,
so all the cases are handled in one place and we're
less likely to have this come up again.

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
2019-08-13 11:19:17 +01:00
Chris Marchbanks
a6a55c433c Improve desired shards calculation (#5763)
The desired shards calculation now properly keeps track of the rate of
pending samples, and uses the previously unused integralAccumulator to
adjust for missing information in the desired shards calculation.

Also, configure more capacity for each shard.  The default 10 capacity
causes shards to block on each other while
sending remote requests. Default to a 500 sample capacity and explain in
the documentation that having more capacity will help throughput.

Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
2019-08-13 10:10:21 +01:00
Ganesh Vernekar
5ecef3542d
Cleanup after merging tsdb into prometheus
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
2019-08-13 14:04:14 +05:30
Ganesh Vernekar
750e438ebb
Merge remote-tracking branch 'tsdb/merge-tsdb' into merge-tsdb-new 2019-08-13 13:59:13 +05:30
Ganesh Vernekar
7cf09b0395
Moving tsdb into its own subdirectory
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
2019-08-13 13:58:49 +05:30
tariqibrahim
df99d943ba pass multiple args to Registers.MustRegister method
Signed-off-by: tariqibrahim <tariq181290@gmail.com>
2019-08-12 22:56:10 -07:00
Krzysztof Kowalczyk
6e53980bbf fix fuzz targets (#5851)
Signed-off-by: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
2019-08-12 20:47:57 +02:00
Björn Rabenstein
c9f617af55
Merge pull request #5825 from simonpasquier/fix-wal-corruptions-alert
prometheus-mixin: remove PrometheusTSDBWALCorruptions
2019-08-12 19:24:18 +02:00
Bartek Płotka
8ae00e9868
Merge pull request #5854 from AllenZMC/patch-1
fix mis-spelling in template.go
2019-08-11 13:20:55 +01:00
AllenZMC
00b556e9b5 fix mis-spelling in template.go
Signed-off-by: czm <zhongming.chang@daocloud.io>
2019-08-11 18:22:42 +08:00
ethan
38ccf0157e cleanup: correct func name in log message (#5852)
Signed-off-by: Guangming Wang <guangming.wang@daocloud.io>
2019-08-10 16:24:58 +01:00
AllenZMC
3638e4ab18 fix mis-spelling in fuzz.go (#5848)
Signed-off-by: czm <zhongming.chang@daocloud.io>
2019-08-09 15:19:45 +01:00
Frederic Branczyk
99ef093e2f
Merge pull request #4639 from csmarchbanks/move-to-testutil
Move to testutil in the remaining packages that use testify
2019-08-09 09:08:23 +02:00
Chris Marchbanks
529ccff07b
Remove all usages of stretchr/testify
Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
2019-08-08 19:49:27 -06:00
Chris Marchbanks
0685eb5395
Refactor testutil.NewStorage into a new package
This avoids a circular dependency between the testutil and storage
packages.

Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
2019-08-08 19:43:04 -06:00
Callum Styan
3b75614892 Add a warning alert, since the remote write behind alert will probably
already be going off, about desired shards being higher than max shards.

Signed-off-by: Callum Styan <callumstyan@gmail.com>
2019-08-08 06:45:46 -07:00
Ben Kochie
ff40de7ca6 Add more details about retention to storage docs (#5842)
* Make compaction docs a little more clear, easy to find.
* Expand compaction docs slightly.
* Add notes about block cleanup to operational section.

Signed-off-by: Ben Kochie <superq@gmail.com>
2019-08-07 17:04:48 +01:00
Vadym Martsynovskyy
8318aa2d5d Check for duplicate label names in remote read (#5829)
* Check for duplicate label names in remote read

Also add test to confirm that #5731 is fixed

* Use subtests in TestValidateLabelsAndMetricName

* Really check that expectedErr matches err

Signed-off-by: Vadym Martsynovskyy <vmartsynovskyy@gmail.com>
2019-08-07 16:13:10 +01:00
Brian Brazil
2184b79763
Mark deleted rule's series as stale on next evaluation. (#5759)
Fixes #5755

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
2019-08-07 16:11:05 +01:00
AllenZMC
04cb37fea8 fix wrong spells in query_logger.go (#5843)
Signed-off-by: czm <zhongming.chang@daocloud.io>
2019-08-07 15:02:53 +01:00
Simon Pasquier
dd174963a2 prometheus-mixin: remove PrometheusTSDBWALCorruptions
The counter is only increased when tsdb.Open() is called which
Prometheus does only once in its lifetime (when it initializes). If the
corruption can't be recovered, tsdb.Open() returns an error and
Prometheus exits. Hence the metric is either 0 (no corruption) or 1
(corruption detected and repaired). If the latter, the alert isn't
actionable and the only way to resolve it is to restart Prometheus which
would reset the counter.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-08-06 14:36:56 +02:00
Ganesh Vernekar
ccdf2f7d94
Merge pull request #660 from YaoZengzeng/fix
enhancement: flush the page more precisely
2019-08-06 15:38:37 +05:30
AllenZMC
41151ca8dc fix mis-spelling in consul_test.go (#5836)
Signed-off-by: czm <zhongming.chang@daocloud.io>
2019-08-06 06:11:41 +01:00
ethan
8928094b56 func name ref correct "qauntile" -> "quantile" (#5834)
Signed-off-by: ethan <guangming.wang@daocloud.io>
2019-08-06 06:11:16 +01:00
slava
5e974d3170 Fix context for the showWarning function (#5833)
* Fix context for the showWarning function

If the difference between the current time on a client and time on a server is quite big, Prometheus tries to show a related warning in UI on the Graph tab. But in the code, an incorrect context is used to invoke this method. As a result, an error is showed in the web developer console and the whole page stop working at all. This commit fixes the context.

CC @juliusv

Signed-off-by: Vyacheslav Kulakov <vkulakov@swiftserve.com>

* Fix context for the showWarning function

Fixed assets

CC @juliusv

Signed-off-by: Vyacheslav Kulakov <vkulakov@swiftserve.com>
2019-08-05 20:03:12 +02:00
Ganesh Vernekar
a3487fc74c
Merge pull request #5830 from vmartsynovskyy/fix-docs
Fix incorrect examples in docs
2019-08-05 11:38:02 +05:30
Callum Styan
c40a83f386 Add metrics for max shards, min shards, and desired shards.
Signed-off-by: Callum Styan <callumstyan@gmail.com>
2019-08-04 20:04:19 -07:00
Vadym Martsynovskyy
a9970a47ef Fix incorrect examples in docs
Signed-off-by: Vadym Martsynovskyy <vmartsynovskyy@gmail.com>
2019-08-04 16:42:42 -07:00
AllenZMC
8d6ec5acdc fix word 'seriess' to 'series' (#5828)
Signed-off-by: czm <zhongming.chang@daocloud.io>
2019-08-04 16:52:51 +01:00
AllenZMC
5c2c9a03e9 fix word 'consequentally' to 'consequently' (#5827)
Signed-off-by: czm <zhongming.chang@daocloud.io>
2019-08-03 14:56:58 +01:00
AllenZMC
9e47bb8b46 fix word 'parmeters' to 'parameters' (#5826)
Signed-off-by: czm <zhongming.chang@daocloud.io>
2019-08-02 14:52:15 +01:00
AllenZMC
ead0933dd9 fix word 'substracting' to 'subtracting' (#5822)
Signed-off-by: czm <zhongming.chang@daocloud.io>
2019-08-01 15:44:38 +01:00
Dan P
a9dea68ee6 removed document reference to meta label that doesnt exist in the kubernetes_sd (#5821)
Signed-off-by: Dan Potepa <dan@danpotepa.co.uk>
2019-08-01 12:34:23 +01:00
Advait Bhatwadekar
5d401f1e1b Added query logging for prometheus. Issue #1315 (#5794)
* Added query logging for prometheus.
Options added:
1) active.queries.filepath: Filename where queries will be recorded
2) active.queries.filesize: Size of the file where queries will be recorded.

Functionality added:
All active queries are now logged in a file. If prometheus crashes unexpectedly, these queries are also printed out on stdout in the rerun.

Queries are written concurrently to an mmaped file, and removed once they are done. Their positions in the file are reused. They are written in json format. However, due to dynamic nature of application, the json has an extra comma after the last query, and is missing an ending ']'. There may also null bytes in the tail of file.

Signed-off-by: Advait Bhatwadekar <advait123@ymail.com>
2019-07-31 16:12:43 +01:00
@aifsair
0f00737308 Fix log config setup (#5807)
The return value of Set() was not checked.
Hence, the typo ("al" instead of "af") wasn't catched.

Signed-off-by: François (fser) <fser@code-libre.org>
2019-07-29 18:00:30 +01:00
yeya24
b7bb278e95 make targets active parallel (#5740)
Signed-off-by: yeya24 <yb532204897@gmail.com>
2019-07-29 17:08:54 +01:00
Björn Rabenstein
7d36178731
Merge pull request #5804 from AllenZMC/patch-1
fix word `encourter` to `encounter`
2019-07-29 16:44:26 +02:00
AllenZMC
758c71b980 fix word encourter to encounter
Signed-off-by: czm <zhongming.chang@daocloud.io>
2019-07-29 22:16:23 +08:00
Ganesh Vernekar
42bbc6b37b
Merge pull request #5801 from dzzg/patch-1
fix wrong spells in ingress.go
2019-07-29 10:06:37 +05:30
YaoZengzeng
104566ae53 enhancement: 1. don't flush the page if it's last fragment of the record
2. if it's last record of the bacth, flush the page after it written into the page

Signed-off-by: YaoZengzeng <yaozengzeng@zju.edu.cn>
2019-07-29 09:07:51 +08:00
dzzg
938ca06057
fix wrong spells in ingress.go
Signed-off-by: dzzg <zhengguang.zhu@daocloud.io>
2019-07-28 02:07:23 +08:00
Yao Zengzeng
d5b3f07043 add metric for tsdb size retention bytes (#667)
Signed-off-by: YaoZengzeng <yaozengzeng@zju.edu.cn>
2019-07-27 09:52:25 +01:00
Yao Zengzeng
56578602ab remove redundant condition judgement whether cut new chunk (#669)
Signed-off-by: YaoZengzeng <yaozengzeng@zju.edu.cn>
2019-07-26 11:54:06 +03:00
Ganesh Vernekar
87a0fe0c75
Merge pull request #5793 from codesome/tsdb-vendor
Vendor tsdb v0.10.0
2019-07-24 16:42:39 +05:30
Johnny Lim
7645ed8fd3 Fix typo (#5796)
Signed-off-by: Johnny Lim <izeye@naver.com>
2019-07-24 10:41:14 +01:00
Ganesh Vernekar
c782d29310
Vendor tsdb 0.10.0
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
2019-07-24 15:09:12 +05:30
Ganesh Vernekar
7762249358
Merge pull request #668 from codesome/release-0.10.0
cut 0.10.0
2019-07-24 15:03:17 +05:30
Ganesh Vernekar
7469719dc8
cut 0.10.0
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
2019-07-24 14:56:19 +05:30