Monitoring
/
monitor-utils
mirror of https://github.com/ranl/monitor-utils.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #7 from svamberg/netapp_temperature 

Add temperature to performance data string
This commit is contained in:
Ran Leibman 2014-08-19 10:14:05 +03:00
parent db31ad1080 bb03d662bc
commit c909305453
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nagios/check-netapp-ng.pl
View File

@ -747,6 +747,7 @@ if("$opt{'check_type'}" eq "TEMP") {
} elsif ( ("$opt{'check_type'}" eq "SHELF") or ("$opt{'check_type'}" eq "SHELFINFO") ) {
my @errs;
my $r_shelf = $snmp_session->get_table($snmpEnclTableIndex);
my $perf_temp = "";
foreach my $key ( sort keys %$r_shelf) {
my @tmp_arr = split(/\./, $key);
my $oid = pop(@tmp_arr);
@ -791,8 +792,13 @@ if("$opt{'check_type'}" eq "TEMP") {
foreach my $subkey ( keys %shelf) {
if ( $shelf{$subkey} ne "" )
{ print "$subkey->$shelf{$subkey} "; }
if ( $shelf{$subkey} ne "" ) {
print "$subkey->$shelf{$subkey} ";
if ( "$subkey" eq "CurrentTemp" ) {
$shelf{$subkey} =~ m/^([0-9]+)C.*$/;
$perf_temp = "$perf_temp, temp_$shelf{'ShelfNumber'}=$1";
}
}
else
{ print "$subkey->"; print "None "; }
@ -813,7 +819,7 @@ if("$opt{'check_type'}" eq "TEMP") {
$stat = $ERRORS{'OK'};
$msg = "OK: $opt{'check_type'} ok";
if ("$opt{'check_type'}" eq "SHELFINFO")
{ $perf = "shelfinfo=0"; }
{ $perf = "shelfinfo=0$perf_temp"; }
else
{ $perf = "shelf=0"; }
} else {
@ -823,7 +829,7 @@ if("$opt{'check_type'}" eq "TEMP") {
$msg = "$msg $_";
}
if ("$opt{'check_type'}" eq "SHELFINFO")
{ $perf = "shelfinfo=1"; }
{ $perf = "shelfinfo=1$perf_temp"; }
else
{ $perf = "shelf=1"; }
}