Commit Graph

3485 Commits (a1eec447a4d214874b98c7214b3e7f6071d588aa)
 

Author SHA1 Message Date
Fabian Reinartz 6703404cb4 Merge remote-tracking branch 'origin/release-1.2'
8 years ago
Fabian Reinartz fc4d9c13e8 Merge pull request #2143 from prometheus/beorn7/fix
8 years ago
Fabian Reinartz 30af47535d Merge remote-tracking branch 'origin/release-1.2'
8 years ago
Fabian Reinartz 6875e9ef91 Merge pull request #2142 from amorken/issue-2140
8 years ago
Anders Daljord Morken 5c025a2f41 query_range: Validate that start comes before end
8 years ago
beorn7 5c41ca84e5 Catch negative staleness delta set on the command line
8 years ago
beorn7 c5bd178b93 Protect exported Querier interface method against negative time ranges
8 years ago
beorn7 2f6899cbb8 Add missing line to CHANGELOG.md
8 years ago
beorn7 5b16d6bd6e Merge branch 'release-1.2'
8 years ago
beorn7 e3d7c39529 Update date of v1.2.2
8 years ago
Björn Rabenstein 720f7e8636 Merge pull request #2135 from prometheus/beorn7/vendoring
8 years ago
beorn7 b216e91b61 Revert "Update github.com/miekg/dns to pull in bug fixes."
8 years ago
Fabian Reinartz 1c3531af4e Merge pull request #2133 from prometheus/beorn7/vendoring
8 years ago
beorn7 d2f1ace31d vendoring: re-add snappy/*_other.go files
8 years ago
beorn7 9c60dce1de vendoring: Update vendor/golang.org/x/sys/unix/ vendoring
8 years ago
beorn7 0cc51a5c5d vendoring: Vendor packages not vendored so far
8 years ago
beorn7 43cddad30b vendor: Update consul client
8 years ago
beorn7 5754f5237e vendoring: Clean up files accidentally left behind
8 years ago
beorn7 9d91b9f2a5 vendoring: Update checksum
8 years ago
beorn7 997864a1f4 Update context vendoring
8 years ago
beorn7 fefe55d11e Cut 1.2.2
8 years ago
beorn7 56c9e024cb Update goleveldb vendoring to pick up many bug fixes
8 years ago
beorn7 13c1086f18 Update vendoring of our own Prometheus packages.
8 years ago
beorn7 590446434f Update github.com/miekg/dns to pull in bug fixes.
8 years ago
beorn7 98e6e4fbee Update github.com/golang/protobuf/proto vendoring
8 years ago
beorn7 50fb82f987 vendor: Remove duplicate entries for "gopkg.in/yaml.v2" from vendor.json
8 years ago
beorn7 f0acde7721 Regenerate assets after cherry-pick
8 years ago
Frederic Branczyk e6dc9b05d5 vendor: update govalidator package (#2125)
8 years ago
Brian Brazil e1cfc994f7 Correctly handle on() in alerts. (#2096)
8 years ago
Stuart Olivera 223a22457f ui: don’t consider aborted requests complete
8 years ago
Frederic Branczyk 04dfd2fab3 vendor: update govalidator package (#2125)
8 years ago
Björn Rabenstein c1ae61a2cc Merge pull request #2116 from prometheus/beorn7/fix
8 years ago
Brian Brazil 64263f280d Add scrape_samples_scraped to indicate samples scraped. (#2123)
8 years ago
Brian Brazil 6bc29ba857 Fix regression from #1957, specify non-zero default timeout. (#2121)
8 years ago
Brian Brazil bbec65d454 Call SD metrics refresh rather than scrape. (#2120)
8 years ago
beorn7 876e5da4f8 Add guard against non-monotonic samples in series
8 years ago
beorn7 569a1d78eb Regenerate bindata after merge
8 years ago
beorn7 7e4d005ee1 Merge branch 'release-1.2'
8 years ago
Björn Rabenstein 233a25a060 Merge pull request #2113 from tattsun/fix/ISSUE-2109-v1.2
8 years ago
tattsun 68e20bd9ac ISSUE-2109 ui: fix decode query params bug
8 years ago
Julius Volz 72e4f1caa3 Merge pull request #2045 from bekbulatov/marathon_tls
8 years ago
bekbulatov 2bc12fa2fb Set timeout for marathon_sd
8 years ago
bekbulatov c689b35858 Merge branch 'master' into marathon_tls
8 years ago
Dominik Schulz f002fe186a Add Marathon-SD metrics. (#2106)
8 years ago
Mitsuhiro Tanda 296644adeb Expose ec2_instance_type (#2107)
8 years ago
Dominik Schulz 36de163900 Add File-SD metrics (#2103)
8 years ago
Dominik Schulz 552ab61fa1 Change SD metric names to make logical grouping more visible. (#2102)
8 years ago
Dominik Schulz 0c69227616 Add Consul-SD metrics (#2097)
8 years ago
Fabian Reinartz 5273b55a0c Merge pull request #2090 from brancz/release-1.3
8 years ago
Frederic Branczyk 26a0fa9f98
Cut v1.3.0-beta.0
8 years ago