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

feature: extended graphing for sla - icmp-jitter #4341

Browse Source 
* - Added more graphs for rtt_type: icmpjitter

* - use $fields as that is the standard throughout the code.
This commit is contained in:
Aaron Daniels
2016-09-07 02:19:10 +10:00
committed by Neil Lathwood
parent 4001f8c60a
commit 948d4f67a1
8 changed files with 295 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
includes/polling/cisco-sla.inc.php
View File

@@ -48,7 +48,7 @@ if (count($slas > 0)) {
$tags = compact('sla_nr', 'rrd_name', 'rrd_def');
data_update($device, 'sla', $tags, $fields);
// Let's gather some per-type metrics.
// Let's gather some per-type fields.
switch ($rtt_type) {
case 'jitter':
$jitter = array(
@@ -80,12 +80,42 @@ if (count($slas > 0)) {
);
$tags = compact('rrd_name', 'rrd_def', 'sla_nr', 'rtt_type');
data_update($device, 'sla', $tags, $jitter);
$metrics = array_merge($metrics, $jitter);
$fields = array_merge($fields, $jitter);
break;
case 'icmpjitter':
$icmpjitter = array(
'PacketLoss' => $rttMonLatestOper['1.3.6.1.4.1.9.9.42.1.5.4.1.26'][$sla_nr],
'PacketOosSD' => $rttMonLatestOper['1.3.6.1.4.1.9.9.42.1.5.4.1.28'][$sla_nr],
'PacketOosDS' => $rttMonLatestOper['1.3.6.1.4.1.9.9.42.1.5.4.1.29'][$sla_nr],
'PacketLateArrival' => $rttMonLatestOper['1.3.6.1.4.1.9.9.42.1.5.4.1.32'][$sla_nr],
'JitterAvgSD' => $rttMonLatestOper['1.3.6.1.4.1.9.9.42.1.5.4.1.45'][$sla_nr],
'JitterAvgDS' => $rttMonLatestOper['1.3.6.1.4.1.9.9.42.1.5.4.1.46'][$sla_nr],
'LatencyOWAvgSD' => $rttMonLatestOper['1.3.6.1.4.1.9.9.42.1.5.4.1.47'][$sla_nr],
'LatencyOWAvgDS' => $rttMonLatestOper['1.3.6.1.4.1.9.9.42.1.5.4.1.48'][$sla_nr],
'JitterIAJOut' => $rttMonLatestOper['1.3.6.1.4.1.9.9.42.1.5.4.1.49'][$sla_nr],
'JitterIAJIn' => $rttMonLatestOper['1.3.6.1.4.1.9.9.42.1.5.4.1.50'][$sla_nr],
);
$rrd_name = array('sla', $sla_nr, $rtt_type);
$rrd_def = array(
'DS:PacketLoss:GAUGE:600:0:U',
'DS:PacketOosSD:GAUGE:600:0:U',
'DS:PacketOosDS:GAUGE:600:0:U',
'DS:PacketLateArrival:GAUGE:600:0:U',
'DS:JitterAvgSD:GAUGE:600:0:U',
'DS:JitterAvgDS:GAUGE:600:0:U',
'DS:LatencyOWAvgSD:GAUGE:600:0:U',
'DS:LatencyOWAvgDS:GAUGE:600:0:U',
'DS:JitterIAJOut:GAUGE:600:0:U',
'DS:JitterIAJIn:GAUGE:600:0:U',
);
$tags = compact('rrd_name', 'rrd_def', 'sla_nr', 'rtt_type');
data_update($device, 'sla', $tags, $icmpjitter);
$fields = array_merge($fields, $icmpjitter);
break;
}
d_echo("The following metrics were collected for #".$sla['sla_nr'].":\n");
d_echo($metrics);
d_echo("The following datasources were collected for #".$sla['sla_nr'].":\n");
d_echo($fields);
// Update the DB if necessary
if (count($update) > 0) {