Merge lp:~verterok/charms/trusty/logstash-forwarder/fix-nrpe-check into lp:~tanuki/charms/trusty/logstash-forwarder/trunk

[Guillermo Gonzalez]

set hostname from nrpe-external-master relation data in nrpe checks

set hostname from nrpe-external-master relation data in nrpe checks

[Celso Providelo (cprov)]

Thanks, Guillermo.

Don't forget to propose a MP for logstash-forward upstream, specially because I think IS is actively working on it (ELK devops)

review: Approve

[Guillermo Gonzalez (verterok)]

> Thanks, Guillermo.
>
> Don't forget to propose a MP for logstash-forward upstream, specially because
> I think IS is actively working on it (ELK devops)
Done: https://code.launchpad.net/~verterok/charms/trusty/logstash-forwarder/set-nrpe-hostname-from-relation/+merge/272614

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-08-31 16:22:46 +0000
+++ hooks/hooks.py	2015-09-25 20:25:34 +0000
@@ -11,7 +11,7 @@
 import base64
 import shutil
 sys.path.insert(0, os.path.join(os.environ['CHARM_DIR'], 'lib'))
-from charmhelpers.core.hookenv import Hooks, log, charm_dir
+from charmhelpers.core.hookenv import Hooks, log, charm_dir, relations_of_type
 from charmhelpers.core.host import mkdir, service_start, service_stop, service_restart
 from charmhelpers.fetch import apt_install, apt_update, add_source
 from Cheetah.Template import Template
@@ -139,10 +139,14 @@
     os.rename('/tmp/new_hosts', '/etc/hosts')
 
 
-
 @hooks.hook('nrpe-external-master-relation-changed')
 def update_nrpe_checks():
-    nrpe_compat = nrpe.NRPE()
+    rels = relations_of_type('nrpe-external-master')
+    if not rels:
+        log("No nrpe-external-master relations found, skipping update_nrpe_checks")
+        return
+    # only use the first relation in the list...we should have a single nrpe
+    nrpe_compat = nrpe.NRPE(hostname=rels[0]['nagios_hostname'])
     conf = nrpe_compat.config
     check_procs_params = conf.get('nagios_check_procs_params')
     if check_procs_params:
@@ -154,14 +158,14 @@
     nrpe_compat.add_check(
         shortname='logstashforwarder_sending',
         description='Check logstash-forwarder is sending by tailing logfile',
-        check_cmd = "/usr/local/lib/nagios/plugins/check-logstashforwarder-sending.sh"
+        check_cmd="/usr/local/lib/nagios/plugins/check-logstashforwarder-sending.sh"
         )
     nrpe_compat.write()
     copy_check_files()
 
 
 def copy_check_files():
-    script_dir="/usr/local/lib/nagios/plugins"
+    script_dir = "/usr/local/lib/nagios/plugins"
     mkdir(script_dir)
     for script in ["check-logstashforwarder-sending.sh"]:
         src = os.path.join(charm_dir(), "files", script)
@@ -192,6 +196,7 @@
     writeEtcHosts()
     writeConfig()
     service_restart("logstash-forwarder")
+    update_nrpe_checks()
 
 
 @hooks.hook("start")
 
=== added symlink 'hooks/nrpe-external-master-relation-changed'
=== target is u'hooks.py'