prometheus

Commit Graph

Author	SHA1	Message	Date
Paul Gier	85a3c974b7	minor yaml indentation consistency fix in example configs (#3946 )	2018-03-11 23:06:13 +00:00
James Turnbull	4db6592d01	Removing external_labels from example conf file (#3409 ) It's unclear why this is in the example configuration file. Probably best to keep that super simple, c.f. https://github.com/prometheus/docs/pull/895#discussion_r148924390	2017-11-06 16:11:04 +00:00
David	e3b926c03b	Fix typo in AM config field static_configs (#3415 ) * typo in prometheus.yml field causes prometheus to throw an error Fixes #3414	2017-11-06 09:46:09 +00:00
Julien Pivotto	3382f39046	Explicitely add alertmanager to example config (#3383 ) As alertmanager needs to be configured in the config file in Prometheus 2, I think it is useful to have it in the example config. Also renamed the rules in the example config so they are explicitely yml files.	2017-10-31 22:02:08 +00:00
gambrose	52c762e9f1	The defaults stated in the example config where wrong (#2110 ) * The stated defaults where wrong * Update prometheus.yml	2016-11-21 09:53:59 +01:00
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

11 Commits (e03869de76fdb4fe8079641317f3c60c8a229e88)