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

- Added more colours to the array and added better debugging.

Browse Source
This commit is contained in:
Aaron Daniels
2016-07-14 17:46:50 +10:00
parent 919b50f76b
commit 9826e0915a
3 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
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,6 +36,7 @@ $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;
foreach ($components as $id => $array) {
if ( ($array['qos-type'] == 2) && ($array['parent'] == $components[$vars['policy']]['sp-obj']) && ($array['sp-id'] == $components[$vars['policy']]['sp-id'])) {
@@ -47,17 +49,17 @@ foreach ($components as $id => $array) {
$stack = ":STACK ";
}
// Grab a color from the array.
if ( isset($config['graph_colours']['mixed'][$count]) ) {
$color = $config['graph_colours']['mixed'][$count];
// Grab a colour from the array.
if ( isset($colours[$count]) ) {
$colour = $colours[$count];
}
else {
$color = $config['graph_colours']['oranges'][$count-7];
d_echo("<pre>Error: Out of colours. Have: ".(count($colours)-1).", Requesting:".$count."</pre>");
}
$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 .= " 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 ";
@@ -69,6 +71,7 @@ foreach ($components as $id => $array) {
if ($rrd_additions == "") {
// We didn't add any data points.
d_echo("<pre>No DS to add</pre>");
}
else {
$rrd_options .= $rrd_additions;

13
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,6 +36,7 @@ $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;
foreach ($components as $id => $array) {
if ( ($array['qos-type'] == 2) && ($array['parent'] == $components[$vars['policy']]['sp-obj']) && ($array['sp-id'] == $components[$vars['policy']]['sp-id'])) {
@@ -47,17 +49,17 @@ foreach ($components as $id => $array) {
$stack = ":STACK ";
}
// Grab a color from the array.
if ( isset($config['graph_colours']['mixed'][$count]) ) {
$color = $config['graph_colours']['mixed'][$count];
// Grab a colour from the array.
if ( isset($colours[$count]) ) {
$colour = $colours[$count];
}
else {
$color = $config['graph_colours']['oranges'][$count-7];
d_echo("<pre>Error: Out of colours. Have: ".(count($colours)-1).", Requesting:".$count."</pre>");
}
$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 .= " 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 ";
@@ -69,6 +71,7 @@ foreach ($components as $id => $array) {
if ($rrd_additions == "") {
// We didn't add any data points.
d_echo("<pre>No DS to add</pre>");
}
else {
$rrd_options .= $rrd_additions;

15
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,6 +36,7 @@ $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;
foreach ($components as $id => $array) {
if ( ($array['qos-type'] == 2) && ($array['parent'] == $components[$vars['policy']]['sp-obj']) && ($array['sp-id'] == $components[$vars['policy']]['sp-id'])) {
@@ -47,17 +49,17 @@ foreach ($components as $id => $array) {
$stack = ":STACK ";
}
// Grab a color from the array.
if ( isset($config['graph_colours']['mixed'][$count]) ) {
$color = $config['graph_colours']['mixed'][$count];
// Grab a colour from the array.
if ( isset($colours[$count]) ) {
$colour = $colours[$count];
}
else {
$color = $config['graph_colours']['oranges'][$count-7];
d_echo("<pre>Error: Out of colours. Have: ".(count($colours)-1).", Requesting:".$count."</pre>");
}
$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 .= " 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 ";
@@ -68,7 +70,8 @@ foreach ($components as $id => $array) {
}
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;