Commit graph

7491 commits

Author SHA1 Message Date
Fabian Reinartz d1d5c5c47d Merge pull request #2713 from brancz/max-block-duration-default
prometheus: default max-block-duration to 10% of retention
2017-05-12 12:07:09 +02:00
Frederic Branczyk c50a3eccce
prometheus: default max-block-duration to 10% of retention 2017-05-12 11:48:51 +02:00
Goutham Veeramachaneni 2fa647f50b Fix missing postings in Merge and Intersect (#77)
* Test for a previous implematation of Intersect

Before we were moving the postings list everytime we create a new
chained `intersectPostings`. That was causing some postings to be
skipped. This test fails on the older version.

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>

* Advance on Seek only when valid.

Issue:
Before in mergedPostings and others we advance everytime we `Seek`,
which causes issues with `Intersect`.

Take the case, where we have a mergedPostings = m merging, a: {10, 20, 30} and
b: {15, 25, 35}. Everytime we `Seek`, we do a.Seek and b.Seek.

Now if we Intersect m with {21, 22, 23, 30}, we would do Seek({21,22,23}) which
would advance a and b beyond 30.

Fix:
Now we advance only when the seeking value is greater than the current
value, as the definition specifies.

Also, posting 0 will not be a valid posting and will be used to signal
finished or un-initialized PostingsList.

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>

* Add test for Merge+Intersect edgecase.

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>

* Add comments to trivial tests.

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-05-12 09:44:41 +02:00
Fabian Reinartz 0e0da989c5 Merge pull request #2712 from prometheus/vendor
vendor: remove leftover dependency
2017-05-12 09:19:15 +02:00
Fabian Reinartz 8d54499e97 vendor: remove leftover dependency 2017-05-12 09:14:44 +02:00
Fabian Reinartz 8e73bde650 Merge pull request #2710 from prometheus/fabxc-patch-1
retrieval: add missing scrape context cancelation
2017-05-11 20:30:33 +02:00
Julius Volz 1c72524870 Fix HTTP error handling in remote.Client.Store() (#2708)
Regression introduced in
e5d7bbfc3c
2017-05-11 18:40:10 +02:00
Fabian Reinartz 76b3378190 retrieval: add missing scrape context cancelation 2017-05-11 17:20:03 +02:00
Julius Volz f160f17a6f retrieval: fix missing scrape context cancellation (#2599) 2017-05-11 16:15:07 +02:00
Fabian Reinartz 0c3462762b Merge pull request #2707 from prometheus/merge16
Merge 1.6 into master
2017-05-11 15:06:15 +02:00
Fabian Reinartz 11aa049b05 Merge branch 'release-1.6' into merge16 2017-05-11 15:00:51 +02:00
Fabian Reinartz b38e977fd8 Merge pull request #2706 from prometheus/cut162
Cut 1.6.2
2017-05-11 14:56:43 +02:00
Fabian Reinartz b51cf7efcb *: cut 1.6.2 2017-05-11 14:50:39 +02:00
Fabian Reinartz ddbbd2b712 Merge branch 'release-1.5' into cut162 2017-05-11 14:29:49 +02:00
Fabian Reinartz 1edf99ce5d Merge pull request #2705 from prometheus/cut153
cut 1.5.3
2017-05-11 14:22:02 +02:00
Fabian Reinartz 968821e575 Merge pull request #57 from telendt/posings_fix
Fix various postings implementations
2017-05-11 14:11:08 +02:00
Fabian Reinartz fc3214c7bf *: cut 1.5.3 2017-05-11 13:58:18 +02:00
Fabian Reinartz 2ff8855ae6 discovery/k8s: update client library 2017-05-11 13:53:12 +02:00
Fabian Reinartz a333c5612a Merge pull request #2678 from brancz/am-discovery-metrics
notifier: expose metric for number of discovered alertmanagers
2017-05-10 18:37:13 +02:00
Tom Wilkie 3141a6b36b Compress remote storage requests and responses with unframed/raw snappy. (#2696)
* Compress remote storage requests and responses with unframed/raw snappy, for compatibility with other languages.

* Remove backwards compatibility code from remote_storage_adapter, update example_write_adapter

* Add /documentation/examples/remote_storage/example_write_adapter/example_writer_adapter to .gitignore
2017-05-10 16:42:59 +02:00
Fabian Reinartz bf64d4efa8 Merge pull request #2703 from prometheus/alertmpl
ui: fix alert template
2017-05-10 15:42:14 +02:00
Fabian Reinartz 9a9211845e ui: fix alert template 2017-05-10 15:30:10 +02:00
Fabian Reinartz 373bec3784 Merge pull request #2700 from improbable-io/bugfix/2699-p2-sighup
Fixup sighup for P2 TSDB init #2699
2017-05-10 10:14:02 +02:00
Michal Witkowski 4177c35eba Fixup sighup for P2 TSDB init #2699 2017-05-09 17:00:54 +01:00
Fabian Reinartz 291137781b Merge branch 'panic-fix2' of https://github.com/Gouthamve/tsdb into Gouthamve-panic-fix2 2017-05-09 16:22:19 +02:00
Fabian Reinartz ff0ee264ae Merge pull request #2695 from prometheus/nolock
Allow disabling of lock file for TSDB
2017-05-09 14:41:24 +02:00
Jorrit Salverda 14d0604aba Kubernetes config scrape node via api proxy (#2641)
* scrape kubelet metrics via api node proxy

* add manifests to setup serviceaccount, clusterrole and clusterrolebinding to work with rbac

* removed .cluster.local and added newline to address comments
2017-05-09 13:57:49 +02:00
Fabian Reinartz 9b175d48cb Add flag to disable TSDB lock file 2017-05-09 12:56:51 +02:00
Fabian Reinartz dae4a801cb vendor: update tsdb 2017-05-09 12:53:33 +02:00
Fabian Reinartz 44769c1654 Allow disabling lock file 2017-05-09 12:52:47 +02:00
Fabian Reinartz c1ce7cf814 Merge pull request #2694 from prometheus/txtparse
pkg/textparse: parse metric names with ':'
2017-05-09 12:43:42 +02:00
Fabian Reinartz f7c5d96e84 pkg/textparse: parse metric names with ':' 2017-05-09 12:21:19 +02:00
beorn7 46226088aa Merge branch 'release-1.6' 2017-05-09 11:16:07 +02:00
Fabian Reinartz e9c25131fe Merge pull request #2690 from prometheus/beorn7/storage
storage: Correctly increase prometheus_local_storage_open_head_chunks
2017-05-09 07:28:13 +02:00
beorn7 69eddc9e84 storage: Correctly increase prometheus_local_storage_open_head_chunks 2017-05-08 18:20:23 +02:00
Frederic Branczyk 0c96c4b157
notifier: expose metric for number of discovered alertmanagers 2017-05-08 10:37:19 +02:00
Fabian Reinartz 09cd2021de Merge pull request #75 from Gouthamve/head-gen
E2E test for headBlock
2017-05-05 18:56:53 +02:00
Goutham Veeramachaneni 8096d11e4e
Add bounds check to headBlockAppender
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-05-05 19:52:11 +05:30
Goutham Veeramachaneni c1939b7136
Simply loop away from using tracking variables.
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-05-05 19:34:59 +05:30
Goutham Veeramachaneni 5d2e72269b
Simplfied loops and functions
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-05-05 19:22:07 +05:30
Tobias Schmidt 368206d2f5 Handle errSeriesDropped correctly
If metrics_relabel_configs are used to drop metrics, an errSeriesDropped
is returned. This shouldn't be used to return an error at the end of a
append() call.
2017-05-05 14:58:36 +02:00
Fabian Reinartz aaaec6431e Merge pull request #2642 from bakins/kubernetes-namespaces
Allow limiting Kubernetes service discover to certain namespaces
2017-05-04 07:36:21 +02:00
Tom Wilkie 2195bb66f7 Ensure ewma int64s are always aligned. (#2675) 2017-05-03 14:32:50 -05:00
Goutham Veeramachaneni 0908b0d27e
Add an end-to-end test for headBlock
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-05-03 22:50:34 +05:30
Goutham Veeramachaneni 7bbbd55aad
Fix bug where having one chunk can cause panic
When we have only one chunk that is out of range, then we are returning
it unpopulated (w/o calling `Chunk(ref)`). This would cause a panic
downstream.

Fixes: prometheus/prometheus#2629

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-05-03 22:45:28 +05:30
Fabian Reinartz 77c937b8e1 Merge pull request #73 from Gouthamve/skip-duplicate
Handle duplicate & out of order values in same txn
2017-05-03 15:28:32 +02:00
Goutham Veeramachaneni 0becfc8eb7
Simplify checking by using readSeriesSet
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-05-03 16:04:50 +05:30
Fabian Reinartz 3b5d60d134 Merge pull request #74 from prometheus/more-license-info
Also add original license info to bstream.go
2017-05-03 06:46:28 +02:00
Tom Wilkie 4d9b917d11 Instrument Prometheus with OpenTracing (#2554)
* Use request.Context() instead of a global map of contexts.

* Add some basic opentracing instrumentation on the query path.

* Remove tracehandler endpoint.
2017-05-02 18:49:29 -05:00
Julius Volz 0e2f8917ed Also add original license info to bstream.go
Plus, extend the messages a bit to mention the origin repo.
2017-05-03 01:32:09 +02:00