Author: glen                         Date: Fri Oct 14 15:27:56 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- make megacli a bit shorter, print only dev name when it is not ok, add test 
output

---- Files affected:
packages/nagios-plugin-check_raid:
   check_raid (1.97 -> 1.98) 
packages/nagios-plugin-check_raid/t:
   megacli.pdlist.all (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_raid/check_raid
diff -u packages/nagios-plugin-check_raid/check_raid:1.97 
packages/nagios-plugin-check_raid/check_raid:1.98
--- packages/nagios-plugin-check_raid/check_raid:1.97   Tue Sep 13 07:42:12 2011
+++ packages/nagios-plugin-check_raid/check_raid        Fri Oct 14 17:27:51 2011
@@ -262,6 +262,7 @@
 # based on info from here:
 # 
http://www.bxtra.net/Articles/2008-09-16/Dell-Perc6i-RAID-Monitoring-Script-using-MegaCli-LSI-CentOS-52-64-bits
 # TODO: http://www.techno-obscura.com/~delgado/code/check_megaraid_sas
+# TODO: process several adapters
 sub check_megacli {
        my @CMD = ($megacli, '-PDList', '-aALL', '-NoLog');
        unshift(@CMD, $sudo) if $> and $sudo;
@@ -274,7 +275,11 @@
                        %cur = ( dev => $s, state => undef, name => undef );
                        next;
                }
-               if (my($s) = /Firmware state: (\S+)/) {
+               if (my($s) = /Firmware state: (.+)/) {
+                       # strip the extra state:
+                       # 'Online, Spun Up'
+                       # 'Hotspare, Spun down'
+                       $s =~ s/,.+//;
                        $cur{state} = $s;
                        next;
                }
@@ -288,15 +293,18 @@
        close $fh;
        push(@devs, { %cur }) if %cur;
 
+       my @dstatus;
        foreach my $dev (@devs) {
-               push(@status, sprintf "Dev%02d (%s): %s", $dev->{dev}, 
$dev->{name}, $dev->{state});
-               if ($dev->{state} ne 'Online') {
-                       # TODO: process other statuses
+               if ($dev->{state} eq 'Online' || $dev->{state} eq 'Hotspare') {
+                       push(@dstatus, sprintf "%02d:%s", $dev->{dev}, 
$dev->{state});
+               } else {
                        $status = $ERRORS{CRITICAL};
+                       # TODO: process other statuses
+                       push(@dstatus, sprintf "%02d (%s): %s", $dev->{dev}, 
$dev->{name}, $dev->{state});
                }
        }
-
-       $message .= "MegaCli:".join(', ', @status) if @status;
+       push(@status, ($#devs + 1) . ' Devs: ' . join(',', @dstatus));
+       $message .= "MegaCli:[".join(' ', @status)."] " if @status;
 }
 
 # AIX LVM

================================================================
Index: packages/nagios-plugin-check_raid/t/megacli.pdlist.all
diff -u /dev/null packages/nagios-plugin-check_raid/t/megacli.pdlist.all:1.1
--- /dev/null   Fri Oct 14 17:27:56 2011
+++ packages/nagios-plugin-check_raid/t/megacli.pdlist.all      Fri Oct 14 
17:27:51 2011
@@ -0,0 +1,384 @@
+
+                                     
+Adapter #0
+
+Enclosure Device ID: 15
+Slot Number: 1
+Enclosure position: 0
+Device Id: 4
+Sequence Number: 2
+Media Error Count: 0
+Other Error Count: 0
+Predictive Failure Count: 0
+Last Predictive Failure Event Seq Number: 0
+PD Type: SATA
+Raw Size: 2.728 TB [0x15d50a3b0 Sectors]
+Non Coerced Size: 2.728 TB [0x15d40a3b0 Sectors]
+Coerced Size: 2.727 TB [0x15d3ef000 Sectors]
+Firmware state: Online, Spun Up
+SAS Address(0): 0x500019b9ff72cd00
+Connected Port Number: 0(path0) 
+Inquiry Data:       MK0311YHGXHPPAHitachi HDS723030ALA640                 
MKAOA5C0
+FDE Capable: Not Capable
+FDE Enable: Disable
+Secured: Unsecured
+Locked: Unlocked
+Needs EKM Attention: No
+Foreign State: None 
+Device Speed: 6.0Gb/s 
+Link Speed: 3.0Gb/s 
+Media Type: Hard Disk Device
+Drive:  Not Certified
+Drive Temperature :38C (100.40 F)
+
+
+
+Enclosure Device ID: 15
+Slot Number: 2
+Enclosure position: 0
+Device Id: 5
+Sequence Number: 2
+Media Error Count: 0
+Other Error Count: 0
+Predictive Failure Count: 0
+Last Predictive Failure Event Seq Number: 0
+PD Type: SATA
+Raw Size: 2.728 TB [0x15d50a3b0 Sectors]
+Non Coerced Size: 2.728 TB [0x15d40a3b0 Sectors]
+Coerced Size: 2.727 TB [0x15d3ef000 Sectors]
+Firmware state: Online, Spun Up
+SAS Address(0): 0x500019b9ff72cd01
+Connected Port Number: 0(path0) 
+Inquiry Data:       MK0311YHGXGTSAHitachi HDS723030ALA640                 
MKAOA5C0
+FDE Capable: Not Capable
+FDE Enable: Disable
+Secured: Unsecured
+Locked: Unlocked
+Needs EKM Attention: No
+Foreign State: None 
+Device Speed: 6.0Gb/s 
+Link Speed: 3.0Gb/s 
+Media Type: Hard Disk Device
+Drive:  Not Certified
+Drive Temperature :38C (100.40 F)
+
+
+
+Enclosure Device ID: 15
+Slot Number: 3
+Enclosure position: 0
+Device Id: 6
+Sequence Number: 2
+Media Error Count: 0
+Other Error Count: 0
+Predictive Failure Count: 0
+Last Predictive Failure Event Seq Number: 0
+PD Type: SATA
+Raw Size: 2.728 TB [0x15d50a3b0 Sectors]
+Non Coerced Size: 2.728 TB [0x15d40a3b0 Sectors]
+Coerced Size: 2.727 TB [0x15d3ef000 Sectors]
+Firmware state: Online, Spun Up
+SAS Address(0): 0x500019b9ff72cd02
+Connected Port Number: 0(path0) 
+Inquiry Data:       MK0311YHGX38DAHitachi HDS723030ALA640                 
MKAOA5C0
+FDE Capable: Not Capable
+FDE Enable: Disable
+Secured: Unsecured
+Locked: Unlocked
+Needs EKM Attention: No
+Foreign State: None 
+Device Speed: 6.0Gb/s 
+Link Speed: 3.0Gb/s 
+Media Type: Hard Disk Device
+Drive:  Not Certified
+Drive Temperature :38C (100.40 F)
+
+
+
+Enclosure Device ID: 15
+Slot Number: 4
+Enclosure position: 0
+Device Id: 7
+Sequence Number: 2
+Media Error Count: 0
+Other Error Count: 0
+Predictive Failure Count: 0
+Last Predictive Failure Event Seq Number: 0
+PD Type: SATA
+Raw Size: 2.728 TB [0x15d50a3b0 Sectors]
+Non Coerced Size: 2.728 TB [0x15d40a3b0 Sectors]
+Coerced Size: 2.727 TB [0x15d3ef000 Sectors]
+Firmware state: Online, Spun Up
+SAS Address(0): 0x500019b9ff72cd03
+Connected Port Number: 0(path0) 
+Inquiry Data:       MK0311YHG31V6AHitachi HDS723030ALA640                 
MKAOA580
+FDE Capable: Not Capable
+FDE Enable: Disable
+Secured: Unsecured
+Locked: Unlocked
+Needs EKM Attention: No
+Foreign State: None 
+Device Speed: 6.0Gb/s 
+Link Speed: 3.0Gb/s 
+Media Type: Hard Disk Device
+Drive:  Not Certified
+Drive Temperature :37C (98.60 F)
+
+
+
+Enclosure Device ID: 15
+Slot Number: 5
+Enclosure position: 0
+Device Id: 8
+Sequence Number: 2
+Media Error Count: 0
+Other Error Count: 0
+Predictive Failure Count: 0
+Last Predictive Failure Event Seq Number: 0
+PD Type: SATA
+Raw Size: 2.728 TB [0x15d50a3b0 Sectors]
+Non Coerced Size: 2.728 TB [0x15d40a3b0 Sectors]
+Coerced Size: 2.727 TB [0x15d3ef000 Sectors]
+Firmware state: Online, Spun Up
+SAS Address(0): 0x500019b9ff72cd04
+Connected Port Number: 0(path0) 
+Inquiry Data:       MK0311YHGVLH4AHitachi HDS723030ALA640                 
MKAOA5C0
+FDE Capable: Not Capable
+FDE Enable: Disable
+Secured: Unsecured
+Locked: Unlocked
+Needs EKM Attention: No
+Foreign State: None 
+Device Speed: 6.0Gb/s 
+Link Speed: 3.0Gb/s 
+Media Type: Hard Disk Device
+Drive:  Not Certified
+Drive Temperature :38C (100.40 F)
+
+
+
+Enclosure Device ID: 15
+Slot Number: 6
+Enclosure position: 0
+Device Id: 9
+Sequence Number: 2
+Media Error Count: 0
+Other Error Count: 0
+Predictive Failure Count: 0
+Last Predictive Failure Event Seq Number: 0
+PD Type: SATA
+Raw Size: 2.728 TB [0x15d50a3b0 Sectors]
+Non Coerced Size: 2.728 TB [0x15d40a3b0 Sectors]
+Coerced Size: 2.727 TB [0x15d3ef000 Sectors]
+Firmware state: Online, Spun Up
+SAS Address(0): 0x500019b9ff72cd05
+Connected Port Number: 0(path0) 
+Inquiry Data:       MK0311YHGBEBZAHitachi HDS723030ALA640                 
MKAOA580
+FDE Capable: Not Capable
+FDE Enable: Disable
+Secured: Unsecured
+Locked: Unlocked
+Needs EKM Attention: No
+Foreign State: None 
+Device Speed: 6.0Gb/s 
+Link Speed: 3.0Gb/s 
+Media Type: Hard Disk Device
+Drive:  Not Certified
+Drive Temperature :37C (98.60 F)
+
+
+
+Enclosure Device ID: 15
+Slot Number: 7
+Enclosure position: 0
+Device Id: 10
+Sequence Number: 2
+Media Error Count: 0
+Other Error Count: 0
+Predictive Failure Count: 0
+Last Predictive Failure Event Seq Number: 0
+PD Type: SATA
+Raw Size: 2.728 TB [0x15d50a3b0 Sectors]
+Non Coerced Size: 2.728 TB [0x15d40a3b0 Sectors]
+Coerced Size: 2.727 TB [0x15d3ef000 Sectors]
+Firmware state: Online, Spun Up
+SAS Address(0): 0x500019b9ff72cd06
+Connected Port Number: 0(path0) 
+Inquiry Data:       MK0311YHGBEAMAHitachi HDS723030ALA640                 
MKAOA580
+FDE Capable: Not Capable
+FDE Enable: Disable
+Secured: Unsecured
+Locked: Unlocked
+Needs EKM Attention: No
+Foreign State: None 
+Device Speed: 6.0Gb/s 
+Link Speed: 3.0Gb/s 
+Media Type: Hard Disk Device
+Drive:  Not Certified
+Drive Temperature :35C (95.00 F)
+
+
+
+Enclosure Device ID: 15
+Slot Number: 8
+Enclosure position: 0
+Device Id: 11
+Sequence Number: 2
+Media Error Count: 0
+Other Error Count: 0
+Predictive Failure Count: 0
+Last Predictive Failure Event Seq Number: 0
+PD Type: SATA
+Raw Size: 2.728 TB [0x15d50a3b0 Sectors]
+Non Coerced Size: 2.728 TB [0x15d40a3b0 Sectors]
+Coerced Size: 2.727 TB [0x15d3ef000 Sectors]
+Firmware state: Online, Spun Up
+SAS Address(0): 0x500019b9ff72cd07
+Connected Port Number: 0(path0) 
+Inquiry Data:       MK0311YHGX2TJAHitachi HDS723030ALA640                 
MKAOA5C0
+FDE Capable: Not Capable
+FDE Enable: Disable
+Secured: Unsecured
+Locked: Unlocked
+Needs EKM Attention: No
+Foreign State: None 
+Device Speed: 6.0Gb/s 
+Link Speed: 3.0Gb/s 
+Media Type: Hard Disk Device
+Drive:  Not Certified
+Drive Temperature :36C (96.80 F)
+
+
+
+Enclosure Device ID: 15
+Slot Number: 9
+Enclosure position: 0
+Device Id: 12
+Sequence Number: 2
+Media Error Count: 0
+Other Error Count: 0
+Predictive Failure Count: 0
+Last Predictive Failure Event Seq Number: 0
+PD Type: SATA
+Raw Size: 2.728 TB [0x15d50a3b0 Sectors]
+Non Coerced Size: 2.728 TB [0x15d40a3b0 Sectors]
+Coerced Size: 2.727 TB [0x15d3ef000 Sectors]
+Firmware state: Online, Spun Up
+SAS Address(0): 0x500019b9ff72cd08
+Connected Port Number: 0(path0) 
+Inquiry Data:       MK0311YHGXJUVAHitachi HDS723030ALA640                 
MKAOA5C0
+FDE Capable: Not Capable
+FDE Enable: Disable
+Secured: Unsecured
+Locked: Unlocked
+Needs EKM Attention: No
+Foreign State: None 
+Device Speed: 6.0Gb/s 
+Link Speed: 3.0Gb/s 
+Media Type: Hard Disk Device
+Drive:  Not Certified
+Drive Temperature :36C (96.80 F)
+
+
+
+Enclosure Device ID: 15
+Slot Number: 10
+Enclosure position: 0
+Device Id: 13
+Sequence Number: 2
+Media Error Count: 0
+Other Error Count: 0
+Predictive Failure Count: 0
+Last Predictive Failure Event Seq Number: 0
+PD Type: SATA
+Raw Size: 2.728 TB [0x15d50a3b0 Sectors]
+Non Coerced Size: 2.728 TB [0x15d40a3b0 Sectors]
+Coerced Size: 2.727 TB [0x15d3ef000 Sectors]
+Firmware state: Online, Spun Up
+SAS Address(0): 0x500019b9ff72cd09
+Connected Port Number: 0(path0) 
+Inquiry Data:       MK0311YHGWM50AHitachi HDS723030ALA640                 
MKAOA5C0
+FDE Capable: Not Capable
+FDE Enable: Disable
+Secured: Unsecured
+Locked: Unlocked
+Needs EKM Attention: No
+Foreign State: None 
+Device Speed: 6.0Gb/s 
+Link Speed: 3.0Gb/s 
+Media Type: Hard Disk Device
+Drive:  Not Certified
+Drive Temperature :34C (93.20 F)
+
+
+
+Enclosure Device ID: 15
+Slot Number: 11
+Enclosure position: 0
+Device Id: 14
+Sequence Number: 2
+Media Error Count: 0
+Other Error Count: 0
+Predictive Failure Count: 0
+Last Predictive Failure Event Seq Number: 0
+PD Type: SATA
+Raw Size: 2.728 TB [0x15d50a3b0 Sectors]
+Non Coerced Size: 2.728 TB [0x15d40a3b0 Sectors]
+Coerced Size: 2.727 TB [0x15d3ef000 Sectors]
+Firmware state: Hotspare, Spun down
+SAS Address(0): 0x500019b9ff72cd0a
+Connected Port Number: 0(path0) 
+Inquiry Data:       MK0311YHGXGURAHitachi HDS723030ALA640                 
MKAOA5C0
+FDE Capable: Not Capable
+FDE Enable: Disable
+Secured: Unsecured
+Locked: Unlocked
+Needs EKM Attention: No
+Foreign State: None 
+Device Speed: 6.0Gb/s 
+Link Speed: 3.0Gb/s 
+Media Type: Hard Disk Device
+Drive:  Not Certified
+Drive Temperature :33C (91.40 F)
+
+
+Hotspare Information: 
+Type: Global, is revertible
+
+
+Enclosure Device ID: 15
+Slot Number: 12
+Enclosure position: 0
+Device Id: 16
+Sequence Number: 2
+Media Error Count: 0
+Other Error Count: 0
+Predictive Failure Count: 0
+Last Predictive Failure Event Seq Number: 0
+PD Type: SATA
+Raw Size: 2.728 TB [0x15d50a3b0 Sectors]
+Non Coerced Size: 2.728 TB [0x15d40a3b0 Sectors]
+Coerced Size: 2.727 TB [0x15d3ef000 Sectors]
+Firmware state: Hotspare, Spun down
+SAS Address(0): 0x500019b9ff72cd0b
+Connected Port Number: 0(path0) 
+Inquiry Data:       MK0311YHGX5JZAHitachi HDS723030ALA640                 
MKAOA5C0
+FDE Capable: Not Capable
+FDE Enable: Disable
+Secured: Unsecured
+Locked: Unlocked
+Needs EKM Attention: No
+Foreign State: None 
+Device Speed: 6.0Gb/s 
+Link Speed: 3.0Gb/s 
+Media Type: Hard Disk Device
+Drive:  Not Certified
+Drive Temperature :33C (91.40 F)
+
+
+Hotspare Information: 
+Type: Global, is revertible
+
+
+
+Exit Code: 0x00
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to