X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-backuppg;h=e7cfd1a386280aeb88eff3d39bc01b54e4e90d94;hb=8c61496edc2a46b5dad705c2297c7b8ae970b537;hp=92ce6cb6731bfdbb08ecc843ee3f8efbfad8b74c;hpb=f060cd469b7ae31ae606acb249210a9399fdbefe;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-checks/checks/dsa-check-backuppg b/dsa-nagios-checks/checks/dsa-check-backuppg
index 92ce6cb..e7cfd1a 100755
--- a/dsa-nagios-checks/checks/dsa-check-backuppg
+++ b/dsa-nagios-checks/checks/dsa-check-backuppg
@@ -65,6 +65,7 @@ def load_conf(cf):
     return config
 
 
+notices_seq = []
 problems_seq = []
 problems_per_db = {}
 global_expires = []
@@ -75,6 +76,12 @@ global_expires = []
 #    global problems_per_db
 #    if not host in problems_per_db: problems_per_db[host] = {}
 #    problems_per_db[host][db] = True
+def note_info(key, value, pre=None):
+    global notices_seq
+    if pre is None:
+        notices_seq.append("%s: %s"%(key, value))
+    else:
+        notices_seq.append("[%s] %s: %s"%(pre, key, value))
 
 def note_warning(key, value, pre=None):
     global problems_seq
@@ -131,8 +138,15 @@ config = load_conf(options.conffile)
 
 os.chdir(config['rootdir'])
 for dir in os.listdir('.'):
+    if dir.startswith('.') or dir.endswith('.old'):
+        note_info('IGNORED', dir)
+        continue
+
     if not os.path.isdir(dir):
-        note_warning('NOT-A-DIR', dir)
+        if min(os.path.getmtime(dir), os.path.getctime(dir)) + 3600*4 > time.time():
+            note_info('IGNORED', dir)
+        else:
+            note_warning('NOT-A-DIR', dir)
         continue
 
     if not dir in config['backups']:
@@ -205,8 +219,11 @@ for dir in os.listdir('.'):
                 basefn = '%s.BASE.%s-%s.tar.gz'%(db, info['label'], info['start wal location'].split(' ',2)[0].replace('/', '_'))
                 baseffn = os.path.join(dir, basefn)
                 if not basefn in files:
-                    note_warning_db(dir, db, 'MISSING-BASE', basefn)
-                    continue
+                    basefn = '%s.BASE.%s.tar.gz'%(db, info['label'])
+                    baseffn = os.path.join(dir, basefn)
+                    if not basefn in files:
+                        note_warning_db(dir, db, 'MISSING-BASE', basefn)
+                        continue
                 files.remove(basefn)
                 if backup_state[db]['can_expire_next']:
                     backup_state[db]['expires'].append(baseffn)
@@ -302,6 +319,8 @@ for dir in os.listdir('.'):
 
 for p in problems_seq:
     print p
+for p in notices_seq:
+    print p
 
 if options.expire:
     for f in global_expires: