Commit Graph

4819 Commits (07299cec17e69e6e967dc1d858e05af1adb09621)
 

Author SHA1 Message Date
Fabian Reinartz 46dc7e356a Merge pull request #3243 from prometheus/mergemaster
7 years ago
Brian Brazil 99905f82a6 Remove keep_common modifier.
7 years ago
Brian Brazil b2ac3d2d86 Remove count_scalar and drop_common_labels.
7 years ago
Brian Brazil 67274f0794 Remove 4 interval staleness heuristic. (#3244)
7 years ago
Bryan Boreham a03193232a Don't disable HTTP keep-alives for remote storage connections. (#3173)
7 years ago
Fabian Reinartz 2d0b8e8b94 Merge branch 'master' into dev-2.0
7 years ago
Goutham Veeramachaneni 35aaa2002d
web/api: Add tests for v2 admin API
7 years ago
Julius Volz f7e8348a88 Re-add contexts to storage.Storage.Querier() (#3230)
7 years ago
Tobias Schmidt 9c475b95db Merge pull request #3199 from pgier/remove-go-validator
7 years ago
Paul Gier 08af129b4d cmd/prometheus: don't allow quotes at beginning or end of url
7 years ago
Paul Gier f79b55d057 cmd/prometheus: remove govalidator for url validation
7 years ago
Goutham Veeramachaneni d70f850a18
web/api: Fix typo which broke the 2.0 admin APIs.
7 years ago
Fabian Reinartz c4270fdbf4 Merge pull request #3229 from krasi-georgiev/update-go-stack
7 years ago
Krasi Georgiev 3c17e51391 vendor: update go-stack to fix sigpanic when debugging with delve
7 years ago
Tom Wilkie 639d5c6f98 Merge pull request #3023 from tomwilkie/2945-remote-read-server
7 years ago
beorn7 f1d4558469 Merge branch 'release-1.7'
7 years ago
Björn Rabenstein 2e8092aec9 Merge pull request #3177 from prometheus/beorn7/release2
7 years ago
beorn7 bea12d4be1 Merge branch 'release-1.7'
7 years ago
Björn Rabenstein 22eadbe635 Merge pull request #3222 from prometheus/beorn7/release
7 years ago
Tobias Schmidt e8ce37ad0d Merge pull request #3223 from alcortesm/dead-code-at-stats
7 years ago
Tobias Schmidt f104a5dfc6 Merge pull request #3224 from alcortesm/config-simplify-returns
7 years ago
Alberto Cortés bb3dad9cba config: simplify some returns
7 years ago
Alberto Cortés 2c9739162e utils/stats: remove dead code
7 years ago
beorn7 f51c97c7d4 Cut v1.7.2
7 years ago
Tobias Schmidt 52ea748248 Merge pull request #3215 from prometheus/grobie/http-accept
7 years ago
Tobias Schmidt 40c278ee2d Send a HTTP Accept header when scraping
7 years ago
Björn Rabenstein 398fa4fd02 Merge pull request #3205 from prometheus/beorn7/ui
7 years ago
beorn7 c2e9a151ab Make all rule links link to the "Console" tab rather than "Graph"
7 years ago
beorn7 16c95ae8e7 Merge branch 'release-1.7'
7 years ago
Fabian Reinartz 64c7932e85 Merge pull request #3202 from prometheus/beta5
7 years ago
Fabian Reinartz c2166d48bb *: cut v2.0.0-beta.5
7 years ago
Fabian Reinartz 34f0af30cf vendor: update prometheus/tsdb
7 years ago
Fabian Reinartz 254ec433ee Merge branch 'dev-2.0' of github.com:prometheus/prometheus into dev-2.0
7 years ago
Fabian Reinartz 249d69b513 Merge pull request #3186 from prometheus/startweb
7 years ago
Fabian Reinartz 701152d574 vendor: update tsdb revisions to master
7 years ago
Fabian Reinartz 7b02bfee0a web: start web handler while TSDB is starting up
7 years ago
Fabian Reinartz 18078e3fcc Merge pull request #3192 from prometheus/scrapecache
7 years ago
beorn7 dd381356a5 Tweak floating point number rendering
7 years ago
beorn7 eaff0dcfc3 Merge branch 'yamatoya-fix_ui_graph_decimal_axis' into release-1.7
7 years ago
beorn7 61b6311504 Merge branch 'fix_ui_graph_decimal_axis' of git://github.com/yamatoya/prometheus into yamatoya-fix_ui_graph_decimal_axis
7 years ago
Fabian Reinartz 437f51a85f Fix cache maintenance on changing metric representations
7 years ago
Fabian Reinartz a04be0bc1c vendor: update prometheus/tsdb
7 years ago
Takahito Yamatoya b1151bdabc ui changed, limit the number of digits for the larger units is 5
7 years ago
Fabian Reinartz d6fbfb49eb Merge pull request #3137 from krasi-georgiev/3083-api-ignores-prefix-option
7 years ago
Krasi Georgiev b4b0999e7f add prefix to the api when prometheus started with custom web.external-url
7 years ago
Takahito Yamatoya 1eac566d09 add ; , and change from B to G, and change from K to k, and add all the prefixes
7 years ago
Tom Wilkie fae3bd17b9 Merge pull request #3132 from tomwilkie/fix-debug-handlers
7 years ago
Tom Wilkie bbc9671d50 Get profile handlers working again after #3054 and #3146.
7 years ago
Goutham Veeramachaneni 6c0070986d Merge pull request #3152 from Gouthamve/go-kit/log
7 years ago
beorn7 e7aab2791a Forward-merge bug fixes frem branch 'release-1.7'
7 years ago