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

Updated BGP polling for Cisco to support CISCO-BGP4-MIB better

Browse Source
This commit is contained in:
laf
2015-06-02 16:32:39 +01:00
parent 9ea274e9a4
commit b9dabae7d8
5 changed files with 2382 additions and 1161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
includes/discovery/bgp-peers.inc.php
View File

@@ -20,18 +20,26 @@ if ($config['enable_bgp'])
echo("Updated AS ");
}
$peers_data = snmp_walk($device, "BGP4-MIB::bgpPeerRemoteAs", "-Oq", "BGP4-MIB", $config['mibdir']);
$peer2 = FALSE;
$peers_data = snmp_walk($device, "cbgpPeer2RemoteAs", "-Oq", "CISCO-BGP4-MIB", $config['mibdir']);
if (empty($peers_data)) {
$peers_data = snmp_walk($device, "BGP4-MIB::bgpPeerRemoteAs", "-Oq", "BGP4-MIB", $config['mibdir']);
} else {
$peer2 = TRUE;
}
if ($debug) { echo("Peers : $peers_data \n"); }
$peers = trim(str_replace("BGP4-MIB::bgpPeerRemoteAs.", "", $peers_data));
$peers = trim(str_replace("CISCO-BGP4-MIB::cbgpPeer2RemoteAs.", "", $peers_data));
$peers = trim(str_replace("BGP4-MIB::bgpPeerRemoteAs.", "", $peers));
foreach (explode("\n", $peers) as $peer)
{
list($ver, $peer) = explode(".", $peer,2);
list($peer_ip, $peer_as) = explode(" ", $peer);
if ($peer && $peer_ip != "0.0.0.0")
{
if ($debug) { echo("Found peer $peer_ip (AS$peer_as)\n"); }
$peerlist[] = array('ip' => $peer_ip, 'as' => $peer_as);
$peerlist[] = array('ip' => $peer_ip, 'as' => $peer_as, 'ver' => $ver);
}
} # Foreach
@@ -92,18 +100,28 @@ if ($config['enable_bgp'])
// Get afi/safi and populate cbgp on cisco ios (xe/xr)
unset($af_list);
$af_data = snmp_walk($device, "cbgpPeerAddrFamilyName." . $peer['ip'], "-OsQ", "CISCO-BGP4-MIB", $config['mibdir']);
if ($debug) { echo("afi data :: $af_data \n"); }
$afs = trim(str_replace("cbgpPeerAddrFamilyName.".$peer['ip'].".", "", $af_data));
foreach (explode("\n", $afs) as $af)
if ($peer2 === TRUE) {
$af_data = snmpwalk_cache_oid($device, "cbgpPeer2AddrFamilyEntry", $cbgp, "CISCO-BGP4-MIB", $config['mibdir']);
} else {
$af_data = snmpwalk_cache_oid($device, "cbgpPeerAddrFamilyEntry", $cbgp, "CISCO-BGP4-MIB", $config['mibdir']);
}
if ($debug) {
echo("afi data :: ");
print_r($af_data);
}
foreach ($af_data as $k => $v)
{
if ($debug) { echo("AFISAFI = $af\n"); }
list($afisafi, $text) = explode(" = ", $af);
list($afi, $safi) = explode(".", $afisafi);
if ($afi && $safi)
if ($peer2 === TRUE) {
list(,$k) = explode('.',$k,2);
}
if ($debug) { echo("AFISAFI = $k\n"); }
$afisafi_tmp = explode('.', $k);
$safi = array_pop($afisafi_tmp);
$afi = array_pop($afisafi_tmp);
$bgp_ip = str_replace(".$afi.$safi", "", $k);
if ($afi && $safi && $bgp_ip == $peer['ip'])
{
$af_list[$afi][$safi] = 1;
$af_list[$bgp_ip][$afi][$safi] = 1;
if (dbFetchCell("SELECT COUNT(*) from `bgpPeers_cbgp` WHERE device_id = ? AND bgpPeerIdentifier = ?, AND afi=? AND safi=?",array($device['device_id'], $peer['ip'],$afi,$safi)) == 0)
{
dbInsert(array('device_id' => $device['device_id'], 'bgpPeerIdentifier' => $peer['ip'], 'afi' => $afi, 'safi' => $safi), 'bgpPeers_cbgp');
@@ -170,7 +188,7 @@ if ($config['enable_bgp'])
{
$afi = $entry['afi'];
$safi = $entry['safi'];
if (!$af_list[$afi][$safi])
if (!$af_list[$afi][$safi] || !$af_list[$entry['bgpPeerIdentifier']][$afi][$safi])
{
dbDelete('bgpPeers_cbgp', '`device_id` = ? AND `bgpPeerIdentifier` = ?, afi=?, safi=?', array($device['device_id'],$peer['ip'],$afi,$safi));
}