From 3d00309d03e6f87d59e1e5cf1d453d1de5e85193 Mon Sep 17 00:00:00 2001 From: Tom Laermans Date: Tue, 16 Feb 2010 01:42:39 +0000 Subject: [PATCH] fix voltage limits git-svn-id: http://www.observium.org/svn/observer/trunk@871 61d68cd4-352d-0410-923a-c4978735b2b8 --- includes/discovery/functions.inc.php | 2 +- includes/discovery/voltages.php | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/includes/discovery/functions.inc.php b/includes/discovery/functions.inc.php index d860c4326..8dec6e5b8 100644 --- a/includes/discovery/functions.inc.php +++ b/includes/discovery/functions.inc.php @@ -58,7 +58,7 @@ function discover_volt($device, $oid, $index, $type, $descr, $precision = 1, $lo if (mysql_result(mysql_query("SELECT count(volt_id) FROM `voltage` WHERE device_id = '".$device['device_id']."' AND volt_type = '$type' AND `volt_index` = '$index'"),0) == '0') { $query = "INSERT INTO voltage (`device_id`, `volt_oid`, `volt_index`, `volt_type`, `volt_descr`, `volt_precision`, `volt_limit`, `volt_limit_low`, `volt_current`) "; - $query .= " VALUES ('".$device['device_id']."', '$oid', '$index', '$type', '$descr', '$precision', '$low_limit', '$volt_limit_low', '$current')"; + $query .= " VALUES ('".$device['device_id']."', '$oid', '$index', '$type', '$descr', '$precision', '$high_limit', '$low_limit', '$current')"; mysql_query($query); if($debug) { echo("$query ". mysql_affected_rows() . " inserted"); } echo("+"); diff --git a/includes/discovery/voltages.php b/includes/discovery/voltages.php index 5e2163a39..15fe07cd1 100755 --- a/includes/discovery/voltages.php +++ b/includes/discovery/voltages.php @@ -56,15 +56,15 @@ if ($device['os'] == "linux") $volt_oid = "1.3.6.1.4.1.10876.2.1.1.1.1.4.".$index; $descr_oid = "1.3.6.1.4.1.10876.2.1.1.1.1.2.".$index; $monitor_oid = "1.3.6.1.4.1.10876.2.1.1.1.1.10.".$index; - $limit_oid = "1.3.6.1.4.1.10876.2.1.1.1.1.5.".$index; - $lowlimit_oid = "1.3.6.1.4.1.10876.2.1.1.1.1.6.".$index; + $limit_oid = "1.3.6.1.4.1.10876.2.1.1.1.1.6.".$index; + $lowlimit_oid = "1.3.6.1.4.1.10876.2.1.1.1.1.5.".$index; - $descr = snmp_get($device, $descr_oid, "-Oqv", "SUPERMICRO-HEALTH-MIB"); - $current = snmp_get($device, $volt_oid, "-Oqv", "SUPERMICRO-HEALTH-MIB"); - $limit = snmp_get($device, $limit_oid, "-Oqv", "SUPERMICRO-HEALTH-MIB"); - $lowlimit = snmp_get($device, $lowlimit_oid, "-Oqv", "SUPERMICRO-HEALTH-MIB"); - $monitor = snmp_get($device, $monitor_oid, "-Oqv", "SUPERMICRO-HEALTH-MIB"); - $descr = trim(str_ireplace("Voltage", "", $descr)); + $descr = snmp_get($device, $descr_oid, "-Oqv", "SUPERMICRO-HEALTH-MIB"); + $current = snmp_get($device, $volt_oid, "-Oqv", "SUPERMICRO-HEALTH-MIB"); + $limit = snmp_get($device, $limit_oid, "-Oqv", "SUPERMICRO-HEALTH-MIB"); + $lowlimit = snmp_get($device, $lowlimit_oid, "-Oqv", "SUPERMICRO-HEALTH-MIB"); + $monitor = snmp_get($device, $monitor_oid, "-Oqv", "SUPERMICRO-HEALTH-MIB"); + $descr = trim(str_ireplace("Voltage", "", $descr)); if ($monitor == 'true') {