Merge lp:~brad-marshall/charm-helpers/add-systemd-nagios-check into lp:charm-helpers

[Brad Marshall]

Add systemd nagios check support

[Brad Marshall (brad-marshall)]

This needs https://code.launchpad.net/~brad-marshall/charms/precise/nrpe-external-master/add-systemd-nagios-check/+merge/294086 and https://code.launchpad.net/~brad-marshall/charms/trusty/nrpe/add-systemd-nagios-check/+merge/294085 merged to provide the check_systemd.py script.

[lp:~brad-marshall/charm-helpers/add-systemd-nagios-check]

572. By Brad Marshall on 2016-05-10

[brad-marshall] Handle the services.d and sysvinit script cases

[Stuart Bishop (stub)]

Tests need updating, probably with variations mocked to test the different code paths:

======================================================================
FAIL: tests.contrib.charmsupport.test_nrpe.NRPEMiscTestCase.test_add_init_service_checks
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "/home/stub/charms/charm-helpers/trunk/tests/contrib/charmsupport/test_nrpe.py", line 316, in test_add_init_service_checks
    self.assertEqual(bill.checks[1].check_cmd, expect_cmds['haproxy'])
MismatchError: !=:
reference = ''
actual = '/usr/lib/nagios/plugins/check_status_file.py -f /var/lib/nagios/service-check-haproxy.txt'

review: Needs Fixing

[Stuart Bishop (stub)]

(otherwise looks good and landable)

[lp:~brad-marshall/charm-helpers/add-systemd-nagios-check]

573. By Brad Marshall on 2016-08-24

Tweak systemd check, and skip qemu-kvm service as well

Unmerged revisions

573. By Brad Marshall on 2016-08-24

Tweak systemd check, and skip qemu-kvm service as well

572. By Brad Marshall on 2016-05-10

[brad-marshall] Handle the services.d and sysvinit script cases

571. By Brad Marshall on 2016-05-09

[brad-marshall] Add support for systemd checks in add_init_service_checks. LP#1578922

=== modified file 'charmhelpers/contrib/charmsupport/nrpe.py'
--- charmhelpers/contrib/charmsupport/nrpe.py	2016-07-29 10:15:48 +0000
+++ charmhelpers/contrib/charmsupport/nrpe.py	2016-08-24 04:55:25 +0000
@@ -339,6 +339,7 @@
 
         upstart_init = '/etc/init/%s.conf' % svc
         sysv_init = '/etc/init.d/%s' % svc
+<<<<<<< TREE
 
         if host.init_is_systemd():
             nrpe.add_check(
@@ -352,6 +353,24 @@
                 description='process check {%s}' % unit_name,
                 check_cmd='check_upstart_job %s' % svc
             )
+=======
+        if os.path.exists('/run/systemd/system'):
+            # Don't add a check for these services from neutron-gateway & nova-compute
+            if svc not in ['ext-port', 'os-charm-phy-nic-mtu', 'qemu-kvm']:
+                nrpe.add_check(
+                    shortname=svc,
+                    description='process check {%s}' % unit_name,
+                    check_cmd='check_systemd.py %s' % svc
+                )
+        elif os.path.exists(upstart_init):
+            # Don't add a check for these services from neutron-gateway & nova-compute
+            if svc not in ['ext-port', 'os-charm-phy-nic-mtu', 'qemu-kvm']:
+                nrpe.add_check(
+                    shortname=svc,
+                    description='process check {%s}' % unit_name,
+                    check_cmd='check_upstart_job %s' % svc
+                )
+>>>>>>> MERGE-SOURCE
         elif os.path.exists(sysv_init):
             cronpath = '/etc/cron.d/nagios-service-check-%s' % svc
             cron_file = ('*/5 * * * * root '