Last commit made on 2020-05-17
Get this branch:
git clone -b stable/20.05
Members of Llama (LMA) Charmers can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

4e16e3c... by Xav Paice

Merge branch 'bug/1867180'

Manual merge of

848846c... by Xav Paice

Make rules_wait_time configurable

Addressing review comments, add config item for the wait_time for
generic rules.

Additionally fix a missing conditional to trigger rules generation when
generic_rules_tmpl is updated.

ae71585... by Xav Paice

add basic generic rules for all targets

Adds a single up == 0 rule for alerting if a target is down.

Fixes-bug LP:#1870473

dae58ed... by Xav Paice

Change os.getlogin() to os.geteuid()

When using os.getlogin() without a terminal (i.e. during hook execution)
an error is returned rather than a value. Additionally, os.getlogin()
returns the terminal user, rather than the user of the process itself
which is what is needed.

Fixes LP: #1877909

12ee9ef... by Alvaro Uria

Merge branch 'xavpaice/dedupe_relation_rules'

Reviewed-by: Alvaro Uria <email address hidden>
Reviewed-by: Wouter van Bommel <email address hidden>
Signed-off-by: Alvaro Uria <email address hidden>

458785d... by Peter Sabaini

Add scrape-timeout parameter

Add option to drive prometheus global scrape_timeout parameter

Rip out old amulet functest stub and add a basic zaza functest

Closes-Bug #1867180

c20b1d3... by Xav Paice

Remove duplicates from rules imported by relation

9c6c769... by Xav Paice

fix unit tests

ddd175b... by Jeremy Lounder

Updated maintainers in metadata.yaml

bca6eb0... by Wouter van Bommel

Added support for focal

Reviewed-by: Haw Loeung <email address hidden>