mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-05 05:04:04 -08:00
Code Issues Actions 22 Packages Projects Releases Wiki Activity
5166 commits 263 branches 434 tags 663 MiB
Commit graph

5166 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Wilkie 12a1a22a5a
Merge pull request #4187 from prometheus/2972-remote-block-shutdown 
Only give remote queues 1 minute to flush samples on shutdown.
 2018-05-29 14:25:19 +01:00
Tom Wilkie b58199bf12 Review feedback. 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-05-29 11:35:43 +01:00
Tom Wilkie 3353bbd018 Add proper unclean shutdown handling with a cancellable context. 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-05-29 09:51:29 +01:00
Fabian Reinartz 56e6679281
Merge pull request #4174 from adamdecaf/upate-common-2018-05-18 
update vendor'd github.com/prometheus/common/config
 2018-05-28 15:18:43 -04:00
Fabian Reinartz 76a4a46cb0 pkg/textparse: refactor and add metadata handling 
Extends the parser to allow retrieving metadata.
The lexer now yields proper tokens that are fed into a hand-written
parser on top.

Signed-off-by: Fabian Reinartz <freinartz@google.com>
 2018-05-25 11:27:25 -04:00
Tom Wilkie 8acad5f3cd make it compile 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-05-24 15:40:24 +01:00
Tom Wilkie e51d6c4b6c Make remote flush deadline a command line param. 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-05-23 15:06:01 +01:00
Tom Wilkie a6c353613a Make the flush deadline configurable. 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-05-23 15:04:36 +01:00
Tom Wilkie aa17263edd Remove WaitGroup and extra goroutine. 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-05-23 15:04:34 +01:00
Tom Wilkie f3c61f8bb2 Only give remote queues 1 minute to flush samples on shutdown. 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-05-23 15:04:32 +01:00
Tom Wilkie 18e6fa7c8a
Merge pull request #4185 from prometheus/4184-dedup-read-recent 
Dedupe samples in the mergeIterator.
 2018-05-23 12:43:07 +01:00
Ben Kochie 2b228b4260
Merge pull request #4182 from prometheus/superq/circle_attach 
Fix CircleCI config
 2018-05-23 13:36:12 +02:00
Tom Wilkie ba418780be Dedupe samples in the mergeIterator. 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-05-23 12:15:47 +01:00
Ben Kochie 1751c527b1
Fix CircleCI config 
Re-add workspace attachment removed by #4132.

Signed-off-by: Ben Kochie <superq@gmail.com>
 2018-05-22 18:53:36 +02:00
Adam Shannon ea761c5ab9 update vendor'd github.com/prometheus/common 
Signed-off-by: Adam Shannon <adamkshannon@gmail.com>
 2018-05-22 09:19:11 -05:00
Frederic Branczyk b5f94667f7
Merge pull request #4131 from Bplotka/annotations 
example: Added notes to the K8s SD config examples explaining limitation of annotations relabeling.
 2018-05-18 12:26:06 +02:00
