X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-hpasm;h=0f008e1bf767a44915d303f09167f5cf0cb867ea;hb=3d0f0b185f09052eed2524aab8fa86b81c536eef;hp=63505f393885f2fb651749ab7da2884d11f82c0b;hpb=3ecc03749909583afb63d28a6ddffbf0117b0700;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-checks/checks/dsa-check-hpasm b/dsa-nagios-checks/checks/dsa-check-hpasm
index 63505f3..0f008e1 100755
--- a/dsa-nagios-checks/checks/dsa-check-hpasm
+++ b/dsa-nagios-checks/checks/dsa-check-hpasm
@@ -112,6 +112,11 @@ sub do_fans {
       $num_fans++;
       my @line = split /\s+/, $line;
 
+      if ($line[1] eq 'VIRTUAL') { # blade, etc
+        $message = 'FAN1: (virtual) OK ';
+        last;
+      }
+
       if ($line[2] ne 'Yes') {
         $message = sprintf("FAN%d: status=%s ", $fan_num, $line[2]);
         $exit_status |= 2;
@@ -217,13 +222,15 @@ sub do_temp {
       next if ($threshold eq '-');
       $num_temp++;
 
-      my $off = $threshold - $current_temp;
-      if ($off <= 0) {
-        $message = sprintf("TEMP zone=%s %sC/%sC ", $zone, $current_temp, $threshold);
-        $exit_status |= 2;
-      } elsif ($off < ($threshold/10)) {
-        $message = sprintf("TEMP zone=%s %sC/%sC ", $zone, $current_temp, $threshold);
-        $exit_status |= 1;
+      if ($current_temp ne '-') {
+        my $off = $threshold - $current_temp;
+        if ($off <= 0) {
+          $message = sprintf("TEMP zone=%s %sC/%sC ", $zone, $current_temp, $threshold);
+          $exit_status |= 2;
+        } elsif ($off < ($threshold/10)) {
+          $message = sprintf("TEMP zone=%s %sC/%sC ", $zone, $current_temp, $threshold);
+          $exit_status |= 1;
+        }
       }
     } elsif ($line =~ /($prompt|^\s*$)/) {
       last;