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

Apply fixes from StyleCI (#12120)

Browse Source
This commit is contained in:
Jellyfrog
2020-09-21 15:40:17 +02:00
committed by GitHub
parent 77c531527c
commit 82f43cb98d
1733 changed files with 18337 additions and 18540 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/html/graphs/generic_simplex.inc.php
+38 -38
View File
@@ -11,56 +11,56 @@ if (\LibreNMS\Config::get('old_graphs')) {
$line_text = str_pad(substr($line_text, 0, 12), 12);
if ($multiplier) {
$rrd_options .= ' DEF:'.$ds.'_o='.$rrd_filename.':'.$ds.':AVERAGE';
$rrd_options .= ' DEF:'.$ds.'_max_o='.$rrd_filename.':'.$ds.':MAX';
$rrd_options .= ' DEF:'.$ds.'_min_o='.$rrd_filename.':'.$ds.':MIN';
$rrd_options .= ' DEF:' . $ds . '_o=' . $rrd_filename . ':' . $ds . ':AVERAGE';
$rrd_options .= ' DEF:' . $ds . '_max_o=' . $rrd_filename . ':' . $ds . ':MAX';
$rrd_options .= ' DEF:' . $ds . '_min_o=' . $rrd_filename . ':' . $ds . ':MIN';
if (empty($multiplier_action)) {
$multiplier_action = '*';
}
$rrd_options .= ' CDEF:'.$ds.'='.$ds."_o,$multiplier,$multiplier_action";
$rrd_options .= ' CDEF:'.$ds.'_max='.$ds."_max_o,$multiplier,$multiplier_action";
$rrd_options .= ' CDEF:'.$ds.'_min='.$ds."_min_o,$multiplier,$multiplier_action";
$rrd_options .= ' CDEF:' . $ds . '=' . $ds . "_o,$multiplier,$multiplier_action";
$rrd_options .= ' CDEF:' . $ds . '_max=' . $ds . "_max_o,$multiplier,$multiplier_action";
$rrd_options .= ' CDEF:' . $ds . '_min=' . $ds . "_min_o,$multiplier,$multiplier_action";
} else {
$rrd_options .= ' DEF:'.$ds.'='.$rrd_filename.':'.$ds.':AVERAGE';
$rrd_options .= ' DEF:'.$ds.'_max='.$rrd_filename.':'.$ds.':MAX';
$rrd_options .= ' DEF:'.$ds.'_min='.$rrd_filename.':'.$ds.':MIN';
$rrd_options .= ' DEF:' . $ds . '=' . $rrd_filename . ':' . $ds . ':AVERAGE';
$rrd_options .= ' DEF:' . $ds . '_max=' . $rrd_filename . ':' . $ds . ':MAX';
$rrd_options .= ' DEF:' . $ds . '_min=' . $rrd_filename . ':' . $ds . ':MIN';
}
if ($print_total) {
$rrd_options .= ' VDEF:'.$ds.'_total=ds,TOTAL';
$rrd_options .= ' VDEF:' . $ds . '_total=ds,TOTAL';
}
if ($percentile) {
$rrd_options .= ' VDEF:'.$ds.'_percentile='.$ds.','.$percentile.',PERCENT';
$rrd_options .= ' VDEF:' . $ds . '_percentile=' . $ds . ',' . $percentile . ',PERCENT';
}
if ($_GET['previous'] == 'yes') {
if ($multiplier) {
$rrd_options .= ' DEF:'.$ds.'_oX='.$rrd_filename.':'.$ds.':AVERAGE:start='.$prev_from.':end='.$from;
$rrd_options .= ' DEF:'.$ds.'_max_oX='.$rrd_filename.':'.$ds.':MAX:start='.$prev_from.':end='.$from;
$rrd_options .= ' SHIFT:'.$ds."_oX:$period";
$rrd_options .= ' SHIFT:'.$ds."_max_oX:$period";
$rrd_options .= ' DEF:' . $ds . '_oX=' . $rrd_filename . ':' . $ds . ':AVERAGE:start=' . $prev_from . ':end=' . $from;
$rrd_options .= ' DEF:' . $ds . '_max_oX=' . $rrd_filename . ':' . $ds . ':MAX:start=' . $prev_from . ':end=' . $from;
$rrd_options .= ' SHIFT:' . $ds . "_oX:$period";
$rrd_options .= ' SHIFT:' . $ds . "_max_oX:$period";
if (empty($multiplier_action)) {
$multiplier_action = '*';
}
$rrd_options .= ' CDEF:'.$ds.'X='.$ds."_oX,$multiplier,$multiplier_action";
$rrd_options .= ' CDEF:'.$ds.'_maxX='.$ds."_max_oX,$multiplier,$multiplier_action";
$rrd_options .= ' CDEF:' . $ds . 'X=' . $ds . "_oX,$multiplier,$multiplier_action";
$rrd_options .= ' CDEF:' . $ds . '_maxX=' . $ds . "_max_oX,$multiplier,$multiplier_action";
} else {
$rrd_options .= ' DEF:'.$ds.'X='.$rrd_filename.':'.$ds.':AVERAGE:start='.$prev_from.':end='.$from;
$rrd_options .= ' DEF:'.$ds.'_maxX='.$rrd_filename.':'.$ds.':MAX:start='.$prev_from.':end='.$from;
$rrd_options .= ' SHIFT:'.$ds."X:$period";
$rrd_options .= ' SHIFT:'.$ds."_maxX:$period";
$rrd_options .= ' DEF:' . $ds . 'X=' . $rrd_filename . ':' . $ds . ':AVERAGE:start=' . $prev_from . ':end=' . $from;
$rrd_options .= ' DEF:' . $ds . '_maxX=' . $rrd_filename . ':' . $ds . ':MAX:start=' . $prev_from . ':end=' . $from;
$rrd_options .= ' SHIFT:' . $ds . "X:$period";
$rrd_options .= ' SHIFT:' . $ds . "_maxX:$period";
}
if ($print_total) {
$rrd_options .= ' VDEF:'.$ds.'_totalX=ds,TOTAL';
$rrd_options .= ' VDEF:' . $ds . '_totalX=ds,TOTAL';
}
if ($percentile) {
$rrd_options .= ' VDEF:'.$ds.'_percentileX='.$ds.','.$percentile.',PERCENT';
$rrd_options .= ' VDEF:' . $ds . '_percentileX=' . $ds . ',' . $percentile . ',PERCENT';
}
// if ($graph_max)
@@ -70,44 +70,44 @@ if (\LibreNMS\Config::get('old_graphs')) {
}//end if
if ($colour_minmax) {
$rrd_options .= ' AREA:'.$ds.'_max#c5c5c5';
$rrd_options .= ' AREA:'.$ds.'_min#ffffffff';
$rrd_options .= ' AREA:' . $ds . '_max#c5c5c5';
$rrd_options .= ' AREA:' . $ds . '_min#ffffffff';
} else {
$rrd_options .= ' AREA:'.$ds.'#'.$colour_area.':';
$rrd_options .= ' AREA:' . $ds . '#' . $colour_area . ':';
if ($graph_max) {
$rrd_options .= ' AREA:'.$ds.'_max#'.$colour_area_max.':';
$rrd_options .= ' AREA:' . $ds . '_max#' . $colour_area_max . ':';
}
}
$rrd_options .= " COMMENT:'".$unit_text.'Now Ave Max';
$rrd_options .= " COMMENT:'" . $unit_text . 'Now Ave Max';
if ($percentile) {
$rrd_options .= ' '.$percentile.'th %';
$rrd_options .= ' ' . $percentile . 'th %';
}
$rrd_options .= "\\n'";
$rrd_options .= ' LINE1.25:'.$ds.'#'.$colour_line.":'".$line_text."'";
$rrd_options .= ' GPRINT:'.$ds.':LAST:%6.'.$float_precision.'lf%s';
$rrd_options .= ' GPRINT:'.$ds.':AVERAGE:%6.'.$float_precision.'lf%s';
$rrd_options .= ' GPRINT:'.$ds.'_max:MAX:%6.'.$float_precision.'lf%s';
$rrd_options .= ' LINE1.25:' . $ds . '#' . $colour_line . ":'" . $line_text . "'";
$rrd_options .= ' GPRINT:' . $ds . ':LAST:%6.' . $float_precision . 'lf%s';
$rrd_options .= ' GPRINT:' . $ds . ':AVERAGE:%6.' . $float_precision . 'lf%s';
$rrd_options .= ' GPRINT:' . $ds . '_max:MAX:%6.' . $float_precision . 'lf%s';
if ($percentile) {
$rrd_options .= ' GPRINT:'.$ds.'_percentile:%6.'.$float_precision.'lf%s';
$rrd_options .= ' GPRINT:' . $ds . '_percentile:%6.' . $float_precision . 'lf%s';
}
$rrd_options .= "\\\\n";
$rrd_options .= " COMMENT:\\n";
if ($print_total) {
$rrd_options .= ' GPRINT:'.$ds.'_tot:Total\ %6.'.$float_precision.'lf%s\)\l';
$rrd_options .= ' GPRINT:' . $ds . '_tot:Total\ %6.' . $float_precision . 'lf%s\)\l';
}
if ($percentile) {
$rrd_options .= ' LINE1:'.$ds.'_percentile#aa0000';
$rrd_options .= ' LINE1:' . $ds . '_percentile#aa0000';
}
if ($_GET['previous'] == 'yes') {
$rrd_options .= ' LINE1.25:'.$ds."X#666666:'Prev \\\\n'";
$rrd_options .= ' AREA:'.$ds.'X#99999966:';
$rrd_options .= ' LINE1.25:' . $ds . "X#666666:'Prev \\\\n'";
$rrd_options .= ' AREA:' . $ds . 'X#99999966:';
}
}//end if