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

don't discover ports that shouldn't be discovered!

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2347 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-05-18 23:08:45 +00:00
parent a1348cb7bb
commit 5033e81e87
3 changed files with 76 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/discovery/ports.inc.php
+27 -55
View File
@@ -4,70 +4,42 @@
echo("Ports : ");
$ports = snmp_walk($device, "ifDescr", "-Onsq", "IF-MIB");
$ports = str_replace("\"", "", $ports);
$ports = str_replace("ifDescr.", "", $ports);
#$ports = str_replace(" ", "||", $ports);
$ports = array();
$ports = snmpwalk_cache_oid($device, "ifDescr", $port_stats, "IF-MIB");
#$ports = snmpwalk_cache_oid($device, "ifName", $port_stats, "IF-MIB");
#$ports = snmpwalk_cache_oid($device, "ifType", $port_stats, "IF-MIB");
$interface_ignored = 0;
$interface_added = 0;
foreach (explode("\n", $ports) as $entry)
foreach ($ports as $ifIndex => $port)
{
$entry = trim($entry);
list($ifIndex, $ifDescr) = explode(" ", $entry, 2);
if (!strstr($entry, "irtual"))
{
$if = trim(strtolower($ifDescr));
$nullintf = 0;
foreach ($config['bad_if'] as $bi)
{
if (strstr($if, $bi))
{
$nullintf = 1;
if($debug) { echo("ignored : $bi : $if"); }
}
}
if (is_array($config['bad_if_regexp']))
{
foreach ($config['bad_if_regexp'] as $bi)
{
if (preg_match($bi ."i", $if))
{
$nullintf = 1;
if($debug) { echo("ignored : $bi : $if"); }
}
}
}
if (empty($ifDescr)) { $nullintf = 1; }
if ($device['os'] == "catos" && strstr($if, "vlan")) { $nullintf = 1; }
if ($device['os'] == "vmware" && preg_match("/Device ([a-z0-9]+) at .*/", $ifDescr, $matches)) { $ifDescr = $matches[1]; }
$ifDescr = fixifName($ifDescr);
if (is_port_valid($port, $device))
{
if ($device['os'] == "vmware" && preg_match("/Device ([a-z0-9]+) at .*/", $port['ifDescr'], $matches)) { $port['ifDescr'] = $matches[1]; }
$port['ifDescr'] = fixifName($port['ifDescr']);
if ($debug) echo("\n $if ");
if ($nullintf == 0)
if (mysql_result(mysql_query("SELECT COUNT(*) FROM `ports` WHERE `device_id` = '".$device['device_id']."' AND `ifIndex` = '$ifIndex'"), 0) == '0')
{
if (mysql_result(mysql_query("SELECT COUNT(*) FROM `ports` WHERE `device_id` = '".$device['device_id']."' AND `ifIndex` = '$ifIndex'"), 0) == '0')
{
mysql_query("INSERT INTO `ports` (`device_id`,`ifIndex`,`ifDescr`) VALUES ('".$device['device_id']."','$ifIndex','".mres($ifDescr)."')");
# Add Interface
echo("+");
} else {
mysql_query("UPDATE `ports` SET `deleted` = '0' WHERE `device_id` = '".$device['device_id']."' AND `ifIndex` = '$ifIndex'");
echo(".");
}
$int_exists[] = "$ifIndex";
mysql_query("INSERT INTO `ports` (`device_id`,`ifIndex`,`ifDescr`) VALUES ('".$device['device_id']."','$ifIndex','".mres($port['ifDescr'])."')");
# Add Interface
echo("+");
} else {
# Ignored Interface
if (mysql_result(mysql_query("SELECT COUNT(*) FROM `ports` WHERE `device_id` = '".$device['device_id']."' AND `ifIndex` = '$ifIndex'"), 0) != '0')
{
mysql_query("UPDATE `ports` SET `deleted` = '1' WHERE `device_id` = '".$device['device_id']."' AND `ifIndex` = '$ifIndex'");
# Delete Interface
echo("-"); ## Deleted Interface
} else {
echo("X"); ## Ignored Interface
}
mysql_query("UPDATE `ports` SET `deleted` = '0' WHERE `device_id` = '".$device['device_id']."' AND `ifIndex` = '$ifIndex'");
echo(".");
}
$int_exists[] = "$ifIndex";
} else {
# Ignored Interface
if (mysql_result(mysql_query("SELECT COUNT(*) FROM `ports` WHERE `device_id` = '".$device['device_id']."' AND `ifIndex` = '$ifIndex'"), 0) != '0')
{
mysql_query("UPDATE `ports` SET `deleted` = '1' WHERE `device_id` = '".$device['device_id']."' AND `ifIndex` = '$ifIndex'");
# Delete Interface
echo("-"); ## Deleted Interface
} else {
echo("X"); ## Ignored Interface
}
}
}
@@ -95,4 +67,4 @@ while ($test_if = mysql_fetch_assoc($query))
unset($temp_exists);
echo("\n");
?>
?>
includes/functions.php
+38
View File
@@ -582,4 +582,42 @@ function include_dir($dir, $regex = "")
}
}
function is_port_valid($port, $device)
{
global $config;
if (!strstr($port['ifDescr'], "irtual"))
{
$valid = 1;
$if = strtolower($port['ifDescr']);
foreach ($config['bad_if'] as $bi)
{
if (strstr($if, $bi))
{
$valid = 0;
if($debug) { echo("ignored : $bi : $if"); }
}
}
if (is_array($config['bad_if_regexp']))
{
foreach ($config['bad_if_regexp'] as $bi)
{
if (preg_match($bi ."i", $if))
{
$valid = 0;
if($debug) { echo("ignored : $bi : ".$if); }
}
}
}
if (empty($port['ifDescr'])) { $valid = 0; }
if ($device['os'] == "catos" && strstr($if, "vlan")) { $valid = 0; }
} else {
$valid = 0;
}
return $valid;
}
?>
includes/polling/ports.inc.php
+11 -8
View File
@@ -105,15 +105,18 @@ foreach ($ports_db as $port) { $ports[$port['ifIndex']] = $port; }
/// New interface detection
foreach ($port_stats as $ifIndex => $port)
{
if (!is_array($ports[$port['ifIndex']]))
if (is_port_valid($port, $device))
{
$interface_id = dbInsert(array('device_id' => $device['device_id'], 'ifIndex' => $ifIndex), 'ports');
$ports[$port['ifIndex']] = dbFetchRow("SELECT * FROM `ports` WHERE `interface_id` = ?", array($interface_id));
echo("Adding: ".$port['ifName']."(".$ifIndex.")(".$ports[$port['ifIndex']]['interface_id'].")");
#print_r($ports);
} elseif ($ports[$ifIndex]['deleted'] == "1") {
dbUpdate(array('deleted' => '0'), 'ports', '`interface_id` = ?', array($ports[$ifIndex]['interface_id']));
$ports[$ifIndex]['deleted'] = "0";
if (!is_array($ports[$port['ifIndex']]))
{
$interface_id = dbInsert(array('device_id' => $device['device_id'], 'ifIndex' => $ifIndex), 'ports');
$ports[$port['ifIndex']] = dbFetchRow("SELECT * FROM `ports` WHERE `interface_id` = ?", array($interface_id));
echo("Adding: ".$port['ifName']."(".$ifIndex.")(".$ports[$port['ifIndex']]['interface_id'].")");
#print_r($ports);
} elseif ($ports[$ifIndex]['deleted'] == "1") {
dbUpdate(array('deleted' => '0'), 'ports', '`interface_id` = ?', array($ports[$ifIndex]['interface_id']));
$ports[$ifIndex]['deleted'] = "0";
}
}
}
/// End New interface detection