mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-11 16:14:05 -08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity
5162 commits 250 branches 438 tags 653 MiB
Commit graph

5162 commits

This branch
This branch
All branches
Author SHA1 Message Date
Martin Lee d0f11a3cc6 Forbid rule-abiding robots from indexing. (#4266) 
* Resolves github issue #4257

Signed-off-by: Martin Lee <martin@billforward.net>
 2018-07-18 05:01:57 +01:00
Thomas Jackson 92c6f0c92e Add offset to selectParams (#4226) 
* Add Start/End to SelectParams
* Make remote read use the new selectParams for start/end

This commit will continue sending the start/end time of the remote read
query as the overarching promql time and the specific range of data that
the query is intersted in receiving a response to is now part of the
ReadHints (upstream discussion in #4226).

* Remove unused vendored code

The genproto.sh script was updated, but the code wasn't regenerated.
This simply removes the vendored deps that are no longer part of the
codegen output.

Signed-off-by: Thomas Jackson <jacksontj.89@gmail.com>
 2018-07-18 04:58:00 +01:00
Alin Sinpalean 96fb0b2155 Optimize PromQL aggregations (#4248) 
* Compute hash of label subsets without creating a LabelSet first.

Signed-off-by: Alin Sinpalean <alin.sinpalean@gmail.com>
 2018-07-18 04:56:27 +01:00
Julius Volz 9e3171f6e3 rules: Minor naming/comment cleanups (#4328) 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2018-07-18 04:54:33 +01:00
Brian Brazil 3ee7a6a6c2
Merge pull request #4375 from prometheus/release-2.3 
Merge 2.3.2 release back to master
 2018-07-16 14:41:43 +01:00
Simon Pasquier f32acc0b7b discovery/openstack: remove unneeded assignment 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-07-15 12:37:57 +01:00
Simon Pasquier ed99af0b05 docs: fix OpenStack SD for the hypervisor role 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-07-15 12:37:57 +01:00
Tom Wilkie 3228814456 Don't forget to register query_duration_seconds{slice="queue_time"} (#4381) 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-07-15 12:24:37 +01:00
Tom Wilkie f83155b11e Review feedback. 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-07-13 19:31:23 +01:00
Paul Gier cfb3f31538 add prefix "common-" to make target names 
This allows rules to be overridden with warnings about conflicting
target names.

Signed-off-by: Paul Gier <pgier@redhat.com>
 2018-07-12 16:53:34 -05:00
Peter Gallerani a9d5034add Fix missing 'msg' in remote storage adapter main.go .Log info message (#4377) 
Signed-off-by: Peter Gallerani <peter.gallerani@gmail.com>
 2018-07-12 20:54:21 +02:00
Brian Brazil 5b596b97bc
Merge branch 'master' into release-2.3 2018-07-12 16:44:11 +01:00
Julius Volz 05d6d6a2e5
k8s SD: Fix "schema" -> "scheme" typo (#4371) 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2018-07-12 16:12:32 +02:00
Brian Brazil 71af5e29e8
Merge pull request #4370 from prometheus/232 
Release 2.3.2
 2018-07-12 15:00:12 +01:00
Brian Brazil ebe107b71b Release 2.3.2 
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2018-07-12 14:44:46 +01:00
Brian Brazil fc2a9c986b Update vendoring for tsdb (#4369) 
This pulls in tsdb PRs 330 344 348 353 354 356

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2018-07-11 15:55:39 +01:00
Brian Brazil 508662fb24 Reorder startup and shutdown to prevent panics. (#4321) 
Start rule manager only after tsdb and config is loaded.
Stop rule manager before tsdb to avoid writing to closed storage.
Wait for any in-progress reloads to complete before shutting
down rule manager, so that rule manager doesn't get updated after
being shut down.

Remove incorrect comment around shutting down query enginge.
Log when config reload is completed.

Fixes #4133
Fixes #4262

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2018-07-11 15:55:30 +01:00
Michael Khalil 5e9056d2f3 return error exit status in prometheus cli (#4296) 
Signed-off-by: mikeykhalil <mikeyfkhalil@gmail.com>
 2018-07-11 15:55:15 +01:00
Frederic Branczyk f7e1a94b03 Merge pull request #4329 from nailgun/4327-ingress-discovery-issue 
discovery/kubernetes/ingress: fix TLS discovery
 2018-07-11 15:54:24 +01:00
Krasi Georgiev 0b93fd6d5e fix the zookeper race (#4355) 
Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2018-07-11 15:51:46 +01:00
Thomas Jackson 86239ee5a5 Check for timeout in each iteration of matrixSelector (#4300) 
Signed-off-by: Thomas Jackson <jacksontj.89@gmail.com>

Fixes #4288
 2018-07-11 15:51:33 +01:00
Thomas Jackson fc7f45ba9e Timeout if populating iterators takes too long (#4291) 
Right now promql won't time out a request if populating the iterators
takes a long time.

Signed-off-by: Thomas Jackson <jacksontj.89@gmail.com>

Fixes #4289
 2018-07-11 15:51:33 +01:00
Thomas Jackson 63b8e4fb88 Bubble up errors to promql from populating iterators (#4136) 
This changes the Walk/Inspect API inside the promql package to bubble
up errors. This is done by having the inspector return an error (instead
of a bool) and then bubbling that up in the Walk. This way if any error
is encountered in the Walk() the walk will stop and return the error.
This avoids issues where errors from the Querier where being ignored
(causing incorrect promql evaluation).

Signed-off-by: Thomas Jackson <jacksontj.89@gmail.com>

Fixes #4136
 2018-07-11 15:46:37 +01:00
Brian Brazil f48ec3f2bb
Update vendoring for tsdb (#4369) 
This pulls in tsdb PRs 330 344 348 353 354 356

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2018-07-11 14:38:51 +01:00
Martin Chodur 504acf4a0a docs: added undocumented step api parameter format (#4360) 2018-07-07 09:20:18 +01:00
Tom Wilkie ccb2ee607b Log errors encountered when marshalling and writing responses. 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-07-06 18:44:45 +01:00
Krasi Georgiev a155b6d29d fix the zookeper race (#4355) 
Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2018-07-06 08:39:38 +01:00
Marcin Owsiany 9fe8bcf4be Fix markup in example. (#4351) 
Signed-off-by: Marcin Owsiany <marcin@owsiany.pl>
 2018-07-05 09:13:00 +01:00
Frederic Branczyk 2f37bab705
Merge pull request #4329 from nailgun/4327-ingress-discovery-issue 
discovery/kubernetes/ingress: fix TLS discovery
 2018-07-05 10:01:59 +02:00
Dmitry Bashkatov 72327d98fb discovery/kubernetes/ingress: remove unnecessary check 
Signed-off-by: Dmitry Bashkatov <dbashkatov@gmail.com>
 2018-07-04 15:47:11 +03:00
Brian Brazil 68e8b80ffe
Reorder startup and shutdown to prevent panics. (#4321) 
Start rule manager only after tsdb and config is loaded.
Stop rule manager before tsdb to avoid writing to closed storage.
Wait for any in-progress reloads to complete before shutting
down rule manager, so that rule manager doesn't get updated after
being shut down.

Remove incorrect comment around shutting down query enginge.
Log when config reload is completed.

Fixes #4133
Fixes #4262

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2018-07-04 13:41:16 +01:00
Krasi Georgiev 9f2f6accba fix the TestManagerReloadNoChange test (#4267) 
Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2018-07-04 12:01:19 +01:00
Dmitry Bashkatov e2baf89eac discovery/kubernetes/ingress: fix scheme discovery (Closes #4327) 
Signed-off-by: Dmitry Bashkatov <dbashkatov@gmail.com>
 2018-07-04 13:28:44 +03:00
Dmitry Bashkatov 9cdca50bdd discovery/kubernetes/ingress: add more tests 
Signed-off-by: Dmitry Bashkatov <dbashkatov@gmail.com>
 2018-07-04 13:28:44 +03:00
Ben Kochie 709ad10d97
Reduce CircleCI duplication (#4335) 
Reduce the duplication of per-project specifics in the CircleCI config.
* Add docker repo variable, default to docker hub.
* Add make targets for docker push and tag latest.

Signed-off-by: Ben Kochie <superq@gmail.com>
 2018-07-04 11:27:10 +02:00
Simon Pasquier 1f8c40943f
Merge pull request #4331 from simonpasquier/fix-travisci 
travis: remove testing with go 1.x
 2018-07-03 13:44:34 +02:00
Julius Volz 5cf0113762
Add "omitempty" to some SD config YAML field tags (#4338) 
Especially for Kubernetes SD, this fixes a bug where the rendered
configuration says "api_server: null", which when read back is not
interpreted as an un-set API server (thus the default is not applied).

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2018-07-03 13:43:41 +02:00
Simon Pasquier 9ded3aea66 travis: remove testing with go 1.x 
Travis and CircleCI should use the same Go version(s).

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-07-03 09:30:28 +02:00
Bryan Boreham 2bd510a63e Make TestUpdate() do some work (#4306) 
Previously it would set no preconditions and check no postconditions,
as the `groups` member was empty.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2018-06-22 15:21:04 +01:00
Thomas Jackson a6dace8829 Check for timeout in each iteration of matrixSelector (#4300) 
Signed-off-by: Thomas Jackson <jacksontj.89@gmail.com>

Fixes #4288
 2018-06-21 22:43:31 +01:00
Michael Khalil 78e0784d04 return error exit status in prometheus cli (#4296) 
Signed-off-by: mikeykhalil <mikeyfkhalil@gmail.com>
 2018-06-21 08:32:26 +01:00
Thomas Jackson 630f42fcf1 Timeout if populating iterators takes too long (#4291) 
Right now promql won't time out a request if populating the iterators
takes a long time.

Signed-off-by: Thomas Jackson <jacksontj.89@gmail.com>

Fixes #4289
 2018-06-21 08:14:51 +01:00
Brian Brazil fb695fb435
Merge pull request #4285 from prometheus/release-2.3 
Merge release-2.3 back to master
 2018-06-20 14:51:00 +01:00
Brian Brazil 188ca45bd8
Merge pull request #4284 from prometheus/231 
Release 2.3.1
 2018-06-19 16:53:36 +01:00
Brian Brazil 141799da6e Release 2.3.1 
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2018-06-19 13:12:11 +01:00
Tom Wilkie 4e4f0d4e41 spelling. 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-06-19 13:03:01 +01:00
Tom Wilkie b8217720ac Review feedback. 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-06-19 13:03:01 +01:00
Tom Wilkie e518f51a99 Extend API tests to cover remote read API. 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-06-19 13:03:01 +01:00
Corentin Chary db9dbeeaec federation: nil pointer deference when using remove read 
```
level=error ts=2018-06-13T07:19:04.515149169Z caller=stdlib.go:89 component=web caller="http: panic serving [::1" msg="]:56202: runtime error: invalid memory address or nil pointer dereference"
level=error ts=2018-06-13T07:19:04.516199547Z caller=stdlib.go:89 component=web caller="http: panic serving [::1" msg="]:56204: runtime error: invalid memory address or nil pointer dereference"
level=error ts=2018-06-13T07:19:04.51717692Z caller=stdlib.go:89 component=web caller="http: panic serving [::1" msg="]:56206: runtime error: invalid memory address or nil pointer dereference"
level=error ts=2018-06-13T07:19:04.564952878Z caller=stdlib.go:89 component=web caller="http: panic serving [::1" msg="]:56208: runtime error: invalid memory address or nil pointer dereference"
level=error ts=2018-06-13T07:19:04.566575791Z caller=stdlib.go:89 component=web caller="http: panic serving [::1" msg="]:56210: runtime error: invalid memory address or nil pointer dereference"
level=error ts=2018-06-13T07:19:04.567106063Z caller=stdlib.go:89 component=web caller="http: panic serving [::1" msg="]:56212: runtime error: invalid memory address or nil pointer dereference"
```

When remove read is enabled, federation will call `q.Select(nil, mset...)`
which will break remote reads because it currently doesn't handle empty
SelectParams.

Signed-off-by: Corentin Chary <c.chary@criteo.com>
 2018-06-19 13:03:01 +01:00
Simon Pasquier dacb6c530a discovery/file: fix logging (#4178) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-06-19 13:03:01 +01:00