From 6ff61c562494d330fbde52faa5b415a4cf3f4d06 Mon Sep 17 00:00:00 2001 From: Rudy Hardeman Date: Sun, 17 May 2015 18:12:30 +0200 Subject: [PATCH] Update for getting sensor devider from snmp --- includes/discovery/current/raritan.inc.php | 3 ++- includes/discovery/frequencies/raritan.inc.php | 8 +++----- includes/discovery/power/raritan.inc.php | 8 +++----- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/includes/discovery/current/raritan.inc.php b/includes/discovery/current/raritan.inc.php index 04594bf524..6d16ea9be9 100644 --- a/includes/discovery/current/raritan.inc.php +++ b/includes/discovery/current/raritan.inc.php @@ -6,8 +6,8 @@ if ($device['os'] == 'raritan') { $divisor = "1000"; $outlet_divisor = $divisor; - $inlet_divisor = 10.0; $multiplier = "1"; + // Check Inlets $inlet_oids = snmp_walk($device,"inletLabel","-Osqn","PDU2-MIB"); $inlet_oids = trim($inlet_oids); @@ -25,6 +25,7 @@ if ($device['os'] == 'raritan') $inlet_insert_index = $inlet_index; $inlet_oid = ".1.3.6.1.4.1.13742.6.5.2.3.1.4.1.$inletsuffix.1"; + $inlet_divisor = pow(10,snmp_get($device, "inletSensorDecimalDigits.1.$inletsuffix.rmsCurrent", "-Ovq","PDU2-MIB"); $inlet_current = snmp_get($device, "measurementsInletSensorValue.1.$inletsuffix.1", "-Ovq","PDU2-MIB") / $inlet_divisor; if ($inlet_current >= 0) { diff --git a/includes/discovery/frequencies/raritan.inc.php b/includes/discovery/frequencies/raritan.inc.php index caefd7c302..a52a98117c 100644 --- a/includes/discovery/frequencies/raritan.inc.php +++ b/includes/discovery/frequencies/raritan.inc.php @@ -2,8 +2,6 @@ if ($device['os'] == 'raritan') { - $inlet_divisor = 10.00; - $multiplier = "1"; // Check Inlets $inlet_oids = snmp_walk($device,"inletLabel","-Osqn","PDU2-MIB"); $inlet_oids = trim($inlet_oids); @@ -21,11 +19,11 @@ if ($device['os'] == 'raritan') $inlet_insert_index = $inlet_index; $inlet_oid = ".1.3.6.1.4.1.13742.6.5.2.3.1.4.1.$inletsuffix.23"; - - $inlet_frequency = snmp_get($device, "measurementsInletSensorValue.$inletsuffix.1.frequency", "-Ovq", "PDU2-MIB"); + $inlet_divisor = pow(10,snmp_get($device, "inletSensorDecimalDigits.1.$inletsuffix.activePower", "-Ovq","PDU2-MIB"); + $inlet_frequency = snmp_get($device, "measurementsInletSensorValue.$inletsuffix.1.frequency", "-Ovq", "PDU2-MIB") / $inlet_divisor; if ($inlet_frequency >= 0) { - discover_sensor($valid['sensor'], 'frequency', $device, $inlet_oid, $inlet_insert_index, 'raritan', $inlet_descr, $inlet_divisor, $multiplier, NULL, NULL, NULL, NULL, $inlet_frequency); + discover_sensor($valid['sensor'], 'frequency', $device, $inlet_oid, $inlet_insert_index, 'raritan', $inlet_descr, $inlet_divisor, 1, NULL, NULL, NULL, NULL, $inlet_frequency); } } } diff --git a/includes/discovery/power/raritan.inc.php b/includes/discovery/power/raritan.inc.php index 7fc6a8c3aa..554fcbd113 100644 --- a/includes/discovery/power/raritan.inc.php +++ b/includes/discovery/power/raritan.inc.php @@ -2,8 +2,6 @@ if ($device['os'] == 'raritan') { - $inlet_divisor = 1; - $multiplier = "1"; // Check Inlets $inlet_oids = snmp_walk($device,"inletLabel","-Osqn","PDU2-MIB"); $inlet_oids = trim($inlet_oids); @@ -21,11 +19,11 @@ if ($device['os'] == 'raritan') $inlet_insert_index = $inlet_index; $inlet_oid = ".1.3.6.1.4.1.13742.6.5.2.3.1.4.1.$inletsuffix.5"; - - $inlet_power = snmp_get($device, "measurementsInletSensorValue.$inletsuffix.1.activePower", "-Ovq", "PDU2-MIB"); + $inlet_divisor = pow(10,snmp_get($device, "inletSensorDecimalDigits.1.$inletsuffix.activePower", "-Ovq","PDU2-MIB"); + $inlet_power = snmp_get($device, "measurementsInletSensorValue.$inletsuffix.1.activePower", "-Ovq", "PDU2-MIB") / $inlet_divisor; if ($inlet_power >= 0) { - discover_sensor($valid['sensor'], 'power', $device, $inlet_oid, $inlet_insert_index, 'raritan', $inlet_descr, $inlet_divisor, $multiplier, NULL, NULL, NULL, NULL, $inlet_power); + discover_sensor($valid['sensor'], 'power', $device, $inlet_oid, $inlet_insert_index, 'raritan', $inlet_descr, $inlet_divisor, 1, NULL, NULL, NULL, NULL, $inlet_power); } } }