From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 12 May 2015 08:09:36 +0000 (+0200)
Subject: rsync now adds thousands separator on its numbers
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=100f56da0c96f396ed77b13294a34c38479580f0;p=mirror%2Fdsa-nagios.git

rsync now adds thousands separator on its numbers
---

diff --git a/dsa-nagios-checks/checks/dsa-check-dabackup b/dsa-nagios-checks/checks/dsa-check-dabackup
index 620d316..8bc56f5 100755
--- a/dsa-nagios-checks/checks/dsa-check-dabackup
+++ b/dsa-nagios-checks/checks/dsa-check-dabackup
@@ -165,7 +165,7 @@ for my $f (sort {$a cmp $b} keys %logfiles) {
 	my $last = '';
 	while (<FH>) {
 		chomp;
-		if (/^sent\s+\d+\s+bytes\s+received\s+\d+\s+bytes\s+[\d\.]+\s+bytes\/sec$/) {
+		if (/^sent\s+[\d,]+\s+bytes\s+received\s+[\d,]+\s+bytes\s+[\d,\.]+\s+bytes\/sec$/) {
 			problem('OK', 'probably ok', $f);
 			close(FH);
 			next FILE;
diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index f8edf69..ce71c60 100644
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -1,8 +1,10 @@
 dsa-nagios-checks (108) UNRELEASED; urgency=medium
 
   * dsa-check-stunnel-sanity: Fix variable name in output.
+  * dsa-check-dabackup: Fix regex as rsync now adds thousands separator on its
+      numbers.
 
- -- Peter Palfrader <weasel@debian.org>  Wed, 25 Mar 2015 07:20:54 +0100
+ -- Peter Palfrader <weasel@debian.org>  Tue, 12 May 2015 10:09:21 +0200
 
 dsa-nagios-checks (107) unstable; urgency=medium