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

Updated to log discovery info via discover_new_device()

Browse Source
This commit is contained in:
laf
2015-07-12 19:57:25 +01:00
parent 2ff989474c
commit 1bbe1b7ccf
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
includes/discovery/bgp-peers.inc.php
View File

@@ -95,12 +95,7 @@ if ($config['enable_bgp'])
$add = dbInsert(array('device_id' => $device['device_id'], 'bgpPeerIdentifier' => $peer['ip'], 'bgpPeerRemoteAs' => $peer['as']), 'bgpPeers');
if ($config['autodiscovery']['bgp'] === true) {
$name = gethostbyaddr($peer['ip']);
$remote_device_id = discover_new_device($name);
if ($remote_device_id) {
log_event("Device $name (" . $peer['ip'] .") autodiscovered through BGP on ".$device['hostname'], $remote_device_id, 'system');
} else {
log_event("BGP discovery of $name (" . $peer['ip'] . ") failed - check ping and SNMP access", $device['device_id'], 'system');
}
$remote_device_id = discover_new_device($name,$device,'BGP');
}
echo("+");
} else {

8
includes/discovery/discovery-arp.inc.php
View File

@@ -85,13 +85,7 @@ echo("\n");
// Run device discovery on each of the devices we've detected so far.
foreach ($names as $name) {
$remote_device_id = discover_new_device($name);
if ($remote_device_id) {
log_event("Device $name (" . $ips[$name] .") autodiscovered through ARP on $hostname", $remote_device_id, 'interface', $if);
}
else {
log_event("ARP discovery of $name (" . $ips[$name] . ") failed - check ping and SNMP access", $deviceid, 'interface', $if);
}
$remote_device_id = discover_new_device($name,$device,'ARP');
}
unset($names);

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

@@ -11,7 +11,7 @@
* See COPYING for more details.
*/
function discover_new_device($hostname)
function discover_new_device($hostname,$device,$method)
{
global $config, $debug;
@@ -44,6 +44,11 @@ function discover_new_device($hostname)
echo("+[".$remote_device['hostname']."(".$remote_device['device_id'].")]");
discover_device($remote_device);
device_by_id_cache($remote_device_id, 1);
if ($remote_device_id) {
log_event("Device $". $remote_device['hostname'] ." ($ip) autodiscovered through $method on ".$device['hostname'], $remote_device_id, 'system');
} else {
log_event("$method discovery of ". $remote_device['hostname'] ." ($ip) failed - check ping and SNMP access", $device['device_id'], 'system');
}
return $remote_device_id;
}
} else {