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

refactor: Update some snmpwalks for ports polling to improve speed (#6341)

Browse Source
This commit is contained in:
Neil Lathwood
2017-04-05 16:13:57 +01:00
committed by GitHub
parent e583fb8c46
commit da68e50c00
1 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,23 +66,6 @@ $stat_oids_db_extended = array(
'ifOutMulticastPkts', 'ifOutMulticastPkts',
); );
// From above for DB
$etherlike_oids = array(
'dot3StatsAlignmentErrors',
'dot3StatsFCSErrors',
'dot3StatsSingleCollisionFrames',
'dot3StatsMultipleCollisionFrames',
'dot3StatsSQETestErrors',
'dot3StatsDeferredTransmissions',
'dot3StatsLateCollisions',
'dot3StatsExcessiveCollisions',
'dot3StatsInternalMacTransmitErrors',
'dot3StatsCarrierSenseErrors',
'dot3StatsFrameTooLongs',
'dot3StatsInternalMacReceiveErrors',
'dot3StatsSymbolErrors',
);
$cisco_oids = array( $cisco_oids = array(
'locIfHardType', 'locIfHardType',
'locIfInRunts', 'locIfInRunts',
@@ -99,6 +82,9 @@ $cisco_oids = array(
$pagp_oids = array( $pagp_oids = array(
'pagpOperationMode', 'pagpOperationMode',
);
$pagp_extended_oids = array(
'pagpPortState', 'pagpPortState',
'pagpPartnerDeviceId', 'pagpPartnerDeviceId',
'pagpPartnerLearnMethod', 'pagpPartnerLearnMethod',
@@ -224,11 +210,11 @@ if ($device['os'] === 'f5' && (version_compare($device['version'], '11.2.0', '>=
} }
} }
if ($config['enable_ports_etherlike']) { if ($device['os'] != 'asa') {
echo 'dot3Stats ';
$port_stats = snmpwalk_cache_oid($device, 'dot3StatsEntry', $port_stats, 'EtherLike-MIB');
} elseif ($device['os'] != 'asa') {
echo 'dot3StatsDuplexStatus'; echo 'dot3StatsDuplexStatus';
if ($config['enable_ports_poe'] || $config['enable_ports_etherlike']) {
$port_stats = snmpwalk_cache_oid($device, 'dot3StatsIndex', $port_stats, 'EtherLike-MIB');
}
$port_stats = snmpwalk_cache_oid($device, 'dot3StatsDuplexStatus', $port_stats, 'EtherLike-MIB'); $port_stats = snmpwalk_cache_oid($device, 'dot3StatsDuplexStatus', $port_stats, 'EtherLike-MIB');
} }
@@ -265,13 +251,17 @@ if ($config['enable_ports_poe']) {
$port_stats = snmpwalk_cache_oid($device, 'cpeExtPsePortEntry', $port_stats, 'CISCO-POWER-ETHERNET-EXT-MIB'); $port_stats = snmpwalk_cache_oid($device, 'cpeExtPsePortEntry', $port_stats, 'CISCO-POWER-ETHERNET-EXT-MIB');
} }
// FIXME This probably needs re-enabled. We need to clear these things when they get unset, too.
// foreach ($etherlike_oids as $oid) { $port_stats = snmpwalk_cache_oid($device, $oid, $port_stats, "EtherLike-MIB"); }
// foreach ($cisco_oids as $oid) { $port_stats = snmpwalk_cache_oid($device, $oid, $port_stats, "OLD-CISCO-INTERFACES-MIB"); }
// foreach ($pagp_oids as $oid) { $port_stats = snmpwalk_cache_oid($device, $oid, $port_stats, "CISCO-PAGP-MIB"); }
if ($device['os_group'] == 'cisco' && $device['os'] != 'asa') { if ($device['os_group'] == 'cisco' && $device['os'] != 'asa') {
foreach ($pagp_oids as $oid) { foreach ($pagp_oids as $oid) {
$port_stats = snmpwalk_cache_oid($device, $oid, $port_stats, 'CISCO-PAGP-MIB'); $pagp_port_stats = snmpwalk_cache_oid($device, $oid, array(), 'CISCO-PAGP-MIB');
}
if (count($pagp_port_stats) > 0) {
foreach ($pagp_port_stats as $p_index => $p_stats) {
$port_stats[$p_index]['pagpOperationMode'] = $p_stats['pagpOperationMode'];
}
foreach ($pagp_extended_oids as $oid) {
$port_stats = snmpwalk_cache_oid($device, $oid, $port_stats, 'CISCO-PAGP-MIB');
}
} }
// Grab data to put ports into vlans or make them trunks // Grab data to put ports into vlans or make them trunks
@@ -280,7 +270,7 @@ if ($device['os_group'] == 'cisco' && $device['os'] != 'asa') {
$port_stats = snmpwalk_cache_oid($device, 'vlanTrunkPortEncapsulationOperType', $port_stats, 'CISCO-VTP-MIB'); $port_stats = snmpwalk_cache_oid($device, 'vlanTrunkPortEncapsulationOperType', $port_stats, 'CISCO-VTP-MIB');
$port_stats = snmpwalk_cache_oid($device, 'vlanTrunkPortNativeVlan', $port_stats, 'CISCO-VTP-MIB'); $port_stats = snmpwalk_cache_oid($device, 'vlanTrunkPortNativeVlan', $port_stats, 'CISCO-VTP-MIB');
} elseif ($device['os'] != 'asa') { } elseif ($device['os'] != 'asa') {
$port_stats = snmpwalk_cache_oid($device, 'dot1qPortVlanTable', $port_stats, 'Q-BRIDGE-MIB'); $port_stats = snmpwalk_cache_oid($device, 'dot1qPvid', $port_stats, 'Q-BRIDGE-MIB');
}//end if }//end if
$polled = time(); $polled = time();
@@ -806,4 +796,4 @@ foreach ($ports as $port) {
} //end port update } //end port update
// Clear Variables Here // Clear Variables Here
unset($port_stats, $ports_found, $data_oids, $stat_oids, $stat_oids_db, $stat_oids_db_extended, $etherlike_oids, $cisco_oids, $pagp_oids, $ifmib_oids, $hc_test, $ports_mapped, $ports, $_stat_oids, $rrd_def); unset($port_stats, $ports_found, $data_oids, $stat_oids, $stat_oids_db, $stat_oids_db_extended, $cisco_oids, $pagp_oids, $ifmib_oids, $hc_test, $ports_mapped, $ports, $_stat_oids, $rrd_def);