Merge lp://staging/~chad.smith/charms/trusty/nrpe/trunk into lp://staging/charms/trusty/nrpe
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 39 | ||||
Proposed branch: | lp://staging/~chad.smith/charms/trusty/nrpe/trunk | ||||
Merge into: | lp://staging/charms/trusty/nrpe | ||||
Diff against target: |
231 lines (+107/-12) 7 files modified
hooks/nrpe_helpers.py (+7/-0) hooks/nrpe_utils.py (+13/-0) hooks/services.py (+1/-0) tests/10-tests (+8/-8) tests/11-monitors-configurations (+2/-2) tests/13-monitors-config (+2/-2) tests/14-basic-nrpe-external-master (+74/-0) |
||||
To merge this branch: | bzr merge lp://staging/~chad.smith/charms/trusty/nrpe/trunk | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Review Queue (community) | automated testing | Needs Fixing | |
Chad Smith (community) | Abstain | ||
Stuart Bishop (community) | Approve | ||
Review via email: mp+284986@code.staging.launchpad.net |
Description of the change
This fixes lp:1532281.
When setting nagions_host_type = "host" on nrpe, all related principals need to write the proper hostname in their service files.
Principals related via nrpe-external-
This branch publishes these two values: nagios_hostname and nagios_host_context as expected by charmhelpers utility functions.
Principals calling get_nagios_hostname will properly write a the host_name in their nagios service__ files matching the host_name definition created by nrpe. This way principals and subordinate nrpe stay synchronized.
to test:
juju deploy local
./tests/
All looks good to me, and tests are fine. Thanks for fixing the unrelated tests too (for Juju 1.25 compatibility).