mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
Apply fixes from StyleCI (#12120)
This commit is contained in:
@@ -12,18 +12,18 @@ if ($multiplier) {
|
||||
$multiplier_action = '*';
|
||||
}
|
||||
|
||||
$rrd_options .= ' DEF:'.$ds.'_o='.$rrd_filename.':'.$ds.':AVERAGE';
|
||||
$rrd_options .= ' CDEF:'.$ds.'='.$ds."_o,$multiplier,$multiplier_action";
|
||||
$rrd_options .= ' DEF:' . $ds . '_o=' . $rrd_filename . ':' . $ds . ':AVERAGE';
|
||||
$rrd_options .= ' CDEF:' . $ds . '=' . $ds . "_o,$multiplier,$multiplier_action";
|
||||
} else {
|
||||
$rrd_options .= ' DEF:'.$ds.'='.$rrd_filename.':'.$ds.':AVERAGE';
|
||||
$rrd_options .= ' DEF:' . $ds . '=' . $rrd_filename . ':' . $ds . ':AVERAGE';
|
||||
}
|
||||
|
||||
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') {
|
||||
@@ -32,20 +32,20 @@ if ($_GET['previous'] == 'yes') {
|
||||
$multiplier_action = '*';
|
||||
}
|
||||
|
||||
$rrd_options .= ' DEF:'.$ds.'_oX='.$rrd_filename.':'.$ds.':AVERAGE:start='.$prev_from.':end='.$from;
|
||||
$rrd_options .= ' SHIFT:'.$ds."_oX:$period";
|
||||
$rrd_options .= ' CDEF:'.$ds.'X='.$ds."_oX,$multiplier,*";
|
||||
$rrd_options .= ' DEF:' . $ds . '_oX=' . $rrd_filename . ':' . $ds . ':AVERAGE:start=' . $prev_from . ':end=' . $from;
|
||||
$rrd_options .= ' SHIFT:' . $ds . "_oX:$period";
|
||||
$rrd_options .= ' CDEF:' . $ds . 'X=' . $ds . "_oX,$multiplier,*";
|
||||
} else {
|
||||
$rrd_options .= ' DEF:'.$ds.'X='.$rrd_filename.':'.$ds.':AVERAGE:start='.$prev_from.':end='.$from;
|
||||
$rrd_options .= ' SHIFT:'.$ds."X:$period";
|
||||
$rrd_options .= ' DEF:' . $ds . 'X=' . $rrd_filename . ':' . $ds . ':AVERAGE:start=' . $prev_from . ':end=' . $from;
|
||||
$rrd_options .= ' SHIFT:' . $ds . "X:$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)
|
||||
@@ -54,36 +54,36 @@ if ($_GET['previous'] == 'yes') {
|
||||
// }
|
||||
}//end if
|
||||
|
||||
$rrd_options .= ' AREA:'.$ds.'#'.$colour_area.':';
|
||||
$rrd_options .= ' AREA:' . $ds . '#' . $colour_area . ':';
|
||||
|
||||
$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:%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:%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.'_total:Total" %6.'.$float_precision.'lf%s"\\l';
|
||||
$rrd_options .= ' GPRINT:' . $ds . '_total: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:';
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user