dsa-check-backuppg: allow BASE backup filenames without the WAL ID

diff --git a/dsa-nagios-checks/checks/dsa-check-backuppg b/dsa-nagios-checks/checks/dsa-check-backuppg
index 0ce4d95..e7cfd1a 100755 (executable)
--- a/dsa-nagios-checks/checks/dsa-check-backuppg
+++ b/dsa-nagios-checks/checks/dsa-check-backuppg
@@ -219,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)

diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index 0feb104..377b275 100644 (file)
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -1,8 +1,12 @@
 dsa-nagios-checks (97) UNRELEASED; urgency=low
 
+  [ Stephen Gran ]
   * Update dsa-check-mq-connection to actually work
 
- -- Stephen Gran <sgran@debian.org>  Sun, 19 Jan 2014 12:18:39 +0000
+  [ Peter Palfrader ]
+  * dsa-check-backuppg: allow BASE backup filenames without the WAL ID.
+
+ -- Peter Palfrader <weasel@debian.org>  Mon, 27 Jan 2014 22:29:15 +0100
 
 dsa-nagios-checks (96) unstable; urgency=low