Merge lp:~jjo/charms/trusty/nova-compute/add-neutron-plugin-nrpe-checks-lp1530227 into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[JuanJo Ciarlante]

Unmerged revisions

188. By JuanJo Ciarlante on 2016-01-07

[jjo] WIP: add NRPE support via NRPESet passed at relation time thru neutron-plugin relation lp#1530227

=== modified file 'hooks/charmhelpers/contrib/charmsupport/nrpe.py'
--- hooks/charmhelpers/contrib/charmsupport/nrpe.py	2016-01-04 21:29:58 +0000
+++ hooks/charmhelpers/contrib/charmsupport/nrpe.py	2016-01-07 21:39:25 +0000
@@ -39,7 +39,11 @@
     relations_of_type,
 )
 
-from charmhelpers.core.host import service
+from charmhelpers.core.host import (
+    service,
+    rsync,
+)
+NAGIOS_PLUGINS = '/usr/local/lib/nagios/plugins'
 
 # This module adds compatibility with the nrpe-external-master and plain nrpe
 # subordinate charms. To use it in your charm:
@@ -217,6 +221,38 @@
         subprocess.call(self.check_cmd)
 
 
+class Cron(object):
+    def __init__(self, filename, cron_freq, cron_user, cron_cmd):
+        super(Cron, self).__init__()
+        self.filename = filename
+        self.cron_freq = cron_freq
+        self.cron_user = cron_user
+        self.cron_cmd = cron_cmd
+
+    def write(self):
+        cron_filename = '/etc/cron.d/{}'.format(self.filename)
+        log("cron.write: {}".format(cron_filename))
+        with open(cron_filename, 'w') as cron_file:
+            cron_file.write("# cron {}\n".format(self.filename))
+            cron_file.write("{} {} {}\n".format(self.cron_freq,
+                                                self.cron_user,
+                                                self.cron_cmd))
+
+class NagiosPlugin(object):
+    def __init__(self, filename):
+        super(NagiosPlugin, self).__init__()
+        self.filename = filename
+
+    def write(self):
+        if not os.path.exists(NAGIOS_PLUGINS):
+            os.makedirs(NAGIOS_PLUGINS)
+        if os.path.exists(self.filename):
+            log("NagiosPlugin.write: {} {}".format(self.filename, NAGIOS_PLUGINS))
+            rsync(self.filename, NAGIOS_PLUGINS)
+        else:
+            log("SKIPPED: NagiosPlugin.write: {} {}".format(self.filename, NAGIOS_PLUGINS))
+
+
 class NRPE(object):
     nagios_logdir = '/var/log/nagios'
     nagios_exportdir = '/var/lib/nagios/export'
@@ -240,6 +276,8 @@
             else:
                 self.hostname = "{}-{}".format(self.nagios_context, self.unit_name)
         self.checks = []
+        self.crons = []
+        self.nagios_plugins = []
 
     def add_check(self, *args, **kwargs):
         self.checks.append(Check(*args, **kwargs))
@@ -260,6 +298,24 @@
         check = Check(*args, **kwargs)
         check.remove(self.hostname)
 
+    def add_cron(self, *args, **kwargs):
+        self.crons.append(Cron(*args, **kwargs))
+
+    def add_nagios_plugin(self, *args, **kwargs):
+        self.nagios_plugins.append(NagiosPlugin(*args, **kwargs))
+
+    def add_from_config(self, config_key):
+        saved_config = config()
+        nrpe_set = NRPESet(saved_config.get(config_key))
+        log('NRPE.add_from_config: nrpe_set={}'.format(str(nrpe_set)))
+        if nrpe_set:
+            for check in nrpe_set.checks:
+                self.add_check(*check)
+            for cron in nrpe_set.crons:
+                self.add_cron(*cron)
+            for nagios_plugins in nrpe_set.nagios_plugins:
+                self.add_nagios_plugin(*nagios_plugins)
+
     def write(self):
         try:
             nagios_uid = pwd.getpwnam('nagios').pw_uid
@@ -281,6 +337,12 @@
                 "command": nrpecheck.command,
             }
 
+        for cron in self.crons:
+            cron.write()
+
+        for nagios_plugins in self.nagios_plugins:
+            nagios_plugins.write()
+
         service('restart', 'nagios-nrpe-server')
 
         monitor_ids = relation_ids("local-monitors") + \
@@ -368,7 +430,6 @@
     Copy the nrpe checks into place
 
     """
-    NAGIOS_PLUGINS = '/usr/local/lib/nagios/plugins'
     nrpe_files_dir = os.path.join(os.getenv('CHARM_DIR'), 'hooks',
                                   'charmhelpers', 'contrib', 'openstack',
                                   'files')
@@ -396,3 +457,40 @@
         shortname='haproxy_queue',
         description='Check HAProxy queue depth {%s}' % unit_name,
         check_cmd='check_haproxy_queue_depth.sh')
+
+class NRPESet:
+    checks = []
+    crons = []
+    nagios_plugins = []
+    def __init__(self, yaml_str='null'):
+        init_values = None
+        if yaml_str:
+            init_values = yaml.safe_load(yaml_str)
+        log('NRPESet: init_values={}'.format(init_values))
+        if type(init_values) == type({}):
+            self.checks = init_values.get('checks', [])
+            self.crons = init_values.get('crons', [])
+            self.nagios_plugins = init_values.get('nagios_plugins', [])
+
+    def add_check(self, shortname, description, check_cmd):
+        log('NRPESet: add_check({})'.format((shortname, description, check_cmd)))
+        self.checks.append((shortname, description, check_cmd))
+
+    def add_init_service_checks(self, services, unit_name=None):
+        if not unit_name:
+            unit_name = local_unit().replace('/', '-')
+        log('NRPESet: add_init_service_checks({}, {})'.format(services, unit_name))
+        add_init_service_checks(self, services, unit_name)
+
+    def add_cron(self, filename, cron_freq, cron_user, cron_cmd):
+        log('NRPESet: add_cron({}, ...)'.format(filename))
+        self.crons.append((filename, cron_freq, cron_user, cron_cmd))
+
+    def add_nagios_plugin(self, filename):
+        log('NRPESet: add_nagios_plugin({})'.format(filename))
+        self.nagios_plugins.append((filename,))
+
+    def __str__(self):
+        return yaml.safe_dump({'checks': self.checks,
+                          'crons': self.crons,
+                          'nagios_plugins': self.nagios_plugins})

=== modified file 'hooks/nova_compute_hooks.py'
--- hooks/nova_compute_hooks.py	2015-11-25 12:48:50 +0000
+++ hooks/nova_compute_hooks.py	2016-01-07 21:39:25 +0000
@@ -378,6 +378,7 @@
     current_unit = nrpe.get_nagios_unit_name()
     nrpe_setup = nrpe.NRPE(hostname=hostname)
     nrpe.add_init_service_checks(nrpe_setup, services(), current_unit)
+    nrpe_setup.add_from_config('neutron-plugin-nrpe-checks')
     nrpe_setup.write()
 
 
@@ -396,6 +397,13 @@
         apt_install('nova-api-metadata', fatal=True)
     else:
         apt_purge('nova-api-metadata', fatal=True)
+
+    saved_config = config()
+    saved_config['neutron-plugin-nrpe-checks'] = settings.get('nrpe-checks')
+    saved_config.save()
+    if is_relation_made("nrpe-external-master"):
+        update_nrpe_config()
+
     CONFIGS.write(NOVA_CONF)