Merge pull request #971 from laf/issue-963

Added Temperature sensor support for NetApp
This commit is contained in:
Daniel Preussker
2015-05-14 13:34:48 +00:00
4 changed files with 57 additions and 11 deletions

View File

@@ -18,17 +18,21 @@ function poll_sensor($device, $class, $unit)
}
if ($class == "temperature")
{
for ($i = 0;$i < 5;$i++) # Try 5 times to get a valid temp reading
{
if ($debug) echo("Attempt $i ");
$sensor_value = trim(str_replace("\"", "", snmp_get($device, $sensor['sensor_oid'], "-OUqnv", "SNMPv2-MIB$mib")));
preg_match("/[\d\.]+/",$sensor_value,$temp_response);
if (!empty($temp_response[0])) {
$sensor_value = $temp_response[0];
}
if ($device['os'] == 'netapp') {
require "includes/polling/temperatures/netapp.inc.php";
} else {
for ($i = 0;$i < 5;$i++) # Try 5 times to get a valid temp reading
{
if ($debug) echo("Attempt $i ");
$sensor_value = trim(str_replace("\"", "", snmp_get($device, $sensor['sensor_oid'], "-OUqnv", "SNMPv2-MIB$mib")));
preg_match("/[\d\.]+/",$sensor_value,$temp_response);
if (!empty($temp_response[0])) {
$sensor_value = $temp_response[0];
}
if (is_numeric($sensor_value) && $sensor_value != 9999) break; # TME sometimes sends 999.9 when it is right in the middle of an update;
sleep(1); # Give the TME some time to reset
if (is_numeric($sensor_value) && $sensor_value != 9999) break; # TME sometimes sends 999.9 when it is right in the middle of an update;
sleep(1); # Give the TME some time to reset
}
}
} else {
if ($sensor['sensor_type'] == 'apc') {

View File

@@ -0,0 +1,6 @@
<?php
$sensor_value = trim(str_replace("\"", "", snmp_get($device, $sensor['sensor_oid'], "-OUqnv", "")));
preg_match_all("/([0-9]+C)+/", $sensor_value, $temps);
list(,$index) = split("\.", $sensor['sensor_index']);
$sensor_value = $temps[0][$index];