~alejdg/charm-prometheus2/+git/prometheus2-charm:scrape_interval_and_timeout_support

Last commit made on 2018-06-21
Get this branch:
git clone -b scrape_interval_and_timeout_support https://git.launchpad.net/~alejdg/charm-prometheus2/+git/prometheus2-charm
Only Alexandre Gomes can upload to this branch. If you are Alexandre Gomes please log in for upload directions.

Branch merges

Branch information

Name:
scrape_interval_and_timeout_support
Repository:
lp:~alejdg/charm-prometheus2/+git/prometheus2-charm

Recent commits

f37f10c... by Alexandre Gomes

Add support for scrape_interval and scrape_timeout from the scrape relation data

2b3cc73... by Jacek Nykis

Rework rule file logic to use globs. Allows for files to be removed without causing config syntax errors. Fixes LP1775740

Reviewed-on: https://code.launchpad.net/~jacekn/prometheus2-charm/+git/prometheus2-charm/+merge/348298
Reviewed-by: David Lawson <email address hidden>

f176999... by Jacek Nykis

Rework rule file logic to use globs. Allows for files to be removed without causing config syntax errors. Fixes LP1775740

e3d5406... by Jacek Nykis

Improve refresh_rules.sh. Fixes LP1775738 and LP1775741

Reviewed-on: https://code.launchpad.net/~jacekn/prometheus2-charm/+git/prometheus2-charm/+merge/347905
Reviewed-by: David Lawson <email address hidden>

682cef3... by Jacek Nykis

Include promtool check config output in refresh_rules.sh notifications. Fixes LP1775741

63fa4f6... by Jacek Nykis

Anoter fix to refresh_rules.sh promtool invocation

fc41ec1... by Jacek Nykis

Update refresh_rules.sh template to use new promtool subcommand for config pre-check

Reviewed-on: https://code.launchpad.net/~jacekn/prometheus2-charm/+git/prometheus2-charm/+merge/347533
Reviewed-by: Stuart Bishop <email address hidden>

16e2f7c... by Jacek Nykis

Update refresh_rules.sh template to use new promtool subcommand for config pre-check

e36aecf... by Martin Hilton

Fix error with specifying the "storage.tsdb.path" flag twice when using juju storage.

Reviewed-on: https://code.launchpad.net/~martin-hilton/prometheus2-charm/+git/prometheus2-charm/+merge/342723
Reviewed-by: Thomas Cuthbert <email address hidden>

ff8510e... by Martin Hilton

Do not set runtime arguments for attached storage

The charm already sets this argument so setting it twice breaks things.