From b97d23e4d200afc6ee907f6a024d2a8878cc140d Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Tue, 17 Jan 2012 16:01:50 +0000 Subject: [PATCH] add string_to_oid, use it in netscaler sensors git-svn-id: http://www.observium.org/svn/observer/trunk@2824 61d68cd4-352d-0410-923a-c4978735b2b8 --- includes/discovery/sensors-netscaler.inc.php | 6 +----- includes/snmp.inc.php | 11 +++++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/includes/discovery/sensors-netscaler.inc.php b/includes/discovery/sensors-netscaler.inc.php index 18c5f97f65..90923bf240 100644 --- a/includes/discovery/sensors-netscaler.inc.php +++ b/includes/discovery/sensors-netscaler.inc.php @@ -17,11 +17,7 @@ foreach($ns_sensor_array as $descr => $data) $current = $data['sysHealthCounterValue']; - $oid = ".1.3.6.1.4.1.5951.4.1.1.41.7.1.2.".strlen($descr); - for($i = 0; $i != strlen($descr); $i++) - { - $oid .= ".".ord($descr[$i]); - } + $oid = ".1.3.6.1.4.1.5951.4.1.1.41.7.1.2." . string_to_oid($descr); if (strpos($descr, "Temp") !== FALSE) { $divisor = 0; $multiplier = 0; $type = "temperature"; } elseif (strpos($descr, "Fan") !== FALSE) { $divisor = 0; $multiplier = 0; $type = "fanspeed"; } diff --git a/includes/snmp.inc.php b/includes/snmp.inc.php index 43bf07bceb..76df18d1bb 100644 --- a/includes/snmp.inc.php +++ b/includes/snmp.inc.php @@ -1,5 +1,16 @@