12 Commits (08c17df24434d289f13319928ef22f79f926d9b2)

Author	SHA1	Message	Date
Michal Wasilewski	3f686cad8b	fixes yamllint errors ... Signed-off-by: Michal Wasilewski <mwasilewski@gmx.com>	4 years ago
Paul Gier	85a3c974b7	minor yaml indentation consistency fix in example configs (#3946)	7 years ago
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	7 years ago
David	e3b926c03b	Fix typo in AM config field static_configs (#3415) ... * typo in prometheus.yml field causes prometheus to throw an error Fixes #3414	7 years ago
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.	7 years ago
gambrose	52c762e9f1	The defaults stated in the example config where wrong (#2110) ... * The stated defaults where wrong * Update prometheus.yml	8 years ago
Fabian Reinartz	9a269b5507	Clarify comment on rule evaluation ... Fixes #1866	8 years ago
beorn7	44aa7ec46d	doc: Update scrape config in example prometheus.yml	9 years ago
Julius Volz	657d65d6d6	Remove invalid scrape timeout from example config. ... It can't be greater than the scrape interval. Let's just remove it.	9 years ago
Thach MAI	94f4430ff3	Fix example prometheus.yml to use "external_labels" instead of "labels".	9 years ago
Fabian Reinartz	a703241bf8	Adjust example config to naming changes	10 years ago
Fabian Reinartz	86087120dd	Replace example config with new YAML format.	10 years ago