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

Improved ports-fdb discovery sql queries (#10883)

Browse Source 
* Improve ports-fdb discovery sql queries
* fix indentation
This commit is contained in:
Tony Murray
2019-12-02 15:45:18 -06:00
committed by PipoCanaja
parent 85addc5933
commit f544c32567
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
includes/discovery/fdb-table.inc.php
View File

@ -30,6 +30,8 @@ if (empty($insert)) {
}
if (!empty($insert)) {
$update_time_only = [];
$now = \Carbon\Carbon::now();
// synchronize with the database
foreach ($insert as $vlan_id => $mac_address_table) {
echo " {$vlans_by_id[$vlan_id]}: ";
@ -37,37 +39,30 @@ if (!empty($insert)) {
foreach ($mac_address_table as $mac_address_entry => $entry) {
if ($existing_fdbs[$vlan_id][$mac_address_entry]) {
$new_port = $entry['port_id'];
$port_fdb_id = $existing_fdbs[$vlan_id][$mac_address_entry]['ports_fdb_id'];
if ($existing_fdbs[$vlan_id][$mac_address_entry]['port_id'] != $new_port) {
$port_fdb_id = $existing_fdbs[$vlan_id][$mac_address_entry]['ports_fdb_id'];
dbUpdate(
array('port_id' => $new_port, 'updated_at' => array('NOW()'),),
'ports_fdb',
'`device_id` = ? AND `vlan_id` = ? AND `mac_address` = ?',
array($device['device_id'], $vlan_id, $mac_address_entry)
);
DB::table('ports_fdb')
->where('ports_fdb_id', $port_fdb_id)
->update([
'port_id' => $new_port,
'updated_at' => $now,
]);
echo 'U';
} else {
dbUpdate(
array('updated_at' => array('NOW()'),), //we need to do this unless we use Eloquent "update" method
'ports_fdb',
'`device_id` = ? AND `vlan_id` = ? AND `mac_address` = ?',
array($device['device_id'], $vlan_id, $mac_address_entry)
);
$update_time_only[] = $port_fdb_id;
echo '.';
}
unset($existing_fdbs[$vlan_id][$mac_address_entry]);
} else {
$new_entry = array(
DB::table('ports_fdb')->insert([
'port_id' => $entry['port_id'],
'mac_address' => $mac_address_entry,
'vlan_id' => $vlan_id,
'device_id' => $device['device_id'],
'created_at' => array('NOW()'), //we need to do this unless we use Eloquent "create" method
'updated_at' => array('NOW()'), //we need to do this unless we use Eloquent "update" method
);
dbInsert($new_entry, 'ports_fdb');
'created_at' => $now,
'updated_at' => $now,
]);
echo '+';
}
}
@ -75,6 +70,8 @@ if (!empty($insert)) {
echo PHP_EOL;
}
DB::table('ports_fdb')->whereIn('ports_fdb_id', $update_time_only)->update(['updated_at' => $now]);
//We do not delete anything here, as daily.sh will take care of the cleaning.
// Delete old entries from the database
@ -91,5 +88,7 @@ unset(
$vlans,
$port,
$fdbPort_table,
$entries
$entries,
$update_time_only,
$now
);