6 Commits

Author	SHA1	Message	Date
Marcus Efraimsson	eef01e3703	docker: change port for prom random data scrape target	2018-03-15 09:52:53 +01:00
Alexander Zobnin	94cf560304	Merge remote-tracking branch 'upstream/master' into prometheus-heatmap	2018-03-12 17:16:02 +03:00
bergquist	e5b9219f13	dev: update dev prometheus2 to 2.2.0	2018-03-08 23:01:03 +01:00
Alexander Zobnin	425d2cfd3a	docker: add prometheus/example-golang-random to docker-compose blocks	2018-03-07 21:20:22 +03:00
Leonard Gram	f00a7e4dd7	dev: docker-compose setup for prom2. ... Copy of prometheus1 docker-compose config.	2018-02-21 11:25:14 +01:00
bergquist	d7321cd89c	prom: initial docker block for prometheus 2	2017-11-21 09:55:42 +01:00