Charm Helpers

Merge lp:~thedac/charm-helpers/no-nrpe-from-charm-directory into lp:charm-helpers

  1. no-nrpe-from-charm-directory
  2. Merge into devel
Proposed by David Ames
Status: Merged
Merged at revision: 103
Proposed branch: lp:~thedac/charm-helpers/no-nrpe-from-charm-directory
Merge into: lp:charm-helpers
Diff against target: 13 lines (+0/-3)
1 file modified
charmhelpers/contrib/charmsupport/nrpe.py (+0/-3)
To merge this branch: bzr merge lp:~thedac/charm-helpers/no-nrpe-from-charm-directory
Reviewer Review Type Date Requested Status
Tom Haddon Approve
Review via email: mp+196327@code.launchpad.net

Description of the change

NRPE checks should not be run from / or the charm directory.
Juju core permissions will not allow the nagios user to read from the charm directory so we should not imply it can be done in charm helpers

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

I like it.

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-11-22 00:29:27 +0000
3+++ charmhelpers/contrib/charmsupport/nrpe.py 2013-11-22 17:15:47 +0000
4@@ -125,9 +125,6 @@
5
6 def _locate_cmd(self, check_cmd):
7 search_path = (
8- '/',
9- os.path.join(os.environ['CHARM_DIR'],
10- 'files/nrpe-external-master'),
11 '/usr/lib/nagios/plugins',
12 '/usr/local/lib/nagios/plugins',
13 )

Subscribers

People subscribed via source and target branches