Merge lp:~axino/charm-helpers/systemd into lp:charm-helpers

[Junien F]

[axino] nrpe: make add_init_service_checks support systemd

[Stuart Bishop (stub)]

Looks good. Having a hardcoded list of services known to fail is bogus, but that doesn't need to be fixed here.

review: Approve

=== modified file 'charmhelpers/contrib/charmsupport/nrpe.py'
--- charmhelpers/contrib/charmsupport/nrpe.py	2016-07-06 14:41:05 +0000
+++ charmhelpers/contrib/charmsupport/nrpe.py	2016-07-29 10:25:11 +0000
@@ -38,6 +38,7 @@
 )
 
 from charmhelpers.core.host import service
+from charmhelpers.core import host
 
 # This module adds compatibility with the nrpe-external-master and plain nrpe
 # subordinate charms. To use it in your charm:
@@ -332,16 +333,25 @@
     :param str unit_name: Unit name to use in check description
     """
     for svc in services:
+        # Don't add a check for these services from neutron-gateway
+        if svc in ['ext-port', 'os-charm-phy-nic-mtu']:
+            next
+
         upstart_init = '/etc/init/%s.conf' % svc
         sysv_init = '/etc/init.d/%s' % svc
-        if os.path.exists(upstart_init):
-            # Don't add a check for these services from neutron-gateway
-            if svc not in ['ext-port', 'os-charm-phy-nic-mtu']:
-                nrpe.add_check(
-                    shortname=svc,
-                    description='process check {%s}' % unit_name,
-                    check_cmd='check_upstart_job %s' % svc
-                )
+
+        if host.init_is_systemd():
+            nrpe.add_check(
+                shortname=svc,
+                description='process check {%s}' % unit_name,
+                check_cmd='check_systemd.py %s' % svc
+            )
+        elif os.path.exists(upstart_init):
+            nrpe.add_check(
+                shortname=svc,
+                description='process check {%s}' % unit_name,
+                check_cmd='check_upstart_job %s' % svc
+            )
         elif os.path.exists(sysv_init):
             cronpath = '/etc/cron.d/nagios-service-check-%s' % svc
             cron_file = ('*/5 * * * * root '

=== modified file 'tests/contrib/charmsupport/test_nrpe.py'
--- tests/contrib/charmsupport/test_nrpe.py	2016-01-06 12:29:13 +0000
+++ tests/contrib/charmsupport/test_nrpe.py	2016-07-29 10:25:11 +0000
@@ -6,6 +6,7 @@
 from mock import patch, call
 
 from charmhelpers.contrib.charmsupport import nrpe
+from charmhelpers.core import host
 
 
 class NRPEBaseTestCase(TestCase):
@@ -26,6 +27,7 @@
         'relation_set': {'object': nrpe},
         'relations_of_type': {'object': nrpe},
         'service': {'object': nrpe},
+        'init_is_systemd': {'object': host},
     }
 
     def setUp(self):
@@ -298,10 +300,14 @@
                      '/usr/lib/nagios/plugins/check_upstart_job',
                      '/etc/init.d/haproxy',
                      '/usr/lib/nagios/plugins/check_status_file.py',
+                     '/usr/lib/nagios/plugins/check_systemd.py'
                      ]
             return init_file in files
 
         self.patched['exists'].side_effect = _exists
+
+        # Test without systemd
+        self.patched['init_is_systemd'].return_value = False
         bill = nrpe.NRPE()
         services = ['apache2', 'haproxy']
         nrpe.add_init_service_checks(bill, services, 'testunit')
@@ -314,3 +320,15 @@
         self.assertEqual(bill.checks[0].check_cmd, expect_cmds['apache2'])
         self.assertEqual(bill.checks[1].shortname, 'haproxy')
         self.assertEqual(bill.checks[1].check_cmd, expect_cmds['haproxy'])
+
+        # Test with systemd
+        self.patched['init_is_systemd'].return_value = True
+        nrpe.add_init_service_checks(bill, services, 'testunit')
+        expect_cmds = {
+            'apache2': '/usr/lib/nagios/plugins/check_systemd.py apache2',
+            'haproxy': '/usr/lib/nagios/plugins/check_systemd.py haproxy',
+        }
+        self.assertEqual(bill.checks[2].shortname, 'apache2')
+        self.assertEqual(bill.checks[2].check_cmd, expect_cmds['apache2'])
+        self.assertEqual(bill.checks[3].shortname, 'haproxy')
+        self.assertEqual(bill.checks[3].check_cmd, expect_cmds['haproxy'])