Charm Helpers

Merge lp:~thedac/charm-helpers/nrpe-usr-local-lib into lp:charm-helpers

  1. nrpe-usr-local-lib
  2. Merge into devel
Proposed by David Ames
Status: Merged
Approved by: Tom Haddon
Approved revision: 101
Merged at revision: 102
Proposed branch: lp:~thedac/charm-helpers/nrpe-usr-local-lib
Merge into: lp: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:~thedac/charm-helpers/nrpe-usr-local-lib
Reviewer Review Type Date Requested Status
Tom Haddon Approve
Review via email: mp+196215@code.launchpad.net

Description of the change

When using NRPE with custom checks use /usr/local/lib/nagios/plugins for non-packaged custom checks

To post a comment you must log in.
Revision history for this message
Tom Haddon (mthaddon) wrote :

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.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/charmsupport/nrpe.py'
2--- charmhelpers/contrib/charmsupport/nrpe.py 2013-07-16 19:58:14 +0000
3+++ charmhelpers/contrib/charmsupport/nrpe.py 2013-11-22 00:31:34 +0000
4@@ -129,6 +129,7 @@
5 os.path.join(os.environ['CHARM_DIR'],
6 'files/nrpe-external-master'),
7 '/usr/lib/nagios/plugins',
8+ '/usr/local/lib/nagios/plugins',
9 )
10 parts = shlex.split(check_cmd)
11 for path in search_path:

Subscribers

People subscribed via source and target branches