tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17 from Robert-Nelson/ipmi-plugin-fix 

Thanks
This commit is contained in:
m-lopez-f 2015-05-29 08:29:57 +02:00
parent 16fa2ec329 c286283594
commit 4c4bdc2940
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pandora_server/util/plugin/ipmi-plugin.pl
View File

@ -47,17 +47,22 @@ my $pass = get_param("p");
my $sensor = get_param("s"); my $sensor = get_param("s");
my $extraopts = get_param("-"); my $extraopts = get_param("-");
my $res = `ipmi-sensors -h $host -u $user -p $pass -s $sensor $extraopts --ignore-not-available-sensors --no-header-output --comma-separated-output --output-event-bitmask`; my $cmd = "ipmi-sensors -h $host -u $user -p $pass -s $sensor $extraopts --ignore-not-available-sensors --no-header-output --comma-separated-output --output-event-bitmask";
my $res = `$cmd`;
my ($sensor_id, $name, $type, $value, $units, $eventmask) = split(/,/, $res); if (defined $res and "$res" ne "") {
my ($sensor_id, $name, $type, $value, $units, $eventmask) = split(/,/, $res);
#Output the value #Output the value
if ($value eq 'N/A') { if ($value eq 'N/A') {
if ($eventmask =~ /([0-9A-Fa-f]+)h/) { if ($eventmask =~ /([0-9A-Fa-f]+)h/) {
print hex $1; print hex $1;
} else {
print $eventmask;
}
} else { } else {
print $eventmask; print $value;
} }
} else { } else {
print $value; print STDERR "Error processing command: $cmd\n";
} }