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

Add ARP discovery patch (untested)

Browse Source
This commit is contained in:
Paul Gear
2013-10-28 15:55:57 +10:00
parent a3e276b8b2
commit 510c2b0fc4
3 changed files with 132 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
includes/defaults.inc.php
View File

@@ -162,6 +162,14 @@ $config['autodiscovery']['snmpscan'] = TRUE; // autodiscover hosts via SNM
$config['discover_services'] = FALSE; // Autodiscover services via SNMP on devices of type "server"
// Networks to exclude from autodiscovery
$config['autodiscovery']['nets-exclude'][] = "0.0.0.0/8";
$config['autodiscovery']['nets-exclude'][] = "127.0.0.0/8";
$config['autodiscovery']['nets-exclude'][] = "169.254.0.0/16";
$config['autodiscovery']['nets-exclude'][] = "224.0.0.0/4";
$config['autodiscovery']['nets-exclude'][] = "240.0.0.0/4";
// Mailer backend Settings
$config['email_backend'] = 'mail'; // Mail backend. Allowed: "mail" (PHP's built-in), "sendmail", "smtp".
@@ -520,6 +528,7 @@ $config['discovery_modules']['storage'] = 1;
$config['discovery_modules']['hr-device'] = 1;
$config['discovery_modules']['discovery-protocols'] = 1;
$config['discovery_modules']['arp-table'] = 1;
$config['discovery_modules']['discovery-arp'] = 0;
$config['discovery_modules']['junose-atm-vp'] = 1;
$config['discovery_modules']['bgp-peers'] = 1;
$config['discovery_modules']['vlans'] = 1;

99
includes/discovery/discovery-arp.inc.php Normal file
View File

@@ -0,0 +1,99 @@
<?php
//
// Observium module to do device discovery by ARP table contents.
//
// Needs to be run after the ARP table discovery, because it uses the
// data gathered by the ARP table discovery module. Keeps a cache of
// seen hosts, and will not attempt re-discovery of the same IP (whether
// discovery failed or succeed) during the same discovery run.
//
// Copyright (c) 2012-2013 Gear Consulting Pty Ltd <http://libertysys.com.au/>
//
// Author: Paul Gear <observium@libertysys.com.au>
// License: GPLv3
//
include_once("../../includes/print-interface.inc.php");
echo("ARP Discovery: ");
$hostname = $device['hostname'];
$deviceid = $device['device_id'];
// Find all IPv4 addresses in the MAC table that haven't been discovered on monitored devices.
$sql = "
SELECT *
FROM ip_mac as m, ports as i
WHERE m.port_id = i.port_id
AND i.device_id = ?
AND i.deleted = 0
AND NOT EXISTS (
SELECT * FROM ipv4_addresses a
WHERE a.ipv4_address = m.ip_address
)
GROUP BY ip_address
ORDER BY ip_address
";
unset($names);
unset($ips);
foreach (dbFetchRows($sql, array($deviceid)) as $entry)
{
global $config;
$ip = $entry['ip_address'];
$mac = $entry['mac_address'];
$if = $entry['port_id'];
$int = humanize_port($if);
$label = $int['label'];
// Even though match_network is done inside discover_new_device, we do it here
// as well in order to skip unnecessary reverse DNS lookups on discovered IPs.
if (match_network($config['autodiscovery']['nets-exclude'], $ip)) {
echo("x");
continue;
}
if (!match_network($config['nets'], $ip)) {
echo("i");
log_event("Ignored $ip", $deviceid, 'interface', $if);
continue;
}
// Attempt discovery of each IP only once per run.
if (arp_discovery_is_cached($ip)) {
echo(".");
continue;
}
arp_discovery_add_cache($ip);
// Log reverse DNS failures so the administrator can take action.
$name = gethostbyaddr($ip);
if ($name != $ip) { // gethostbyaddr returns the original argument on failure
echo("+");
$names[] = $name;
$ips[$name] = $ip;
}
else {
echo("-");
log_event("ARP discovery of $ip failed due to absent reverse DNS", $deviceid, 'interface', $if);
}
}
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 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);
}
}
unset($names);
unset($ips);
?>

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

@@ -23,6 +23,12 @@ function discover_new_device($hostname)
}
$ip = gethostbyname($dst_host);
$dst_host = rtrim($dst_host, '.'); // remove trailing dot
if ( match_network($config['autodiscovery']['nets-exclude'], $ip)) {
return FALSE;
}
if ( match_network($config['nets'], $ip) )
{
$remote_device_id = addHost ($dst_host);
@@ -543,4 +549,22 @@ function discover_process_ipv6(&$valid, $ifIndex,$ipv6_address,$ipv6_prefixlen,$
}
}
// maintain a simple cache of seen IPs during ARP discovery
function arp_discovery_add_cache($ip)
{
global $arp_discovery;
$arp_discovery[$ip] = TRUE;
}
function arp_discovery_is_cached($ip)
{
global $arp_discovery;
if (array_key_exists($ip, $arp_discovery)) {
return $arp_discovery[$ip];
}
else {
return FALSE;
}
}
?>