mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
refactor: Discovery protocols re-write (#7380)
* refactor: discovery protocols re-write extract more code to make it easier to read use snmpwalk_group walk lldpRemTable instead of lldpRemoteSystemsData Optimize discover_device to reduce dns lookups of bad dns names Make discovery_by_ip behavior consistent between cdp and lldp move can_skip_discovery to discovery functions Tested lldp, cdp, and ospf. * always discover links even if the remote device isn't in system Fix discover_link always updating * fix style * fix update, not fetching id * increase platform length. Most devices use sysDescr here, which is max length 255 * remove orphaned links * update db_schema.yaml
This commit is contained in:
Tony Murray
committed by
Neil Lathwood
Neil Lathwood
parent
a1d782613b
commit
c0b267b49c
@@ -1,236 +1,227 @@
|
||||
<?php
|
||||
|
||||
global $link_exists;
|
||||
|
||||
use LibreNMS\Config;
|
||||
use LibreNMS\Util\IP;
|
||||
|
||||
$community = $device['community'];
|
||||
global $link_exists;
|
||||
|
||||
if ($device['os'] == 'ironware' && Config::get('autodiscovery.xdp') === true) {
|
||||
echo ' Brocade FDP: ';
|
||||
$fdp_array = snmpwalk_cache_twopart_oid($device, 'snFdpCacheEntry', array(), 'FOUNDRY-SN-SWITCH-GROUP-MIB');
|
||||
d_echo($fdp_array);
|
||||
if ($fdp_array) {
|
||||
unset($fdp_links);
|
||||
foreach ($fdp_array as $key => $fdp_if_array) {
|
||||
$interface = get_port_by_ifIndex($device['device_id'], $key);
|
||||
d_echo($fdp_if_array);
|
||||
foreach ($fdp_if_array as $entry_key => $fdp) {
|
||||
$remote_device_id = dbFetchCell('SELECT `device_id` FROM `devices` WHERE `sysName` = ? OR `hostname` = ?', array($fdp['snFdpCacheDeviceId'], $fdp['snFdpCacheDeviceId']));
|
||||
$fdp_array = snmpwalk_group($device, 'snFdpCacheEntry', 'FOUNDRY-SN-SWITCH-GROUP-MIB', 2);
|
||||
|
||||
if (!$remote_device_id &&
|
||||
!can_skip_discovery(Config::get('autodiscovery.xdp_exclude.sysname_regexp'), $fdp['snFdpCacheDeviceId'], $fdp['snFdpCacheDeviceId']) &&
|
||||
!can_skip_discovery(Config::get('autodiscovery.xdp_exclude.sysdesc_regexp'), $fdp['snFdpCacheVersion'], $fdp['snFdpCacheDeviceId'])
|
||||
) {
|
||||
$remote_device_id = discover_new_device($fdp['snFdpCacheDeviceId'], $device, 'FDP', $interface);
|
||||
}
|
||||
foreach ($fdp_array as $key => $fdp_if_array) {
|
||||
$interface = get_port_by_ifIndex($device['device_id'], $key);
|
||||
d_echo($fdp_if_array);
|
||||
|
||||
if ($remote_device_id) {
|
||||
$if = $fdp['snFdpCacheDevicePort'];
|
||||
$remote_port_id = dbFetchCell('SELECT port_id FROM `ports` WHERE (`ifDescr` = ? OR `ifName` = ?) AND `device_id` = ?', array($if, $if, $remote_device_id));
|
||||
} else {
|
||||
$remote_port_id = '0';
|
||||
}
|
||||
foreach ($fdp_if_array as $entry_key => $fdp) {
|
||||
$remote_device_id = find_device_id($fdp['snFdpCacheDeviceId']);
|
||||
|
||||
discover_link($interface['port_id'], $fdp['snFdpCacheVendorId'], $remote_port_id, $fdp['snFdpCacheDeviceId'], $fdp['snFdpCacheDevicePort'], $fdp['snFdpCachePlatform'], $fdp['snFdpCacheVersion'], $device['device_id'], $remote_device_id);
|
||||
if (!$remote_device_id &&
|
||||
!can_skip_discovery($fdp['snFdpCacheDeviceId'], $fdp['snFdpCacheVersion'])
|
||||
) {
|
||||
$remote_device_id = discover_new_device($fdp['snFdpCacheDeviceId'], $device, 'FDP', $interface);
|
||||
}
|
||||
}//end foreach
|
||||
}//end if
|
||||
|
||||
$remote_port_id = find_port_id($fdp['snFdpCacheDevicePort'], '', $remote_device_id);
|
||||
discover_link(
|
||||
$interface['port_id'],
|
||||
$fdp['snFdpCacheVendorId'],
|
||||
$remote_port_id,
|
||||
$fdp['snFdpCacheDeviceId'],
|
||||
$fdp['snFdpCacheDevicePort'],
|
||||
$fdp['snFdpCachePlatform'],
|
||||
$fdp['snFdpCacheVersion'],
|
||||
$device['device_id'],
|
||||
$remote_device_id
|
||||
);
|
||||
}
|
||||
}//end foreach
|
||||
echo PHP_EOL;
|
||||
}//end if
|
||||
|
||||
echo ' CISCO-CDP-MIB: ';
|
||||
unset($cdp_array);
|
||||
if (Config::get('autodiscovery.xdp') === true) {
|
||||
$cdp_array = snmpwalk_cache_twopart_oid($device, 'cdpCache', array(), 'CISCO-CDP-MIB');
|
||||
d_echo($cdp_array);
|
||||
if ($cdp_array) {
|
||||
unset($cdp_links);
|
||||
foreach ($cdp_array as $key => $cdp_if_array) {
|
||||
$interface = get_port_by_ifIndex($device['device_id'], $key);
|
||||
d_echo($cdp_if_array);
|
||||
foreach ($cdp_if_array as $entry_key => $cdp) {
|
||||
if (is_valid_hostname($cdp['cdpCacheDeviceId']) || Config::get('discovery_by_ip', false)) {
|
||||
$cdp_ip = IP::fromHexString($cdp['cdpCacheAddress'], true);
|
||||
$remote_device_id = dbFetchCell('SELECT `device_id` FROM `devices` WHERE `sysName` = ? OR `hostname` = ? OR `hostname` = ?', array($cdp['cdpCacheDeviceId'], $cdp['cdpCacheDeviceId'], $cdp_ip));
|
||||
$cdp_array = snmpwalk_group($device, 'cdpCache', 'CISCO-CDP-MIB', 2);
|
||||
|
||||
if (!$remote_device_id &&
|
||||
!can_skip_discovery(Config::get('autodiscovery.cdp_exclude.platform_regexp'), $cdp['cdpCachePlatform'], $cdp['cdpCacheDeviceId']) &&
|
||||
!can_skip_discovery(Config::get('autodiscovery.xdp_exclude.sysname_regexp'), $cdp['cdpCacheDeviceId'], $cdp['cdpCacheDeviceId']) &&
|
||||
!can_skip_discovery(Config::get('autodiscovery.xdp_exclude.sysdesc_regexp'), $cdp['cdpCacheVersion'], $cdp['cdpCacheDeviceId'])
|
||||
) {
|
||||
if (Config::get('discovery_by_ip', false)) {
|
||||
$remote_device_id = discover_new_device($cdp_ip, $device, 'CDP', $interface);
|
||||
} else {
|
||||
$remote_device_id = discover_new_device($cdp['cdpCacheDeviceId'], $device, 'CDP', $interface);
|
||||
}
|
||||
}
|
||||
foreach ($cdp_array as $key => $cdp_if_array) {
|
||||
$interface = get_port_by_ifIndex($device['device_id'], $key);
|
||||
|
||||
if ($remote_device_id) {
|
||||
$if = $cdp['cdpCacheDevicePort'];
|
||||
$remote_port_id = dbFetchCell('SELECT port_id FROM `ports` WHERE (`ifDescr` = ? OR `ifName` = ?) AND `device_id` = ?', array($if, $if, $remote_device_id));
|
||||
} else {
|
||||
$remote_port_id = '0';
|
||||
}
|
||||
foreach ($cdp_if_array as $entry_key => $cdp) {
|
||||
d_echo($cdp);
|
||||
|
||||
if ($interface['port_id'] && $cdp['cdpCacheDeviceId'] && $cdp['cdpCacheDevicePort']) {
|
||||
discover_link($interface['port_id'], 'cdp', $remote_port_id, $cdp['cdpCacheDeviceId'], $cdp['cdpCacheDevicePort'], $cdp['cdpCachePlatform'], $cdp['cdpCacheVersion'], $device['device_id'], $remote_device_id);
|
||||
}
|
||||
} else {
|
||||
echo 'X';
|
||||
}//end if
|
||||
}//end foreach
|
||||
$cdp_ip = IP::fromHexString($cdp['cdpCacheAddress'], true);
|
||||
$remote_device_id = find_device_id($cdp['cdpCacheDeviceId'], $cdp_ip);
|
||||
|
||||
if (!$remote_device_id &&
|
||||
!can_skip_discovery($cdp['cdpCacheDeviceId'], $cdp['cdpCacheVersion'], $cdp['cdpCachePlatform'])
|
||||
) {
|
||||
$remote_device_id = discover_new_device($cdp['cdpCacheDeviceId'], $device, 'CDP', $interface);
|
||||
|
||||
if (!$remote_device_id && Config::get('discovery_by_ip', false)) {
|
||||
$remote_device_id = discover_new_device($cdp_ip, $device, 'CDP', $interface);
|
||||
}
|
||||
}
|
||||
|
||||
if ($interface['port_id'] && $cdp['cdpCacheDeviceId'] && $cdp['cdpCacheDevicePort']) {
|
||||
$remote_port_id = find_port_id($cdp['cdpCacheDevicePort'], '', $remote_device_id);
|
||||
discover_link(
|
||||
$interface['port_id'],
|
||||
'cdp',
|
||||
$remote_port_id,
|
||||
$cdp['cdpCacheDeviceId'],
|
||||
$cdp['cdpCacheDevicePort'],
|
||||
$cdp['cdpCachePlatform'],
|
||||
$cdp['cdpCacheVersion'],
|
||||
$device['device_id'],
|
||||
$remote_device_id
|
||||
);
|
||||
}
|
||||
}//end foreach
|
||||
}//end if
|
||||
}//end foreach
|
||||
echo PHP_EOL;
|
||||
}//end if
|
||||
|
||||
unset(
|
||||
$lldp_array,
|
||||
$cdp_array
|
||||
);
|
||||
|
||||
if ($device['os'] == 'pbn' && Config::get('autodiscovery.xdp') === true) {
|
||||
echo ' NMS-LLDP-MIB: ';
|
||||
$lldp_array = snmpwalk_cache_oid($device, 'lldpRemoteSystemsData', array(), 'NMS-LLDP-MIB', 'pbn');
|
||||
d_echo($lldp_array);
|
||||
if ($lldp_array) {
|
||||
unset($lldp_links);
|
||||
foreach ($lldp_array as $key => $lldp) {
|
||||
d_echo($lldp);
|
||||
$interface = get_port_by_ifIndex($device['device_id'], $lldp['lldpRemLocalPortNum']);
|
||||
$remote_device_id = dbFetchCell('SELECT `device_id` FROM `devices` WHERE `sysName` = ? OR `hostname` = ?', array($lldp['lldpRemSysName'], $lldp['lldpRemSysName']));
|
||||
$lldp_array = snmpwalk_group($device, 'lldpRemoteSystemsData', 'NMS-LLDP-MIB');
|
||||
|
||||
if (!$remote_device_id &&
|
||||
is_valid_hostname($lldp['lldpRemSysName']) &&
|
||||
!can_skip_discovery(Config::get('autodiscovery.xdp_exclude.sysname_regexp'), $lldp['lldpRemSysName'], $lldp['lldpRemSysName']) &&
|
||||
!can_skip_discovery(Config::get('autodiscovery.xdp_exclude.sysdesc_regexp'), $lldp['lldpRemSysDesc'], $lldp['lldpRemSysName'])
|
||||
) {
|
||||
$remote_device_id = discover_new_device($lldp['lldpRemSysName'], $device, 'LLDP', $interface);
|
||||
}
|
||||
foreach ($lldp_array as $key => $lldp) {
|
||||
d_echo($lldp);
|
||||
$interface = get_port_by_ifIndex($device['device_id'], $lldp['lldpRemLocalPortNum']);
|
||||
$remote_device_id = find_device_id($lldp['lldpRemSysName']);
|
||||
|
||||
if ($remote_device_id) {
|
||||
$if = $lldp['lldpRemPortDesc'];
|
||||
$id = $lldp['lldpRemPortId'];
|
||||
$remote_port_id = dbFetchCell('SELECT `port_id` FROM `ports` WHERE (`ifDescr` = ? OR `ifName` = ? OR `ifDescr` = ? OR `ifName` = ?) AND `device_id` = ?', array($if, $if, $id, $id, $remote_device_id));
|
||||
} else {
|
||||
$remote_port_id = '0';
|
||||
}
|
||||
if (!$remote_device_id &&
|
||||
is_valid_hostname($lldp['lldpRemSysName']) &&
|
||||
!can_skip_discovery($lldp['lldpRemSysName'], $lldp['lldpRemSysDesc'])
|
||||
) {
|
||||
$remote_device_id = discover_new_device($lldp['lldpRemSysName'], $device, 'LLDP', $interface);
|
||||
}
|
||||
|
||||
if (is_numeric($interface['port_id']) && isset($lldp['lldpRemSysName']) && isset($lldp['lldpRemPortId'])) {
|
||||
discover_link($interface['port_id'], 'lldp', $remote_port_id, $lldp['lldpRemSysName'], $lldp['lldpRemPortId'], null, $lldp['lldpRemSysDesc'], $device['device_id'], $remote_device_id);
|
||||
}
|
||||
}//end foreach
|
||||
}//end if
|
||||
if ($interface['port_id'] && $lldp['lldpRemSysName'] && $lldp['lldpRemPortId']) {
|
||||
$remote_port_id = find_port_id($lldp['lldpRemPortDesc'], $lldp['lldpRemPortId'], $remote_device_id);
|
||||
discover_link(
|
||||
$interface['port_id'],
|
||||
'lldp',
|
||||
$remote_port_id,
|
||||
$lldp['lldpRemSysName'],
|
||||
$lldp['lldpRemPortId'],
|
||||
null,
|
||||
$lldp['lldpRemSysDesc'],
|
||||
$device['device_id'],
|
||||
$remote_device_id
|
||||
);
|
||||
}
|
||||
}//end foreach
|
||||
echo PHP_EOL;
|
||||
} elseif (Config::get('autodiscovery.xdp') === true) {
|
||||
echo ' LLDP-MIB: ';
|
||||
$lldp_array = snmpwalk_cache_threepart_oid($device, 'lldpRemoteSystemsData', array(), 'LLDP-MIB');
|
||||
d_echo($lldp_array);
|
||||
$dot1d_array = snmpwalk_cache_oid($device, 'dot1dBasePortIfIndex', array(), 'BRIDGE-MIB');
|
||||
d_echo($dot1d_array);
|
||||
if ($lldp_array) {
|
||||
$lldp_links = '';
|
||||
foreach ($lldp_array as $key => $lldp_if_array) {
|
||||
d_echo($lldp_if_array);
|
||||
foreach ($lldp_if_array as $entry_key => $lldp_instance) {
|
||||
if (is_numeric($dot1d_array[$entry_key]['dot1dBasePortIfIndex'])) {
|
||||
$ifIndex = $dot1d_array[$entry_key]['dot1dBasePortIfIndex'];
|
||||
} else {
|
||||
$ifIndex = $entry_key;
|
||||
$lldp_array = snmpwalk_group($device, 'lldpRemTable', 'LLDP-MIB', 3);
|
||||
if (!empty($lldp_array)) {
|
||||
$dot1d_array = snmpwalk_group($device, 'dot1dBasePortIfIndex', 'BRIDGE-MIB');
|
||||
}
|
||||
|
||||
foreach ($lldp_array as $key => $lldp_if_array) {
|
||||
foreach ($lldp_if_array as $entry_key => $lldp_instance) {
|
||||
if (is_numeric($dot1d_array[$entry_key]['dot1dBasePortIfIndex'])) {
|
||||
$ifIndex = $dot1d_array[$entry_key]['dot1dBasePortIfIndex'];
|
||||
} else {
|
||||
$ifIndex = $entry_key;
|
||||
}
|
||||
$interface = get_port_by_ifIndex($device['device_id'], $ifIndex);
|
||||
d_echo($lldp_instance);
|
||||
|
||||
foreach ($lldp_instance as $entry_instance => $lldp) {
|
||||
// normalize MAC address if present
|
||||
$remote_port_mac = '';
|
||||
if ($lldp['lldpRemPortIdSubtype'] == 3) { // 3 = macaddress
|
||||
$remote_port_mac = str_replace(array(' ', ':', '-'), '', strtolower($lldp['lldpRemPortId']));
|
||||
}
|
||||
$interface = get_port_by_ifIndex($device['device_id'], $ifIndex);
|
||||
|
||||
d_echo($lldp_instance);
|
||||
foreach ($lldp_instance as $entry_instance => $lldp) {
|
||||
$remote_device_id = dbFetchCell('SELECT `device_id` FROM `devices` WHERE `sysName` = ? OR `hostname` = ?', array($lldp['lldpRemSysName'], $lldp['lldpRemSysName']));
|
||||
$remote_device_id = find_device_id($lldp['lldpRemSysName'], $lldp['lldpRemManAddr'], $remote_port_mac);
|
||||
|
||||
if (!$remote_device_id && is_valid_hostname($lldp['lldpRemSysName'])) {
|
||||
if (!can_skip_discovery(Config::get('autodiscovery.xdp_exclude.sysname_regexp'), $lldp['lldpRemSysName'], $lldp['lldpRemSysName']) &&
|
||||
!can_skip_discovery(Config::get('autodiscovery.xdp_exclude.sysdesc_regexp'), $lldp['lldpRemSysDesc'], $lldp['lldpRemSysName'])
|
||||
) {
|
||||
$remote_device_id = discover_new_device($lldp['lldpRemSysName'], $device, 'LLDP', $interface);
|
||||
if (is_numeric($remote_device_id) === false) {
|
||||
$ptopo_array = snmpwalk_cache_oid($device, 'ptopoConnEntry', array(), 'PTOPO-MIB');
|
||||
d_echo($ptopo_array);
|
||||
foreach ($ptopo_array as $ptopo) {
|
||||
if (strcmp(trim($ptopo['ptopoConnRemoteChassis']), trim($lldp['lldpRemChassisId'])) == 0) {
|
||||
$discover_hostname = IP::fromHexString($ptopo['ptopoConnAgentNetAddr'], true);
|
||||
break;
|
||||
}
|
||||
}
|
||||
unset(
|
||||
$ptopo_array,
|
||||
$ip_arr
|
||||
);
|
||||
// add device if configured to do so
|
||||
if (!$remote_device_id && !can_skip_discovery($lldp['lldpRemSysName'], $lldp['lldpRemSysDesc'])) {
|
||||
$remote_device_id = discover_new_device($lldp['lldpRemSysName'], $device, 'LLDP', $interface);
|
||||
|
||||
if (!$remote_device_id && Config::get('discovery_by_ip', false)) {
|
||||
$ptopo_array = snmpwalk_group($device, 'ptopoConnEntry', 'PTOPO-MIB');
|
||||
d_echo($ptopo_array);
|
||||
foreach ($ptopo_array as $ptopo) {
|
||||
if (strcmp(trim($ptopo['ptopoConnRemoteChassis']), trim($lldp['lldpRemChassisId'])) == 0) {
|
||||
$ip = IP::fromHexString($ptopo['ptopoConnAgentNetAddr'], true);
|
||||
$remote_device_id = discover_new_device($ip, $device, 'LLDP', $interface);
|
||||
break;
|
||||
}
|
||||
d_echo("Discovering $discover_hostname\n");
|
||||
$remote_device_id = discover_new_device($discover_hostname, $device, 'LLDP', $interface);
|
||||
}
|
||||
unset($ptopo_array);
|
||||
}
|
||||
// normalize MAC address if present
|
||||
$remote_port_mac_address = '';
|
||||
if ($lldp['lldpRemPortIdSubtype'] == 'macAddress') {
|
||||
$remote_port_mac_address = str_replace(array(' ', ':', '-'), '', strtolower($lldp['lldpRemPortId']));
|
||||
}
|
||||
// get remote device hostname from db by MAC address and replace lldpRemSysName if absent
|
||||
if (!$remote_device_id && $remote_port_mac_address) {
|
||||
$remote_device_id = dbFetchCell('SELECT `device_id` FROM `ports` WHERE ifPhysAddress = ? AND `deleted` = ?', array($remote_port_mac_address, '0'));
|
||||
if ($remote_device_id) {
|
||||
$remote_device_hostname = dbFetchRow('SELECT `hostname` FROM `devices` WHERE `device_id` = ?', array($remote_device_id));
|
||||
}
|
||||
if ($remote_device_hostname['hostname']) {
|
||||
$lldp['lldpRemSysName'] = $remote_device_hostname['hostname'];
|
||||
}
|
||||
}
|
||||
if ($remote_device_id) {
|
||||
$if = $lldp['lldpRemPortDesc'];
|
||||
$id = $lldp['lldpRemPortId'];
|
||||
$remote_port_id = dbFetchCell('SELECT `port_id` FROM `ports` WHERE (`ifDescr` = ? OR `ifName` = ? OR `ifDescr` = ? OR `ifName` = ? OR `ifPhysAddress` = ?) AND `device_id` = ?', array($if, $if, $id, $id, $remote_port_mac_address, $remote_device_id));
|
||||
} else {
|
||||
$remote_port_id = '0';
|
||||
}
|
||||
if (is_numeric($interface['port_id']) && isset($lldp['lldpRemSysName']) && isset($lldp['lldpRemPortId'])) {
|
||||
discover_link($interface['port_id'], 'lldp', $remote_port_id, $lldp['lldpRemSysName'], $lldp['lldpRemPortId'], null, $lldp['lldpRemSysDesc'], $device['device_id'], $remote_device_id);
|
||||
}
|
||||
}//end foreach
|
||||
}
|
||||
|
||||
$remote_port_id = find_port_id(
|
||||
$lldp['lldpRemPortDesc'],
|
||||
$lldp['lldpRemPortId'],
|
||||
$remote_device_id,
|
||||
$remote_port_mac
|
||||
);
|
||||
|
||||
if (empty($lldp['lldpRemSysName'])) {
|
||||
$remote_device = device_by_id_cache($remote_device_id);
|
||||
$lldp['lldpRemSysName'] = $remote_device['sysName'] ?: $remote_device['hostname'];
|
||||
}
|
||||
|
||||
if ($interface['port_id'] && $lldp['lldpRemSysName'] && $lldp['lldpRemPortId']) {
|
||||
discover_link(
|
||||
$interface['port_id'],
|
||||
'lldp',
|
||||
$remote_port_id,
|
||||
$lldp['lldpRemSysName'],
|
||||
$lldp['lldpRemPortId'],
|
||||
null,
|
||||
$lldp['lldpRemSysDesc'],
|
||||
$device['device_id'],
|
||||
$remote_device_id
|
||||
);
|
||||
}
|
||||
}//end foreach
|
||||
}//end foreach
|
||||
}//end if
|
||||
}//end foreach
|
||||
|
||||
unset(
|
||||
$dot1d_array
|
||||
);
|
||||
echo PHP_EOL;
|
||||
}//end elseif
|
||||
|
||||
unset(
|
||||
$lldp_array
|
||||
);
|
||||
|
||||
echo ' OSPF Discovery: ';
|
||||
|
||||
if (Config::get('autodiscovery.ospf') === true) {
|
||||
echo "enabled\n";
|
||||
foreach (dbFetchRows('SELECT DISTINCT(`ospfNbrIpAddr`),`device_id` FROM `ospf_nbrs` WHERE `device_id`=?', array($device['device_id'])) as $nbr) {
|
||||
$ip = $nbr['ospfNbrIpAddr'];
|
||||
if (match_network(Config::get('autodiscovery.nets-exclude'), $ip)) {
|
||||
echo 'x';
|
||||
continue;
|
||||
}
|
||||
echo ' OSPF Discovery: ';
|
||||
$sql = 'SELECT DISTINCT(`ospfNbrIpAddr`),`device_id` FROM `ospf_nbrs` WHERE `device_id`=?';
|
||||
foreach (dbFetchRows($sql, array($device['device_id'])) as $nbr) {
|
||||
try {
|
||||
$ip = IP::parse($nbr['ospfNbrIpAddr']);
|
||||
|
||||
if (!match_network(Config::get('nets'), $ip)) {
|
||||
echo 'i';
|
||||
continue;
|
||||
}
|
||||
if ($ip->inNetworks(Config::get('autodiscovery.nets-exclude'))) {
|
||||
echo 'x';
|
||||
continue;
|
||||
}
|
||||
|
||||
$name = gethostbyaddr($ip);
|
||||
$remote_device_id = discover_new_device($name, $device, 'OSPF');
|
||||
if (!$ip->inNetworks(Config::get('nets'))) {
|
||||
echo 'i';
|
||||
continue;
|
||||
}
|
||||
|
||||
$name = gethostbyaddr($ip);
|
||||
$remote_device_id = discover_new_device($name, $device, 'OSPF');
|
||||
} catch (\LibreNMS\Exceptions\InvalidIpException $e) {
|
||||
//
|
||||
}
|
||||
}
|
||||
} else {
|
||||
echo "disabled\n";
|
||||
echo PHP_EOL;
|
||||
}
|
||||
|
||||
d_echo($link_exists);
|
||||
|
||||
$sql = "SELECT * FROM `links` AS L, `ports` AS I WHERE L.local_port_id = I.port_id AND I.device_id = '".$device['device_id']."'";
|
||||
foreach (dbFetchRows($sql) as $test) {
|
||||
$sql = "SELECT * FROM `links` AS L, `ports` AS I WHERE L.local_port_id = I.port_id AND I.device_id = ?";
|
||||
foreach (dbFetchRows($sql, array($device['device_id'])) as $test) {
|
||||
$local_port_id = $test['local_port_id'];
|
||||
$remote_hostname = $test['remote_hostname'];
|
||||
$remote_port = $test['remote_port'];
|
||||
@@ -243,8 +234,15 @@ foreach (dbFetchRows($sql) as $test) {
|
||||
}
|
||||
}
|
||||
|
||||
// remove orphaned links
|
||||
$deleted = dbQuery('DELETE `l` FROM `links` `l` LEFT JOIN `devices` `d` ON `d`.`device_id` = `l`.`local_device_id` WHERE `d`.`device_id` IS NULL');
|
||||
echo str_repeat('-', $deleted);
|
||||
d_echo(" $deleted orphaned links deleted\n");
|
||||
|
||||
unset(
|
||||
$link_exists,
|
||||
$sql
|
||||
$sql,
|
||||
$fdp_array,
|
||||
$cdp_array,
|
||||
$lldp_array
|
||||
);
|
||||
echo "\n";
|
||||
|
||||
Reference in New Issue
Block a user