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

more db* (and add on-the-fly discovery of ports and removal of OSPF areas)

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2338 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-05-16 21:56:01 +00:00
parent 59521d8778
commit 66b34b8999
11 changed files with 121 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
includes/polling/ports.inc.php
View File

@@ -5,8 +5,6 @@
#$ports = snmp_cache_ifIndex($device); // Cache Port List
# /FIXME
#mysql_query("INSERT INTO `ports` (`device_id`,`ifIndex`) VALUES ('".$device['device_id']."','$ifIndex')");
// Build SNMP Cache Array
$data_oids = array('ifName','ifDescr','ifAlias', 'ifAdminStatus', 'ifOperStatus', 'ifMtu', 'ifSpeed', 'ifHighSpeed', 'ifType', 'ifPhysAddress',
'ifPromiscuousMode','ifConnectorPresent','ifDuplex');
@@ -45,7 +43,7 @@ if ($config['enable_ports_etherlike'])
if ($config['enable_ports_adsl'])
{
$device['adsl_count'] = mysql_result(mysql_query("SELECT COUNT(*) FROM `ports` WHERE `device_id` = '".$device['device_id']."' AND `ifType` = 'adsl'"),0);
$device['adsl_count'] = dbFetchCell("SELECT COUNT(*) FROM `ports` WHERE `device_id` = ? AND `ifType` = 'adsl'", array($device['device_id']));
}
if ($device['adsl_count'] > "0")
@@ -111,7 +109,6 @@ foreach ($port_stats as $ifIndex => $port)
{
$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));
mysql_error();
echo("Adding: ".$port['ifName']."(".$ifIndex.")(".$ports[$port['ifIndex']]['interface_id'].")");
#print_r($ports);
} elseif ($ports[$ifIndex]['deleted'] == "1") {
@@ -314,13 +311,13 @@ foreach ($ports as $port)
if($device['os'] == "aos") { include("port-alcatel.inc.php"); }
// Update MySQL
// Update Database
if (count($port['update']))
{
$updated = dbUpdate($port['update'], 'ports', '`interface_id` = ?', array($port['interface_id']));
if($debug) { echo("$updated updated"); }
}
// End Update MySQL
// End Update Database
// Send alerts for interface flaps.
if ($config['warn']['ifdown'] && ($port['ifOperStatus'] != $this_port['ifOperStatus']) && $port['ignore'] == 0)