X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-bacula;h=2d6c34d2d911bed35fd764bd3637e8a24d393299;hb=e64ee9382ef72c0d37f07f32c2b7f093474be242;hp=35aade99552e806b3dffe2d56b0b91f00be60bf1;hpb=1abaca55b56fe3e8fe0d5b214072eebd9aa27900;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-checks/checks/dsa-check-bacula b/dsa-nagios-checks/checks/dsa-check-bacula
index 35aade9..2d6c34d 100755
--- a/dsa-nagios-checks/checks/dsa-check-bacula
+++ b/dsa-nagios-checks/checks/dsa-check-bacula
@@ -31,8 +31,8 @@ import sys
 
 codes = {
     'UNKNOWN': 3,
-    'CRITICAL': 1,
-    'WARNING': 2,
+    'CRITICAL': 2,
+    'WARNING': 1,
     'OK': 0 }
 
 
@@ -102,7 +102,7 @@ conn = psycopg2.connect(options.db)
 cursor = conn.cursor(cursor_factory=psycopg2.extras.DictCursor)
 cursor.execute(query, params)
 records = cursor.fetchall()
-if len(records) == 0:
+if len(records) == 0 or records[0][0] is None:
     print "CRITICAL: No backups of %s/%s."%(host, level)
     sys.exit(codes['CRITICAL'])
 elif len(records) > 1:
@@ -113,7 +113,7 @@ elif records[0]['age'] > options.critical:
     sys.exit(codes['CRITICAL'])
 elif records[0]['age'] > options.warn:
     print "WARN: Last backup of %s/%s is %.2f days old."%(host, level, float(records[0]['age'])/3600/24)
-    sys.exit(codes['WARN'])
+    sys.exit(codes['WARNING'])
 else:
     print "OK: Last backup of %s/%s is %.2f days old."%(host, level, float(records[0]['age'])/3600/24)
     sys.exit(codes['OK'])