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

Fixing irrelevant values rpm packetloss (#13010)

Browse Source 
* Fixing irrelevant value for Juniper RPM percentage packetloss

Old MIB values fron generic DISMAN ping pingResultsProbeResponses and pingResultsSentProbes are
querying current probe values so if a probe is still pending, irrelevant value are taken. It results
in high percentage packetloss that not match reality.
Using the Juniper MIB values jnxPingLastTestResultProbeResponses and jnxPingLastTestResultSentProbes
seem to fix this.
At the same time we take here jnxPingLastTestResultAvgRttUs instead of jnxPingResultsRttUs which
is more accurate.

* Fixing typo in the name of Cisco MIB for Cisco SLA's polling

* Delete old comment about SNMP values : getting the all values once instead of one by one

* Adding test files for Juniper RPM last modification

* Revert "Adding test files for Juniper RPM last modification"

This reverts commit 0209b18b9d.

Reverting to keep snmprec junos_vmx already generated file

* Regenerating JSON test file and keeping snmprec file
This commit is contained in:
geg347
2021-07-08 15:59:48 +02:00
committed by GitHub
parent fd597dbd1f
commit 3bf11187d1
3 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
LibreNMS/OS/Junos.php
View File

@@ -101,9 +101,7 @@ class Junos extends \LibreNMS\OS implements SlaDiscovery, OSPolling, SlaPolling
// Go get some data from the device.
$data = snmpwalk_group($device, 'pingCtlRowStatus', 'DISMAN-PING-MIB', 2);
$data = snmpwalk_group($device, 'pingResultsProbeResponses', 'DISMAN-PING-MIB', 2, $data);
$data = snmpwalk_group($device, 'pingResultsSentProbes', 'DISMAN-PING-MIB', 2, $data);
$data = snmpwalk_group($device, 'jnxPingResultsTable', 'JUNIPER-PING-MIB', 2, $data);
$data = snmpwalk_group($device, 'jnxPingLastTestResultTable', 'JUNIPER-PING-MIB', 2, $data);
// Get the needed information
foreach ($slas as $sla) {
@@ -117,8 +115,8 @@ class Junos extends \LibreNMS\OS implements SlaDiscovery, OSPolling, SlaPolling
// Use DISMAN-PING Status codes. 0=Good 2=Critical
$sla->opstatus = $data[$owner][$test]['pingCtlRowStatus'] == '1' ? 0 : 2;
$sla->rtt = $data[$owner][$test]['jnxPingResultsRttUs'] / 1000;
$time = Carbon::parse($data[$owner][$test]['jnxPingResultsTime'])->toDateTimeString();
$sla->rtt = $data[$owner][$test]['jnxPingLastTestResultAvgRttUs'] / 1000;
$time = Carbon::parse($data[$owner][$test]['jnxPingLastTestResultTime'])->toDateTimeString();
echo 'SLA : ' . $rtt_type . ' ' . $owner . ' ' . $test . '... ' . $sla->rtt . 'ms at ' . $time . "\n";
$fields = [
@@ -140,11 +138,11 @@ class Junos extends \LibreNMS\OS implements SlaDiscovery, OSPolling, SlaPolling
case 'IcmpEcho':
case 'IcmpTimeStamp':
$icmp = [
'MinRttUs' => $data[$owner][$test]['jnxPingResultsMinRttUs'] / 1000,
'MaxRttUs' => $data[$owner][$test]['jnxPingResultsMaxRttUs'] / 1000,
'StdDevRttUs' => $data[$owner][$test]['jnxPingResultsStdDevRttUs'] / 1000,
'ProbeResponses' => $data[$owner][$test]['pingResultsProbeResponses'],
'ProbeLoss' => (int) $data[$owner][$test]['pingResultsSentProbes'] - (int) $data[$owner][$test]['pingResultsProbeResponses'],
'MinRttUs' => $data[$owner][$test]['jnxPingLastTestResultMinRttUs'] / 1000,
'MaxRttUs' => $data[$owner][$test]['jnxPingLastTestResultMaxRttUs'] / 1000,
'StdDevRttUs' => $data[$owner][$test]['jnxPingLastTestResultStdDevRttUs'] / 1000,
'ProbeResponses' => $data[$owner][$test]['jnxPingLastTestResultProbeResponses'],
'ProbeLoss' => (int) $data[$owner][$test]['jnxPingLastTestResultSentProbes'] - (int) $data[$owner][$test]['jnxPingLastTestResultProbeResponses'],
];
$rrd_name = ['sla', $sla_nr, $rtt_type];
$rrd_def = RrdDefinition::make()

2
LibreNMS/OS/Shared/Cisco.php
View File

@@ -405,7 +405,7 @@ class Cisco extends OS implements OSDiscovery, SlaDiscovery, ProcessorDiscovery,
$device = $this->getDeviceArray();
$data = snmpwalk_group($device, 'rttMonLatestRttOperTable', 'CISCO-RTTMON-MIB');
$data = snmpwalk_group($device, 'ttMonLatestOper', 'CISCO-RTTMON-MIB', 1, $data);
$data = snmpwalk_group($device, 'rttMonLatestOper', 'CISCO-RTTMON-MIB', 1, $data);
$time_offset = time() - $this->getDevice()->uptime;

25
tests/data/junos_vmx.json
View File

@@ -12554,7 +12554,30 @@
}
]
},
"poller": "matches discovery"
"poller": {
"slas": [
{
"sla_nr": 664440489,
"owner": "test-rpm3",
"tag": "timestamp",
"rtt_type": "IcmpTimeStamp",
"rtt": 0,
"status": 1,
"opstatus": 0,
"deleted": 0
},
{
"sla_nr": 1077751536,
"owner": "test-rpm",
"tag": "internet",
"rtt_type": "IcmpEcho",
"rtt": 0,
"status": 1,
"opstatus": 0,
"deleted": 0
}
]
}
},
"sensors": {
"discovery": {