Commit Graph

5135 Commits (11155c702874de25c78fdea99191bc5596b38a3d)
 

Author SHA1 Message Date
Fabian Reinartz e4bb42208f
Merge pull request #4183 from prometheus/metastore
7 years ago
Fabian Reinartz 057a5ae2b1 Address comments
7 years ago
Fabian Reinartz 0ff42e754e pkg/textparse: unescape help string
7 years ago
Fabian Reinartz ad4c33c1ff scrape,api: provide per-target metric metadata
7 years ago
Fabian Reinartz 290d71791a *: cut v2.3.0
7 years ago
Fabian Reinartz 0e7112330e
Merge pull request #4162 from prometheus/scrapemeta
7 years ago
Fabian Reinartz 37dc0adcbd
Merge pull request #4217 from prometheus/update
7 years ago
Fabian Reinartz 32324f79c7 vendour: update prometheus/tsdb
7 years ago
Fabian Reinartz 9c83e815d1 Merge branch 'release-2.2' into update
7 years ago
Simon Pasquier 097439b0f9 web: limit the number of dropped targets (#4212)
7 years ago
Fabian Reinartz 5fcc5b6028 pkg/textparse: support null bytes in comments and help
7 years ago
Fabian Reinartz fe80dddbc4
Merge pull request #4210 from bboreham/log-remote-name
7 years ago
Brian Brazil dd6781add2 Optimise PromQL (#3966)
7 years ago
Alin Sinpalean 9dc763cc03 Run rule evaluation with timestamps precisely evaluation_interval apart (#4201)
7 years ago
Bryan Boreham 05cf674279 Mention the DCO (#4211)
7 years ago
Bryan Boreham 3277aeefaa Add queue name to logger for remote writes
7 years ago
Callum Styan 03578d5df8 add example usage of SD adapter for converting unsupported SD type to filesd (#3720)
7 years ago
Fabian Reinartz d29e0ba16b
Merge pull request #4179 from krasi-georgiev/update-tsdb
7 years ago
Krasi Georgiev 229f4e63f7 update tsdb
7 years ago
Tom Wilkie 12a1a22a5a
Merge pull request #4187 from prometheus/2972-remote-block-shutdown
7 years ago
Tom Wilkie b58199bf12 Review feedback.
7 years ago
Tom Wilkie 3353bbd018 Add proper unclean shutdown handling with a cancellable context.
7 years ago
Fabian Reinartz 56e6679281
Merge pull request #4174 from adamdecaf/upate-common-2018-05-18
7 years ago
Fabian Reinartz 76a4a46cb0 pkg/textparse: refactor and add metadata handling
7 years ago
Tom Wilkie 8acad5f3cd make it compile
7 years ago
Tom Wilkie e51d6c4b6c Make remote flush deadline a command line param.
7 years ago
Tom Wilkie a6c353613a Make the flush deadline configurable.
7 years ago
Tom Wilkie aa17263edd Remove WaitGroup and extra goroutine.
7 years ago
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