Adam Shannon a22e1736b9 discovery/marathon: include url in fetchApps error (#4171) 
This was previously part of a larger PR, but that was closed.

https://github.com/prometheus/prometheus/issues/4048#issuecomment-389899997

This change could include auth information in the URL. That's been
fixed in upstream go, but not until Go 1.11. See: https://github.com/golang/go/issues/24572

Signed-off-by: Adam Shannon <adamkshannon@gmail.com>
 2018-05-18 10:20:14 +01:00
Henri DF 986674a790 Make some lexing errors more informative (#4167) 
Signed-off-by: Henri DF <henridf@gmail.com>
 2018-05-16 16:18:15 +01:00
Ben Kochie 7e376dfc89
Merge pull request #4157 from prometheus/superq/docker_promtool 
Add promtool to docker build.
 2018-05-11 15:45:25 +02:00
Ben Kochie a36f35ed2c
Add promtool to docker build. 
Signed-off-by: Ben Kochie <superq@gmail.com>
 2018-05-11 14:14:22 +02:00
Frederic Branczyk 89fce8da58
Merge pull request #4060 from dlespiau/2018-04-06-relabel-expose-k8s-controller 
Expose controller kind and name to labelling rules
 2018-05-09 20:10:46 +02:00
Damien Lespiau e64037053d Expose controller kind and name to labelling rules 
Relabelling rules can use this information to attach the name of the controller
that has created a pod.

In turn, this can be used to slice metrics by workload at query time, ie.
"Give me all metrics that have been created by the $name Deployment"

Signed-off-by: Damien Lespiau <damien@weave.works>
 2018-05-09 11:51:37 +02:00
Nathan Graves 5b27996cb3 Include GCE labels during service discovery. Updated vendor files for Google API. (#4150) 
Signed-off-by: Nathan Graves <nathan.graves@kofile.us>
 2018-05-08 17:37:47 +01:00
Henri DF 2952387ed1 Pass query hints down into remote read query proto (#4122) 
Signed-off-by: Henri DF <henridf@gmail.com>
 2018-05-08 09:48:13 +01:00
Ben Kochie e6b2a9bac1
Merge pull request #4149 from simonpasquier/fix-circleci-cfg 
circleci: fix push command
 2018-05-08 09:52:43 +02:00
Simon Pasquier 476f55d7c9 circleci: fix push command 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-05-07 21:01:24 +02:00
Ivan Voronchihin b3441cb0e7 Fix graph page for IE11 (#4148) 
Signed-off-by: bege13mot <bege13mot@gmail.com>
 2018-05-07 13:26:38 +01:00
Ben Kochie 390e260bd9 Improve wording of remote write documentation. (#3817) 
Reduce the use of the term `long-term`, when what we're really talking
about is remote clustered storage for increased capacity and durability.

Signed-off-by: Ben Kochie <superq@gmail.com>
 2018-05-05 16:38:45 +01:00
Eric V c207920500 Added HTTP security headers to web.go (#3583) 
Signed-off-by: Eric Valenzuela <evalenzuela@thousandeyes.com>
 2018-05-03 07:27:34 +01:00
Simon Pasquier 6a5f949317 circleci: clean up build configuration (#4132) 
This changes removes environment variables for jobs that don't need
them. It also removes one unnecessary test for the
docker_hub_release_tags job.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-05-02 20:23:48 +03:00
Bartek Plotka 03a9e7f72e example: Commented out annotation examples as they are meant only for example not as an idiomatic way of relabelling. 
Signed-off-by: Bartek Plotka <bwplotka@gmail.com>
 2018-05-02 13:42:23 +01:00
Daisy T b424eb42e3 document remote write queue parameters (#4126) 2018-04-30 20:08:45 +02:00
beorn7 a4e4bec3fe Merge branch 'release-2.2' 2018-04-30 14:38:29 +02:00
Björn Rabenstein 94e4a43217
Merge pull request #4117 from prometheus/beorn7/cherrypick 
K8s SD refactoring for release-2.2
 2018-04-30 14:37:37 +02:00
Ben Kochie 8807c20581
Merge pull request #4106 from prometheus/superq/circleci2 
Update CircleCI build
 2018-04-27 17:45:07 +02:00
Elif T. Kuş 57dcdfb15f Rewrote tests with testutil for several test files (#4086) 
* promql: Rewrote tests with testutil for functions_test

Signed-off-by: Elif T. Kuş <elifkus@gmail.com>

* pkg/relabel: Rewrote tests with testutil for relabel_test

Signed-off-by: Elif T. Kuş <elifkus@gmail.com>

* discovery/consul: Rewrote tests with testutil for consul_test

Signed-off-by: Elif T. Kuş <elifkus@gmail.com>

* scrape: Rewrote tests with testutil for manager_test

Signed-off-by: Elif T. Kuş <elifkus@gmail.com>
 2018-04-27 13:11:16 +01:00
Karsten Weiss d79d573f71 Fix spelling mistakes found by codespell (#4065) 
Signed-off-by: Karsten Weiss <knweiss@gmail.com>
 2018-04-27 13:04:02 +01:00
Chris Aniszczyk adb81f943a Reference non-goals in contributing guidelines (#4118) 
https://github.com/prometheus/docs/issues/149

Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
 2018-04-26 22:54:27 +01:00
Sneha Inguva c1a851074b promtool: add query instant and query range commands (#4085) 
* promtool: add QueryInstant and QueryRange cmds

* promtool: add more query functions

* promtool: finished query Instant

* promtool: add range query

* promtool: add query command and address arguments

* vendor client and api
 2018-04-26 20:41:56 +02:00
Brian Brazil fbe66819c5
Update ALERTS docs for 2.0 staleness changes. (#4116) 
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2018-04-26 12:44:11 +01:00
Yecheng Fu 2be543e65a Simplify some code and comments. 
Signed-off-by: Yecheng Fu <cofyc.jackson@gmail.com>
 2018-04-25 19:29:34 +02:00
Yecheng Fu 46683dd67d Simplify code. 
- Unified `send` function.
- Pass InformerSynced functions to `cache.WaitForCacheSync`.
- Use `Role\w+` constants instead of literal string.

Signed-off-by: Yecheng Fu <cofyc.jackson@gmail.com>
 2018-04-25 19:29:21 +02:00
Yecheng Fu 3a253f796c Fix grammar in comments and add missing expectedMaxItems to let it 
break fast.

Signed-off-by: Yecheng Fu <cofyc.jackson@gmail.com>
 2018-04-25 19:29:03 +02:00
Yecheng Fu d73b0d3141 Move hasSynced interface and its implementations to *_test.go files. 
Signed-off-by: Yecheng Fu <cofyc.jackson@gmail.com>
 2018-04-25 19:28:49 +02:00
Yecheng Fu 8ceb8f2ae8 Refactor Kubernetes Discovery Part 2: Refactoring 
- Do initial listing and syncing to scrape manager, then register event
  handlers may lost events happening in listing and syncing (if it
  lasted a long time). We should register event handlers at the very
  begining, before processing just wait until informers synced (sync in
  informer will list all objects and call OnUpdate event handler).
- Use a queue then we don't block event callbacks and an object will be
  processed only once if added multiple times before it being processed.
- Fix bug in `serviceUpdate` in endpoints.go, we should build endpoints
  when `exists && err == nil`. Add `^TestEndpointsDiscoveryWithService`
  tests to test this feature.

Testing:

- Use `k8s.io/client-go` testing framework and fake implementations which are
  more robust and reliable for testing.
- `Test\w+DiscoveryBeforeRun` are used to test objects created before
  discoverer runs
- `Test\w+DiscoveryAdd\w+` are used to test adding objects
- `Test\w+DiscoveryDelete\w+` are used to test deleting objects
- `Test\w+DiscoveryUpdate\w+` are used to test updating objects
- `TestEndpointsDiscoveryWithService\w+` are used to test endpoints
  events triggered by services
- `cache.DeletedFinalStateUnknown` related stuffs are removed, because
  we don't care deleted objects in store, we only need its name to send
  a specical `targetgroup.Group` to scrape manager

Signed-off-by: Yecheng Fu <cofyc.jackson@gmail.com>
 2018-04-25 19:28:34 +02:00
Yecheng Fu 9bc6ced55d Refactor Kubernetes Discovery Part 1: Add Vendor files. 
Signed-off-by: Yecheng Fu <cofyc.jackson@gmail.com>
 2018-04-25 19:28:14 +02:00
Adam Shannon 809881d7f5 support reading basic_auth password_file for HTTP basic auth (#4077) 
Issue: https://github.com/prometheus/prometheus/issues/4076

Signed-off-by: Adam Shannon <adamkshannon@gmail.com>
 2018-04-25 18:19:06 +01:00
Björn Rabenstein 7cc46bafcb
Merge pull request #4113 from prometheus/beorn7/juggling 
Fix the merge into release-2.2
 2018-04-25 17:09:10 +02:00
Ben Kochie 219433aae5
Update CircleCI build 
Use CircleCI 2.0 build config.

Signed-off-by: Ben Kochie <superq@gmail.com>
 2018-04-25 16:38:05 +02:00
Björn Rabenstein 91e470d733
Merge pull request #4096 from simonpasquier/fix-scrape-races-2.2 
Fix scrape races (release-2.2 branch)
 2018-04-25 15:36:29 +02:00