4955 Commits (18e6fa7c8aafbe45ed0a9981fdd32affe819bbb4)

 

All Branches   

Search

Author	SHA1	Message	Date
Tom Wilkie	18e6fa7c8a	Merge pull request #4185 from prometheus/4184-dedup-read-recent ... Dedupe samples in the mergeIterator.	8 years ago
Ben Kochie	2b228b4260	Merge pull request #4182 from prometheus/superq/circle_attach ... Fix CircleCI config	8 years ago
Tom Wilkie	ba418780be	Dedupe samples in the mergeIterator. ... Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>	8 years ago
Ben Kochie	1751c527b1	Fix CircleCI config ... Re-add workspace attachment removed by #4132. Signed-off-by: Ben Kochie <superq@gmail.com>	8 years ago
Frederic Branczyk	b5f94667f7	Merge pull request #4131 from Bplotka/annotations ... example: Added notes to the K8s SD config examples explaining limitation of annotations relabeling.	8 years ago
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>	8 years ago
Henri DF	986674a790	Make some lexing errors more informative (#4167) ... Signed-off-by: Henri DF <henridf@gmail.com>	8 years ago
Ben Kochie	7e376dfc89	Merge pull request #4157 from prometheus/superq/docker_promtool ... Add promtool to docker build.	8 years ago
Ben Kochie	a36f35ed2c	Add promtool to docker build. ... Signed-off-by: Ben Kochie <superq@gmail.com>	8 years ago
Frederic Branczyk	89fce8da58	Merge pull request #4060 from dlespiau/2018-04-06-relabel-expose-k8s-controller ... Expose controller kind and name to labelling rules	8 years ago
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>	8 years ago
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>	8 years ago
Henri DF	2952387ed1	Pass query hints down into remote read query proto (#4122) ... Signed-off-by: Henri DF <henridf@gmail.com>	8 years ago
Ben Kochie	e6b2a9bac1	Merge pull request #4149 from simonpasquier/fix-circleci-cfg ... circleci: fix push command	8 years ago
Simon Pasquier	476f55d7c9	circleci: fix push command ... Signed-off-by: Simon Pasquier <spasquie@redhat.com>	8 years ago
Ivan Voronchihin	b3441cb0e7	Fix graph page for IE11 (#4148) ... Signed-off-by: bege13mot <bege13mot@gmail.com>	8 years ago
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>	8 years ago
Eric V	c207920500	Added HTTP security headers to web.go (#3583) ... Signed-off-by: Eric Valenzuela <evalenzuela@thousandeyes.com>	8 years ago
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>	8 years ago
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>	8 years ago
Daisy T	b424eb42e3	document remote write queue parameters (#4126)	8 years ago
beorn7	a4e4bec3fe	Merge branch 'release-2.2'	8 years ago
Björn Rabenstein	94e4a43217	Merge pull request #4117 from prometheus/beorn7/cherrypick ... K8s SD refactoring for release-2.2	8 years ago
Ben Kochie	8807c20581	Merge pull request #4106 from prometheus/superq/circleci2 ... Update CircleCI build	8 years ago
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>	8 years ago
Karsten Weiss	d79d573f71	Fix spelling mistakes found by codespell (#4065) ... Signed-off-by: Karsten Weiss <knweiss@gmail.com>	8 years ago
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>	8 years ago
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	8 years ago
Brian Brazil	fbe66819c5	Update ALERTS docs for 2.0 staleness changes. (#4116) ... Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>	8 years ago
Yecheng Fu	2be543e65a	Simplify some code and comments. ... Signed-off-by: Yecheng Fu <cofyc.jackson@gmail.com>	8 years ago
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>	8 years ago
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>	8 years ago
Yecheng Fu	d73b0d3141	Move hasSynced interface and its implementations to *_test.go files. ... Signed-off-by: Yecheng Fu <cofyc.jackson@gmail.com>	8 years ago
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>	8 years ago
Yecheng Fu	9bc6ced55d	Refactor Kubernetes Discovery Part 1: Add Vendor files. ... Signed-off-by: Yecheng Fu <cofyc.jackson@gmail.com>	8 years ago
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>	8 years ago
Björn Rabenstein	7cc46bafcb	Merge pull request #4113 from prometheus/beorn7/juggling ... Fix the merge into release-2.2	8 years ago
Ben Kochie	219433aae5	Update CircleCI build ... Use CircleCI 2.0 build config. Signed-off-by: Ben Kochie <superq@gmail.com>	8 years ago
Björn Rabenstein	91e470d733	Merge pull request #4096 from simonpasquier/fix-scrape-races-2.2 ... Fix scrape races (release-2.2 branch)	8 years ago
Ben Kochie	4a4e8a7d3b	Fix spelling in Makefile.common. (#4105) ... Signed-off-by: Ben Kochie <superq@gmail.com>	8 years ago
Ben Kochie	76f6fe8f86	Merge pull request #4102 from krasi-georgiev/makefile ... run the style target to fail if the code is not properly formatted	8 years ago
Krasi Georgiev	98c51d241b	run the style target to fail if the code is not properly formated ... Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>	8 years ago
Krasi Georgiev	0b0c9f4b6b	unused target didn't trigger an error for unused packages (#4101) ... Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>	8 years ago
Krasi Georgiev	416db814e8	use package shorthand selection that excludes vendored. (#4100) ... Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>	8 years ago
Krasi Georgiev	3f2b2c50dd	use the Makefile.common (#3978) ... split common targets in a Makefile.common to reuse it across projects Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>	8 years ago
Simon Pasquier	2cbba4e948	scrape: fix data races ... This commit avoids passing the full scrape configuration down to the scrape loop to fix data races when the scrape configuration is being reloaded. Signed-off-by: Simon Pasquier <spasquie@redhat.com>	8 years ago
Simon Pasquier	8b89ab0173	scrape: add test detecting data races ... Signed-off-by: Simon Pasquier <spasquie@redhat.com>	8 years ago
Rohit Gupta	30c3e02864	Fixes #4090. Marathon service discovery for 5XX http response (#4091) ... Signed-off-by: rohit01 <hello@rohit.io>	8 years ago
Krasi Georgiev	d13db89548	Merge pull request #4073 from krasi-georgiev/remove-unused-vendored ... remove unused vendored packages	8 years ago
David King	6286c10df0	Fix OOM when a large K is used in topk queries (#4087) ... This attempts to close #3973. Handles cases where the length of the input vector to an aggregate topk / bottomk function is less than the K paramater. The change updates Prometheus to allocate a result vector the same length as the input vector in these cases. Previously Prometheus would out-of-memory panic for large K values. This change makes that unlikely unless the size of the input vector is equally large. Signed-off-by: David King <dave@davbo.org>	8 years ago