From 20ca50820f1dcb2031a25d5dc734311fe0371bad Mon Sep 17 00:00:00 2001 From: Tom Laermans Date: Fri, 4 Jun 2010 14:35:03 +0000 Subject: [PATCH] frequency fixes for MGE UPS Galaxy git-svn-id: http://www.observium.org/svn/observer/trunk@1100 61d68cd4-352d-0410-923a-c4978735b2b8 --- includes/discovery/frequencies.inc.php | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/includes/discovery/frequencies.inc.php b/includes/discovery/frequencies.inc.php index a594e85ec..f1976be53 100644 --- a/includes/discovery/frequencies.inc.php +++ b/includes/discovery/frequencies.inc.php @@ -17,9 +17,15 @@ if ($device['os'] == "mgeups") list($unused,$numPhase) = explode(' ',$oids); for($i = 1; $i <= $numPhase;$i++) { - $freq_oid = ".1.3.6.1.4.1.705.1.7.2.1.3.$i.0"; + $freq_oid = ".1.3.6.1.4.1.705.1.7.2.1.3.$i"; $descr = "Output"; if ($numPhase > 1) $descr .= " Phase $i"; - $current = snmp_get($device, $freq_oid, "-Oqv") / 10; + $current = snmp_get($device, $volt_oid, "-Oqv"); + if (!$current) + { + $volt_oid .= ".0"; + $current = snmp_get($device, $volt_oid, "-Oqv"); + } + $current /= 10; $type = "mge-ups"; $precision = 10; $index = $i; @@ -48,9 +54,15 @@ if ($device['os'] == "mgeups") list($unused,$numPhase) = explode(' ',$oids); for($i = 1; $i <= $numPhase;$i++) { - $freq_oid = ".1.3.6.1.4.1.705.1.6.2.1.3.$i.0"; + $freq_oid = ".1.3.6.1.4.1.705.1.6.2.1.3.$i"; $descr = "Input"; if ($numPhase > 1) $descr .= " Phase $i"; - $current = snmp_get($device, $freq_oid, "-Oqv") / 10; + $current = snmp_get($device, $volt_oid, "-Oqv"); + if (!$current) + { + $volt_oid .= ".0"; + $current = snmp_get($device, $volt_oid, "-Oqv"); + } + $current /= 10; $type = "mge-ups"; $precision = 10; $index = 100+$i;