1992 Commits (beae7b6afb42351685189ce94c95732b176e2102)

 

All Branches   

Search

Author	SHA1	Message	Date
Fabian Reinartz	f515559a96	Merge pull request #872 from prometheus/fabxc/vecfix ... promql: marshal sample pairs to JSON tuples.	10 years ago
Fabian Reinartz	75ba840d88	web/js: adjust Javascript to new response format	10 years ago
Fabian Reinartz	3d67d75935	promql: implement JSON array format for scalar and string	10 years ago
Fabian Reinartz	834cec44cf	httputil: remove non-general helper functions	10 years ago
Fabian Reinartz	77e8983221	promql: add MarshalJSON method for SamplePair	10 years ago
Fabian Reinartz	92c20168c4	Merge pull request #874 from prometheus/fabxc/cfgfix ... resolve rule files relative to config file.	10 years ago
Julius Volz	d4f1402444	Merge pull request #873 from prometheus/global-url-tests ... Add tests for "globalURL" template function.	10 years ago
Fabian Reinartz	7e615dcdf0	cmd/promtool: resolve rule files relative to config file	10 years ago
Fabian Reinartz	feb8a03503	rules: load rule files relative to a base dir	10 years ago
Julius Volz	0f57b403a9	Add tests for "globalURL" template function.	10 years ago
Julius Volz	fd7b4cae43	Merge pull request #864 from prometheus/configurable-scheme ... Consolidate external reachability flags into one.	10 years ago
Julius Volz	fcff35b43e	Consolidate external reachability flags into one. ... Besides fixing https://github.com/prometheus/prometheus/issues/805 by making the entire externally reachable server URL configurable, this adds tests for the "globalURL" template function and makes it easier to test other such functions in the future. This breaks the `web.Hostname` flag (and introduces `web.external-url`). This flag is likely only used by few users, so I hope that's justifiable. Fixes https://github.com/prometheus/prometheus/issues/805	10 years ago
Fabian Reinartz	85100767f7	Merge pull request #870 from prometheus/fabxc/ctype ... api/v1: fix response format tests	10 years ago
Fabian Reinartz	8f904d6a54	api/v1: fix response format tests	10 years ago
Julius Volz	78f4da8bf1	Merge pull request #859 from sdurrheimer/circleci ... Add circleci yaml for Dockerfile test build	10 years ago
Fabian Reinartz	6b3d79cfce	Merge pull request #868 from prometheus/fabxc/ctype ... api/v1: fix Content-Type in response	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 ... retrieval: Handle serverset node not existing.	10 years ago
Brian Brazil	3d268d681e	retrieval: Handle serverset node not existing. ... This stops configuration loading hanging if the Znode doesn't exist, and retries until the node does exist.	10 years ago
Fabian Reinartz	049a106821	Merge pull request #863 from prometheus/fabxc/alertstate ... Preserve alert state, cleanup rules/	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 ... cmd/prometheus: fix remote storage fanout	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 ... Enable container-based Travis builds.	10 years ago
Julius Volz	fed2fcbe25	Enable container-based Travis builds. ... See: http://docs.travis-ci.com/user/workers/container-based-infrastructure/ Apparently disabling sudo is all that's needed.	10 years ago
Fabian Reinartz	ab7473b970	Merge pull request #856 from sdurrheimer/fix-dockerfile ... Fix Dockerfile with the removal of tools/rulechecker	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 ... Cut Prometheus 0.15.0rc1.	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 ... tools/rulechecker: bye bye	10 years ago
Fabian Reinartz	6e61fd3e96	tools/rulechecker: bye bye	10 years ago
Julius Volz	8887f1e1a2	Merge pull request #853 from prometheus/fabxc/help ... cmd/prometheus: improve help output	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 ... web: generate embedded assets.	10 years ago
Fabian Reinartz	22945455ac	Merge pull request #851 from prometheus/fabxc/promtool ... cmd/promtool: fix missing builddate in version info	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 ... retrieval: double timeout in target scrape 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 ... Use v1 API for querying.	10 years ago
Julius Volz	cf2a7a7ca9	Use v1 API for querying. ... Also remove hidden input fields that are not used anymore, because the query params are now passed as JSON to the AJAX function. This also has the wonderful side effect that we're no longer sending all the other non-hidden fields along to the query endpoints anymore.	10 years ago
Fabian Reinartz	c1d37bc55b	Merge pull request #843 from prometheus/fabxc/runbook ... promql: add runbook to alert statement.	10 years ago
Julius Volz	ef4ba843a2	Merge pull request #848 from prometheus/fabxc/apifix ... promql: add json tags, fix query constructor.	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. ... This commit adds the RUNBOOK keyword to alert statements. The field is optional and expected to be a link.	10 years ago
Julius Volz	689ed7978f	Merge pull request #845 from prometheus/fabxc/apifix ... promql: add MarshalJSON method for ExprType.	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 ... Add 'hashmod' relabel action.	10 years ago