diff options
| author | Seth Mos <seth.mos@xs4all.nl> | 2008-04-01 21:13:35 +0000 |
|---|---|---|
| committer | Seth Mos <seth.mos@xs4all.nl> | 2008-04-01 21:13:35 +0000 |
| commit | 9835307e0b9fda7b5d3e13e9dbbdf56ca97e4daf (patch) | |
| tree | 43535d7df07f2bb896b7bf3fd8533534b0cea16c /usr/local/www/status_rrd_graph_img.php | |
| parent | 3a1259aef233b8047215c03cdc62f66d2b1ff9d0 (diff) | |
| download | pfsense-9835307e0b9fda7b5d3e13e9dbbdf56ca97e4daf.zip pfsense-9835307e0b9fda7b5d3e13e9dbbdf56ca97e4daf.tar.gz | |
Fix graph totals calculus
Diffstat (limited to 'usr/local/www/status_rrd_graph_img.php')
| -rw-r--r-- | usr/local/www/status_rrd_graph_img.php | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/usr/local/www/status_rrd_graph_img.php b/usr/local/www/status_rrd_graph_img.php index 6d7ae8f..7592a0c 100644 --- a/usr/local/www/status_rrd_graph_img.php +++ b/usr/local/www/status_rrd_graph_img.php @@ -135,6 +135,8 @@ if ($altq_list_queues[$curif]) { $downif = "lan"; } +$speedlimit = ($upstream + $downstream); + /* select theme colors if the inclusion file exists */ $rrdcolors = "./themes/{$g['theme']}/rrdcolors.inc.php"; if(file_exists($rrdcolors)) { @@ -199,11 +201,11 @@ if((strstr($curdatabase, "-traffic.rrd")) && (file_exists("$rrddbpath$curdatabas \"CDEF:$curif-out_bits=$curif-out_bytes,8,*\" \\ \"CDEF:$curif-bits_io=$curif-in_bits,$curif-out_bits,+\" \\ \"CDEF:$curif-out_bits_neg=$curif-out_bits,$multiplier,*\" \\ - \"CDEF:$curif-bytes_in=$curif-in_bytes,0,$downstream,LIMIT,UN,0,$curif-in_bytes,IF,$average,*\" \\ - \"CDEF:$curif-bytes_out=$curif-out_bytes,0,$upstream,LIMIT,UN,0,$curif-out_bytes,IF,$average,*\" \\ + \"CDEF:$curif-bytes_in=$curif-in_bytes,0,$speedlimit,LIMIT,UN,0,$curif-in_bytes,IF,$average,*\" \\ + \"CDEF:$curif-bytes_out=$curif-out_bytes,0,$speedlimit,LIMIT,UN,0,$curif-out_bytes,IF,$average,*\" \\ \"CDEF:$curif-bytes=$curif-bytes_in,$curif-bytes_out,+\" \\ - \"CDEF:$curif-bytes_in_t=$curif-in_bytes,0,$downstream,LIMIT,UN,0,$curif-in_bytes,IF,$seconds,*\" \\ - \"CDEF:$curif-bytes_out_t=$curif-out_bytes,0,$upstream,LIMIT,UN,0,$curif-out_bytes,IF,$seconds,*\" \\ + \"CDEF:$curif-bytes_in_t=$curif-in_bytes,0,$speedlimit,LIMIT,UN,0,$curif-in_bytes,IF,$seconds,*\" \\ + \"CDEF:$curif-bytes_out_t=$curif-out_bytes,0,$speedlimit,LIMIT,UN,0,$curif-out_bytes,IF,$seconds,*\" \\ \"CDEF:$curif-bytes_t=$curif-bytes_in_t,$curif-bytes_out_t,+\" \\ AREA:$curif-in_bits#$colortrafficdown:$curif-in \\ $AREA:$curif-out_bits_neg#$colortrafficup:$curif-out \\ @@ -266,11 +268,11 @@ elseif(strstr($curdatabase, "-throughput.rrd")) { $graphcmd .= "\"CDEF:{$ifname}-in_bits={$ifname}-in_bytes,8,*\" "; $graphcmd .= "\"CDEF:{$ifname}-out_bits={$ifname}-out_bytes,8,*\" "; $graphcmd .= "\"CDEF:{$ifname}-bits_io={$ifname}-in_bits,{$ifname}-out_bits,+\" "; - $graphcmd .= "\"CDEF:{$ifname}-bytes_in={$ifname}-in_bytes,0,$downstream,LIMIT,UN,0,{$ifname}-in_bytes,IF,$average,*\" "; - $graphcmd .= "\"CDEF:{$ifname}-bytes_out={$ifname}-out_bytes,0,$upstream,LIMIT,UN,0,{$ifname}-out_bytes,IF,$average,*\" "; + $graphcmd .= "\"CDEF:{$ifname}-bytes_in={$ifname}-in_bytes,0,$speedlimit,LIMIT,UN,0,{$ifname}-in_bytes,IF,$average,*\" "; + $graphcmd .= "\"CDEF:{$ifname}-bytes_out={$ifname}-out_bytes,0,$speedlimit,LIMIT,UN,0,{$ifname}-out_bytes,IF,$average,*\" "; $graphcmd .= "\"CDEF:{$ifname}-bytes={$ifname}-bytes_in,{$ifname}-bytes_out,+\" "; - $graphcmd .= "\"CDEF:{$ifname}-bytes_in_t={$ifname}-in_bytes,0,$downstream,LIMIT,UN,0,{$ifname}-in_bytes,IF,$seconds,*\" "; - $graphcmd .= "\"CDEF:{$ifname}-bytes_out_t={$ifname}-out_bytes,0,$upstream,LIMIT,UN,0,{$ifname}-out_bytes,IF,$seconds,*\" "; + $graphcmd .= "\"CDEF:{$ifname}-bytes_in_t={$ifname}-in_bytes,0,$speedlimit,LIMIT,UN,0,{$ifname}-in_bytes,IF,$seconds,*\" "; + $graphcmd .= "\"CDEF:{$ifname}-bytes_out_t={$ifname}-out_bytes,0,$speedlimit,LIMIT,UN,0,{$ifname}-out_bytes,IF,$seconds,*\" "; $graphcmd .= "\"CDEF:{$ifname}-bytes_t={$ifname}-bytes_in_t,{$ifname}-bytes_out_t,+\" "; if ($g > 0) { $operand .= ",+"; @@ -566,7 +568,7 @@ elseif((strstr($curdatabase, "-queues.rrd")) && (file_exists("$rrddbpath$curdata $color = "$colorqueuesup[$t]"; //if($t > 0) { $stack = ":STACK"; } $graphcmd .= "DEF:$name=$rrddbpath$curdatabase:$name:AVERAGE \\ - \"CDEF:$name-bytes_out=$name,0,$upstream,LIMIT,UN,0,$name,IF\" \\ + \"CDEF:$name-bytes_out=$name,0,$speedlimit,LIMIT,UN,0,$name,IF\" \\ \"CDEF:$name-bits_out=$name-bytes_out,8,*\" \\ $AREA:$name-bits_out#${color}:$name \\"; $t++; @@ -593,7 +595,7 @@ elseif((strstr($curdatabase, "-queuedrops.rrd")) && (file_exists("$rrddbpath$cur $color = "$colorqueuesdropup[$t]"; //if($t > 0) { $stack = ":STACK"; } $graphcmd .= "DEF:$name=$rrddbpath$curdatabase:$name:AVERAGE \\ - \"CDEF:$name-bytes_out=$name,0,$upstream,LIMIT,UN,0,$name,IF\" \\ + \"CDEF:$name-bytes_out=$name,0,$speedlimit,LIMIT,UN,0,$name,IF\" \\ \"CDEF:$name-bits_out=$name-bytes_out,8,*\" \\ \"CDEF:$name-bits_out_neg=$name-bits_out,$multiplier,*\" \\ $AREA:$name-bits_out_neg#${color}:$name \\"; |
