← Back to branch summary

~thedac/charm-helpers/no-nrpe-from-charm-directory

« back to all changes in this revision

Viewing changes to charmhelpers/contrib/charmsupport/nrpe.py

  • Committer: Tom Haddon
  • Date: 2013-11-22 17:10:24 UTC
  • mfrom: (100.2.1 charm-helpers)
  • Revision ID: tom.haddon@canonical.com-20131122171024-pc9v0exu6rkztoh9
[thedac,r=mthaddon] When using NRPE with custom checks use /usr/local/lib/nagios/plugins for non-packaged custom checks

Show diffs side-by-side

added added

removed removed

Lines of Context:
charmhelpers/contrib/charmsupport/nrpe.py
129
129
            os.path.join(os.environ['CHARM_DIR'],
130
130
                         'files/nrpe-external-master'),
131
131
            '/usr/lib/nagios/plugins',
 
132
            '/usr/local/lib/nagios/plugins',
132
133
        )
133
134
        parts = shlex.split(check_cmd)
134
135
        for path in search_path: