openstack/charm-rabbitmq-server
Code Issues Proposed changes

Use /usr/local/lib/nagios/plugins for non-packaged checks

Browse Source
This commit is contained in:
David Ames 2013-11-21 14:42:56 -08:00
parent a83043b686
commit b9e621b3e2
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/rabbitmq_server_relations.py
View File

@ -23,7 +23,7 @@ from charmhelpers.contrib.charmsupport.nrpe import NRPE
SERVICE_NAME = os.getenv('JUJU_UNIT_NAME').split('/')[0] SERVICE_NAME = os.getenv('JUJU_UNIT_NAME').split('/')[0]
POOL_NAME = SERVICE_NAME POOL_NAME = SERVICE_NAME
RABBIT_DIR = '/var/lib/rabbitmq' RABBIT_DIR = '/var/lib/rabbitmq'
NAGIOS_PLUGINS='/usr/lib/nagios/plugins' NAGIOS_PLUGINS='/usr/local/lib/nagios/plugins'
def install(): def install():

1
lib/charmhelpers/contrib/charmsupport/nrpe.py
View File

@ -129,6 +129,7 @@ define service {{
os.path.join(os.environ['CHARM_DIR'], os.path.join(os.environ['CHARM_DIR'],
'files/nrpe-external-master'), 'files/nrpe-external-master'),
'/usr/lib/nagios/plugins', '/usr/lib/nagios/plugins',
'/usr/local/lib/nagios/plugins',
) )
parts = shlex.split(check_cmd) parts = shlex.split(check_cmd)
for path in search_path: for path in search_path:

2
scripts/check_rabbitmq.py
View File

@ -10,8 +10,6 @@
# This file is managed by juju. Do not make local changes. # This file is managed by juju. Do not make local changes.
# Author: Cristian Gafton <cristian.gafton@canonical.com>
#
# Copyright (C) 2009, 2012 Canonical # Copyright (C) 2009, 2012 Canonical
# All Rights Reserved # All Rights Reserved
# #