diff --git a/html/includes/graphs/device/smokeping_all_common.inc.php b/html/includes/graphs/device/smokeping_all_common.inc.php new file mode 100644 index 000000000..afd9aa15e --- /dev/null +++ b/html/includes/graphs/device/smokeping_all_common.inc.php @@ -0,0 +1,97 @@ +Human translation:> + +$scale_min = 0; +$scale_rigid = TRUE; + +include("includes/graphs/common.inc.php"); +include("smokeping_common.inc.php"); + + +$i = 0; +$pings = 20; +$iter = 0; +$colourset = "mixed"; + +if($width > "500") +{ + $descr_len=18; +} else { + $descr_len=8; + $descr_len += round(($width - 250) / 8); +} + +$unit_text = "Latency"; + +if($width > "500") +{ + $rrd_options .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+5),0,$descr_len+5)." Current Average Maximum '"; + if (!$nototal) { $rrd_options .= " COMMENT:'Total '"; } + $rrd_options .= " COMMENT:'\l'"; +} else { + $rrd_options .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+5),0,$descr_len+5)." Now Ave Max\l'"; + +} + +foreach($smokeping_files[$direction][$device['hostname']] as $source => $filename) +{ + + if (!isset($config['graph_colours'][$colourset][$iter])) { $iter = 0; } + $colour = $config['graph_colours'][$colourset][$iter]; + $iter++; + + $descr = str_replace(":", "\:", substr(str_pad($source, $descr_len),0,$descr_len)); + + $filename = $config['smokeping']['dir'] . $filename; + $rrd_options .= " DEF:median$i=".$filename.":median:AVERAGE "; + $rrd_options .= " DEF:loss$i=".$filename.":loss:AVERAGE"; + $rrd_options .= " CDEF:ploss$i=loss$i,$pings,/,100,*"; + $rrd_options .= " CDEF:dm$i=median$i"; +# $rrd_options .= " CDEF:dm$i=median$i,0,".$max->{$start}.",LIMIT"; + + /// start emulate Smokeping::calc_stddev + foreach(range(1, $pings) as $p) + { + $rrd_options .= " DEF:pin".$i."p".$p."=".$filename.":ping".$p.":AVERAGE"; + $rrd_options .= " CDEF:p".$i."p".$p."=pin".$i."p".$p.",UN,0,pin".$i."p".$p.",IF"; + } + + foreach(range(2, $pings) as $p) + { + $pings_options .= ",p".$i."p".$p.",UN,+"; + $m_options .= ",p".$i."p".$p.",+"; + $sdev_options .= ",p".$i."p".$p.",m".$i.",-,DUP,*,+"; + } + + $rrd_options .= " CDEF:pings".$i."=".$pings .",p".$i."p1,UN". $pings_options . ",-"; + $rrd_options .= " CDEF:m".$i."=p".$i."p1".$m_options.",pings".$i.",/"; + $rrd_options .= " CDEF:sdev".$i."=p".$i."p1,m".$i.",-,DUP,*".$sdev_options.",pings".$i.",/,SQRT"; + // end emulate Smokeping::calc_stddev + + $rrd_options .= " CDEF:dmlow$i=dm$i,sdev$i,2,/,-"; + $rrd_options .= " CDEF:s2d$i=sdev$i"; + $rrd_options .= " AREA:dmlow$i"; + $rrd_options .= " AREA:s2d$i#".$colour."30::STACK"; + $rrd_options .= " LINE1:dm$i#".$colour.":$descr"; + +# $rrd_options .= " LINE1:sdev$i#000000:$descr"; + + $rrd_options .= " VDEF:avmed$i=median$i,AVERAGE"; + $rrd_options .= " VDEF:avsd$i=sdev$i,AVERAGE"; + $rrd_options .= " CDEF:msr$i=median$i,POP,avmed$i,avsd$i,/"; + $rrd_options .= " VDEF:avmsr$i=msr$i,AVERAGE"; + + $rrd_options .= " GPRINT:avmed$i:'%5.1lf %ss av md '"; + $rrd_options .= " GPRINT:ploss$i:AVERAGE:'%5.1lf %% av ls'"; + +# $rrd_options .= " GPRINT:sdev$i:'%5.1lf %s ms sd'"; + $rrd_options .= " GPRINT:avmsr$i:'%5.1lf %s am/as\\l'"; + + + $i++; +} + +?> diff --git a/html/includes/graphs/device/smokeping_in_all.inc.php b/html/includes/graphs/device/smokeping_in_all.inc.php index 73462d4a2..aaee41706 100644 --- a/html/includes/graphs/device/smokeping_in_all.inc.php +++ b/html/includes/graphs/device/smokeping_in_all.inc.php @@ -1,21 +1,7 @@ $filename) -{ - $i++; - $rrd_list[$i]['filename'] = $config['smokeping']['dir'] . $filename; - $rrd_list[$i]['descr'] = $source; - $rrd_list[$i]['ds'] = "median"; -} - -$colours='mixed'; - -$nototal = 1; -$simple_rrd = 1; - -include("includes/graphs/generic_multi_line.inc.php"); +include("smokeping_all_common.inc.php"); ?> diff --git a/html/includes/graphs/device/smokeping_out_all.inc.php b/html/includes/graphs/device/smokeping_out_all.inc.php index bd8461ff4..ef1d87f94 100644 --- a/html/includes/graphs/device/smokeping_out_all.inc.php +++ b/html/includes/graphs/device/smokeping_out_all.inc.php @@ -1,22 +1,7 @@ $filename) -{ - $i++; - $rrd_list[$i]['filename'] = $config['smokeping']['dir'] . $filename; - $rrd_list[$i]['descr'] = $source; - $rrd_list[$i]['ds'] = "median"; -} - -$colours='mixed'; - -$nototal = 1; -$simple_rrd = 1; - -include("includes/graphs/generic_multi_line.inc.php"); +include("smokeping_all_common.inc.php"); ?>