mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-16 18:44:05 -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
Brian Brazil 36dbf042e3
Correctly handle {__name__="a"} (#5552) 
This can cause problems in alerts.

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2019-05-11 00:46:15 +01:00
mrasu 3a7a743bc4 Consistent Content-Type for js and css (#5551) 
Currently, When `/etc/mime.types` has a unusual mime type, web of prometheus uses the type and you may get unexpected result.
With this change, web returns consistent Content-Type header for static js and css files

To reproduce:
1. Add a type at the end of `/etc/mime` like `text/x-js js`
2. Run prometheus
3. Request js file like `http://localhost:9090/static/vendor/js/jquery.min.js`
4. You will see Content-Type of the response is `text/x-js` instead of `application/javascript`

Signed-off-by: mrasu <m.rasu.hitsuji@gmail.com>
 2019-05-09 16:10:15 +01:00
Semyon Slepov 33f085a4d6 Remove bits about substring matching from the docs (#5549) 
Substring matching for labels doesn't work anymore.
These parts are misleading, and contradict with the rest of the
documentation.

Signed-off-by: Semyon Slepov <slepovss@gmail.com>
 2019-05-09 11:12:32 +01:00
Brian Brazil b98e818876
Add scrape_series_added per-scrape metric. (#5546) 
This is an estimate of churn, with series being added to the cache being
considered churn. This will have both false positives (e.g. series
appearing and disappearing) and false negatives (e.g. series hit
sample_limit, but still created in head block), but should be generally
useful as-is.

Relevant docs live in another repo.

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2019-05-08 22:24:00 +01:00
Björn Rabenstein c8939a67ba
Merge pull request #5545 from prometheus/beorn7/release 
Volunteer beorn7 as 2.10 release shepherd
 2019-05-08 15:00:08 +02:00
beorn7 bab26d9df8 Volunteer beorn7 as 2.10 release shepherd 
I'm willing to do this under the condition that I can run an
experiment with never freezing master. See addition in the file.

I believe, this way is more consistent with how we handle the bugfix
releases after the final minor release is cut. It's at least worth a
try.

Signed-off-by: beorn7 <bjoern@rabenste.in>
 2019-05-08 13:30:35 +02:00
Brian Brazil 6ac81cc7a9
Correctly handle empty labels. (#594) 
Currently a time series with empty labels is not treated the same
as one with missing labels. Currently this can only come from
ALERTS&ALERT_FOR_STATE so it's unlikely anyone has actually hit it.

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2019-05-07 11:00:16 +01:00
Goutham Veeramachaneni 2ae028114c
Add FromData function (again)! (#600) 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2019-05-06 19:17:26 +05:30
Yao Zengzeng dbd7a7400e some minor fixes: (#5535) 
1. If alerts is empty after `relabelAlerts`, just return to avoid
subsequent unnecessary operations

2. minor fix in notifier's test case

3. minor fix in comment

Signed-off-by: YaoZengzeng <yaozengzeng@zju.edu.cn>
 2019-05-06 08:02:40 +01:00
PrometheusBot 4da65c46c9 makefile: update Makefile.common with newer version (#597) 
Signed-off-by: prombot <prometheus-team@googlegroups.com>
 2019-05-05 19:17:35 +03:00
Yao Zengzeng 5544cb252a fix some mistakes in comments (#5533) 
Signed-off-by: YaoZengzeng <yaozengzeng@zju.edu.cn>
 2019-05-05 10:48:42 +01:00
Simon Pasquier 45506841e6
*: enable all default linters (#5504) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-05-03 15:11:28 +02:00
Simon Pasquier 9c69eec82a cmd/promtool: use log.NewNopLogger() (#5531) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-05-03 10:00:07 +01:00
zhulongcheng 3ccab17f5d docs: add label offset table and postings offset table (#593) 
Signed-off-by: zhulongcheng <zhulongcheng.me@gmail.com>
 2019-05-02 23:23:58 +03:00
Simon Pasquier 03b90b4645
web/ui: update to Bootstrap 4.3.1 (#5506) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-04-30 10:16:36 +02:00
Krasi Georgiev 5512826f13
make Close methods for the querier safe to call more than once. (#581) 
* make Close methods for the querier safe to call more than once.

Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2019-04-30 10:17:07 +03:00
Frederic Branczyk c790d7658c
Merge pull request #5491 from metalmatze/rungroup 
Use github.com/oklog/run not archived oklog/oklog
 2019-04-29 16:22:16 +02:00
Frederic Branczyk 3cffd81035
Merge pull request #5520 from YaoZengzeng/service 
The workqueue of service should be `service` other than `ingress`
 2019-04-29 14:03:21 +02:00
YaoZengzeng 658b33808c The workqueue of service should be service other than ingress 
Signed-off-by: YaoZengzeng <yaozengzeng@zju.edu.cn>
 2019-04-29 17:21:35 +08:00
Frederic Branczyk f874555a0d
Merge pull request #5486 from tariq1890/update_kubernetes 
update client-go,api,api-machinery and klog dependencies
 2019-04-29 09:34:27 +02:00
zhulongcheng 19d402d154 cleanup tmp files (#570) 
Signed-off-by: zhulongcheng <zhulongcheng.me@gmail.com>
 2019-04-26 11:27:36 +03:00
Julius Volz f04b1b5559
Clarify binary operator output label sets (#5512) 
* Clarify binary operator output label sets

Signed-off-by: Julius Volz <julius.volz@gmail.com>

* Clarify binary op output labels further

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2019-04-25 14:10:22 +02:00
Krasi Georgiev 288f67efbf
fix some unchecked errors and remove unused vars. (#592) 
Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2019-04-25 13:07:04 +03:00
PrometheusBot a10c001689 Synchronize Makefile.common from prometheus/prometheus (#591) 
* makefile: update Makefile.common with newer version

Signed-off-by: prombot <prometheus-team@googlegroups.com>

* Add .golangci.yml

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-04-25 12:29:09 +03:00
Brian Brazil ad4ba49132
Merge pull request #5509 from prometheus/release-2.9 
Merge 2.9.2 back to master
 2019-04-25 08:53:06 +01:00
Brian Brazil d3245f1502
Merge pull request #5503 from prometheus/release292 
Cut 2.9.2
 2019-04-24 16:30:33 +01:00
Björn Rabenstein 0be9388f8d
Merge pull request #5463 from prometheus/beorn7/templating 
Follow-up on #5009
 2019-04-24 16:42:23 +02:00
Brian Brazil cdc2ad05ef Cut 2.9.2 
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2019-04-24 13:53:27 +01:00
Brian Brazil 7f9ff08c50 Upgrade tsdb to 0.7.1 (#5502) 
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2019-04-24 13:50:16 +01:00
Callum Styan 23c382e240 Remote Storage: string interner should not panic in release (#5487) 
* Don't panic if we try to release a string that is not in the interner.

* Move seriesMtx locking in QueueManager's StoreSeries function.

This stops us from calling release for strings that aren't interned if
there's a race between reading a checkpoint and storing new series
labels, which could happen during checkpointing or reloading config.

Signed-off-by: Callum Styan <callumstyan@gmail.com>
 2019-04-24 13:50:16 +01:00
Simon Pasquier 31a2d14e2f cmd/promtool: return errors from rule evaluations (#5483) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-04-24 13:50:16 +01:00
Romain Baugue f2ca36e56a Exhaust every request body before closing it (#5166) (#5479) 
From the documentation:
> The default HTTP client's Transport may not
> reuse HTTP/1.x "keep-alive" TCP connections if the Body is
> not read to completion and closed.

This effectively enable keep-alive for the fixed requests.

Signed-off-by: Romain Baugue <romain.baugue@elwinar.com>
 2019-04-24 13:50:16 +01:00
Goutham Veeramachaneni 3da718c21a Make sure subquery range is taken into account for selection (#5467) 
* Make sure subquery range is taken into account for selection

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2019-04-24 13:49:31 +01:00
Brian Brazil aabac9be52
Upgrade tsdb to 0.7.1 (#5502) 
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2019-04-24 13:44:59 +01:00
Brian Brazil c20450564c
Release 0.7.1 (#587) 
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2019-04-24 13:20:45 +01:00
Simon Pasquier f5d54e5be6
*: enable golangci-lint (#5437) 
* *: enable golangci-lint

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Remove freebsd from supported platforms for lint

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Update CONTRIBUTING.md

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Update CONTRIBUTING.md

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Add common-staticcheck for compatibility

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-04-24 14:18:40 +02:00
Brian Brazil f9bc0817a1
Avoid allocation in mergedPostings.Seek. (#586) 
See
https://github.com/prometheus/prometheus/issues/5424#issuecomment-485199651

benchmark                                                            old
ns/op      new ns/op       delta
BenchmarkHeadPostingForMatchers/n="1"-4
5266           5267            +0.02%
BenchmarkHeadPostingForMatchers/n="1",j="foo"-4
6469           7801            +20.59%
BenchmarkHeadPostingForMatchers/j="foo",n="1"-4
4984           4963            -0.42%
BenchmarkHeadPostingForMatchers/n="1",j!="foo"-4
7137           7527            +5.46%
BenchmarkHeadPostingForMatchers/i=~".*"-4
8055830839     8117651746      +0.77%
BenchmarkHeadPostingForMatchers/i=~".+"-4
9369298293     9742710251      +3.99%
BenchmarkHeadPostingForMatchers/i=~""-4
2363120708     2507789029      +6.12%
BenchmarkHeadPostingForMatchers/i!=""-4
9387069195     11740628557     +25.07%
BenchmarkHeadPostingForMatchers/n="1",i=~".*",j="foo"-4
109668312      107644136       -1.85%
BenchmarkHeadPostingForMatchers/n="1",i=~".*",i!="2",j="foo"-4
106022679      105759760       -0.25%
BenchmarkHeadPostingForMatchers/n="1",i!="",j="foo"-4
330201810      266421024       -19.32%
BenchmarkHeadPostingForMatchers/n="1",i=~".+",j="foo"-4
355627801      292774913       -17.67%
BenchmarkHeadPostingForMatchers/n="1",i=~"1.+",j="foo"-4
108132305      106697690       -1.33%
BenchmarkHeadPostingForMatchers/n="1",i=~".+",i!="2",j="foo"-4
358836972      362579998       +1.04%
BenchmarkHeadPostingForMatchers/n="1",i=~".+",i!~"2.*",j="foo"-4
555879392      575858378       +3.59%

benchmark                                                            old
allocs     new allocs     delta
BenchmarkHeadPostingForMatchers/n="1"-4                              8
8              +0.00%
BenchmarkHeadPostingForMatchers/n="1",j="foo"-4                      11
11             +0.00%
BenchmarkHeadPostingForMatchers/j="foo",n="1"-4                      11
11             +0.00%
BenchmarkHeadPostingForMatchers/n="1",j!="foo"-4                     17
17             +0.00%
BenchmarkHeadPostingForMatchers/i=~".*"-4                            58
58             +0.00%
BenchmarkHeadPostingForMatchers/i=~".+"-4
100115         100115         +0.00%
BenchmarkHeadPostingForMatchers/i=~""-4
100125         100125         +0.00%
BenchmarkHeadPostingForMatchers/i!=""-4
100112         100112         +0.00%
BenchmarkHeadPostingForMatchers/n="1",i=~".*",j="foo"-4              19
19             +0.00%
BenchmarkHeadPostingForMatchers/n="1",i=~".*",i!="2",j="foo"-4       22
22             +0.00%
BenchmarkHeadPostingForMatchers/n="1",i!="",j="foo"-4
100109         100079         -0.03%
BenchmarkHeadPostingForMatchers/n="1",i=~".+",j="foo"-4
100110         100079         -0.03%
BenchmarkHeadPostingForMatchers/n="1",i=~"1.+",j="foo"-4
11176          11167          -0.08%
BenchmarkHeadPostingForMatchers/n="1",i=~".+",i!="2",j="foo"-4
100112         100082         -0.03%
BenchmarkHeadPostingForMatchers/n="1",i=~".+",i!~"2.*",j="foo"-4
111307         111277         -0.03%

benchmark                                                            old
bytes     new bytes     delta
BenchmarkHeadPostingForMatchers/n="1"-4
1360          1360          +0.00%
BenchmarkHeadPostingForMatchers/n="1",j="foo"-4
1392          1392          +0.00%
BenchmarkHeadPostingForMatchers/j="foo",n="1"-4
1392          1392          +0.00%
BenchmarkHeadPostingForMatchers/n="1",j!="foo"-4
1520          1520          +0.00%
BenchmarkHeadPostingForMatchers/i=~".*"-4
258254040     258254040     +0.00%
BenchmarkHeadPostingForMatchers/i=~".+"-4
281554280     281554280     +0.00%
BenchmarkHeadPostingForMatchers/i=~""-4
241554888     241554888     +0.00%
BenchmarkHeadPostingForMatchers/i!=""-4
281553664     281553664     +0.00%
BenchmarkHeadPostingForMatchers/n="1",i=~".*",j="foo"-4
1607277       1607277       +0.00%
BenchmarkHeadPostingForMatchers/n="1",i=~".*",i!="2",j="foo"-4
1607389       1607389       +0.00%
BenchmarkHeadPostingForMatchers/n="1",i!="",j="foo"-4
73076560      24907600      -65.92%
BenchmarkHeadPostingForMatchers/n="1",i=~".+",j="foo"-4
73076765      24907723      -65.92%
BenchmarkHeadPostingForMatchers/n="1",i=~"1.+",j="foo"-4
5416925       3794909       -29.94%
BenchmarkHeadPostingForMatchers/n="1",i=~".+",i!="2",j="foo"-4
73076779      24907819      -65.92%
BenchmarkHeadPostingForMatchers/n="1",i=~".+",i!~"2.*",j="foo"-4
99874860      51705900      -48.23%

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2019-04-24 13:12:58 +01:00
Callum Styan 3639d51eb6 Remote Storage: string interner should not panic in release (#5487) 
* Don't panic if we try to release a string that is not in the interner.

* Move seriesMtx locking in QueueManager's StoreSeries function.

This stops us from calling release for strings that aren't interned if
there's a race between reading a checkpoint and storing new series
labels, which could happen during checkpointing or reloading config.

Signed-off-by: Callum Styan <callumstyan@gmail.com>
 2019-04-24 10:46:31 +01:00
Dougal Matthews 24efe92593 Update the required Go version to 1.12 (#5498) 
See #5455

Signed-off-by: Dougal Matthews <dougal@redhat.com>
 2019-04-24 09:30:54 +02:00
Tariq Ibrahim 00036cd1e5
update client-go,api,api-machinery and klog dependencies 
Signed-off-by: Tariq Ibrahim <tariq181290@gmail.com>
 2019-04-23 10:54:18 -07:00
Callum Styan e87449b59d Remote Write: Queue Manager specific metrics shouldn't exist if the queue no longer exists (#5445) 
* Unregister remote write queue manager specific metrics when stopping the
queue manager.

* Use DeleteLabelValues instead of Unregister to remove queue and watcher
related metrics when we stop them. Create those metrics in the structs
start functions rather than in their constructors because of the
ordering of creation, start, and stop in remote storage ApplyConfig.

* Add setMetrics function to WAL watcher so we can set
the watchers metrics in it's Start function, but not
have to call Start in some tests (causes data race).

Signed-off-by: Callum Styan <callumstyan@gmail.com>
 2019-04-23 09:49:17 +01:00
Callum Styan b7538e7b49 Don't stop, recreate, and start remote storage QueueManagers if the (#5485) 
remote write config hasn't changed at all.

Signed-off-by: Callum Styan <callumstyan@gmail.com>
 2019-04-23 09:47:18 +01:00
Simon Pasquier abc1994bec
cmd/promtool: return errors from rule evaluations (#5483) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-04-23 09:59:03 +02:00
Bjoern Rabenstein 76102d570c Add test for external labels in label template 
Signed-off-by: Bjoern Rabenstein <bjoern@rabenste.in>
 2019-04-21 00:08:39 +02:00
Matthias Loibl 388caa06ac
Use github.com/oklog/run not archived oklog/oklog 
Signed-off-by: Matthias Loibl <mail@matthiasloibl.com>
 2019-04-19 14:55:28 +02:00
naivewong 7a12d4588a Avoid potential collision of createIdxChkReaders in querier_test.go (#585) 
* Make chink ref monotonically increasing number in the `createIdxChkReaders` test func.
Signed-off-by: naivewong <867245430@qq.com>
 2019-04-18 16:11:39 +03:00
PrometheusBot e2c6eb2c60 Synchronize Makefile.common from prometheus/prometheus (#584) 
Propagating changes from master Makefile.common located in prometheus/prometheus.
 2019-04-18 14:26:25 +03:00
Simon Pasquier 7efb8e9480
scripts/sync_makefiles.sh: redirect git-push to /dev/null (#5478) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-04-18 12:01:49 +02:00
Romain Baugue 95193fa027 Exhaust every request body before closing it (#5166) (#5479) 
From the documentation:
> The default HTTP client's Transport may not
> reuse HTTP/1.x "keep-alive" TCP connections if the Body is
> not read to completion and closed.

This effectively enable keep-alive for the fixed requests.

Signed-off-by: Romain Baugue <romain.baugue@elwinar.com>
 2019-04-18 09:50:37 +01:00
EarthmanT 35be8c9e25 Add azure public ip label (#5475) 
* Update Azure SD Config with Public IP label

Signed-off-by: earthmant <trammell@cloudify.co>
 2019-04-17 16:05:44 +01:00