6 Commits (552ab61fa1f1598408ca891d39ac957f1c61d9d4)

Author	SHA1	Message	Date
Fabian Reinartz	9a269b5507	Clarify comment on rule evaluation ... Fixes #1866	2016-08-03 08:29:51 +02:00
beorn7	44aa7ec46d	doc: Update scrape config in example prometheus.yml	2016-06-14 09:57:03 +02:00
Julius Volz	657d65d6d6	Remove invalid scrape timeout from example config. ... It can't be greater than the scrape interval. Let's just remove it.	2016-02-24 21:06:36 +01:00
Thach MAI	94f4430ff3	Fix example prometheus.yml to use "external_labels" instead of "labels".	2015-10-02 23:00:10 +02:00
Fabian Reinartz	a703241bf8	Adjust example config to naming changes	2015-05-19 18:12:58 +02:00
Fabian Reinartz	86087120dd	Replace example config with new YAML format.	2015-05-11 18:14:07 +02:00