From 37d3ff0f2a3f30efe79646f22b9a0718c0c5e680 Mon Sep 17 00:00:00 2001 From: Rudy Hardeman Date: Tue, 12 May 2015 23:29:47 +0200 Subject: [PATCH] Clean the code changed the phase discovery --- includes/discovery/current/apc.inc.php | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/includes/discovery/current/apc.inc.php b/includes/discovery/current/apc.inc.php index 499d913d4d..53329368dd 100644 --- a/includes/discovery/current/apc.inc.php +++ b/includes/discovery/current/apc.inc.php @@ -4,7 +4,7 @@ if ($device['os'] == "apc") { # PDU - Phase - $oids = snmp_walk($device, "rPDUStatusPhaseIndex", "-OsqnU", "PowerNet-MIB"); + $oids = snmp_walk($device, "rPDULoadPhaseConfigIndex", "-OsqnU", "PowerNet-MIB"); if ($oids) { if ($debug) { echo($oids."\n"); } @@ -96,19 +96,8 @@ if ($device['os'] == "apc") $lowlimit = snmp_get($device, $lowlimit_oid, "-Oqv", ""); $warnlimit = snmp_get($device, $warnlimit_oid, "-Oqv", ""); - if ($limit < 0 && $lowlimit < 0 && $warnlimit < 0){ - - echo "Phase "; - - $limit_oid = "1.3.6.1.4.1.318.1.1.12.2.2.1.1.4.".$index; #rPDULoadPhaseConfigOverloadThreshold - $lowlimit_oid = "1.3.6.1.4.1.318.1.1.12.2.2.1.1.2.".$index; #rPDULoadPhaseConfigLoLoadThreshold - $warnlimit_oid = "1.3.6.1.4.1.318.1.1.12.2.2.1.1.3.".$index; #rPDULoadPhaseConfigNearOverloadThreshold - - $limit = snmp_get($device, $limit_oid, "-Oqv", ""); - $lowlimit = snmp_get($device, $lowlimit_oid, "-Oqv", ""); - $warnlimit = snmp_get($device, $warnlimit_oid, "-Oqv", ""); - } - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, NULL, $warnlimit, $limit, $current); + if ($limit < 0 && $lowlimit < 0 && $warnlimit < 0) + discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, NULL, $warnlimit, $limit, $current); } }