Merge pull request #1586 from adaniels21487/issue-1571

Discover UDP Jitter types for Cisco IPSLAs

html/pages/device/slas.inc.php

@@ -9,6 +9,9 @@ $slas = dbFetchRows('SELECT * FROM `slas` WHERE `device_id` = ? AND `deleted` =
 // Collect types
 $sla_types = array('all' => 'All');
 foreach ($slas as $sla) {
+    // Set a default type, if we know about it, it will be overwritten below.
+    $text = 'Unknown';
+
     $sla_type = $sla['rtt_type'];
 
     if (!in_array($sla_type, $sla_types)) {

includes/discovery/cisco-sla.inc.php

@@ -70,6 +70,10 @@ if ($config['enable_sla'] && $device['os_group'] == 'cisco') {
                         $data['tag'] = preg_replace('/:0*([0-9])/', ':$1', $data['tag']);
                     }
                 break;
+
+                case 'jitter':
+                    $data['tag'] = $sla_config['rttMonEchoAdminCodecType'] ." (". preg_replace('/milliseconds/', 'ms', $sla_config['rttMonEchoAdminCodecInterval']) .")";
+                    break;
             }//end switch
         }//end if