2 files changed, 18 insertions, 9 deletions

diff --git a/contrib/check_linux_raid.pl b/contrib/check_linux_raid.pl
index c24b0cd2..6650a42b 100644
--- a/contrib/check_linux_raid.pl
+++ b/contrib/check_linux_raid.pl
@@ -28,8 +28,8 @@ use utils qw(%ERRORS);
 
 # die with an error if we're not on Linux
 if ($^O ne 'linux') {
-    print "This plugin only applicable on Linux.\n";
-    exit $ERRORS{'UNKNOWN'};
+        print "This plugin only applicable on Linux.\n";
+        exit $ERRORS{'UNKNOWN'};
 }
 
 sub max_state($$){
@@ -50,6 +50,7 @@ my $code = "UNKNOWN";
 my $msg = "";
 my %status;
 my %recovery;
+my %resyncing;
 my %finish;
 my %active;
 my %devices;
@@ -65,6 +66,10 @@ while(defined $nextdev){
                                 $recovery{$device} = $1;
                                 ($finish{$device}) = /finish=(.*?min)/;
                                 $device=undef;
+                        } elsif (/resync =\s+(.*?)\s/) {
+                                $resyncing{$device} = $1;
+                                ($finish{$device}) = /finish=(.*?min)/;
+                                $device=undef;
                         } elsif (/^\s*$/) {
                                 $device=undef;
                         }
@@ -95,8 +100,14 @@ foreach my $k (sort keys %devices){
                         $code = max_state($code, "CRITICAL");
                 }
         } elsif ($status{$k} =~ /U+/) {
-                $msg .= sprintf " %s status=%s.", $devices{$k}, $status{$k};
-                $code = max_state($code, "OK");
+                if (defined $resyncing{$k}) {
+                        $msg .= sprintf " %s status=%s, resync=%s, finish=%s.",
+                                $devices{$k}, $status{$k}, $resyncing{$k}, $finish{$k};
+                        $code = max_state($code, "WARNING");
+                } else {
+                        $msg .= sprintf " %s status=%s.", $devices{$k}, $status{$k};
+                        $code = max_state($code, "OK");
+                }
         } else {
                 if ($active{$k}) {
                         $msg .= sprintf " %s active with no status information.",
@@ -112,4 +123,3 @@ foreach my $k (sort keys %devices){
 
 print $code, $msg, "\n";
 exit ($ERRORS{$code});
-
diff --git a/contrib/check_nmap.py b/contrib/check_nmap.py
index 07f6d7fa..481a62bf 100644
--- a/contrib/check_nmap.py
+++ b/contrib/check_nmap.py
@@ -43,7 +43,7 @@ _version_ = '1.21'
 # 0.20   2000-07-10 jaclu Initial release
 
 
-import sys, os, string, whrandom
+import sys, os, string, random
 
 import tempfile
 from getopt import getopt
@@ -207,8 +207,7 @@ class CheckNmap:
         # _if_ two processes in deed get the same tmp-file
         # the only result is a normal error message to nagios
         #
-        r=whrandom.whrandom()
-        self.tmp_file=tempfile.mktemp('.%s')%r.randint(0,100000)
+        self.tmp_file=tempfile.mktemp('.%s') % random.randint(0,100000)
         if self.debug:
             print 'Tmpfile is: %s'%self.tmp_file
         #
@@ -388,7 +387,7 @@ Version: %s""" % _version_
 
 def doc_syntax():
     print """
-Usage: check_ports [-v|--debug] [-H|--host host] [-V|--version] [-h|--help]
+Usage: check_nmap.py [-v|--debug] [-H|--host host] [-V|--version] [-h|--help]
                    [-o|--optional port1,port2,port3 ...] [-r|--range range]
                    [-p|--port port1,port2,port3 ...] [-t|--timeout timeout]"""