Merge ~brad-marshall/charm-openstack-service-checks/+git/charm-openstack-service-checks:nova-check-fixes into ~canonical-bootstack/charm-openstack-service-checks:master

[Brad Marshall]

Allow tweaking of the warning and critical levels

[Marian Gasparovic (marosg)]

All seems good to me.

review: Approve

[James Hebden (ec0)]

Minor nitpick - if you could update the config.yaml to include a statement such as -
"Setting this value to any negative number will effectively disable host aggregate checks"

diff --git a/config.yaml b/config.yaml
index fbee527..3a8f508 100644
--- a/config.yaml
+++ b/config.yaml
@@ -7,6 +7,16 @@ options:
       It is strongly recommended this be a user with a dedicated role,
       and not a full admin.  Takes the format of
       username=foo, password=bar, credentials_project=baz, region_name=Region1, auth_url=http://127.0.0.1:35357
+  nova_warn:
+    default: 2
+    type: int
+    description: |
+      Warning level for nova aggregate unit count check - setting this to -1 will effectively disable host aggregate checks.
+  nova_crit:
+    default: 1
+    type: int
+    description: |
+      Critical level for nova aggregate unit count check - setting this to -1 will effectively disable host aggregate checks.
   nagios_context:
     default: "juju"
     type: string
diff --git a/reactive/service_checks.py b/reactive/service_checks.py
index f22a164..29d4de7 100644
--- a/reactive/service_checks.py
+++ b/reactive/service_checks.py
@@ -135,12 +135,16 @@ def render_checks():
         options=['--executability']
     )
 
+    warn = config.get("nova_warn")
+    crit = config.get("nova_crit")
+
     nrpe.add_check(shortname='nova_services',
                    description='Check that enabled Nova services are up',
-                   check_cmd=plugins_dir+'check_nova_services.py')
+                   check_cmd=plugins_dir + 'check_nova_services.py --warn '
+                   + str(warn) + ' --crit ' + str(crit))
     nrpe.add_check(shortname='neutron_agents',
                    description='Check that enabled Neutron agents are up',
-                   check_cmd=plugins_dir+'check_neutron_agents.sh')
+                   check_cmd=plugins_dir + 'check_neutron_agents.sh')
 
     nrpe.write()