Removed echos from discovery | Reverted custom temperature poller

This commit is contained in:
Alan Gregory
2015-05-16 22:05:29 -03:00
parent 9b2ef2153d
commit 2bf4786f92
4 changed files with 2 additions and 8 deletions
-1
View File
@@ -6,7 +6,6 @@ if (!$os){
* OLT AN5516-01
*/
if (preg_match('/^AN5516-0[16]$/',$sysDescr)) {
echo "Fiberhome $sysDescr\n";
$os = "fiberhome";
}
}
@@ -3,8 +3,8 @@ if ($device['os'] == 'fiberhome')
{
$temperature = snmp_get($device, "sysTemperature.0", "-Oqv", "GEPON-OLT-COMMON-MIB");
if (is_numeric($temperature)) {
echo("Fiberhome - $temperature \n");
discover_sensor($valid['sensor'], 'temperature', $device, "GEPON-OLT-COMMON-MIB::sysTemperature", "0", 'fiberhome',"Internal Temperature", '1', '1', "20" , NULL, NULL, "50", $temperature);
$oid = ".1.3.6.1.4.1.5875.800.3.9.4.5.0";
discover_sensor($valid['sensor'], 'temperature', $device, $oid , "0", 'fiberhome',"Internal Temperature", '1', '1', "20" , NULL, NULL, "50", $temperature);
}
}
?>
-2
View File
@@ -20,8 +20,6 @@ function poll_sensor($device, $class, $unit)
{
if ($device['os'] == 'netapp') {
require "includes/polling/temperatures/netapp.inc.php";
} elseif ($device['os'] == 'fiberhome') {
require "includes/polling/temperatures/fiberhome.inc.php";
} else {
for ($i = 0;$i < 5;$i++) # Try 5 times to get a valid temp reading
{
@@ -1,3 +0,0 @@
<?php
$sensor_value = snmp_get($device, "sysTemperature.0", "-Oqv", "GEPON-OLT-COMMON-MIB");