Merge lp:~pedronis/charms/trusty/apache2/nagios_extra_check_https into lp:~tanuki/charms/trusty/apache2/trunk
Proposed by
Samuele Pedroni
Status: | Merged |
---|---|
Approved by: | Samuele Pedroni |
Approved revision: | 69 |
Merged at revision: | 68 |
Proposed branch: | lp:~pedronis/charms/trusty/apache2/nagios_extra_check_https |
Merge into: | lp:~tanuki/charms/trusty/apache2/trunk |
Diff against target: |
85 lines (+50/-1) 3 files modified
config.yaml (+13/-0) hooks/hooks.py (+9/-0) hooks/tests/test_nrpe_hooks.py (+28/-1) |
To merge this branch: | bzr merge lp:~pedronis/charms/trusty/apache2/nagios_extra_check_https |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Celso Providelo (community) | Approve | ||
Review via email: mp+269489@code.launchpad.net |
Commit message
support new config nagios_
Description of the change
support new config nagios_
at least here not all the preexisting tests pass :/
To post a comment you must log in.
Samuele,
Thanks for the changes, as discussed on IRC, test failure were there pre-fork (FAILED (errors=4, failures=2)), so don't worry (much).
I think we will probably need to pass a proper "description" for each extra check (as part of our guided-alerts story), but let's do it when we need.