nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-12 16:06:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make OSPF & ARP autodiscovery independent of xDP autodiscovery

Browse Source 
Both OSPF & ARP discovery use discover_new_device(), but it was checking
$config[autodiscovery][xdp] internally, meaning xDP had to be enabled for the other two to work.
This commit is contained in:
Paul Gear
2015-05-18 20:32:11 +10:00
parent b8b9ef7abe
commit ab66b453e4
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/discovery/discovery-protocols.inc.php
+3 -3
View File
@@ -6,7 +6,7 @@ global $link_exists;
$community = $device['community'];
if ($device['os'] == "ironware")
if ($device['os'] == "ironware" && $config['autodiscovery']['xdp'] === TRUE)
{
echo(" Brocade FDP: ");
$fdp_array = snmpwalk_cache_twopart_oid($device, "snFdpCacheEntry", array(), "FOUNDRY-SN-SWITCH-GROUP-MIB");
@@ -47,7 +47,7 @@ if ($device['os'] == "ironware")
echo(" CISCO-CDP-MIB: ");
unset($cdp_array);
$cdp_array = snmpwalk_cache_twopart_oid($device, "cdpCache", array(), "CISCO-CDP-MIB");
if ($cdp_array)
if ($cdp_array && $config['autodiscovery']['xdp'] === TRUE)
{
unset($cdp_links);
foreach (array_keys($cdp_array) as $key)
@@ -96,7 +96,7 @@ unset($lldp_array);
$lldp_array = snmpwalk_cache_threepart_oid($device, "lldpRemoteSystemsData", array(), "LLDP-MIB");
$dot1d_array = snmpwalk_cache_oid($device, "dot1dBasePortIfIndex", array(), "BRIDGE-MIB");
if ($lldp_array)
if ($lldp_array && $config['autodiscovery']['xdp'] === TRUE)
{
$lldp_links = "";
foreach (array_keys($lldp_array) as $key)
includes/discovery/functions.inc.php
+1 -6
View File
@@ -13,9 +13,8 @@
function discover_new_device($hostname)
{
global $config, $debug;
global $config, $debug;
if ($config['autodiscovery']['xdp']) {
if (!empty($config['mydomain']) && isDomainResolves($hostname . "." . $config['mydomain']) ) {
$dst_host = $hostname . "." . $config['mydomain'];
} else {
@@ -50,10 +49,6 @@ function discover_new_device($hostname)
} else {
if ($debug) { echo("$ip not in a matched network - skipping\n"); }
}
} else {
if ($debug) { echo("autodiscovery disabled - skipping\n"); }
return FALSE;
}
}
function discover_device($device, $options = NULL)