X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-backuppg;h=b7b05c89aa6a8c56b9eae7274fe631cc6bfeec3e;hb=62e84c5eebc839e990cb386d7d9b8ddee8fbbd95;hp=83f54ba353300a0f28eb8f750af5aa85756001a6;hpb=b4a2207497cf87fd5b342859c28d86ef41130ac6;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-checks/checks/dsa-check-backuppg b/dsa-nagios-checks/checks/dsa-check-backuppg
index 83f54ba..b7b05c8 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('.'):
+        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']:
@@ -266,18 +280,18 @@ for dir in os.listdir('.'):
 
     for db in backup_state:
         if not 'newest-base' in backup_state[db]:
-            note_warning(dir, db, 'NO-BASE', 'no base backup found?')
+            note_warning_db(dir, db, 'NO-BASE', 'no base backup found?')
         else:
             age = time.time() - os.stat(backup_state[db]['newest-base']).st_mtime
             if age > config['warn-age']['base']:
-                note_warning(dir, db, 'BASE-IS-OLD', 'latest base backup is too old')
+                note_warning_db(dir, db, 'BASE-IS-OLD', 'latest base backup is too old')
 
         if not 'newest-wal-file' in backup_state[db]:
-            note_warning(dir, db, 'NO-BASE', 'no WAL files found?')
+            note_warning_db(dir, db, 'NO-BASE', 'no WAL files found?')
         else:
             age = time.time() - os.stat(backup_state[db]['newest-wal-file']).st_mtime
             if age > config['warn-age']['wal']:
-                note_warning(dir, db, 'WAL-IS-OLD', 'latest wal file is too old')
+                note_warning_db(dir, db, 'WAL-IS-OLD', 'latest wal file is too old')
 
     for db in backup_state:
         if len(backup_state[db]['expires']) > 0:
@@ -302,6 +316,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:
@@ -311,7 +327,8 @@ if options.expire:
 if len(problems_seq) > 0:
     sys.exit(1)
 
-print "OK: no problems detected"
+if not options.expire or options.verbose:
+    print "OK: no problems detected"
 sys.exit(0)
 
 # vim:set et: