Merge lp:~cprov/charms/trusty/tanuki-spec-manager/negate-poller-check into lp:~tanuki/charms/trusty/tanuki-spec-manager/trunk

[Celso Providelo]

Negate store-poller nagios check when it gets disabled.

Negate store-poller nagios check when it gets disabled.

[Guillermo Gonzalez (verterok)]

LGTM

review: Approve

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-09-17 05:20:25 +0000
+++ hooks/actions.py	2015-09-21 14:53:31 +0000
@@ -323,22 +323,29 @@
         check_cmd="/usr/lib/nagios/plugins/check_http -I 127.0.0.1 -p 8000 -e ' 200 OK' -u '/nagios/postgres'",
     )
 
+    # Builds a nagios check command to verify `store-poller` log file age
+    # according the service configuration.
+    environment = hookenv.Config()['environment']
+    log_path = os.path.join(LOG_DIR, 'store-poller.log')
+    max_age_seconds = int(config['store_poller_nagios_file_age_max_minutes']) * 60
+    check_cmd = "/usr/lib/nagios/plugins/check_file_age -w {0} -c {0} -f {1}".format(
+        max_age_seconds,
+        log_path,
+    )
+
+    # If `store-poller` cronscript is enabled in this unit, ensure the log file
+    # exists. Otherwise 'negate' standard check (verifies cronscript is not running). 
     config_unit = config.get('store_poller_unit')
     local_unit = int(hookenv.local_unit().split('/')[-1])
-
     if local_unit == config_unit:
-        environment = hookenv.Config()['environment']
-        log_path = os.path.join(LOG_DIR, 'store-poller.log')
-        # Create the file now, so the nagios check doesn't fail right after
-        # we've completed the deployment.
         host.write_file(log_path,"", "www-data", "www-data", perms=0o660)
-        max_age_seconds = int(config['store_poller_nagios_file_age_max_minutes']) * 60
-        nrpe_compat.add_check(
-            shortname="store_poller_check",
-            description="Store poller check.",
-            check_cmd="/usr/lib/nagios/plugins/check_file_age -w {0} -c {0} -f {1}".format(
-                max_age_seconds,
-                log_path,
-            )
-        )
+    else:
+        check_cmd = "negate {}".format(check_cmd)
+
+    nrpe_compat.add_check(
+        shortname="store_poller_check",
+        description="Store poller check.",
+        check_cmd=check_cmd
+    )
+
     nrpe_compat.write()