packages: nagios-plugin-check_raid/check_raid - check_mdstat didn't see the...

[glen]

Author: glen                         Date: Sun Jan 22 23:01:28 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- check_mdstat didn't see the check state because of the space in front of '8.8%'.
  bugreport by Kai-H. Weutzing <kai#weutzing.de>

---- Files affected:
packages/nagios-plugin-check_raid:
   check_raid (1.102 -> 1.103) 

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_raid/check_raid
diff -u packages/nagios-plugin-check_raid/check_raid:1.102 packages/nagios-plugin-check_raid/check_raid:1.103
--- packages/nagios-plugin-check_raid/check_raid:1.102	Mon Jan  2 16:37:11 2012
+++ packages/nagios-plugin-check_raid/check_raid	Mon Jan 23 00:01:23 2012
@@ -11,19 +11,19 @@
 # 2004-2006 Steve Shipway, university of auckland,
 # http://www.steveshipway.org/forum/viewtopic.php?f=20&t=417&p=3211
 # Steve Shipway Thanks M Carmier for megaraid section.
-# 2009-2011 Elan Ruusamäe <glen at pld-linux.org>
+# 2009-2012 Elan Ruusamäe <glen at pld-linux.org>
 #
 # $Id$
 
-# Requires: Perl 5.8 for the open(my $fh , '-|', @CMD) syntax
-# you may workaround for earlier perl it as:
+# Requires: Perl 5.8 for the open(my $fh , '-|', @CMD) syntax.
+# You can workaround for earlier Perl it as:
 # open(my $fh , join(" ", @CMD, '|') or return;
 # http://perldoc.perl.org/perl58delta.html#PerlIO-is-Now-The-Default
 #
 # License: GPL v2
 # URL in Nagios Exchange: http://exchange.nagios.org/directory/Plugins/Hardware/Storage-Systems/RAID-Controllers/check_raid/details
-# URL in VCS: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugin-check_raid/check_raid
-# Current Maintainer: Elan Ruusamäe <glen at pld-linux.org>, patches welcome :)
+# URL in VCS: http://cvs.pld-linux.org/packages/nagios-plugin-check_raid/check_raid
+# Current Maintainer: Elan Ruusamäe <glen at pld-linux.org>, patches welcome, send them in unified format (diff -u)
 #
 # Supports:
 # - Adaptec AAC RAID via aaccli or afacli or arcconf
@@ -96,7 +96,7 @@
 
 sub print_help () {
 	print "check_raid, v$VERSION\n";
-	print "Copyright (c) 2004-2006 Steve Shipway, Copyright (c) 2009-2011, Elan Ruusamäe <glen\@pld-linux.org>
+	print "Copyright (c) 2004-2006 Steve Shipway, Copyright (c) 2009-2012, Elan Ruusamäe <glen\@pld-linux.org>
 
 This plugin reports the current server's RAID status
 ";
@@ -203,7 +203,8 @@
 		}
 		# linux-2.6.33/drivers/md/md.c, status_resync
 		# [==>..................]  resync = 13.0% (95900032/732515712) finish=175.4min speed=60459K/sec
-		if (my($action, $perc, $eta, $speed) = m{(resync|recovery|check|reshape) = ([\d.]+%) \(\d+/\d+\) finish=([\d.]+min) speed=(\d+K/sec)}) {
+		# [=>...................]  check =  8.8% (34390144/390443648) finish=194.2min speed=30550K/sec
+		if (my($action, $perc, $eta, $speed) = m{(resync|recovery|check|reshape)\s+=\s+([\d.]+%) \(\d+/\d+\) finish=([\d.]+min) speed=(\d+K/sec)}) {
 			$resync_status = "$action:$perc $speed ETA: $eta";
 			next;
 		}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugin-check_raid/check_raid?r1=1.102&r2=1.103&f=u