From 496c8d611ff426e91655cf281410763e27cc0a94 Mon Sep 17 00:00:00 2001 From: laf Date: Mon, 20 Apr 2015 18:42:03 +0100 Subject: [PATCH] Updated division --- includes/discovery/current/apc.inc.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/includes/discovery/current/apc.inc.php b/includes/discovery/current/apc.inc.php index a522e3e69..7e3181699 100644 --- a/includes/discovery/current/apc.inc.php +++ b/includes/discovery/current/apc.inc.php @@ -177,7 +177,7 @@ if ($device['os'] == "apc") $oid_array = array( array('HighPrecOid' => 'upsHighPrecOutputCurrent', 'AdvOid' => 'upsAdvOutputCurrent', 'type' => 'apc', 'index' => 0, 'descr' => 'Current Drawn', 'divisor' => 10, 'mib' => '+PowerNet-MIB'), - array('HighPrecOid' => 'upsHighPrecOutputLoad', 'AdvOid' => 'upsAdvOutputLoad', 'type' => 'apc', 'index' => 0, 'descr' => 'Current Load', 'divisor' => 1, 'mib' => '+PowerNet-MIB'), + array('HighPrecOid' => 'upsHighPrecOutputLoad', 'AdvOid' => 'upsAdvOutputLoad', 'type' => 'apc', 'index' => 0, 'descr' => 'Current Load', 'divisor' => 10, 'mib' => '+PowerNet-MIB'), ); foreach ($oid_array as $item) { $low_limit = NULL; @@ -199,8 +199,13 @@ if ($device['os'] == "apc") if ($oids) { echo $item['type'] . ' ' . $item['mib'] . ' UPS'; } - $current = $oids / $item['divisor']; - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $item['index'], $item['type'], $item['descr'], $item['divisor'], 1, $low_limit, $low_limit_warn, $warn_limit, $high_limit, $current); + if (stristr($current_oid, "HighPrec")) { + $current = $oids / $item['divisor']; + } else { + $current = $oids; + $item['divisor'] = 1; + } + discover_sensor($valid['sensor'], 'current', $device, $current_oid.'.'.$item['index'], $current_oid.'.'.$item['index'], $item['type'], $item['descr'], $item['divisor'], 1, $low_limit, $low_limit_warn, $warn_limit, $high_limit, $current); } } }