projects
/
mirror
/
dsa-nagios.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix --ignore-transfer-speed to not always ignore transfer speed
[mirror/dsa-nagios.git]
/
dsa-nagios-checks
/
checks
/
dsa-check-hpacucli
diff --git
a/dsa-nagios-checks/checks/dsa-check-hpacucli
b/dsa-nagios-checks/checks/dsa-check-hpacucli
index
06c6fad
..
7aff0c3
100755
(executable)
--- a/
dsa-nagios-checks/checks/dsa-check-hpacucli
+++ b/
dsa-nagios-checks/checks/dsa-check-hpacucli
@@
-27,6
+27,8
@@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
use strict;
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
use strict;
+use English;
+use Getopt::Long;
# nagios exit codes
my %CODE = (
# nagios exit codes
my %CODE = (
@@
-62,6
+64,20
@@
sub record($) {
};
}
};
}
+my $usage = "$PROGRAM_NAME: Usage: $PROGRAM_NAME [--ignore-transfer-speed=<pd> [--ignore-transfer-speed=<pd> ...]]\n";
+my $params;
+Getopt::Long::Configure('bundling');
+if (!GetOptions (
+ '--help' => \$params->{'help'},
+ '--ignore-transfer-speed=s@' => \$params->{'ignore-transfer-speed'},
+ )) {
+ die ($usage);
+};
+if ($params->{'help'}) {
+ print $usage;
+ exit (0);
+};
+die ($usage) unless (scalar @ARGV == 0);
my $ctrlallshow = runcmd("controller all show");
my @controllers;
my $ctrlallshow = runcmd("controller all show");
my @controllers;
@@
-92,6
+108,7
@@
for my $slot (sort @controllers) {
next if /^$/;
next if (/^\S.*in Slot $slot/);
next if /^ *array [A-Z]$/;
next if /^$/;
next if (/^\S.*in Slot $slot/);
next if /^ *array [A-Z]$/;
+ next if /^ *unassigned/;
if (/^ *(array [A-Z]) \(Failed\)$/) {
record('CRITICAL');
push @{$status{'Failed'}}, $1;
if (/^ *(array [A-Z]) \(Failed\)$/) {
record('CRITICAL');
push @{$status{'Failed'}}, $1;
@@
-126,6
+143,8
@@
for my $slot (sort @controllers) {
$type = 'SCSI';
} elsif ($drive =~ /^[0-9]+[EI]:[0-9]+:[0-9]+$/) { # SAS
$type = 'SAS';
$type = 'SCSI';
} elsif ($drive =~ /^[0-9]+[EI]:[0-9]+:[0-9]+$/) { # SAS
$type = 'SAS';
+ } elsif ($drive =~ /^[0-9]+[C]:[0-9]+:[0-9]+$/) { # New 6GBPS SAS
+ $type = 'SAS+';
} else {
# I'm not going to run pass arguments of unknown form to the shell..
warn ("Unknown diskdrive ID $drive\n");
} else {
# I'm not going to run pass arguments of unknown form to the shell..
warn ("Unknown diskdrive ID $drive\n");
@@
-161,21
+180,37
@@
for my $slot (sort @controllers) {
push @{$status{'unknown transfer mode'}}, $drive."(".$value{'Transfer Mode'}.")";
next;
};
push @{$status{'unknown transfer mode'}}, $drive."(".$value{'Transfer Mode'}.")";
next;
};
- } elsif ($type eq 'SAS') {
+ } elsif ($type eq 'SAS'
|| $type eq 'SAS+'
) {
$key = 'PHY Transfer Rate';
if ($value{'PHY Count'} eq '2') {
$key = 'PHY Transfer Rate';
if ($value{'PHY Count'} eq '2') {
- $expected = '3.0GBPS, Unknown';
+ if (defined($value{'Redundant Path(s)'})) {
+ $expected = [ '3.0GBPS, 3.0GBPS', '6.0GBPS, 6.0GBPS' ];
+ } else {
+ $expected = [ '3.0GBPS, Unknown', 'Unknown, 3.0GBPS',
+ '6.0GBPS, Unknown', 'Unknown, 6.0GBPS' ];
+ }
} else {
} else {
- $expected =
'3.0GBPS'
;
+ $expected =
[ '3.0GBPS', '6.0GBPS' ]
;
}
} else {
warn "Should not be here. Do not know what to do with type '$type'\n";
next;
}
}
} else {
warn "Should not be here. Do not know what to do with type '$type'\n";
next;
}
+ if ($params->{'ignore-transfer-speed'}) {
+ if (grep { $drive eq $_ } @{$params->{'ignore-transfer-speed'}}) {
+ push @{$status{'ignored transfer speed'}}, $drive."(".$value{$key}.")";
+ };
+ next;
+ };
if (!defined $value{$key}) {
record('WARNING');
push @{$status{'unknown transfer speed'}}, $drive;
if (!defined $value{$key}) {
record('WARNING');
push @{$status{'unknown transfer speed'}}, $drive;
+ } elsif (ref($expected) eq 'ARRAY') {
+ if (scalar(grep { $value{$key} eq $_ } @$expected) == 0) {
+ record('WARNING');
+ push @{$status{'bad transfer speed'}}, $drive."(".$value{$key}.")";
+ };
} elsif ($value{$key} ne $expected) {
record('WARNING');
push @{$status{'bad transfer speed'}}, $drive."(".$value{$key}.")";
} elsif ($value{$key} ne $expected) {
record('WARNING');
push @{$status{'bad transfer speed'}}, $drive."(".$value{$key}.")";