Revert "RRD Graph Float Precision adjustment (#11812)" (#11850)

This reverts commit fd5c2bcaeb.
This commit is contained in:
SourceDoctor
2020-06-23 13:08:06 +02:00
committed by GitHub
parent fd5c2bcaeb
commit f2ed5452b3
14 changed files with 128 additions and 132 deletions

View File

@@ -139,27 +139,27 @@ $rrd_options .= " COMMENT:'bps Now Ave Max " . Config::get(
$rrd_options .= ' AREA:in' . $format . '_max#D7FFC7' . $stacked['transparency'] . ':';
$rrd_options .= ' AREA:in' . $format . '#90B040' . $stacked['transparency'] . ':';
$rrd_options .= ' LINE:in' . $format . "#608720:'In '";
$rrd_options .= ' GPRINT:in' . $format . ':LAST:%6.'.$float_precision.'lf%s';
$rrd_options .= ' GPRINT:in' . $format . ':AVERAGE:%6.'.$float_precision.'lf%s';
$rrd_options .= ' GPRINT:in' . $format . '_max:MAX:%6.'.$float_precision.'lf%s';
$rrd_options .= " GPRINT:percentile_in:%6.'.$float_precision.'lf%s\\n";
$rrd_options .= ' GPRINT:in' . $format . ':LAST:%6.2lf%s';
$rrd_options .= ' GPRINT:in' . $format . ':AVERAGE:%6.2lf%s';
$rrd_options .= ' GPRINT:in' . $format . '_max:MAX:%6.2lf%s';
$rrd_options .= " GPRINT:percentile_in:%6.2lf%s\\n";
$rrd_options .= ' AREA:dout' . $format . '_max#E0E0FF' . $stacked['transparency'] . ':';
$rrd_options .= ' AREA:dout' . $format . '#8080C0' . $stacked['transparency'] . ':';
$rrd_options .= ' LINE:dout' . $format . "#606090:'Out'";
$rrd_options .= ' GPRINT:out' . $format . ':LAST:%6.'.$float_precision.'lf%s';
$rrd_options .= ' GPRINT:out' . $format . ':AVERAGE:%6.'.$float_precision.'lf%s';
$rrd_options .= ' GPRINT:out' . $format . '_max:MAX:%6.'.$float_precision.'lf%s';
$rrd_options .= " GPRINT:percentile_out:%6.'.$float_precision.'lf%s\\n";
$rrd_options .= ' GPRINT:out' . $format . ':LAST:%6.2lf%s';
$rrd_options .= ' GPRINT:out' . $format . ':AVERAGE:%6.2lf%s';
$rrd_options .= ' GPRINT:out' . $format . '_max:MAX:%6.2lf%s';
$rrd_options .= " GPRINT:percentile_out:%6.2lf%s\\n";
if (Config::get('rrdgraph_real_percentile')) {
$rrd_options .= ' HRULE:percentilehigh#FF0000:"Highest"';
$rrd_options .= " GPRINT:percentilehigh:\"%30.2lf%s\\n\"";
}
$rrd_options .= " GPRINT:tot:'Total %6.'.$float_precision.'lf%sB'";
$rrd_options .= " GPRINT:totin:'(In %6.'.$float_precision.'lf%sB'";
$rrd_options .= " GPRINT:totout:'Out %6.'.$float_precision.'lf%sB)\\l'";
$rrd_options .= " GPRINT:tot:'Total %6.2lf%sB'";
$rrd_options .= " GPRINT:totin:'(In %6.2lf%sB'";
$rrd_options .= " GPRINT:totout:'Out %6.2lf%sB)\\l'";
$rrd_options .= ' LINE1:percentile_in#aa0000';
$rrd_options .= ' LINE1:dpercentile_out#aa0000';
@@ -179,16 +179,16 @@ if ($to > time()) {
if ($_GET['previous'] == 'yes') {
$rrd_options .= " COMMENT:' \\n'";
$rrd_options .= ' LINE1.25:in' . $format . "X#333300:'Prev In '\t";
$rrd_options .= ' GPRINT:in' . $format . 'X:AVERAGE:%6.'.$float_precision.'lf%s';
$rrd_options .= ' GPRINT:in' . $format . '_maxX:MAX:%6.'.$float_precision.'lf%s';
$rrd_options .= " GPRINT:percentile_inX:%6.'.$float_precision.'lf%s\\n";
$rrd_options .= ' GPRINT:in' . $format . 'X:AVERAGE:%6.2lf%s';
$rrd_options .= ' GPRINT:in' . $format . '_maxX:MAX:%6.2lf%s';
$rrd_options .= " GPRINT:percentile_inX:%6.2lf%s\\n";
$rrd_options .= ' LINE1.25:dout' . $format . "X#000099:'Prev Out '\t";
$rrd_options .= ' GPRINT:out' . $format . 'X:AVERAGE:%6.'.$float_precision.'lf%s';
$rrd_options .= ' GPRINT:out' . $format . '_maxX:MAX:%6.'.$float_precision.'lf%s';
$rrd_options .= " GPRINT:percentile_outX:%6.'.$float_precision.'lf%s\\n";
$rrd_options .= " GPRINT:totX:'Total %6.'.$float_precision.'lf%sB'";
$rrd_options .= " GPRINT:totinX:'(In %6.'.$float_precision.'lf%sB'";
$rrd_options .= " GPRINT:totoutX:'Out %6.'.$float_precision.'lf%sB)\\l'";
$rrd_options .= ' GPRINT:out' . $format . 'X:AVERAGE:%6.2lf%s';
$rrd_options .= ' GPRINT:out' . $format . '_maxX:MAX:%6.2lf%s';
$rrd_options .= " GPRINT:percentile_outX:%6.2lf%s\\n";
$rrd_options .= " GPRINT:totX:'Total %6.2lf%sB'";
$rrd_options .= " GPRINT:totinX:'(In %6.2lf%sB'";
$rrd_options .= " GPRINT:totoutX:'Out %6.2lf%sB)\\l'";
$rrd_options .= ' LINE1:percentile_inX#00aaaa';
$rrd_options .= ' LINE1:dpercentile_outX#00aaaa';
}