master : lp:~raychan96/charm-prometheus2 : Git : Code : Prometheus2 charm

Get this branch:: git clone -b master https://git.launchpad.net/~raychan96/charm-prometheus2

Only Chi Wai CHAN can upload to this branch. If you are Chi Wai CHAN please log in for upload directions.

Branch information

Clarify config description of rules-repo and rules-update-ssh-key.

Reviewed-on: https://code.launchpad.net/~cjohnston/charm-prometheus2/+git/charm-prometheus2/+merge/443139
Reviewed-by: Eric Chen <email address hidden>
Reviewed-by: 🤖 prod-jenkaas-bootstack <email address hidden>

Clarify config description of rules-repo and rules-update-ssh-key. Fixes: LP: #2018932, #2018933

remove dup manual_job

Reviewed-on: https://code.launchpad.net/~seyeongkim/charm-prometheus2/+git/charm-prometheus2/+merge/434676
Reviewed-by: Eric Chen <email address hidden>
Reviewed-by: 🤖 prod-jenkaas-bootstack <email address hidden>

remove dup manual_job

fix functional test in case dns_name has IP

Reviewed-on: https://code.launchpad.net/~seyeongkim/charm-prometheus2/+git/charm-prometheus2/+merge/439359
Reviewed-by: Eric Chen <email address hidden>
Reviewed-by: Erhan Sunar <email address hidden>
Reviewed-by: JamesLin <email address hidden>
Reviewed-by: 🤖 prod-jenkaas-bootstack <email address hidden>

Fix functional test as dns_name for prometheus

dns_name sometimes has IP, sometimes has dns

so checks both of them. and if one of them are matched.

it should be ok.

Add "alert-relabel-configs" charm option.

Reviewed-on: https://code.launchpad.net/~jsimpso/charm-prometheus2/+git/charm-prometheus2/+merge/432872
Reviewed-by: Erhan Sunar <email address hidden>
Reviewed-by: Sudeep Bhandari <email address hidden>
Reviewed-by: 🤖 prod-jenkaas-bootstack <email address hidden>

Linting fixes

Extract some code to a helper function for clarity

Remove extraneous comments

»