Merge lp://staging/~chris-gondolin/charms/trusty/nrpe/fix-sub-postfix into lp://staging/charms/trusty/nrpe

Proposed by Chris Stratford
Status: Merged
Merged at revision: 40
Proposed branch: lp://staging/~chris-gondolin/charms/trusty/nrpe/fix-sub-postfix
Merge into: lp://staging/charms/trusty/nrpe
Diff against target: 50 lines (+18/-1)
3 files modified
config.yaml (+6/-0)
hooks/nrpe_helpers.py (+2/-1)
tests/10-tests (+10/-0)
To merge this branch: bzr merge lp://staging/~chris-gondolin/charms/trusty/nrpe/fix-sub-postfix
Reviewer Review Type Date Requested Status
Marco Ceppi (community) Approve
David Ames (community) Approve
Review via email: mp+285692@code.staging.launchpad.net

Description of the change

This adds a new "sub_postfix" option to allow the deployer to specify what (if any) extension they want used for the subordinate checks automatically added by the charm (check_disk_root, etc.)

By default it's set to "_sub", so we end up with /etc/nagios/nrpe.d/check_disk_root_sub (i.e. the same as the current version), but if set to "" it makes the checks compatible with the old nagios-external-master charm and should fix bug#1473205.

To post a comment you must log in.
Revision history for this message
David Ames (thedac) wrote :

Chris,

This looks good. Approved.

review: Approve
Revision history for this message
Marco Ceppi (marcoceppi) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: