projects
/
mirror
/
dsa-nagios.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dsa-check-hpasm: Incorporate patch from Jan Wagner to ignore "N/A" DIMM status.
[mirror/dsa-nagios.git]
/
dsa-nagios-checks
/
checks
/
dsa-check-hpasm
diff --git
a/dsa-nagios-checks/checks/dsa-check-hpasm
b/dsa-nagios-checks/checks/dsa-check-hpasm
index
ee5ec8b
..
fc98866
100755
(executable)
--- a/
dsa-nagios-checks/checks/dsa-check-hpasm
+++ b/
dsa-nagios-checks/checks/dsa-check-hpasm
@@
-47,15
+47,19
@@
my %callbacks = (
my $params = {};
my $params = {};
+my $USAGE = "PROGRAM_NAME: Usage: $PROGRAM_NAME [--help] [--ps-no-redundant] [--fan-no-redundant] [--fan-high] [--dimm-na]\n";
Getopt::Long::config('bundling');
if (!GetOptions (
'--help' => \$params->{'help'},
'--ps-no-redundant' => \$params->{'ps-no-redundant'},
Getopt::Long::config('bundling');
if (!GetOptions (
'--help' => \$params->{'help'},
'--ps-no-redundant' => \$params->{'ps-no-redundant'},
+ '--fan-no-redundant' => \$params->{'fan-no-redundant'},
+ '--fan-high' => \$params->{'fan-high'},
+ '--dimm-na' => \$params->{'dimm-na'},
)) {
)) {
- die ("$
PROGRAM_NAME: Usage: $PROGRAM_NAME [--help] [--ps-no-redundant]\n
");
+ die ("$
USAGE
");
};
if ($params->{'help'}) {
};
if ($params->{'help'}) {
- print "$
PROGRAM_NAME: Usage: $PROGRAM_NAME [--help] [--ps-no-redundant]\n
";
+ print "$
USAGE
";
print "Checks hp hardware health.\n";
exit (0);
};
print "Checks hp hardware health.\n";
exit (0);
};
@@
-80,7
+84,8
@@
sub do_dimm {
if ($line =~ /(^\s*$|-----)/) {
if ($in_block) {
if ($line =~ /(^\s*$|-----)/) {
if ($in_block) {
- if ($status ne 'Ok') {
+ unless (($status eq 'Ok') ||
+ ($params->{'dimm-na'} && $status eq 'N/A')) {
$message = sprintf("DIMM%d: %s ", $dimm_num, $status);
$exit_status |= 2;
}
$message = sprintf("DIMM%d: %s ", $dimm_num, $status);
$exit_status |= 2;
}
@@
-141,10
+146,10
@@
sub do_fans {
$exit_status |= 2;
} elsif ($line[3] ne 'NORMAL') {
$message = sprintf("FAN%d: speed=%s ", $fan_num, $line[3]);
$exit_status |= 2;
} elsif ($line[3] ne 'NORMAL') {
$message = sprintf("FAN%d: speed=%s ", $fan_num, $line[3]);
- $exit_status |= 1;
+ $exit_status |= 1
unless ($line[3] eq 'HIGH' && $params->{'fan-high'})
;
} elsif ($line[5] ne 'Yes') {
$message = sprintf("FAN%d: redundant=%s ",$fan_num, $line[5]);
} elsif ($line[5] ne 'Yes') {
$message = sprintf("FAN%d: redundant=%s ",$fan_num, $line[5]);
- $exit_status |= 1;
+ $exit_status |= 1
unless ($params->{'fan-no-redundant'})
;
}
} elsif ($line =~ /($prompt|^\s*$)/) {
last;
}
} elsif ($line =~ /($prompt|^\s*$)/) {
last;