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: lldp discovery change local port resolution (#7443)

Browse Source 
* fix: lldp discovery change local port resolution
dot1dBasePortIfIndex seems to skip some ports in certain configurations on Cisco devices.
Add quirk for Calix devices that return different port labels than they actually are.

* bdcom uses NMS-LLDP-MIB too.

* use dot1dBasePort to look up ifIndex if we can.
This commit is contained in:
Tony Murray
2017-10-24 02:21:32 -05:00
committed by Neil Lathwood
parent c50ddc3555
commit f01cf38a3a
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
includes/discovery/discovery-protocols.inc.php
View File

@@ -81,7 +81,7 @@ if (Config::get('autodiscovery.xdp') === true) {
echo PHP_EOL;
}//end if
if ($device['os'] == 'pbn' && Config::get('autodiscovery.xdp') === true) {
if (($device['os'] == 'pbn' || $device['os'] == 'bdcom') && Config::get('autodiscovery.xdp') === true) {
echo ' NMS-LLDP-MIB: ';
$lldp_array = snmpwalk_group($device, 'lldpRemoteSystemsData', 'NMS-LLDP-MIB');
@@ -118,6 +118,7 @@ if ($device['os'] == 'pbn' && Config::get('autodiscovery.xdp') === true) {
$lldp_array = snmpwalk_group($device, 'lldpRemTable', 'LLDP-MIB', 3);
if (!empty($lldp_array)) {
$dot1d_array = snmpwalk_group($device, 'dot1dBasePortIfIndex', 'BRIDGE-MIB');
$lldp_ports = snmpwalk_group($device, 'lldpLocPortId', 'LLDP-MIB');
}
foreach ($lldp_array as $key => $lldp_if_array) {
@@ -127,7 +128,10 @@ if ($device['os'] == 'pbn' && Config::get('autodiscovery.xdp') === true) {
} else {
$ifIndex = $entry_key;
}
$interface = get_port_by_ifIndex($device['device_id'], $ifIndex);
$local_port_id = find_port_id($lldp_ports[$entry_key]['lldpLocPortId'], $ifIndex, $device['device_id']);
$interface = get_port_by_id($local_port_id);
d_echo($lldp_instance);
foreach ($lldp_instance as $entry_instance => $lldp) {
@@ -157,6 +161,11 @@ if ($device['os'] == 'pbn' && Config::get('autodiscovery.xdp') === true) {
}
}
$remote_device = device_by_id_cache($remote_device_id);
if ($remote_device['os'] == 'calix') {
$lldp['lldpRemPortId'] = 'EthPort ' . $lldp['lldpRemPortId'];
}
$remote_port_id = find_port_id(
$lldp['lldpRemPortDesc'],
$lldp['lldpRemPortId'],
@@ -165,7 +174,6 @@ if ($device['os'] == 'pbn' && Config::get('autodiscovery.xdp') === true) {
);
if (empty($lldp['lldpRemSysName'])) {
$remote_device = device_by_id_cache($remote_device_id);
$lldp['lldpRemSysName'] = $remote_device['sysName'] ?: $remote_device['hostname'];
}

2
includes/discovery/functions.inc.php
View File

@@ -1439,7 +1439,7 @@ function find_port_id($description, $identifier = '', $device_id = 0, $mac_addre
if ($identifier) {
if (is_numeric($identifier)) {
$sql .= ' OR `ifAlias`=? OR `ifIndex`=?';
$sql .= ' OR `ifIndex`=? OR `ifAlias`=?';
} else {
$sql .= ' OR `ifDescr`=? OR `ifName`=?';
}