[bradm] Added support to get nagios hostname from nrpe relation

1 files changed, 6 insertions, 2 deletions

diff --git a/hooks/charmhelpers/contrib/charmsupport/nrpe.py b/hooks/charmhelpers/contrib/charmsupport/nrpe.py
index f3bfe3f..51b62d3 100644
--- a/hooks/charmhelpers/contrib/charmsupport/nrpe.py
+++ b/hooks/charmhelpers/contrib/charmsupport/nrpe.py
@@ -129,6 +129,7 @@ define service {{
 os.path.join(os.environ['CHARM_DIR'],
 'files/nrpe-external-master'),
 '/usr/lib/nagios/plugins',
+ '/usr/local/lib/nagios/plugins',
 )
 parts = shlex.split(check_cmd)
 for path in search_path:
@@ -181,12 +182,15 @@ class NRPE(object):
 nagios_exportdir = '/var/lib/nagios/export'
 nrpe_confdir = '/etc/nagios/nrpe.d'
 
- def __init__(self):
+ def __init__(self, hostname=None):
 super(NRPE, self).__init__()
 self.config = config()
 self.nagios_context = self.config['nagios_context']
 self.unit_name = local_unit().replace('/', '-')
- self.hostname = "{}-{}".format(self.nagios_context, self.unit_name)
+ if hostname:
+ self.hostname = hostname
+ else:
+ self.hostname = "{}-{}".format(self.nagios_context, self.unit_name)
 self.checks = []
 
 def add_check(self, *args, **kwargs):