github
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,190 Commits
287 Branches
442 Tags
620 MiB
Commit Graph

5190 Commits (abf6fe0a983ca116f1c3be8875193458174c6748)

Author SHA1 Message Date
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
Paul Gier 5c70213f9f config: set target group source index during unmarshalling (#4245) 
* config: set target group source index during unmarshalling

Fixes issue #4214 where the scrape pool is unnecessarily reloaded for a
config reload where the config hasn't changed.  Previously, the discovery
manager changed the static config after loading which caused the in-memory
config to differ from a freshly reloaded config.

Signed-off-by: Paul Gier <pgier@redhat.com>

* [issue #4214] Test that static targets are not modified by discovery manager

Signed-off-by: Paul Gier <pgier@redhat.com>
 2018-06-19 13:03:01 +01:00
Tom Wilkie 47809cae01
Merge pull request #4282 from prometheus/4263-remote 
remote read: nil pointer deference when using remove read
 2018-06-18 17:59:42 +01:00
Brian Brazil 78efdc6d6b
Avoid infinite loop on duplicate NaN values. (#4275) 
Fixes #4254

NaNs don't equal themselves, so a duplicate NaN would
always hit the break statement and never get popped.

We should not be returning multiple data point for the same
timestamp, so don't compare values at all.

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2018-06-18 17:34:08 +01:00
Tom Wilkie fcc3f43acd spelling. 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-06-18 17:32:44 +01:00
Tom Wilkie 0b189b2da9 Review feedback. 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-06-18 17:21:12 +01:00
Tom Wilkie ae29512444 Extend API tests to cover remote read API. 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-06-18 17:21:12 +01:00
Corentin Chary 530107f8ef 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-18 17:21:12 +01:00
Callum Styan d0ee4da932 fix minor issues in custom SD example (#4278) 
Signed-off-by: Callum Styan <callumstyan@gmail.com>
 2018-06-18 16:08:02 +01:00
Simon Pasquier 6eab4bbca1 kubernetes_sd: fix namespace filtering (#4273) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-06-15 09:08:14 +01:00
Fabian Reinartz e7cfc7dae5 web: restore old path prefix behavior 
Signed-off-by: Fabian Reinartz <freinartz@google.com>
 2018-06-15 09:08:14 +01:00
Simon Pasquier 8cd59da857 kubernetes_sd: fix namespace filtering (#4273) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-06-14 15:49:43 +01:00
Alin Sinpalean 91ce63a140 Log the line when failing a PromQL test. (#4272) 
Signed-off-by: Alin Sinpalean <alin.sinpalean@gmail.com>
 2018-06-14 15:18:16 +01:00
Paul Gier d24d2acd11 config: set target group source index during unmarshalling (#4245) 
* config: set target group source index during unmarshalling

Fixes issue #4214 where the scrape pool is unnecessarily reloaded for a
config reload where the config hasn't changed.  Previously, the discovery
manager changed the static config after loading which caused the in-memory
config to differ from a freshly reloaded config.

Signed-off-by: Paul Gier <pgier@redhat.com>

* [issue #4214] Test that static targets are not modified by discovery manager

Signed-off-by: Paul Gier <pgier@redhat.com>
 2018-06-13 16:34:59 +01:00
Frederic Branczyk f77b65d430
Merge pull request #4259 from prometheus/rmsecheaders 
web: remove security headers
 2018-06-12 17:05:14 +02:00
Fabian Reinartz 97767eb581
Merge pull request #4256 from prometheus/routeprefix 
web: restore old path prefix behavior
 2018-06-12 16:23:13 +02:00
Fabian Reinartz 7a74689973
Merge pull request #4258 from prometheus/rmsecheaders 
web: remove security headers
 2018-06-12 16:21:35 +02:00
Fabian Reinartz 8a4bda8d57 web: remove security headers 
Signed-off-by: Fabian Reinartz <freinartz@google.com>
 2018-06-12 08:59:13 -04:00
Fabian Reinartz 4d675e2aa8 web: restore old path prefix behavior 
Signed-off-by: Fabian Reinartz <freinartz@google.com>
 2018-06-12 08:45:43 -04:00
Simon Pasquier 0e5e7f75cd discovery/file: fix logging (#4178) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-06-12 12:45:59 +01:00
Henri DF a3ddde0800 Add prompb/README (#4222) 
Signed-off-by: Henri DF <henridf@gmail.com>
 2018-06-11 22:00:33 +01:00
Simon Pasquier 45b8dea320 Makefile: update .PHONY target (#4234) 
Makefile: update .PHONY target

* Move .PHONY declarations near their targets

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-06-11 17:51:28 +02:00
Brian Brazil 25e2d9f152
Update example console template for node exporter 0.16.0 (#4208) 
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2018-06-08 14:01:05 +01:00