14 Commits

Author SHA1 Message Date
Simon Pasquier
6ee50afb09 Update the openstack_sd_config section
openstack_sd_config requires a 'role' parameter which wasn't documented.
2017-12-08 17:47:30 +01:00
Tobias Schmidt
cd973650d2
Merge pull request #3474 from prometheus/grobie/fix-wrong-alertmanager-url-docs
Remove wrong statement about alertmanager URL configuration
2017-11-14 22:52:31 +01:00
vthriller
cf00e16837 [minor] docs: recording_rules: fix missing key 2017-11-14 19:27:21 +03:00
Tobias Schmidt
2bf2bcd48e Remove wrong statement about alertmanager URL configuration 2017-11-14 17:16:59 +01:00
Brian Brazil
b225a0bf20
Document consul sd tls_config (#3440)
Fixes https://github.com/prometheus/docs/issues/681
2017-11-08 16:36:08 +00:00
phyber
6a92ccaaf9 Fix markdown in recording rules. (#3432)
Resolves an issue where rendered markdown was incorrect.
2017-11-08 10:38:03 +00:00
Brian Brazil
a5b7955ace Tweak marathon wording around clustering. 2017-11-02 13:03:19 +00:00
Goutham Veeramachaneni
646e33242e docs: Fix minor issues with the docs. (#3389)
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-11-01 15:35:50 +00:00
Brian Brazil
b6494960d1
docs: Document new recording rule format (#3378) 2017-11-01 12:58:32 +00:00
James Turnbull
3701a827cf Updates to alerting rules docs (#3381)
1. Added a further explanation of the for clause.
2. Added further clarification of non identifying labels.
2017-10-31 19:19:17 +00:00
Brian Brazil
8cf279efb1 Document new alerting rule format. 2017-10-31 14:46:34 +00:00
Fabian Reinartz
8a2b5a3936 docs: update flags to new double-dash syntax 2017-10-28 12:08:33 +02:00
Tobias Schmidt
f49ae044d7 Import template reference and examples 2017-10-27 16:08:38 +02:00
Tobias Schmidt
f432b8176d Consolidate configuration and rules docs in docs/configuration/ 2017-10-27 09:54:02 +02:00