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

Merge pull request #3842 from adaniels21487/issue-3841

Browse Source 
Cisco-CBQOS - more colours, graph single class
This commit is contained in:
Neil Lathwood
2016-07-18 20:16:18 +01:00
committed by GitHub
parent b8828e49f0 6f6b18cbc9
commit 7d1a94af7d
4 changed files with 177 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
html/includes/graphs/port/cbqos_bufferdrops.inc.php
View File

@ -13,6 +13,7 @@
require_once "../includes/component.php";
$component = new component();
$options = array();
$options['filter']['type'] = array('=','Cisco-CBQOS');
$components = $component->getComponents($device['device_id'],$options);
@ -35,40 +36,69 @@ $rrd_options .= " -l 0 -E ";
$rrd_options .= " COMMENT:'Class-Map Now Avg Max\\n'";
$rrd_additions = "";
$colours = array_merge($config['graph_colours']['mixed'],$config['graph_colours']['manycolours'],$config['graph_colours']['manycolours']);
$count = 0;
d_echo("<pre>Policy: ".$vars['policy']);
d_echo("\nSP-OBJ: ".$components[$vars['policy']]['sp-obj']);
foreach ($components as $id => $array) {
$addtograph = false;
// We only care about children of the selected policy.
if ( ($array['qos-type'] == 2) && ($array['parent'] == $components[$vars['policy']]['sp-obj']) && ($array['sp-id'] == $components[$vars['policy']]['sp-id'])) {
$rrd_filename = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename("port-".$array['ifindex']."-cbqos-".$array['sp-id']."-".$array['sp-obj'].".rrd");
if (file_exists($rrd_filename)) {
// Stack the area on the second and subsequent DS's
$stack = "";
if ($count != 0) {
$stack = ":STACK ";
// Are we trying to only graph a single class?
if (isset($vars['class'])) {
// Yes, is this the selected class
if ($vars['class'] == $id) {
$addtograph = true;
}
// Grab a color from the array.
if ( isset($config['graph_colours']['mixed'][$count]) ) {
$color = $config['graph_colours']['mixed'][$count];
}
else {
$color = $config['graph_colours']['oranges'][$count-7];
}
$rrd_additions .= " DEF:DS" . $count . "=" . $rrd_filename . ":bufferdrops:AVERAGE ";
$rrd_additions .= " CDEF:MOD" . $count . "=DS" . $count . ",8,* ";
$rrd_additions .= " AREA:MOD" . $count . "#" . $color . ":'" . str_pad(substr($components[$id]['label'],0,15),15) . "'" . $stack;
$rrd_additions .= " GPRINT:MOD" . $count . ":LAST:%6.2lf%s ";
$rrd_additions .= " GPRINT:MOD" . $count . ":AVERAGE:%6.2lf%s ";
$rrd_additions .= " GPRINT:MOD" . $count . ":MAX:%6.2lf%s\\\l ";
$count++;
}
else {
// No, Graph everything
$addtograph = true;
}
// Add the class map to the graph
if ($addtograph === true) {
d_echo("\n Class: ".$components[$id]['label']."\t+ added to the graph");
$rrd_filename = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename("port-".$array['ifindex']."-cbqos-".$array['sp-id']."-".$array['sp-obj'].".rrd");
if (file_exists($rrd_filename)) {
// Stack the area on the second and subsequent DS's
$stack = "";
if ($count != 0) {
$stack = ":STACK ";
}
// Grab a colour from the array.
if ( isset($colours[$count]) ) {
$colour = $colours[$count];
}
else {
d_echo("\nError: Out of colours. Have: ".(count($colours)-1).", Requesting:".$count);
}
$rrd_additions .= " DEF:DS" . $count . "=" . $rrd_filename . ":bufferdrops:AVERAGE ";
$rrd_additions .= " CDEF:MOD" . $count . "=DS" . $count . ",8,* ";
$rrd_additions .= " AREA:MOD" . $count . "#" . $colour . ":'" . str_pad(substr($components[$id]['label'],0,15),15) . "'" . $stack;
$rrd_additions .= " GPRINT:MOD" . $count . ":LAST:%6.2lf%s ";
$rrd_additions .= " GPRINT:MOD" . $count . ":AVERAGE:%6.2lf%s ";
$rrd_additions .= " GPRINT:MOD" . $count . ":MAX:%6.2lf%s\\\l ";
$count++;
} // End if file exists
}
else {
d_echo("\n Class: ".$components[$id]['label']."\t- NOT added to the graph");
} // End if addtograph
}
}
d_echo("</pre>");
if ($rrd_additions == "") {
// We didn't add any data points.
d_echo("<pre>No DS to add</pre>");
}
else {
$rrd_options .= $rrd_additions;

76
html/includes/graphs/port/cbqos_qosdrops.inc.php
View File

@ -13,6 +13,7 @@
require_once "../includes/component.php";
$component = new component();
$options = array();
$options['filter']['type'] = array('=','Cisco-CBQOS');
$components = $component->getComponents($device['device_id'],$options);
@ -35,40 +36,69 @@ $rrd_options .= " -l 0 -E ";
$rrd_options .= " COMMENT:'Class-Map Now Avg Max\\n'";
$rrd_additions = "";
$colours = array_merge($config['graph_colours']['mixed'],$config['graph_colours']['manycolours'],$config['graph_colours']['manycolours']);
$count = 0;
d_echo("<pre>Policy: ".$vars['policy']);
d_echo("\nSP-OBJ: ".$components[$vars['policy']]['sp-obj']);
foreach ($components as $id => $array) {
$addtograph = false;
// We only care about children of the selected policy.
if ( ($array['qos-type'] == 2) && ($array['parent'] == $components[$vars['policy']]['sp-obj']) && ($array['sp-id'] == $components[$vars['policy']]['sp-id'])) {
$rrd_filename = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename("port-".$array['ifindex']."-cbqos-".$array['sp-id']."-".$array['sp-obj'].".rrd");
if (file_exists($rrd_filename)) {
// Stack the area on the second and subsequent DS's
$stack = "";
if ($count != 0) {
$stack = ":STACK ";
// Are we trying to only graph a single class?
if (isset($vars['class'])) {
// Yes, is this the selected class
if ($vars['class'] == $id) {
$addtograph = true;
}
// Grab a color from the array.
if ( isset($config['graph_colours']['mixed'][$count]) ) {
$color = $config['graph_colours']['mixed'][$count];
}
else {
$color = $config['graph_colours']['oranges'][$count-7];
}
$rrd_additions .= " DEF:DS" . $count . "=" . $rrd_filename . ":qosdrops:AVERAGE ";
$rrd_additions .= " CDEF:MOD" . $count . "=DS" . $count . ",8,* ";
$rrd_additions .= " AREA:MOD" . $count . "#" . $color . ":'" . str_pad(substr($components[$id]['label'],0,15),15) . "'" . $stack;
$rrd_additions .= " GPRINT:MOD" . $count . ":LAST:%6.2lf%s ";
$rrd_additions .= " GPRINT:MOD" . $count . ":AVERAGE:%6.2lf%s ";
$rrd_additions .= " GPRINT:MOD" . $count . ":MAX:%6.2lf%s\\\l ";
$count++;
}
else {
// No, Graph everything
$addtograph = true;
}
// Add the class map to the graph
if ($addtograph === true) {
d_echo("\n Class: ".$components[$id]['label']."\t+ added to the graph");
$rrd_filename = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename("port-".$array['ifindex']."-cbqos-".$array['sp-id']."-".$array['sp-obj'].".rrd");
if (file_exists($rrd_filename)) {
// Stack the area on the second and subsequent DS's
$stack = "";
if ($count != 0) {
$stack = ":STACK ";
}
// Grab a colour from the array.
if ( isset($colours[$count]) ) {
$colour = $colours[$count];
}
else {
d_echo("\nError: Out of colours. Have: ".(count($colours)-1).", Requesting:".$count);
}
$rrd_additions .= " DEF:DS" . $count . "=" . $rrd_filename . ":qosdrops:AVERAGE ";
$rrd_additions .= " CDEF:MOD" . $count . "=DS" . $count . ",8,* ";
$rrd_additions .= " AREA:MOD" . $count . "#" . $colour . ":'" . str_pad(substr($components[$id]['label'],0,15),15) . "'" . $stack;
$rrd_additions .= " GPRINT:MOD" . $count . ":LAST:%6.2lf%s ";
$rrd_additions .= " GPRINT:MOD" . $count . ":AVERAGE:%6.2lf%s ";
$rrd_additions .= " GPRINT:MOD" . $count . ":MAX:%6.2lf%s\\\l ";
$count++;
} // End if file exists
}
else {
d_echo("\n Class: ".$components[$id]['label']."\t- NOT added to the graph");
} // End if addtograph
}
}
d_echo("</pre>");
if ($rrd_additions == "") {
// We didn't add any data points.
d_echo("<pre>No DS to add</pre>");
}
else {
$rrd_options .= $rrd_additions;

78
html/includes/graphs/port/cbqos_traffic.inc.php
View File

@ -13,6 +13,7 @@
require_once "../includes/component.php";
$component = new component();
$options = array();
$options['filter']['type'] = array('=','Cisco-CBQOS');
$components = $component->getComponents($device['device_id'],$options);
@ -35,40 +36,69 @@ $rrd_options .= " -l 0 -E ";
$rrd_options .= " COMMENT:'Class-Map Now Avg Max\\n'";
$rrd_additions = "";
$colours = array_merge($config['graph_colours']['mixed'],$config['graph_colours']['manycolours'],$config['graph_colours']['manycolours']);
$count = 0;
d_echo("<pre>Policy: ".$vars['policy']);
d_echo("\nSP-OBJ: ".$components[$vars['policy']]['sp-obj']);
foreach ($components as $id => $array) {
$addtograph = false;
// We only care about children of the selected policy.
if ( ($array['qos-type'] == 2) && ($array['parent'] == $components[$vars['policy']]['sp-obj']) && ($array['sp-id'] == $components[$vars['policy']]['sp-id'])) {
$rrd_filename = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename("port-".$array['ifindex']."-cbqos-".$array['sp-id']."-".$array['sp-obj'].".rrd");
if (file_exists($rrd_filename)) {
// Stack the area on the second and subsequent DS's
$stack = "";
if ($count != 0) {
$stack = ":STACK ";
// Are we trying to only graph a single class?
if (isset($vars['class'])) {
// Yes, is this the selected class
if ($vars['class'] == $id) {
$addtograph = true;
}
// Grab a color from the array.
if ( isset($config['graph_colours']['mixed'][$count]) ) {
$color = $config['graph_colours']['mixed'][$count];
}
else {
$color = $config['graph_colours']['oranges'][$count-7];
}
$rrd_additions .= " DEF:DS" . $count . "=" . $rrd_filename . ":postbits:AVERAGE ";
$rrd_additions .= " CDEF:MOD" . $count . "=DS" . $count . ",8,* ";
$rrd_additions .= " AREA:MOD" . $count . "#" . $color . ":'" . str_pad(substr($components[$id]['label'],0,15),15) . "'" . $stack;
$rrd_additions .= " GPRINT:MOD" . $count . ":LAST:%6.2lf%s ";
$rrd_additions .= " GPRINT:MOD" . $count . ":AVERAGE:%6.2lf%s ";
$rrd_additions .= " GPRINT:MOD" . $count . ":MAX:%6.2lf%s\\\l ";
$count++;
}
else {
// No, Graph everything
$addtograph = true;
}
// Add the class map to the graph
if ($addtograph === true) {
d_echo("\n Class: ".$components[$id]['label']."\t+ added to the graph");
$rrd_filename = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename("port-".$array['ifindex']."-cbqos-".$array['sp-id']."-".$array['sp-obj'].".rrd");
if (file_exists($rrd_filename)) {
// Stack the area on the second and subsequent DS's
$stack = "";
if ($count != 0) {
$stack = ":STACK ";
}
// Grab a colour from the array.
if ( isset($colours[$count]) ) {
$colour = $colours[$count];
}
else {
d_echo("\nError: Out of colours. Have: ".(count($colours)-1).", Requesting:".$count);
}
$rrd_additions .= " DEF:DS" . $count . "=" . $rrd_filename . ":postbits:AVERAGE ";
$rrd_additions .= " CDEF:MOD" . $count . "=DS" . $count . ",8,* ";
$rrd_additions .= " AREA:MOD" . $count . "#" . $colour . ":'" . str_pad(substr($components[$id]['label'],0,15),15) . "'" . $stack;
$rrd_additions .= " GPRINT:MOD" . $count . ":LAST:%6.2lf%s ";
$rrd_additions .= " GPRINT:MOD" . $count . ":AVERAGE:%6.2lf%s ";
$rrd_additions .= " GPRINT:MOD" . $count . ":MAX:%6.2lf%s\\\l ";
$count++;
} // End if file exists
}
else {
d_echo("\n Class: ".$components[$id]['label']."\t- NOT added to the graph");
} // End if addtograph
}
}
d_echo("</pre>");
if ($rrd_additions == "") {
// We didn't add any data points.
// We didn't add any data sources.
d_echo("<pre>No DS to add</pre>");
}
else {
$rrd_options .= $rrd_additions;

19
html/pages/device/port/cbqos.inc.php
View File

@ -23,10 +23,16 @@ function find_child($components,$parent,$level) {
echo "<li>";
if ($array['qos-type'] == 1) {
// Its a policy, we need to make it a link.
echo('<a href="' . generate_url($vars, array('policy' => $id)) . '">' . $array['label'] . '</a>');
$linkvars = array_merge($vars, array('policy' => $id));
unset($linkvars['class']);
echo('<a href="' . generate_url($linkvars) . '">' . $array['label'] . '</a>');
}
elseif ($array['qos-type'] == 2) {
// Its a class, we need to make it a link.
echo('<a href="' . generate_url($vars, array('policy' => $parent,'class' => $id)) . '">' . $array['label'] . '</a>');
}
else {
// No policy, no link
// Unknown, no link
echo $array['label'];
}
if (isset($array['match'])) {
@ -102,16 +108,25 @@ foreach ($components as $id => $array) {
echo "<div class='col-md-12'>";
echo "<div class='graphhead'>Traffic by CBQoS Class - ".$components[$vars['policy']]['label']."</div>";
$graph_array['policy'] = $vars['policy'];
if (isset($vars['class'])) {
$graph_array['class'] = $vars['class'];
}
$graph_type = 'port_cbqos_traffic';
include 'includes/print-interface-graphs.inc.php';
echo "<div class='graphhead'>QoS Drops by CBQoS Class - ".$components[$vars['policy']]['label']."</div>";
$graph_array['policy'] = $vars['policy'];
if (isset($vars['class'])) {
$graph_array['class'] = $vars['class'];
}
$graph_type = 'port_cbqos_bufferdrops';
include 'includes/print-interface-graphs.inc.php';
echo "<div class='graphhead'>Buffer Drops by CBQoS Class - ".$components[$vars['policy']]['label']."</div>";
$graph_array['policy'] = $vars['policy'];
if (isset($vars['class'])) {
$graph_array['class'] = $vars['class'];
}
$graph_type = 'port_cbqos_qosdrops';
include 'includes/print-interface-graphs.inc.php';
echo "</div>\n\n";