Merge lp:~thomir-deactivatedaccount/charms/trusty/tanuki-spec-manager/trunk-fix-ng-alert into lp:~tanuki/charms/trusty/tanuki-spec-manager/trunk

[Thomi Richards]

Fix a race condition in the nagios check for the store poller.

Fix a race condition in the nagios check for the store poller.

[Celso Providelo (cprov)]

Thomi, thanks.

review: Approve

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-09-21 14:51:30 +0000
+++ hooks/actions.py	2015-09-22 04:33:53 +0000
@@ -325,7 +325,6 @@
 
     # 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(
@@ -334,12 +333,17 @@
     )
 
     # If `store-poller` cronscript is enabled in this unit, ensure the log file
-    # exists. Otherwise 'negate' standard check (verifies cronscript is not running). 
+    # 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:
-        host.write_file(log_path,"", "www-data", "www-data", perms=0o660)
+        host.write_file(log_path, "", "www-data", "www-data", perms=0o660)
     else:
+        # The poller might have been run on this unit before, possibly before
+        # the timeout period. To avoid spurious alerts, we rename the file if
+        # it exists.
+        if os.path.exists(log_path):
+            os.rename(log_path, log_path + ".old")
         check_cmd = "negate {}".format(check_cmd)
 
     nrpe_compat.add_check(