mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix handling of zero value for entSensorThresholdValue for dbm cisco sensor (#16336)

Browse Source 
* add handling of zero value for entSensorThresholdValue for dbm sensor type

this addresses https://github.com/librenms/librenms/issues/16335
* Update cisco-entity-sensor.inc.php
* safe check for $key['entSensorThresholdValue']
* style
---------

Co-authored-by: PipoCanaja <38363551+PipoCanaja@users.noreply.github.com>
This commit is contained in:
makriska
2024-09-03 21:39:05 +02:00
committed by GitHub
parent f89ed301d7
commit 4efad1ae69
3 changed files with 10456 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/discovery/sensors/cisco-entity-sensor.inc.php
+3 -3
View File
@@ -148,15 +148,15 @@ if ($device['os_group'] == 'cisco') {
if (isset($t_oids[$index]) && is_array($t_oids[$index])) { if (isset($t_oids[$index]) && is_array($t_oids[$index])) {
foreach ($t_oids[$index] as $t_index => $key) { foreach ($t_oids[$index] as $t_index => $key) {
// Skip invalid treshold values // Skip invalid treshold values
if ($key['entSensorThresholdValue'] == '-32768') { if (! isset($key['entSensorThresholdValue']) || $key['entSensorThresholdValue'] == '-32768') {
continue; continue;
} }
// Critical Limit // Critical Limit
if (($key['entSensorThresholdSeverity'] == 'major' || $key['entSensorThresholdSeverity'] == 'critical') && ($key['entSensorThresholdValue'] != 0) && ($key['entSensorThresholdRelation'] == 'greaterOrEqual' || $key['entSensorThresholdRelation'] == 'greaterThan')) { if (($key['entSensorThresholdSeverity'] == 'major' || $key['entSensorThresholdSeverity'] == 'critical') && ($key['entSensorThresholdRelation'] == 'greaterOrEqual' || $key['entSensorThresholdRelation'] == 'greaterThan')) {
$limit = ($key['entSensorThresholdValue'] * $multiplier / $divisor); $limit = ($key['entSensorThresholdValue'] * $multiplier / $divisor);
} }
if (($key['entSensorThresholdSeverity'] == 'major' || $key['entSensorThresholdSeverity'] == 'critical') && ($key['entSensorThresholdValue'] != 0) && ($key['entSensorThresholdRelation'] == 'lessOrEqual' || $key['entSensorThresholdRelation'] == 'lessThan')) { if (($key['entSensorThresholdSeverity'] == 'major' || $key['entSensorThresholdSeverity'] == 'critical') && ($key['entSensorThresholdRelation'] == 'lessOrEqual' || $key['entSensorThresholdRelation'] == 'lessThan')) {
$limit_low = ($key['entSensorThresholdValue'] * $multiplier / $divisor); $limit_low = ($key['entSensorThresholdValue'] * $multiplier / $divisor);
} }
tests/data/iosxe_c8500-20x6c.json
+7432
View File
File diff suppressed because it is too large Load Diff
tests/snmpsim/iosxe_c8500-20x6c.snmprec
+3021
View File
File diff suppressed because it is too large Load Diff