mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
fix: Fixed cbgp peers data on some devices (#8208)
* IOSXR snmprec data (unsorted) * iosxr sorted * Fix cbgp peers data on some devices * fix formatting
This commit is contained in:
Tony Murray
committed by
Neil Lathwood
Neil Lathwood
parent
a2acccd531
commit
f706d0ab41
@@ -49,32 +49,31 @@ if (Config::get('enable_bgp')) {
|
||||
$peerlist = build_bgp_peers($device, $peers_data, $peer2);
|
||||
|
||||
// Process discovered peers
|
||||
if (isset($peerlist)) {
|
||||
if (!empty($peerlist)) {
|
||||
$af_data = array();
|
||||
$af_list = array();
|
||||
|
||||
foreach ($peerlist as $peer) {
|
||||
$astext = get_astext($peer['as']);
|
||||
$peer['astext'] = $astext;
|
||||
$peer['astext'] = get_astext($peer['as']);
|
||||
|
||||
add_bgp_peer($device, $peer);
|
||||
|
||||
$af_data = array();
|
||||
$af_list = array();
|
||||
|
||||
if ($device['os_group'] == 'cisco') {
|
||||
if (empty($af_data)) {
|
||||
if (empty($af_data)) {
|
||||
if ($device['os_group'] == 'cisco') {
|
||||
if ($peer2 === true) {
|
||||
$af_data = snmpwalk_cache_oid($device, 'cbgpPeer2AddrFamilyEntry', array(), 'CISCO-BGP4-MIB');
|
||||
} else {
|
||||
$af_data = snmpwalk_cache_oid($device, 'cbgpPeerAddrFamilyEntry', array(), 'CISCO-BGP4-MIB');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($device['os_group'] === 'arista') {
|
||||
if (empty($af_data)) {
|
||||
if (empty($af_data)) {
|
||||
$af_data = snmpwalk_cache_oid($device, 'cbgpPeerAddrFamilyEntry', array(), 'CISCO-BGP4-MIB');
|
||||
$peer2 = false;
|
||||
}
|
||||
} elseif ($device['os_group'] === 'arista') {
|
||||
$af_data = snmpwalk_cache_oid($device, 'aristaBgp4V2PrefixInPrefixes', $af_data, 'ARISTA-BGP4V2-MIB');
|
||||
}
|
||||
}
|
||||
|
||||
// build the list
|
||||
if (!empty($af_data)) {
|
||||
$af_list = build_cbgp_peers($device, $peer, $af_data, $peer2);
|
||||
}
|
||||
@@ -126,7 +125,7 @@ if (Config::get('enable_bgp')) {
|
||||
}
|
||||
}
|
||||
|
||||
$af_query = "SELECT * FROM bgpPeers_cbgp WHERE `device_id` = '".$device['device_id']."' AND bgpPeerIdentifier = '".$peer['ip']."'";
|
||||
$af_query = "SELECT bgpPeerIdentifier, afi, safi FROM bgpPeers_cbgp WHERE `device_id` = '".$device['device_id']."' AND bgpPeerIdentifier = '".$peer['ip']."'";
|
||||
foreach (dbFetchRows($af_query) as $entry) {
|
||||
$afi = $entry['afi'];
|
||||
$safi = $entry['safi'];
|
||||
@@ -141,30 +140,20 @@ if (Config::get('enable_bgp')) {
|
||||
unset($j_peerIndexes);
|
||||
}
|
||||
|
||||
// Delete removed peers
|
||||
$sql = "SELECT * FROM bgpPeers WHERE device_id = '".$device['device_id']."' AND (context_name = '".$device['context_name']."' OR context_name IS NULL)";
|
||||
$params = array_column($peerlist, 'ip');
|
||||
$query = 'device_id=? AND bgpPeerIdentifier NOT IN ' . dbGenPlaceholders(count($params));
|
||||
array_unshift($params, $device['device_id']); // prepend device_id
|
||||
|
||||
foreach (dbFetchRows($sql) as $entry) {
|
||||
unset($exists);
|
||||
$i = 0;
|
||||
while ($i < count($peerlist) && !isset($exists)) {
|
||||
if ($peerlist[$i]['ip'] == $entry['bgpPeerIdentifier']) {
|
||||
$exists = 1;
|
||||
}
|
||||
$deleted = dbDelete('bgpPeers', $query, $params);
|
||||
dbDelete('bgpPeers_cbgp', $query, $params);
|
||||
|
||||
$i++;
|
||||
}
|
||||
echo str_repeat('-', $deleted);
|
||||
echo PHP_EOL;
|
||||
|
||||
if (!isset($exists)) {
|
||||
dbDelete('bgpPeers', '`bgpPeer_id` = ?', array($entry['bgpPeer_id']));
|
||||
dbDelete('bgpPeers_cbgp', '`bgpPeer_id` = ?', array($entry['bgpPeer_id']));
|
||||
echo '-';
|
||||
}
|
||||
}
|
||||
echo "\n";
|
||||
unset(
|
||||
$device['context_name'],
|
||||
$peerlist
|
||||
$peerlist,
|
||||
$af_data
|
||||
);
|
||||
}
|
||||
unset(
|
||||
|
||||
@@ -254,46 +254,47 @@ if ($config['enable_bgp']) {
|
||||
|
||||
if (!empty($check)) {
|
||||
$cgp_peer_identifier = $ip_type.'.'.$ip_len.'.'.$bgp_peer_ident.'.'.$ip_type.'.'.$ip_cast;
|
||||
$cbgp_data_tmp = snmp_get_multi(
|
||||
$device,
|
||||
' cbgpPeer2AcceptedPrefixes.'.$cgp_peer_identifier.' cbgpPeer2DeniedPrefixes.'.$cgp_peer_identifier.' cbgpPeer2PrefixAdminLimit.'.$cgp_peer_identifier.' cbgpPeer2PrefixThreshold.'.$cgp_peer_identifier.' cbgpPeer2PrefixClearThreshold.'.$cgp_peer_identifier.' cbgpPeer2AdvertisedPrefixes.'.$cgp_peer_identifier.' cbgpPeer2SuppressedPrefixes.'.$cgp_peer_identifier.' cbgpPeer2WithdrawnPrefixes.'.$cgp_peer_identifier,
|
||||
'-OQUs',
|
||||
'CISCO-BGP4-MIB'
|
||||
$cbgp2_oids = array(
|
||||
'cbgpPeer2AcceptedPrefixes.' . $cgp_peer_identifier,
|
||||
'cbgpPeer2DeniedPrefixes.' . $cgp_peer_identifier,
|
||||
'cbgpPeer2PrefixAdminLimit.' . $cgp_peer_identifier,
|
||||
'cbgpPeer2PrefixThreshold.' . $cgp_peer_identifier,
|
||||
'cbgpPeer2PrefixClearThreshold.' . $cgp_peer_identifier,
|
||||
'cbgpPeer2AdvertisedPrefixes.' . $cgp_peer_identifier,
|
||||
'cbgpPeer2SuppressedPrefixes.' . $cgp_peer_identifier,
|
||||
'cbgpPeer2WithdrawnPrefixes.' . $cgp_peer_identifier,
|
||||
);
|
||||
$ident = "$ip_ver.\"".$peer['bgpPeerIdentifier'].'"'.'.'.$ip_type.'.'.$ip_cast;
|
||||
unset($cbgp_data);
|
||||
$temp_keys = array_keys($cbgp_data_tmp);
|
||||
unset($temp_data);
|
||||
$temp_data['cbgpPeer2AcceptedPrefixes'] = $cbgp_data_tmp[$temp_keys[0]]['cbgpPeer2AcceptedPrefixes'];
|
||||
$temp_data['cbgpPeer2DeniedPrefixes'] = $cbgp_data_tmp[$temp_keys[0]]['cbgpPeer2DeniedPrefixes'];
|
||||
$temp_data['cbgpPeer2PrefixAdminLimit'] = $cbgp_data_tmp[$temp_keys[0]]['cbgpPeer2PrefixAdminLimit'];
|
||||
$temp_data['cbgpPeer2PrefixThreshold'] = $cbgp_data_tmp[$temp_keys[0]]['cbgpPeer2PrefixThreshold'];
|
||||
$temp_data['cbgpPeer2PrefixClearThreshold'] = $cbgp_data_tmp[$temp_keys[0]]['cbgpPeer2PrefixClearThreshold'];
|
||||
$temp_data['cbgpPeer2AdvertisedPrefixes'] = $cbgp_data_tmp[$temp_keys[0]]['cbgpPeer2AdvertisedPrefixes'];
|
||||
$temp_data['cbgpPeer2SuppressedPrefixes'] = $cbgp_data_tmp[$temp_keys[0]]['cbgpPeer2SuppressedPrefixes'];
|
||||
$temp_data['cbgpPeer2WithdrawnPrefixes'] = $cbgp_data_tmp[$temp_keys[0]]['cbgpPeer2WithdrawnPrefixes'];
|
||||
foreach ($temp_data as $k => $v) {
|
||||
$cbgp_data .= "$v\n";
|
||||
}
|
||||
$cbgp_data_tmp = snmp_get_multi($device, $cbgp2_oids, '-OQUs', 'CISCO-BGP4-MIB');
|
||||
$ident = "$ip_ver.\"".$peer['bgpPeerIdentifier'].'"'.'.'.$ip_type.'.'.$ip_cast;
|
||||
|
||||
d_echo("$cbgp_data\n");
|
||||
$key = key($cbgp_data_tmp); // get key of item
|
||||
$cbgp_data = array(
|
||||
'cbgpPeerAcceptedPrefixes' => $cbgp_data_tmp[$key]['cbgpPeer2AcceptedPrefixes'],
|
||||
'cbgpPeerDeniedPrefixes' => $cbgp_data_tmp[$key]['cbgpPeer2DeniedPrefixes'],
|
||||
'cbgpPeerPrefixAdminLimit' => $cbgp_data_tmp[$key]['cbgpPeer2PrefixAdminLimit'],
|
||||
'cbgpPeerPrefixThreshold' => $cbgp_data_tmp[$key]['cbgpPeer2PrefixThreshold'],
|
||||
'cbgpPeerPrefixClearThreshold' => $cbgp_data_tmp[$key]['cbgpPeer2PrefixClearThreshold'],
|
||||
'cbgpPeerAdvertisedPrefixes' => $cbgp_data_tmp[$key]['cbgpPeer2AdvertisedPrefixes'],
|
||||
'cbgpPeerSuppressedPrefixes' => $cbgp_data_tmp[$key]['cbgpPeer2SuppressedPrefixes'],
|
||||
'cbgpPeerWithdrawnPrefixes' => $cbgp_data_tmp[$key]['cbgpPeer2WithdrawnPrefixes'],
|
||||
);
|
||||
} else {
|
||||
// FIXME - move to function
|
||||
$oids = " cbgpPeerAcceptedPrefixes." . $peer['bgpPeerIdentifier'] . ".$afi.$safi";
|
||||
$oids .= " cbgpPeerDeniedPrefixes." . $peer['bgpPeerIdentifier'] . ".$afi.$safi";
|
||||
$oids .= " cbgpPeerPrefixAdminLimit." . $peer['bgpPeerIdentifier'] . ".$afi.$safi";
|
||||
$oids .= " cbgpPeerPrefixThreshold." . $peer['bgpPeerIdentifier'] . ".$afi.$safi";
|
||||
$oids .= " cbgpPeerPrefixClearThreshold." . $peer['bgpPeerIdentifier'] . ".$afi.$safi";
|
||||
$oids .= " cbgpPeerAdvertisedPrefixes." . $peer['bgpPeerIdentifier'] . ".$afi.$safi";
|
||||
$oids .= " cbgpPeerSuppressedPrefixes." . $peer['bgpPeerIdentifier'] . ".$afi.$safi";
|
||||
$oids .= " cbgpPeerWithdrawnPrefixes." . $peer['bgpPeerIdentifier'] . ".$afi.$safi";
|
||||
$cbgp_oids = array(
|
||||
"cbgpPeerAcceptedPrefixes." . $peer['bgpPeerIdentifier'] . ".$afi.$safi",
|
||||
"cbgpPeerDeniedPrefixes." . $peer['bgpPeerIdentifier'] . ".$afi.$safi",
|
||||
"cbgpPeerPrefixAdminLimit." . $peer['bgpPeerIdentifier'] . ".$afi.$safi",
|
||||
"cbgpPeerPrefixThreshold." . $peer['bgpPeerIdentifier'] . ".$afi.$safi",
|
||||
"cbgpPeerPrefixClearThreshold." . $peer['bgpPeerIdentifier'] . ".$afi.$safi",
|
||||
"cbgpPeerAdvertisedPrefixes." . $peer['bgpPeerIdentifier'] . ".$afi.$safi",
|
||||
"cbgpPeerSuppressedPrefixes." . $peer['bgpPeerIdentifier'] . ".$afi.$safi",
|
||||
"cbgpPeerWithdrawnPrefixes." . $peer['bgpPeerIdentifier'] . ".$afi.$safi",
|
||||
);
|
||||
|
||||
d_echo("$oids\n");
|
||||
$cbgp_data = snmp_get_multi($device, $cbgp_oids, '-OUQs', 'CISCO-BGP4-MIB');
|
||||
$cbgp_data = reset($cbgp_data); // get first entry
|
||||
}
|
||||
d_echo($cbgp_data);
|
||||
|
||||
$cbgp_data= snmp_get_multi($device, $oids, '-OUQs ', 'CISCO-BGP4-MIB');
|
||||
$cbgp_data= array_pop($cbgp_data);
|
||||
d_echo("$cbgp_data\n");
|
||||
}//end if
|
||||
$cbgpPeerAcceptedPrefixes = $cbgp_data['cbgpPeerAcceptedPrefixes'];
|
||||
$cbgpPeerDeniedPrefixes = $cbgp_data['cbgpPeerDeniedPrefixes'];
|
||||
$cbgpPeerPrefixAdminLimit = $cbgp_data['cbgpPeerPrefixAdminLimit'];
|
||||
@@ -399,7 +400,12 @@ if ($config['enable_bgp']) {
|
||||
}
|
||||
|
||||
if ($peer['c_update']) {
|
||||
dbUpdate($peer['c_update'], 'bgpPeers_cbgp', '`device_id` = ? AND bgpPeerIdentifier = ? AND afi = ? AND safi = ?', array($device['device_id'], $peer['bgpPeerIdentifier'], $afi, $safi));
|
||||
dbUpdate(
|
||||
$peer['c_update'],
|
||||
'bgpPeers_cbgp',
|
||||
'`device_id` = ? AND bgpPeerIdentifier = ? AND afi = ? AND safi = ?',
|
||||
array($device['device_id'], $peer['bgpPeerIdentifier'], $afi, $safi)
|
||||
);
|
||||
}
|
||||
|
||||
$cbgp_rrd_name = safename('cbgp-'.$peer['bgpPeerIdentifier'].".$afi.$safi");
|
||||
|
||||
Reference in New Issue
Block a user