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

Ensure the checks for ASA context devices are strict (#9441)

Browse Source
This commit is contained in:
Neil Lathwood
2018-11-10 21:05:25 +00:00
committed by GitHub
parent 9c7d5ed5ba
commit a10503b927
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/discovery/sensors/entity-sensor.inc.php
View File

@@ -138,7 +138,7 @@ if (!empty($entity_oids)) {
$valid_sensor = false; $valid_sensor = false;
} }
} }
if ($current == '-127' || ($device['os'] == 'asa' && str_contains($device['hardware'], 'sc'))) { if ($current == '-127' || ($device['os'] == 'asa' && ends_with($device['hardware'], 'sc'))) {
$valid_sensor = false; $valid_sensor = false;
} }
// Check for valid sensors // Check for valid sensors

2
includes/polling/os/asa.inc.php
View File

@@ -10,7 +10,7 @@
* option) any later version. Please see LICENSE.txt at the top level of * option) any later version. Please see LICENSE.txt at the top level of
* the source code distribution for details. * the source code distribution for details.
*/ */
if (!str_contains($device['hardware'], 'sc')) { if (!ends_with($device['hardware'], 'sc')) {
$oids = 'entPhysicalModelName.1 entPhysicalSoftwareRev.1 entPhysicalSerialNum.1 entPhysicalModelName.4 entPhysicalSoftwareRev.4'; $oids = 'entPhysicalModelName.1 entPhysicalSoftwareRev.1 entPhysicalSerialNum.1 entPhysicalModelName.4 entPhysicalSoftwareRev.4';
$data = snmp_get_multi($device, $oids, '-OQUs', 'ENTITY-MIB'); $data = snmp_get_multi($device, $oids, '-OQUs', 'ENTITY-MIB');

2
includes/polling/ports.inc.php
View File

@@ -683,7 +683,7 @@ foreach ($ports as $port) {
} }
} else { } else {
if ($oid == 'ifOperStatus' || $oid == 'ifAdminStatus') { if ($oid == 'ifOperStatus' || $oid == 'ifAdminStatus') {
if ($port[$oid . '_prev'] != $this_port[$oid]) { if ($port[$oid.'_prev'] == null) {
$port['update'][$oid . '_prev'] = $this_port[$oid]; $port['update'][$oid . '_prev'] = $this_port[$oid];
} }
} }