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

Timos sap dot1q graphing fix (#13654)

Browse Source 
* Added wireless MSE

* dot1q sap graph fix

* Fix removed files

* fix

* Fixed style

* Fixed style

* Fixed style

* Removed vscode workspace file

* Clarification
This commit is contained in:
Maikel de Boer
2022-01-09 10:33:32 +01:00
committed by GitHub
parent cc83ab5146
commit fa3367f5c6
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
LibreNMS/OS/Timos.php
View File

@ -661,6 +661,13 @@ class Timos extends OS implements MplsDiscovery, MplsPolling, WirelessPowerDisco
$svc_id = $svcs->firstWhere('svc_oid', $svcId)->svc_id;
$traffic_id = $svcId . '.' . $sapPortId . '.' . $this->nokiaEncap($sapEncapValue);
// Any unused vlan on a port returns * in sapEncapValue but had OID .4095
$specialQinQIdentifier = $this->nokiaEncap($sapEncapValue);
if ($specialQinQIdentifier == '*') {
$specialQinQIdentifier = '4095';
$traffic_id = $svcId . '.' . $sapPortId . '.' . $specialQinQIdentifier;
}
$saps->push(new MplsSap([
'svc_id' => $svc_id,
'svc_oid' => $svcId,

5
includes/html/functions.inc.php
View File

@ -440,6 +440,11 @@ function generate_port_url($port, $vars = [])
function generate_sap_url($sap, $vars = [])
{
// Overwrite special QinQ sap identifiers
if ($sap['sapEncapValue'] == '*') {
$sap['sapEncapValue'] = '4095';
}
return \LibreNMS\Util\Url::graphPopup(['device' => $sap['device_id'], 'page' => 'graphs', 'type' => 'device_sap', 'tab' => 'routing', 'proto' => 'mpls', 'view' => 'saps', 'traffic_id' => $sap['svc_oid'] . '.' . $sap['sapPortId'] . '.' . $sap['sapEncapValue']], $vars);
}//end generate_sap_url()