From deb7fa8081808d6b61e23b9e1fc03437098df0fd Mon Sep 17 00:00:00 2001 From: Tom Laermans Date: Sun, 18 Jul 2010 19:43:11 +0000 Subject: [PATCH] clean up entity sensor names git-svn-id: http://www.observium.org/svn/observer/trunk@1422 61d68cd4-352d-0410-923a-c4978735b2b8 --- includes/discovery/temperatures/entity-sensor.inc.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/includes/discovery/temperatures/entity-sensor.inc.php b/includes/discovery/temperatures/entity-sensor.inc.php index ed4f6b0bc4..15477500a7 100644 --- a/includes/discovery/temperatures/entity-sensor.inc.php +++ b/includes/discovery/temperatures/entity-sensor.inc.php @@ -2,7 +2,7 @@ global $valid_temp; -echo("ENTITY-SENSOR"); +echo("ENTITY-SENSOR "); $oids = array(); @@ -22,7 +22,12 @@ if(is_array($oids[$device['device_id']])) $descr = snmp_get($device, "entPhysicalDescr.".$index, "-Oqv", "ENTITY-SENSOR-MIB"); $oid = ".1.3.6.1.2.1.99.1.1.1.4.".$index; $current = $entry['entPhySensorValue']; + #ENTITY-SENSOR-MIB::entPhySensorUnitsDisplay.11 = STRING: "C" + $descr = str_replace("temperature", "", $descr); + $descr = str_replace("temp", "", $descr); + $descr = str_replace("sensor", "", $descr); + if($entry['entPhySensorScale'] == "milli") { $divisor = "1000"; } else { $divisor = "1"; } discover_temperature($valid_temp, $device, $oid, $index, "entity-sensor", $descr, $divisor, NULL, NULL, $current);