Merge lp://qastaging/~brad-marshall/charms/trusty/ceph-osd/add-nrpe-checks into lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph-osd/trunk
Proposed by
Brad Marshall
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 34 | ||||
| Proposed branch: | lp://qastaging/~brad-marshall/charms/trusty/ceph-osd/add-nrpe-checks | ||||
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph-osd/trunk | ||||
| Diff against target: |
566 lines (+488/-0) 8 files modified
charm-helpers-hooks.yaml (+1/-0) config.yaml (+11/-0) files/nagios/check_ceph_status.py (+44/-0) files/nagios/collect_ceph_status.sh (+18/-0) hooks/charmhelpers/contrib/charmsupport/nrpe.py (+222/-0) hooks/charmhelpers/contrib/charmsupport/volumes.py (+156/-0) hooks/hooks.py (+32/-0) metadata.yaml (+4/-0) |
||||
| To merge this branch: | bzr merge lp://qastaging/~brad-marshall/charms/trusty/ceph-osd/add-nrpe-checks | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Liam Young (community) | Disapprove | ||
|
Review via email:
|
|||
Description of the change
Adds nrpe-external-
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thank for the mp. The new nrpe support is very gratefully received !
I've taken this branch and centralised the common code between this and the other nrpe branches and moved it to charm-helpers. To land it I created a new branch from this one which has now been merged into the 'next' charm. The 'next' charms will overwrite the stable ones in a couple of weeks.