Commit Graph

5057 Commits (96fb0b21558df2602a4666a47de947367e6508fc)
 

Author SHA1 Message Date
Tom Wilkie f3c61f8bb2 Only give remote queues 1 minute to flush samples on shutdown.
7 years ago
Tom Wilkie 18e6fa7c8a
Merge pull request #4185 from prometheus/4184-dedup-read-recent
7 years ago
Ben Kochie 2b228b4260
Merge pull request #4182 from prometheus/superq/circle_attach
7 years ago
Tom Wilkie ba418780be Dedupe samples in the mergeIterator.
7 years ago
Ben Kochie 1751c527b1
Fix CircleCI config
7 years ago
Adam Shannon ea761c5ab9 update vendor'd github.com/prometheus/common
7 years ago
Frederic Branczyk b5f94667f7
Merge pull request #4131 from Bplotka/annotations
7 years ago
Adam Shannon a22e1736b9 discovery/marathon: include url in fetchApps error (#4171)
7 years ago
Henri DF 986674a790 Make some lexing errors more informative (#4167)
7 years ago
Ben Kochie 7e376dfc89
Merge pull request #4157 from prometheus/superq/docker_promtool
7 years ago
Ben Kochie a36f35ed2c
Add promtool to docker build.
7 years ago
Frederic Branczyk 89fce8da58
Merge pull request #4060 from dlespiau/2018-04-06-relabel-expose-k8s-controller
7 years ago
Damien Lespiau e64037053d Expose controller kind and name to labelling rules
7 years ago
Nathan Graves 5b27996cb3 Include GCE labels during service discovery. Updated vendor files for Google API. (#4150)
7 years ago
Henri DF 2952387ed1 Pass query hints down into remote read query proto (#4122)
7 years ago
Ben Kochie e6b2a9bac1
Merge pull request #4149 from simonpasquier/fix-circleci-cfg
7 years ago
Simon Pasquier 476f55d7c9 circleci: fix push command
7 years ago
Ivan Voronchihin b3441cb0e7 Fix graph page for IE11 (#4148)
7 years ago
Ben Kochie 390e260bd9 Improve wording of remote write documentation. (#3817)
7 years ago
Eric V c207920500 Added HTTP security headers to web.go (#3583)
7 years ago
Simon Pasquier 6a5f949317 circleci: clean up build configuration (#4132)
7 years ago
Bartek Plotka 03a9e7f72e example: Commented out annotation examples as they are meant only for example not as an idiomatic way of relabelling.
7 years ago
Daisy T b424eb42e3 document remote write queue parameters (#4126)
7 years ago
beorn7 a4e4bec3fe Merge branch 'release-2.2'
7 years ago
Björn Rabenstein 94e4a43217
Merge pull request #4117 from prometheus/beorn7/cherrypick
7 years ago
Ben Kochie 8807c20581
Merge pull request #4106 from prometheus/superq/circleci2
7 years ago
Elif T. Kuş 57dcdfb15f Rewrote tests with testutil for several test files (#4086)
7 years ago
Karsten Weiss d79d573f71 Fix spelling mistakes found by codespell (#4065)
7 years ago
Chris Aniszczyk adb81f943a Reference non-goals in contributing guidelines (#4118)
7 years ago
Sneha Inguva c1a851074b promtool: add query instant and query range commands (#4085)
7 years ago
Brian Brazil fbe66819c5
Update ALERTS docs for 2.0 staleness changes. (#4116)
7 years ago
Yecheng Fu 2be543e65a Simplify some code and comments.
7 years ago
Yecheng Fu 46683dd67d Simplify code.
7 years ago
Yecheng Fu 3a253f796c Fix grammar in comments and add missing `expectedMaxItems` to let it
7 years ago
Yecheng Fu d73b0d3141 Move hasSynced interface and its implementations to *_test.go files.
7 years ago
Yecheng Fu 8ceb8f2ae8 Refactor Kubernetes Discovery Part 2: Refactoring
7 years ago
Yecheng Fu 9bc6ced55d Refactor Kubernetes Discovery Part 1: Add Vendor files.
7 years ago
Adam Shannon 809881d7f5 support reading basic_auth password_file for HTTP basic auth (#4077)
7 years ago
Björn Rabenstein 7cc46bafcb
Merge pull request #4113 from prometheus/beorn7/juggling
7 years ago
Ben Kochie 219433aae5
Update CircleCI build
7 years ago
Björn Rabenstein 91e470d733
Merge pull request #4096 from simonpasquier/fix-scrape-races-2.2
7 years ago
Ben Kochie 4a4e8a7d3b Fix spelling in Makefile.common. (#4105)
7 years ago
Ben Kochie 76f6fe8f86
Merge pull request #4102 from krasi-georgiev/makefile
7 years ago
Krasi Georgiev 98c51d241b run the style target to fail if the code is not properly formated
7 years ago
Krasi Georgiev 0b0c9f4b6b
unused target didn't trigger an error for unused packages (#4101)
7 years ago
Krasi Georgiev 416db814e8
use package shorthand selection that excludes vendored. (#4100)
7 years ago
Krasi Georgiev 3f2b2c50dd
use the Makefile.common (#3978)
7 years ago
Simon Pasquier 2cbba4e948 scrape: fix data races
7 years ago
Simon Pasquier 8b89ab0173 scrape: add test detecting data races
7 years ago
Rohit Gupta 30c3e02864 Fixes #4090. Marathon service discovery for 5XX http response (#4091)
7 years ago