configfile = '/etc/nagios/dsa-check-backuppg.conf'
f = open(configfile)
- config = yaml.load(f.read())
+ config = yaml.safe_load(f.read())
f.close()
return config
files.sort()
- unhandled_backups = copy.copy(config['backups'][dir])
+ notyetseen_dbs = copy.copy(config['backups'][dir])
ignored_dbs = {}
backup_state = {}
continue
(db, type) = r.groups(1)
- if not isinstance(config['backups'][dir], list) or not db in config['backups'][dir]:
+ if not isinstance(config['backups'][dir], dict) or not db in config['backups'][dir]:
if not db in ignored_dbs:
note_warning_db(dir, db, 'NOT-CONFIGURED', '%s/%s'%(dir, db))
ignored_dbs[db] = True
# can_expire_next: Can expire all files that we handle from now on
backup_state[db]['can_expire_next'] = False
backup_state[db]['expires'] = []
+ if isinstance(config['backups'][dir][db], dict) and 'timeline' in config['backups'][dir][db]:
+ backup_state[db]['timeline'] = config['backups'][dir][db]['timeline']
+ else:
+ backup_state[db]['timeline'] = 1
# Apparently we already have seen a base backup and all its wal files
# which we want to keep, so everything what we see now is older than
else:
note_warning_db(dir, db, 'MISSING-BASE', basefn)
continue
+ if db in notyetseen_dbs: del notyetseen_dbs[db]
files.remove(basefn)
if backup_state[db]['can_expire_next']:
backup_state[db]['expires'].append(baseffn)
backup_state[db]['can_expire_next'] = True
(timeline, wal1, wal2) = map(lambda x: int(x,16), r.groups())
- if not timeline == 1:
- note_warning_db(dir, db, 'CANNOT-HANDLE-TIMELINES_NOT_1', ffn)
+ if not timeline == backup_state[db]['timeline']:
+ note_warning_db(dir, db, 'UNEXPECTED-TIMELINE', ffn)
continue
thissegment = (wal1, wal2)
for f in backup_state[db]['expires']:
global_expires.append(f)
+ for db in notyetseen_dbs:
+ note_warning_db(dir, db, 'NO-BACKUP', 'no backups! (no .backup files found)')
+
#if not db in backup_state:
# note_warning('BASE-WITHOUT-WAL', ffn)
# ignored_dbs[db] = True