Merge lp://qastaging/~thedac/charm-helpers/nrpe-usr-local-lib into lp://qastaging/charm-helpers
Proposed by
David Ames
| Status: | Merged |
|---|---|
| Approved by: | Tom Haddon |
| Approved revision: | 101 |
| Merged at revision: | 102 |
| Proposed branch: | lp://qastaging/~thedac/charm-helpers/nrpe-usr-local-lib |
| Merge into: | lp://qastaging/charm-helpers |
| Diff against target: |
11 lines (+1/-0) 1 file modified
charmhelpers/contrib/charmsupport/nrpe.py (+1/-0) |
| To merge this branch: | bzr merge lp://qastaging/~thedac/charm-helpers/nrpe-usr-local-lib |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tom Haddon | Approve | ||
|
Review via email:
|
|||
Description of the change
When using NRPE with custom checks use /usr/local/
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
Looks good, approving, although we should review lines 5 and 6 of this diff, as I think it means we're allowing nagios plugins to be run from within the charm directory, which is a bad thing™ and may even be broken in juju-core.