Commit Graph

1979 Commits (9d98910fca035a8573b43c0654248dffafd16170)
 

Author SHA1 Message Date
Fabian Reinartz 8f904d6a54 api/v1: fix response format tests
10 years ago
Julius Volz 78f4da8bf1 Merge pull request #859 from sdurrheimer/circleci
10 years ago
Fabian Reinartz 6b3d79cfce Merge pull request #868 from prometheus/fabxc/ctype
10 years ago
Fabian Reinartz b36fa7ad61 api/v1: fix Content-Type in response
10 years ago
Brian Brazil 293f3808fb Merge pull request #866 from brian-brazil/zk-no-node
10 years ago
Brian Brazil 3d268d681e retrieval: Handle serverset node not existing.
10 years ago
Fabian Reinartz 049a106821 Merge pull request #863 from prometheus/fabxc/alertstate
10 years ago
Fabian Reinartz f06cf664e1 rules: cleanup alerting test
10 years ago
Fabian Reinartz 9bd4f6d017 rules: preserve alert state across reloads.
10 years ago
Fabian Reinartz 4625485b84 rules: move rules*.go contents to manager*.go
10 years ago
Steve Durrheimer 016e00441f Add circleci yaml for Dockerfile test build
10 years ago
Fabian Reinartz 1e61b5e0cf Merge pull request #858 from prometheus/fabxc/rmtfix
10 years ago
Fabian Reinartz b201725d1c cmd/prometheus: fix remote storage fanout
10 years ago
Julius Volz edc73318eb Merge pull request #857 from prometheus/container-builds
10 years ago
Julius Volz fed2fcbe25 Enable container-based Travis builds.
10 years ago
Fabian Reinartz ab7473b970 Merge pull request #856 from sdurrheimer/fix-dockerfile
10 years ago
Steve Durrheimer 785736c742 Fix Dockerfile with the removal of tools/rulechecker
10 years ago
Julius Volz 5176a480e6 Merge pull request #855 from prometheus/cut-0.15.0
10 years ago
Julius Volz 9ad71e5bbe Cut Prometheus 0.15.0rc1.
10 years ago
Julius Volz 21aec6e437 Merge pull request #854 from prometheus/fabxc/rulecheckerkill0r
10 years ago
Fabian Reinartz 6e61fd3e96 tools/rulechecker: bye bye
10 years ago
Julius Volz 8887f1e1a2 Merge pull request #853 from prometheus/fabxc/help
10 years ago
Fabian Reinartz 525070419b cmd/prometheus: improve help output
10 years ago
Julius Volz e701bdc434 Merge pull request #852 from prometheus/fabxc/graph
10 years ago
Fabian Reinartz 22945455ac Merge pull request #851 from prometheus/fabxc/promtool
10 years ago
Fabian Reinartz 4db3eeb054 web: generate embedded assets.
10 years ago
Fabian Reinartz 080e067601 Merge pull request #832 from prometheus/fabxc/target-test
10 years ago
Fabian Reinartz bcc8101d9e cmd/promtool: fix missing builddate in version info
10 years ago
Julius Volz a8f117b02d Merge pull request #849 from prometheus/use-api-v1
10 years ago
Julius Volz cf2a7a7ca9 Use v1 API for querying.
10 years ago
Fabian Reinartz c1d37bc55b Merge pull request #843 from prometheus/fabxc/runbook
10 years ago
Julius Volz ef4ba843a2 Merge pull request #848 from prometheus/fabxc/apifix
10 years ago
Fabian Reinartz 70d7a987a7 promql: add json tags, fix query constructor.
10 years ago
Fabian Reinartz 749ae450c5 promql: add runbook to alert statement.
10 years ago
Julius Volz 689ed7978f Merge pull request #845 from prometheus/fabxc/apifix
10 years ago
Fabian Reinartz 7f85b9b215 promql: add MarshalJSON method for ExprType.
10 years ago
Brian Brazil 52859b8033 Merge pull request #836 from prometheus/shard
10 years ago
Brian Brazil 682f949ab1 Add 'hashmod' relabel action.
10 years ago
Fabian Reinartz 2677d7b99a Merge pull request #842 from prometheus/fabxc/consulcfg
10 years ago
Julius Volz 9607b8bbdb Merge pull request #840 from prometheus/fix-scrape-errors-ui
10 years ago
Julius Volz 32a77085e0 Merge pull request #841 from prometheus/fix-cors-perms
10 years ago
Fabian Reinartz 23862c92c4 retrieval/discovery: refresh services in Consul to recover from missing events.
10 years ago
Julius Volz bc1c789bab Disallow cross-origin DELETE and POST requests.
10 years ago
Fabian Reinartz 3fcd26b328 Merge pull request #838 from prometheus/fabxc/consulcfg
10 years ago
Julius Volz c7039c3a73 Fix blown-up scrape error display in web UI.
10 years ago
Fabian Reinartz 4319b06dd2 config: add omitempty for consul SD config.
10 years ago
Julius Volz 364003c444 Merge pull request #837 from prometheus/update-web
10 years ago
Julius Volz 535a7f2640 Update web/blog/files.go with new web content.
10 years ago
Fabian Reinartz 3e811ad7a4 Merge pull request #827 from prometheus/fabxc/rmt-cleanup
10 years ago
Julius Volz 30fc04b240 Merge pull request #834 from prometheus/improve-dockerfile-deps
10 years ago