Merge lp:~mthaddon/openstack-mojo-specs/mojo-nagios-check into lp:openstack-mojo-specs

[Tom Haddon]

Switch to using Mojo's built in nagios-check phase rather than maintaining a custom script. Note that this phase will throw an ERROR if any machines with services running don't have nagios checks configured, so you'd need to confirm that'll not break things before merging.

There's also a bunch of other options to consider when running this phase per https://mojo.canonical.com/readme.html#nagios-check

[David Ames (thedac)]

In the OpenStack Charms team we rarely use nagios and our goal is to move toward tempest for the validation phase.
Having said that, it does make more sense to utilize the built in feature for when we do use nagios.

Approved.

review: Approve

=== removed file 'helper/tests/run_nagios_checks.py'
--- helper/tests/run_nagios_checks.py	2015-01-21 09:46:18 +0000
+++ helper/tests/run_nagios_checks.py	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-#!/usr/bin/python
-import sys
-import utils.mojo_utils as mojo_utils
-import logging
-import argparse
-
-
-def main(argv):
-    logging.basicConfig(level=logging.INFO)
-    parser = argparse.ArgumentParser()
-    default_service = 'all'
-    parser.add_argument("--service", default=default_service)
-    options = parser.parse_args()
-    service = mojo_utils.parse_mojo_arg(options, 'service')
-    if service == 'all':
-        units = mojo_utils.get_juju_units()
-    else:
-        units = mojo_utils.get_juju_units(service=service)
-    for unit in units:
-        logging.info('Running nagios check(s) on ' + unit)
-        cmd = "ls -l /etc/nagios/nrpe.d/* 2>/dev/null | wc -l"
-        check_count = mojo_utils.remote_run(unit, cmd)[0]
-        if int(check_count) > 0:
-            try:
-                cmd = "grep -Eoh '/usr.*' /etc/nagios/nrpe.d/* | bash -e"
-                mojo_utils.remote_run(unit, cmd)
-            except:
-                pass
-        else:
-            logging.warn('No nagios checks found on ' + unit)
-
-if __name__ == "__main__":
-    sys.exit(main(sys.argv))

=== modified file 'specs/dev/full_nrpe/manifest'
--- specs/dev/full_nrpe/manifest	2015-10-14 17:32:54 +0000
+++ specs/dev/full_nrpe/manifest	2016-11-08 18:14:00 +0000
@@ -19,6 +19,6 @@
 # Create 1 * tiny cirros and 3 * small precise instances on the overcloud
 verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1' CLOUDINIT_WAIT="300"
 
-verify config=run_nagios_checks.py
+nagios-check
 
 # Success

=== modified file 'specs/dev/nova_cc_legacy_neutron/utils/mojo_utils.py'
--- specs/dev/nova_cc_legacy_neutron/utils/mojo_utils.py	2015-07-13 20:44:27 +0000
+++ specs/dev/nova_cc_legacy_neutron/utils/mojo_utils.py	2016-11-08 18:14:00 +0000
@@ -65,7 +65,7 @@
     p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
     output = p.communicate()
     if p.returncode != 0:
-        raise Exception('Error running nagios checks')
+        raise Exception('Error running remote command')
     return output
 
 
@@ -76,7 +76,7 @@
         dst = unit + ':/tmp/'
     cmd = ['juju', 'scp', script, dst]
     return subprocess.check_call(cmd)
-    
+
 
 def delete_unit(unit):
     service = unit.split('/')[0]

=== modified file 'specs/dev/swift_nrpe/simple_nonha/manifest'
--- specs/dev/swift_nrpe/simple_nonha/manifest	2015-10-14 17:32:54 +0000
+++ specs/dev/swift_nrpe/simple_nonha/manifest	2016-11-08 18:14:00 +0000
@@ -5,6 +5,6 @@
 script config=keystone_setup.py
 verify config=swift_ring_status.py
 verify config=test_obj_store.py
-verify config=run_nagios_checks.py
+nagios-check
 
 # Success