Merge lp:~stub/charms/precise/postgresql/bug-1329816-backup-log-spurious-alert into lp:charms/postgresql

[Stuart Bishop]

The backup log file does not exist until the first backup runs, causing a spurious nagios alert on a freshly deployed service.

This branch ensures the log file is created on initial installation.

[Michael Nelson (michael.nelson)]

Excellent - thanks Stuart!

review: Approve

[lp:~stub/charms/precise/postgresql/bug-1329816-backup-log-spurious-alert]

142. By Stuart Bishop on 2014-06-16

revert unnecessary whitespace change

143. By Stuart Bishop on 2014-06-27

Merged tests into bug-1329816-backup-log-spurious-alert.

144. By Stuart Bishop on 2014-06-27

Merged tests into bug-1329816-backup-log-spurious-alert.

145. By Stuart Bishop on 2014-06-30

Merged tests into bug-1329816-backup-log-spurious-alert.

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-06-05 12:32:17 +0000
+++ hooks/hooks.py	2014-06-30 13:36:25 +0000
@@ -1011,6 +1011,12 @@
         os.path.join(postgresql_scripts_dir, 'pg_backup_job'),
         backup_job, perms=0755)
     install_postgresql_crontab(postgresql_crontab)
+
+    # Create this empty log file on installation to avoid triggering
+    # spurious monitoring system alerts, per Bug #1329816.
+    if not os.path.exists(backup_log):
+        host.write_file(backup_log, '', 'postgres', 'postgres', 0664)
+
     hookenv.open_port(get_service_port())
 
     # Ensure at least minimal access granted for hooks to run.
@@ -2202,7 +2208,6 @@
             .format(get_service_port()))
     # pgsql backups
     nrpe_check_file = '/etc/nagios/nrpe.d/check_pgsql_backups.cfg'
-    backup_log = "{}/backups.log".format(postgresql_logs_dir)
     # XXX: these values _should_ be calculated from the backup schedule
     #      perhaps warn = backup_frequency * 1.5, crit = backup_frequency * 2
     warn_age = 172800
@@ -2331,6 +2336,8 @@
 juju_log_dir = "/var/log/juju"
 external_volume_mount = "/srv/data"
 
+backup_log = os.path.join(postgresql_logs_dir, "backups.log")
+
 
 if __name__ == '__main__':
     # Hook and context overview. The various replication and client