X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-backuppg;h=92ce6cb6731bfdbb08ecc843ee3f8efbfad8b74c;hb=fc7afdc62513f6811468029f19eadc0ce4e7aff6;hp=83f54ba353300a0f28eb8f750af5aa85756001a6;hpb=d12305aad989b838d516ef1a87191bab77f444d0;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..92ce6cb 100755
--- a/dsa-nagios-checks/checks/dsa-check-backuppg
+++ b/dsa-nagios-checks/checks/dsa-check-backuppg
@@ -266,18 +266,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:
@@ -311,7 +311,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: