mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
Fix coding style part 2
This commit is contained in:
Job Snijders
@@ -2,130 +2,134 @@
|
||||
|
||||
// Draw generic bits graph
|
||||
// args: ds_in, ds_out, rrd_filename, bg, legend, from, to, width, height, inverse, previous
|
||||
require 'includes/graphs/common.inc.php';
|
||||
|
||||
include("includes/graphs/common.inc.php");
|
||||
|
||||
if ($rrd_filename) { $rrd_filename_out = $rrd_filename; $rrd_filename_in = $rrd_filename; }
|
||||
if ($inverse) { $in = 'out'; $out = 'in'; } else { $in = 'in'; $out = 'out'; }
|
||||
|
||||
if ($multiplier)
|
||||
{
|
||||
$rrd_options .= " DEF:p".$out."octets=".$rrd_filename_out.":".$ds_out.":AVERAGE";
|
||||
$rrd_options .= " DEF:p".$in."octets=".$rrd_filename_in.":".$ds_in.":AVERAGE";
|
||||
$rrd_options .= " DEF:p".$out."octets_max=".$rrd_filename_out.":".$ds_out.":MAX";
|
||||
$rrd_options .= " DEF:p".$in."octets_max=".$rrd_filename_in.":".$ds_in.":MAX";
|
||||
$rrd_options .= " CDEF:inoctets=pinoctets,$multiplier,*";
|
||||
$rrd_options .= " CDEF:outoctets=poutoctets,$multiplier,*";
|
||||
$rrd_options .= " CDEF:inoctets_max=pinoctets_max,$multiplier,*";
|
||||
$rrd_options .= " CDEF:outoctets_max=poutoctets_max,$multiplier,*";
|
||||
} else {
|
||||
$rrd_options .= " DEF:".$out."octets=".$rrd_filename_out.":".$ds_out.":AVERAGE";
|
||||
$rrd_options .= " DEF:".$in."octets=".$rrd_filename_in.":".$ds_in.":AVERAGE";
|
||||
$rrd_options .= " DEF:".$out."octets_max=".$rrd_filename_out.":".$ds_out.":MAX";
|
||||
$rrd_options .= " DEF:".$in."octets_max=".$rrd_filename_in.":".$ds_in.":MAX";
|
||||
if ($rrd_filename) {
|
||||
$rrd_filename_out = $rrd_filename;
|
||||
$rrd_filename_in = $rrd_filename;
|
||||
}
|
||||
|
||||
if($_GET['previous'] == "yes")
|
||||
{
|
||||
if ($multiplier)
|
||||
{
|
||||
$rrd_options .= " DEF:p".$out."octetsX=".$rrd_filename_out.":".$ds_out.":AVERAGE:start=".$prev_from.":end=".$from;
|
||||
$rrd_options .= " DEF:p".$in."octetsX=".$rrd_filename_in.":".$ds_in.":AVERAGE:start=".$prev_from.":end=".$from;
|
||||
$rrd_options .= " SHIFT:p".$out."octetsX:$period";
|
||||
$rrd_options .= " SHIFT:p".$in."octetsX:$period";
|
||||
$rrd_options .= " CDEF:inoctetsX=pinoctetsX,$multiplier,*";
|
||||
$rrd_options .= " CDEF:outoctetsX=poutoctetsX,$multiplier,*";
|
||||
} else {
|
||||
$rrd_options .= " DEF:".$out."octetsX=".$rrd_filename_out.":".$ds_out.":AVERAGE:start=".$prev_from.":end=".$from;
|
||||
$rrd_options .= " DEF:".$in."octetsX=".$rrd_filename_in.":".$ds_in.":AVERAGE:start=".$prev_from.":end=".$from;
|
||||
$rrd_options .= " SHIFT:".$out."octetsX:$period";
|
||||
$rrd_options .= " SHIFT:".$in."octetsX:$period";
|
||||
}
|
||||
|
||||
$rrd_options .= " CDEF:octetsX=inoctetsX,outoctetsX,+";
|
||||
$rrd_options .= " CDEF:doutoctetsX=outoctetsX,-1,*";
|
||||
$rrd_options .= " CDEF:outbitsX=outoctetsX,8,*";
|
||||
#$rrd_options .= " CDEF:outbits_maxX=outoctets_maxX,8,*";
|
||||
#$rrd_options .= " CDEF:doutoctets_maxX=outoctets_maxX,-1,*";
|
||||
$rrd_options .= " CDEF:doutbitsX=doutoctetsX,8,*";
|
||||
#$rrd_options .= " CDEF:doutbits_maxX=doutoctets_maxX,8,*";
|
||||
|
||||
$rrd_options .= " CDEF:inbitsX=inoctetsX,8,*";
|
||||
#$rrd_options .= " CDEF:inbits_maxX=inoctets_maxX,8,*";
|
||||
$rrd_options .= " VDEF:totinX=inoctetsX,TOTAL";
|
||||
$rrd_options .= " VDEF:totoutX=outoctetsX,TOTAL";
|
||||
$rrd_options .= " VDEF:totX=octetsX,TOTAL";
|
||||
|
||||
if ($inverse) {
|
||||
$in = 'out';
|
||||
$out = 'in';
|
||||
}
|
||||
else {
|
||||
$in = 'in';
|
||||
$out = 'out';
|
||||
}
|
||||
|
||||
$rrd_options .= " CDEF:octets=inoctets,outoctets,+";
|
||||
$rrd_options .= " CDEF:doutoctets=outoctets,-1,*";
|
||||
$rrd_options .= " CDEF:outbits=outoctets,8,*";
|
||||
$rrd_options .= " CDEF:outbits_max=outoctets_max,8,*";
|
||||
$rrd_options .= " CDEF:doutoctets_max=outoctets_max,-1,*";
|
||||
$rrd_options .= " CDEF:doutbits=doutoctets,8,*";
|
||||
$rrd_options .= " CDEF:doutbits_max=doutoctets_max,8,*";
|
||||
if ($multiplier) {
|
||||
$rrd_options .= ' DEF:p'.$out.'octets='.$rrd_filename_out.':'.$ds_out.':AVERAGE';
|
||||
$rrd_options .= ' DEF:p'.$in.'octets='.$rrd_filename_in.':'.$ds_in.':AVERAGE';
|
||||
$rrd_options .= ' DEF:p'.$out.'octets_max='.$rrd_filename_out.':'.$ds_out.':MAX';
|
||||
$rrd_options .= ' DEF:p'.$in.'octets_max='.$rrd_filename_in.':'.$ds_in.':MAX';
|
||||
$rrd_options .= " CDEF:inoctets=pinoctets,$multiplier,*";
|
||||
$rrd_options .= " CDEF:outoctets=poutoctets,$multiplier,*";
|
||||
$rrd_options .= " CDEF:inoctets_max=pinoctets_max,$multiplier,*";
|
||||
$rrd_options .= " CDEF:outoctets_max=poutoctets_max,$multiplier,*";
|
||||
}
|
||||
else {
|
||||
$rrd_options .= ' DEF:'.$out.'octets='.$rrd_filename_out.':'.$ds_out.':AVERAGE';
|
||||
$rrd_options .= ' DEF:'.$in.'octets='.$rrd_filename_in.':'.$ds_in.':AVERAGE';
|
||||
$rrd_options .= ' DEF:'.$out.'octets_max='.$rrd_filename_out.':'.$ds_out.':MAX';
|
||||
$rrd_options .= ' DEF:'.$in.'octets_max='.$rrd_filename_in.':'.$ds_in.':MAX';
|
||||
}
|
||||
|
||||
$rrd_options .= " CDEF:inbits=inoctets,8,*";
|
||||
$rrd_options .= " CDEF:inbits_max=inoctets_max,8,*";
|
||||
if ($_GET['previous'] == 'yes') {
|
||||
if ($multiplier) {
|
||||
$rrd_options .= ' DEF:p'.$out.'octetsX='.$rrd_filename_out.':'.$ds_out.':AVERAGE:start='.$prev_from.':end='.$from;
|
||||
$rrd_options .= ' DEF:p'.$in.'octetsX='.$rrd_filename_in.':'.$ds_in.':AVERAGE:start='.$prev_from.':end='.$from;
|
||||
$rrd_options .= ' SHIFT:p'.$out."octetsX:$period";
|
||||
$rrd_options .= ' SHIFT:p'.$in."octetsX:$period";
|
||||
$rrd_options .= " CDEF:inoctetsX=pinoctetsX,$multiplier,*";
|
||||
$rrd_options .= " CDEF:outoctetsX=poutoctetsX,$multiplier,*";
|
||||
}
|
||||
else {
|
||||
$rrd_options .= ' DEF:'.$out.'octetsX='.$rrd_filename_out.':'.$ds_out.':AVERAGE:start='.$prev_from.':end='.$from;
|
||||
$rrd_options .= ' DEF:'.$in.'octetsX='.$rrd_filename_in.':'.$ds_in.':AVERAGE:start='.$prev_from.':end='.$from;
|
||||
$rrd_options .= ' SHIFT:'.$out."octetsX:$period";
|
||||
$rrd_options .= ' SHIFT:'.$in."octetsX:$period";
|
||||
}
|
||||
|
||||
$rrd_options .= ' CDEF:octetsX=inoctetsX,outoctetsX,+';
|
||||
$rrd_options .= ' CDEF:doutoctetsX=outoctetsX,-1,*';
|
||||
$rrd_options .= ' CDEF:outbitsX=outoctetsX,8,*';
|
||||
// $rrd_options .= " CDEF:outbits_maxX=outoctets_maxX,8,*";
|
||||
// $rrd_options .= " CDEF:doutoctets_maxX=outoctets_maxX,-1,*";
|
||||
$rrd_options .= ' CDEF:doutbitsX=doutoctetsX,8,*';
|
||||
// $rrd_options .= " CDEF:doutbits_maxX=doutoctets_maxX,8,*";
|
||||
$rrd_options .= ' CDEF:inbitsX=inoctetsX,8,*';
|
||||
// $rrd_options .= " CDEF:inbits_maxX=inoctets_maxX,8,*";
|
||||
$rrd_options .= ' VDEF:totinX=inoctetsX,TOTAL';
|
||||
$rrd_options .= ' VDEF:totoutX=outoctetsX,TOTAL';
|
||||
$rrd_options .= ' VDEF:totX=octetsX,TOTAL';
|
||||
}//end if
|
||||
|
||||
$rrd_options .= ' CDEF:octets=inoctets,outoctets,+';
|
||||
$rrd_options .= ' CDEF:doutoctets=outoctets,-1,*';
|
||||
$rrd_options .= ' CDEF:outbits=outoctets,8,*';
|
||||
$rrd_options .= ' CDEF:outbits_max=outoctets_max,8,*';
|
||||
$rrd_options .= ' CDEF:doutoctets_max=outoctets_max,-1,*';
|
||||
$rrd_options .= ' CDEF:doutbits=doutoctets,8,*';
|
||||
$rrd_options .= ' CDEF:doutbits_max=doutoctets_max,8,*';
|
||||
|
||||
$rrd_options .= ' CDEF:inbits=inoctets,8,*';
|
||||
$rrd_options .= ' CDEF:inbits_max=inoctets_max,8,*';
|
||||
|
||||
if ($config['rrdgraph_real_95th']) {
|
||||
$rrd_options .= " CDEF:highbits=inoctets,outoctets,MAX,8,*";
|
||||
$rrd_options .= " VDEF:95thhigh=highbits,95,PERCENT";
|
||||
$rrd_options .= ' CDEF:highbits=inoctets,outoctets,MAX,8,*';
|
||||
$rrd_options .= ' VDEF:95thhigh=highbits,95,PERCENT';
|
||||
}
|
||||
|
||||
$rrd_options .= " VDEF:totin=inoctets,TOTAL";
|
||||
$rrd_options .= " VDEF:totout=outoctets,TOTAL";
|
||||
$rrd_options .= " VDEF:tot=octets,TOTAL";
|
||||
$rrd_options .= ' VDEF:totin=inoctets,TOTAL';
|
||||
$rrd_options .= ' VDEF:totout=outoctets,TOTAL';
|
||||
$rrd_options .= ' VDEF:tot=octets,TOTAL';
|
||||
|
||||
$rrd_options .= " VDEF:95thin=inbits,95,PERCENT";
|
||||
$rrd_options .= " VDEF:95thout=outbits,95,PERCENT";
|
||||
$rrd_options .= " VDEF:d95thout=doutbits,5,PERCENT";
|
||||
$rrd_options .= ' VDEF:95thin=inbits,95,PERCENT';
|
||||
$rrd_options .= ' VDEF:95thout=outbits,95,PERCENT';
|
||||
$rrd_options .= ' VDEF:d95thout=doutbits,5,PERCENT';
|
||||
|
||||
if($format == "octets" || $format == "bytes")
|
||||
{
|
||||
$units = "Bps";
|
||||
$format = "octets";
|
||||
} else {
|
||||
$units = "bps";
|
||||
$format = "bits";
|
||||
if ($format == 'octets' || $format == 'bytes') {
|
||||
$units = 'Bps';
|
||||
$format = 'octets';
|
||||
}
|
||||
else {
|
||||
$units = 'bps';
|
||||
$format = 'bits';
|
||||
}
|
||||
|
||||
$rrd_options .= " COMMENT:'bps Now Ave Max 95th %\\n'";
|
||||
|
||||
$rrd_options .= " AREA:in".$format."_max#D7FFC7:";
|
||||
$rrd_options .= " AREA:in".$format."#90B040:";
|
||||
$rrd_options .= " LINE:in".$format."#608720:'In '";
|
||||
#$rrd_options .= " LINE1.25:in".$format."#006600:'In '";
|
||||
$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 .= ' AREA:in'.$format.'_max#D7FFC7:';
|
||||
$rrd_options .= ' AREA:in'.$format.'#90B040:';
|
||||
$rrd_options .= ' LINE:in'.$format."#608720:'In '";
|
||||
// $rrd_options .= " LINE1.25:in".$format."#006600:'In '";
|
||||
$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:95thin:%6.2lf%s\\\\n";
|
||||
|
||||
$rrd_options .= " AREA:dout".$format."_max#E0E0FF:";
|
||||
$rrd_options .= " AREA:dout".$format."#8080C0:";
|
||||
$rrd_options .= " LINE:dout".$format."#606090:'Out'";
|
||||
#$rrd_options .= " LINE1.25:dout".$format."#000099:Out";
|
||||
$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 .= ' AREA:dout'.$format.'_max#E0E0FF:';
|
||||
$rrd_options .= ' AREA:dout'.$format.'#8080C0:';
|
||||
$rrd_options .= ' LINE:dout'.$format."#606090:'Out'";
|
||||
// $rrd_options .= " LINE1.25:dout".$format."#000099:Out";
|
||||
$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:95thout:%6.2lf%s\\\\n";
|
||||
|
||||
if ($config['rrdgraph_real_95th']) {
|
||||
$rrd_options .= " HRULE:95thhigh#FF0000:\"Highest\"";
|
||||
$rrd_options .= " GPRINT:95thhigh:\"%30.2lf%s\\n\"";
|
||||
$rrd_options .= ' HRULE:95thhigh#FF0000:"Highest"';
|
||||
$rrd_options .= " GPRINT:95thhigh:\"%30.2lf%s\\n\"";
|
||||
}
|
||||
|
||||
$rrd_options .= " GPRINT:tot:'Total %6.2lf%s'";
|
||||
$rrd_options .= " GPRINT:totin:'(In %6.2lf%s'";
|
||||
$rrd_options .= " GPRINT:totout:'Out %6.2lf%s)\\\\l'";
|
||||
$rrd_options .= " LINE1:95thin#aa0000";
|
||||
$rrd_options .= " LINE1:d95thout#aa0000";
|
||||
$rrd_options .= ' LINE1:95thin#aa0000';
|
||||
$rrd_options .= ' LINE1:d95thout#aa0000';
|
||||
|
||||
if($_GET['previous'] == "yes")
|
||||
{
|
||||
$rrd_options .= " LINE1.25:in".$format."X#009900:'Prev In \\\\n'";
|
||||
$rrd_options .= " LINE1.25:dout".$format."X#000099:'Prev Out'";
|
||||
if ($_GET['previous'] == 'yes') {
|
||||
$rrd_options .= ' LINE1.25:in'.$format."X#009900:'Prev In \\\\n'";
|
||||
$rrd_options .= ' LINE1.25:dout'.$format."X#000099:'Prev Out'";
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
Reference in New Issue
Block a user