X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-backuppg;fp=dsa-nagios-checks%2Fchecks%2Fdsa-check-backuppg;h=b12479b6c27949285aba1c24668236f1edebc665;hb=7a3a31cd0f0e17e803f2a24d71395dced8b6dbe6;hp=ddef856ac84d13898828027da80d2ad47b8a8588;hpb=56887ecc2721f52ffe8c35aca5827773440e17e5;p=mirror%2Fdsa-nagios.git diff --git a/dsa-nagios-checks/checks/dsa-check-backuppg b/dsa-nagios-checks/checks/dsa-check-backuppg index ddef856..b12479b 100755 --- a/dsa-nagios-checks/checks/dsa-check-backuppg +++ b/dsa-nagios-checks/checks/dsa-check-backuppg @@ -120,6 +120,25 @@ def parse_pg_backup_info(fn): f.close() return i +def get_retention(config, host, db): + assert('retention' in config) + + assert('backups' in config) + assert(isinstance(config['backups'], dict)) + + assert(host in config['backups']) + assert(isinstance(config['backups'][host], dict)) + + assert(db in config['backups'][host]) + if isinstance(config['backups'][host][db], dict) and 'retention' in config['backups'][host][db]: + r = config['backups'][host][db]['retention'] + elif '_retention' in config['backups'][host]: + r = config['backups'][host]['_retention'] + else: + r = config['retention'] + + assert(isinstance(r, int)) + return r parser = optparse.OptionParser() parser.set_usage("%prog [-c=] (nagios mode)\n" + @@ -264,7 +283,7 @@ for dir in os.listdir('.'): backup_state[db]['base_needs_wal_until'] = walbase start = time.mktime(time.strptime(info['start time'], '%Y-%m-%d %H:%M:%S %Z')) - if start + config['retention'] < time.time(): + if start + get_retention(config, dir, db) < time.time(): backup_state[db]['can_expire_for_base_hit'] = True continue