65 Commits (f7e923c3bb47071e9d810e31889e7cb3da133862)

Author	SHA1	Message	Date
Krasi Georgiev	aca8f85699	fixed the tests	2017-12-18 17:22:50 +00:00
Fabian Reinartz	53875da7fb	Merge pull request #3286 from prometheus/dev-2.0 ... Dev 2.0	2017-10-12 16:19:10 +02:00
Brian Brazil	8740fcc657	Use panic in goroutine in test, not t.Fatalf	2017-10-09 19:44:03 +01:00
Julien Levesy	26a067b23d	use testutil assertion helpers in web package testsuite	2017-10-05 22:40:10 +02:00
Fabian Reinartz	7a3261aa99	Merge pull request #3240 from Gouthamve/fix-admin-api ... web/api: Fix typo which broke the 2.0 admin APIs.	2017-10-05 14:33:12 +02:00
Fabian Reinartz	2d0b8e8b94	Merge branch 'master' into dev-2.0	2017-10-05 13:09:18 +02:00
Goutham Veeramachaneni	35aaa2002d	web/api: Add tests for v2 admin API ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	2017-10-05 15:25:09 +05:30
Fabian Reinartz	7b02bfee0a	web: start web handler while TSDB is starting up	2017-09-20 15:03:19 +02:00
Krasi Georgiev	b4b0999e7f	add prefix to the api when prometheus started with custom web.external-url ... Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>	2017-09-18 17:59:27 +03:00
Tom Wilkie	bbc9671d50	Get profile handlers working again after #3054 and #3146. ... Ensures the pprod endpoints deal with path-prefixes correctly; adds a test so we don't break it again.	2017-09-18 13:27:09 +01:00
Fabian Reinartz	d21f149745	*: migrate to go-kit/log	2017-09-08 22:01:51 +05:30
Fabian Reinartz	25f3e1c424	Merge branch 'master' into mergemaster	2017-08-10 17:04:25 +02:00
emluque	ff54c5c11a	2831 Add Healthy and Ready endpoints	2017-08-07 17:34:04 -03:00
Jonathan Boulle	38098f8c95	Add missing license headers ... Prometheus is Apache 2 licensed, and most source files have the appropriate copyright license header, but some were missing it without apparent reason. Correct that by adding it.	2016-04-13 16:08:22 +02:00
Julius Volz	0f57b403a9	Add tests for "globalURL" template function.	2015-07-03 14:47:52 +02:00