[project @ peter@palfrader.org-20080924140318-7urfd3evu4g40uv4]

dsa-check-hpacucli: Do not inspect drives in detail when they are listed as
Failed in the overview already.

diff --git a/dsa-nagios-nrpe-config/debian/changelog b/dsa-nagios-nrpe-config/debian/changelog
index 79d2795..ffa4b73 100644 (file)
--- a/dsa-nagios-nrpe-config/debian/changelog
+++ b/dsa-nagios-nrpe-config/debian/changelog
@@ -1,3 +1,10 @@
+dsa-nagios-nrpe-config (57) unstable; urgency=low
+
+  * dsa-check-hpacucli: Do not inspect drives in detail when they are
+    listed as Failed in the overview already.
+
+ -- Peter Palfrader <weasel@debian.org>  Wed, 24 Sep 2008 16:02:31 +0200
+
 dsa-nagios-nrpe-config (56) unstable; urgency=low
 
   * fix dsa-check-samhain.

diff --git a/dsa-nagios-nrpe-config/dsa-check-hpacucli b/dsa-nagios-nrpe-config/dsa-check-hpacucli
index a3c42c7..4ee5bbe 100755 (executable)
--- a/dsa-nagios-nrpe-config/dsa-check-hpacucli
+++ b/dsa-nagios-nrpe-config/dsa-check-hpacucli
@@ -119,6 +119,8 @@ for my $slot (sort @controllers) {
        # Check that all drives have the proper transfer speed.
        # sometimes stuff breaks and they fall back to 10mb/sec.
        for my $drive (@drives) {
+               # skip drives that are known to have failed
+               next if (grep {$drive eq $_} @{$status{'Failed'}});
                my $type;
                if ($drive =~ /^[0-9]+:[0-9]+$/) { # scsi drives
                        $type = 'SCSI';