From dd553342939e06aa57f1138c81ccc62cef436988 Mon Sep 17 00:00:00 2001 From: mchasteen Date: Wed, 18 Feb 2015 08:35:02 -0700 Subject: [PATCH] Rethought this code. Added some logic to detect a temperature value that contains more than numbers. --- includes/discovery/temperatures/cisco-envmon.inc.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/includes/discovery/temperatures/cisco-envmon.inc.php b/includes/discovery/temperatures/cisco-envmon.inc.php index 923fa7556..c0224d49b 100644 --- a/includes/discovery/temperatures/cisco-envmon.inc.php +++ b/includes/discovery/temperatures/cisco-envmon.inc.php @@ -25,8 +25,11 @@ if (dbFetchCell("SELECT COUNT(*) FROM `sensors` WHERE `device_id` = ? AND `senso $descr = str_replace("temperature", "", $descr); $descr = trim($descr); - - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'cisco', $descr, '1', '1', NULL, NULL, NULL, NULL, stristr($temperature, " degrees", true)); + if (!is_numeric($temperature)) { + $temperature = stristr($temperature, " degrees", true); + } + + discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'cisco', $descr, '1', '1', NULL, NULL, NULL, NULL, $temperature); } } }