From 3139239240fce1a7bb59a17fe3a9aa6d7679b025 Mon Sep 17 00:00:00 2001 From: Rosiak Date: Sun, 31 Jan 2016 00:16:39 +0100 Subject: [PATCH 1/2] Do not discover a temp sensor which is not present #2848 --- .../discovery/sensors/temperatures/cisco-envmon.inc.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/includes/discovery/sensors/temperatures/cisco-envmon.inc.php b/includes/discovery/sensors/temperatures/cisco-envmon.inc.php index 74408318d7..2bf2a80d81 100644 --- a/includes/discovery/sensors/temperatures/cisco-envmon.inc.php +++ b/includes/discovery/sensors/temperatures/cisco-envmon.inc.php @@ -15,8 +15,10 @@ if ($device['os_group'] == 'cisco') { if (is_array($temp)) { $cur_oid = '.1.3.6.1.4.1.9.9.13.1.3.1.3.'; foreach ($temp as $index => $entry) { - $descr = ucwords($temp[$index]['ciscoEnvMonTemperatureStatusDescr']); - discover_sensor($valid['sensor'], 'temperature', $device, $cur_oid.$index, $index, 'cisco', $descr, '1', '1', null, null, $temp[$index]['ciscoEnvMonTemperatureThreshold'], null, $temp[$index]['ciscoEnvMonTemperatureStatusValue'], 'snmp', $index); + if ($temp[$index]['ciscoEnvMonTemperatureThreshold'] != 'notPresent') { + $descr = ucwords($temp[$index]['ciscoEnvMonTemperatureStatusDescr']); + discover_sensor($valid['sensor'], 'temperature', $device, $cur_oid.$index, $index, 'cisco', $descr, '1', '1', null, null, $temp[$index]['ciscoEnvMonTemperatureThreshold'], null, $temp[$index]['ciscoEnvMonTemperatureStatusValue'], 'snmp', $index); + } } } } From 5dd9fed3e0482c5a3d8f5dbd86c798c5182a05ae Mon Sep 17 00:00:00 2001 From: Rosiak Date: Sun, 31 Jan 2016 00:18:30 +0100 Subject: [PATCH 2/2] Wrong array value --- includes/discovery/sensors/temperatures/cisco-envmon.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/discovery/sensors/temperatures/cisco-envmon.inc.php b/includes/discovery/sensors/temperatures/cisco-envmon.inc.php index 2bf2a80d81..2268f2b33e 100644 --- a/includes/discovery/sensors/temperatures/cisco-envmon.inc.php +++ b/includes/discovery/sensors/temperatures/cisco-envmon.inc.php @@ -15,7 +15,7 @@ if ($device['os_group'] == 'cisco') { if (is_array($temp)) { $cur_oid = '.1.3.6.1.4.1.9.9.13.1.3.1.3.'; foreach ($temp as $index => $entry) { - if ($temp[$index]['ciscoEnvMonTemperatureThreshold'] != 'notPresent') { + if ($temp[$index]['ciscoEnvMonTemperatureState'] != 'notPresent') { $descr = ucwords($temp[$index]['ciscoEnvMonTemperatureStatusDescr']); discover_sensor($valid['sensor'], 'temperature', $device, $cur_oid.$index, $index, 'cisco', $descr, '1', '1', null, null, $temp[$index]['ciscoEnvMonTemperatureThreshold'], null, $temp[$index]['ciscoEnvMonTemperatureStatusValue'], 'snmp', $index); }