Merge lp://staging/~abentley/charms/precise/charmworld/nagios into lp://staging/~juju-jitsu/charms/precise/charmworld/trunk
Proposed by
Aaron Bentley
| Status: | Merged |
|---|---|
| Merged at revision: | 36 |
| Proposed branch: | lp://staging/~abentley/charms/precise/charmworld/nagios |
| Merge into: | lp://staging/~juju-jitsu/charms/precise/charmworld/trunk |
| Diff against target: |
550 lines (+375/-84) 13 files modified
charmsupport/hookenv.py (+150/-0) charmsupport/nrpe.py (+169/-0) config.yaml (+10/-0) files/nrpe-external-master/check_ingest.sh (+5/-0) hooks/config-changed (+3/-1) hooks/install (+1/-1) hooks/nrpe-external-master-relation-changed (+2/-0) hooks/upgrade-charm (+3/-0) metadata.yaml (+3/-0) revision (+1/-1) run-write-errors (+16/-0) shhh.py (+0/-81) update-nrpe.py (+12/-0) |
| To merge this branch: | bzr merge lp://staging/~abentley/charms/precise/charmworld/nagios |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Juju-Jitsu Hackers | Pending | ||
|
Review via email:
|
|||
Description of the change
Implement nagios support
Change the way errors are reported so that any errors running ingest cause a
file, ~ubuntu/
used for a nagios check.
The files in charmsupport are copied almost verbatim from lp:charmsupport r27.
(Exception, the change in lp:~pjdc/charmsupport/hookenv-vs-nrpe was applied.)
Ideally we will switch to a packaged version of charmsupport, but not if its
nagios support is broken!
The shhh.py file is deleted because it is no longer needed.
To post a comment you must log in.
Revision history for this message
| Richard Harding (rharding) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
lgtm but I'd like to move the new files into a scripts directory. I've
started one in my branch as well. Things like the run-write-errors and
update-nrpe.py could find a home there and help prevent polluting the
root of the file tree.
https:/