From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bernhard Bitsch <bbitsch@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] Network based RRD graphs Bytes to Bits
Date: Mon, 24 May 2021 21:43:51 +0200
Message-ID: <8aebf43d-571a-bdbc-3d2d-131f5b81e4b0@ipfire.org>
In-Reply-To: <be613c0f-b6d8-8c71-3b36-86f0247d81ba@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4179821030966196157=="
List-Id: <development.lists.ipfire.org>

--===============4179821030966196157==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hi,

I've tested also, for the qos and network graphs.
No problem.

One annotation: why are the legends 'incoming traffic in bytes per=20
second' ( new '... bits per second' )? The associated text is 'incoming=20
traffic' ( obviously in both versions ).
Can't we change this key just to 'incoming traffic'?
This is true for 'outgoing traffic...', 'incoming overhead...', ...
I didn't search where this texts are used  in the project.

Regards,
Bernhard

Am 24.05.2021 um 18:18 schrieb Matthias Fischer:
> Hi,
>=20
> thanks for the corrected patch - now I could apply it.
>=20
> I made a quick test =3D> please see attachments.
>=20
> Seems to work as expected.
>=20
> However I cannot test VPN connections, sorry.
>=20
> Best,
> Matthias
>=20
> On 24.05.2021 16:04, nateos2g(a)fastmail.com wrote:
>> From: Nate Oaks <nateos2g(a)fastmail.com>
>>
>> For proper display of network measurements, Bps (bytes) should be
>> converted to bps (bits). Bytes are for data/storage (RAM, HDD, SSD,
>> etc.), bits are for network bandwidth or throughput (NICs, switches,
>> routers, WiFi adapters, etc.).
>>
>> Networks transfer data as single bits at a time. It=E2=80=99s both more ac=
curate
>> and more intuitive to measure network speed in bits per second that a
>> network connection is transmitting, not the amount of data units, or
>> bytes, it transmits. Notice all network devices are marketed, measure
>> and diplay in bits per second.
>>
>> I simply used RRD CDEF to multiply by 8.
>>
>> NOTE: Found: "ERROR: rpn expressions without DEF or CDEF variables are
>> not supported".
>> Specifically in updateqosgraph, CDEF does not like a number as a
>> variable name. ie. "204" from $classline[1].
>>
>> Requires update of the language cache files:
>> perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
>> or: update-lang-cache
>>
>> Found one other asking for this:
>> https://community.ipfire.org/t/ipfire-bandwidth-usage/1203
>>
>> Signed-off-by: Nate Oaks <nateos2g(a)fastmail.com>
>> ---
>>   config/cfgroot/graphs.pl | 202 +++++++++++++++++++++------------------
>>   langs/en/cgi-bin/en.pl   |  13 +--
>>   2 files changed, 117 insertions(+), 98 deletions(-)
>>
>> diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
>> index 441d4c483a46..c83ae67bbfc1 100644
>> --- a/config/cfgroot/graphs.pl
>> +++ b/config/cfgroot/graphs.pl
>> @@ -545,28 +545,30 @@ sub updateifgraph {
>>   		"-1".$period,
>>   		"-r",
>>   		"-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'=
}." ".$Lang::tr{$period."-graph"},
>> -		"-v ".$Lang::tr{'bytes per second'},
>> +		"-v ".$Lang::tr{'bits per second'},
>>   		"--color=3DSHADEA".$color{"color19"},
>>   		"--color=3DSHADEB".$color{"color19"},
>>   		"--color=3DBACK".$color{"color21"},
>>   		"DEF:incoming=3D".$mainsettings{'RRDLOG'}."/collectd/localhost/interfa=
ce/if_octets-".$interface.".rrd:rx:AVERAGE",
>>   		"DEF:outgoing=3D".$mainsettings{'RRDLOG'}."/collectd/localhost/interfa=
ce/if_octets-".$interface.".rrd:tx:AVERAGE",
>> -		"CDEF:outgoingn=3Doutgoing,-1,*",
>> +		"CDEF:outgoingb=3Doutgoing,8,*",
>> +		"CDEF:outgoingn=3Doutgoingb,-1,*",
>> +		"CDEF:incomingb=3Dincoming,8,*",
>>   		"COMMENT:".sprintf("%-20s",$Lang::tr{'caption'}),
>>   		"COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}),
>>   		"COMMENT:".sprintf("%15s",$Lang::tr{'average'}),
>>   		"COMMENT:".sprintf("%15s",$Lang::tr{'minimal'}),
>>   		"COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j",
>> -		"AREA:incoming".$color{"color12"}."A0:".sprintf("%-20s",$Lang::tr{'inco=
ming traffic in bytes per second'}),
>> -		"GPRINT:incoming:MAX:%8.1lf %sBps",
>> -		"GPRINT:incoming:AVERAGE:%8.1lf %sBps",
>> -		"GPRINT:incoming:MIN:%8.1lf %sBps",
>> -		"GPRINT:incoming:LAST:%8.1lf %sBps\\j",
>> -		"AREA:outgoingn".$color{"color13"}."A0:".sprintf("%-20s",$Lang::tr{'out=
going traffic in bytes per second'}),
>> -		"GPRINT:outgoing:MAX:%8.1lf %sBps",
>> -		"GPRINT:outgoing:AVERAGE:%8.1lf %sBps",
>> -		"GPRINT:outgoing:MIN:%8.1lf %sBps",
>> -		"GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>> +		"AREA:incomingb".$color{"color12"}."A0:".sprintf("%-20s",$Lang::tr{'inc=
oming traffic in bits per second'}),
>> +		"GPRINT:incomingb:MAX:%8.1lf %sbps",
>> +		"GPRINT:incomingb:AVERAGE:%8.1lf %sbps",
>> +		"GPRINT:incomingb:MIN:%8.1lf %sbps",
>> +		"GPRINT:incomingb:LAST:%8.1lf %sbps\\j",
>> +		"AREA:outgoingn".$color{"color13"}."A0:".sprintf("%-20s",$Lang::tr{'out=
going traffic in bits per second'}),
>> +		"GPRINT:outgoingb:MAX:%8.1lf %sbps",
>> +		"GPRINT:outgoingb:AVERAGE:%8.1lf %sbps",
>> +		"GPRINT:outgoingb:MIN:%8.1lf %sbps",
>> +		"GPRINT:outgoingb:LAST:%8.1lf %sbps\\j",
>>   		);
>>   		$ERROR =3D RRDs::error;
>>   		return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERRO=
R;
>> @@ -582,28 +584,30 @@ sub updatevpngraph {
>>   		"-1".$period,
>>   		"-r",
>>   		"-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'=
}." ".$Lang::tr{$period."-graph"},
>> -		"-v ".$Lang::tr{'bytes per second'},
>> +		"-v ".$Lang::tr{'bits per second'},
>>   		"--color=3DSHADEA".$color{"color19"},
>>   		"--color=3DSHADEB".$color{"color19"},
>>   		"--color=3DBACK".$color{"color21"},
>>   		"DEF:incoming=3D".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn=
-$interface/if_octets_derive.rrd:rx:AVERAGE",
>>   		"DEF:outgoing=3D".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn=
-$interface/if_octets_derive.rrd:tx:AVERAGE",
>> -		"CDEF:outgoingn=3Doutgoing,-1,*",
>> +		"CDEF:outgoingb=3Doutgoing,8,*",
>> +		"CDEF:outgoingn=3Doutgoingb,-1,*",
>> +		"CDEF:incomingb=3Dincoming,8,*",
>>   		"COMMENT:".sprintf("%-20s",$Lang::tr{'caption'}),
>>   		"COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}),
>>   		"COMMENT:".sprintf("%15s",$Lang::tr{'average'}),
>>   		"COMMENT:".sprintf("%15s",$Lang::tr{'minimal'}),
>>   		"COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j",
>> -		"AREA:incoming#00dd00:".sprintf("%-20s",$Lang::tr{'incoming traffic in =
bytes per second'}),
>> -		"GPRINT:incoming:MAX:%8.1lf %sBps",
>> -		"GPRINT:incoming:AVERAGE:%8.1lf %sBps",
>> -		"GPRINT:incoming:MIN:%8.1lf %sBps",
>> -		"GPRINT:incoming:LAST:%8.1lf %sBps\\j",
>> -		"AREA:outgoingn#dd0000:".sprintf("%-20s",$Lang::tr{'outgoing traffic in=
 bytes per second'}),
>> -		"GPRINT:outgoing:MAX:%8.1lf %sBps",
>> -		"GPRINT:outgoing:AVERAGE:%8.1lf %sBps",
>> -		"GPRINT:outgoing:MIN:%8.1lf %sBps",
>> -		"GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>> +		"AREA:incomingb#00dd00:".sprintf("%-20s",$Lang::tr{'incoming traffic in=
 bits per second'}),
>> +		"GPRINT:incomingb:MAX:%8.1lf %sbps",
>> +		"GPRINT:incomingb:AVERAGE:%8.1lf %sbps",
>> +		"GPRINT:incomingb:MIN:%8.1lf %sbps",
>> +		"GPRINT:incomingb:LAST:%8.1lf %sbps\\j",
>> +		"AREA:outgoingn#dd0000:".sprintf("%-20s",$Lang::tr{'outgoing traffic in=
 bits per second'}),
>> +		"GPRINT:outgoingb:MAX:%8.1lf %sbps",
>> +		"GPRINT:outgoingb:AVERAGE:%8.1lf %sbps",
>> +		"GPRINT:outgoingb:MIN:%8.1lf %sbps",
>> +		"GPRINT:outgoingb:LAST:%8.1lf %sbps\\j",
>>   		);
>>   		$ERROR =3D RRDs::error;
>>   		return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERRO=
R;
>> @@ -619,7 +623,7 @@ sub updatevpnn2ngraph {
>>   		"-1".$period,
>>   		"-r",
>>   		"-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'=
}." ".$Lang::tr{$period."-graph"},
>> -		"-v ".$Lang::tr{'bytes per second'},
>> +		"-v ".$Lang::tr{'bits per second'},
>>   		"--color=3DSHADEA".$color{"color19"},
>>   		"--color=3DSHADEB".$color{"color19"},
>>   		"--color=3DBACK".$color{"color21"},
>> @@ -629,44 +633,50 @@ sub updatevpnn2ngraph {
>>   		"DEF:overhead_out=3D".$mainsettings{'RRDLOG'}."/collectd/localhost/ope=
nvpn-$interface/if_octets_derive-overhead.rrd:tx:AVERAGE",
>>   		"DEF:compression_in=3D".$mainsettings{'RRDLOG'}."/collectd/localhost/o=
penvpn-$interface/compression_derive-data_in.rrd:uncompressed:AVERAGE",
>>   		"DEF:compression_out=3D".$mainsettings{'RRDLOG'}."/collectd/localhost/=
openvpn-$interface/compression_derive-data_out.rrd:uncompressed:AVERAGE",
>> -		"CDEF:outgoingn=3Doutgoing,-1,*",
>> -		"CDEF:overhead_outn=3Doverhead_out,-1,*",
>> -		"CDEF:compression_outn=3Dcompression_out,-1,*",
>> +		"CDEF:outgoingb=3Doutgoing,8,*",
>> +		"CDEF:outgoingn=3Doutgoingb,-1,*",
>> +		"CDEF:incomingb=3Dincoming,8,*",
>> +		"CDEF:overhead_outb=3Doverhead_out,8,*",
>> +		"CDEF:overhead_outn=3Doverhead_outb,-1,*",
>> +		"CDEF:overhead_inb=3Doverhead_in,8,*",
>> +		"CDEF:compression_outb=3Dcompression_out,8,*",
>> +		"CDEF:compression_outn=3Dcompression_outb,-1,*",
>> +		"CDEF:compression_inb=3Dcompression_in,8,*",
>>   		"COMMENT:".sprintf("%-20s",$Lang::tr{'caption'}),
>>   		"COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}),
>>   		"COMMENT:".sprintf("%15s",$Lang::tr{'average'}),
>>   		"COMMENT:".sprintf("%15s",$Lang::tr{'minimal'}),
>>   		"COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j",
>> -		"AREA:incoming#00dd00:".sprintf("%-23s",$Lang::tr{'incoming traffic in =
bytes per second'}),
>> -		"GPRINT:incoming:MAX:%8.1lf %sBps",
>> -		"GPRINT:incoming:AVERAGE:%8.1lf %sBps",
>> -		"GPRINT:incoming:MIN:%8.1lf %sBps",
>> -		"GPRINT:incoming:LAST:%8.1lf %sBps\\j",
>> -		"STACK:overhead_in#116B11:".sprintf("%-23s",$Lang::tr{'incoming overhea=
d in bytes per second'}),
>> -		"GPRINT:overhead_in:MAX:%8.1lf %sBps",
>> -		"GPRINT:overhead_in:AVERAGE:%8.1lf %sBps",
>> -		"GPRINT:overhead_in:MIN:%8.1lf %sBps",
>> -		"GPRINT:overhead_in:LAST:%8.1lf %sBps\\j",
>> -		"LINE1:compression_in#ff00ff:".sprintf("%-23s",$Lang::tr{'incoming comp=
ression in bytes per second'}),
>> -		"GPRINT:compression_in:MAX:%8.1lf %sBps",
>> -		"GPRINT:compression_in:AVERAGE:%8.1lf %sBps",
>> -		"GPRINT:compression_in:MIN:%8.1lf %sBps",
>> -		"GPRINT:compression_in:LAST:%8.1lf %sBps\\j",
>> -		"AREA:outgoingn#dd0000:".sprintf("%-23s",$Lang::tr{'outgoing traffic in=
 bytes per second'}),
>> -		"GPRINT:outgoing:MAX:%8.1lf %sBps",
>> -		"GPRINT:outgoing:AVERAGE:%8.1lf %sBps",
>> -		"GPRINT:outgoing:MIN:%8.1lf %sBps",
>> -		"GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>> -		"STACK:overhead_outn#870C0C:".sprintf("%-23s",$Lang::tr{'outgoing overh=
ead in bytes per second'}),
>> -		"GPRINT:overhead_out:MAX:%8.1lf %sBps",
>> -		"GPRINT:overhead_out:AVERAGE:%8.1lf %sBps",
>> -		"GPRINT:overhead_out:MIN:%8.1lf %sBps",
>> -		"GPRINT:overhead_out:LAST:%8.1lf %sBps\\j",
>> -		"LINE1:compression_outn#000000:".sprintf("%-23s",$Lang::tr{'outgoing co=
mpression in bytes per second'}),
>> -		"GPRINT:compression_out:MAX:%8.1lf %sBps",
>> -		"GPRINT:compression_out:AVERAGE:%8.1lf %sBps",
>> -		"GPRINT:compression_out:MIN:%8.1lf %sBps",
>> -		"GPRINT:compression_out:LAST:%8.1lf %sBps\\j",
>> +		"AREA:incomingb#00dd00:".sprintf("%-23s",$Lang::tr{'incoming traffic in=
 bits per second'}),
>> +		"GPRINT:incomingb:MAX:%8.1lf %sbps",
>> +		"GPRINT:incomingb:AVERAGE:%8.1lf %sbps",
>> +		"GPRINT:incomingb:MIN:%8.1lf %sbps",
>> +		"GPRINT:incomingb:LAST:%8.1lf %sbps\\j",
>> +		"STACK:overhead_inb#116B11:".sprintf("%-23s",$Lang::tr{'incoming overhe=
ad in bits per second'}),
>> +		"GPRINT:overhead_inb:MAX:%8.1lf %sbps",
>> +		"GPRINT:overhead_inb:AVERAGE:%8.1lf %sbps",
>> +		"GPRINT:overhead_inb:MIN:%8.1lf %sbps",
>> +		"GPRINT:overhead_inb:bLAST:%8.1lf %sbps\\j",
>> +		"LINE1:compression_inb#ff00ff:".sprintf("%-23s",$Lang::tr{'incoming com=
pression in bits per second'}),
>> +		"GPRINT:compression_inb:MAX:%8.1lf %sbps",
>> +		"GPRINT:compression_inb:AVERAGE:%8.1lf %sbps",
>> +		"GPRINT:compression_inb:MIN:%8.1lf %sbps",
>> +		"GPRINT:compression_inb:LAST:%8.1lf %sbps\\j",
>> +		"AREA:outgoingn#dd0000:".sprintf("%-23s",$Lang::tr{'outgoing traffic in=
 bits per second'}),
>> +		"GPRINT:outgoingb:MAX:%8.1lf %sbps",
>> +		"GPRINT:outgoingb:AVERAGE:%8.1lf %sbps",
>> +		"GPRINT:outgoingb:MIN:%8.1lf %sbps",
>> +		"GPRINT:outgoingb:LAST:%8.1lf %sbps\\j",
>> +		"STACK:overhead_outn#870C0C:".sprintf("%-23s",$Lang::tr{'outgoing overh=
ead in bits per second'}),
>> +		"GPRINT:overhead_outb:MAX:%8.1lf %sbps",
>> +		"GPRINT:overhead_outb:AVERAGE:%8.1lf %sbps",
>> +		"GPRINT:overhead_outb:MIN:%8.1lf %sbps",
>> +		"GPRINT:overhead_outb:LAST:%8.1lf %sbps\\j",
>> +		"LINE1:compression_outn#000000:".sprintf("%-23s",$Lang::tr{'outgoing co=
mpression in bits per second'}),
>> +		"GPRINT:compression_outb:MAX:%8.1lf %sbps",
>> +		"GPRINT:compression_outb:AVERAGE:%8.1lf %sbps",
>> +		"GPRINT:compression_outb:MIN:%8.1lf %sbps",
>> +		"GPRINT:compression_outb:LAST:%8.1lf %sbps\\j",
>>   		);
>>   		$ERROR =3D RRDs::error;
>>   		return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERRO=
R;
>> @@ -683,7 +693,7 @@ sub updatefwhitsgraph {
>>   		"-1".$period,
>>   		"-r",
>>   		"-t ".$Lang::tr{'firewall hits per'}." ".$Lang::tr{$period."-graph"},
>> -		"-v ".$Lang::tr{'bytes per second'},
>> +		"-v ".$Lang::tr{'bits per second'},
>>   		"--color=3DSHADEA".$color{"color19"},
>>   		"--color=3DSHADEB".$color{"color19"},
>>   		"--color=3DBACK".$color{"color21"},
>> @@ -692,36 +702,41 @@ sub updatefwhitsgraph {
>>   		"DEF:forward=3D".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables=
-filter-POLICYFWD/ipt_bytes-DROP_FORWARD.rrd:value:AVERAGE",
>>   		"DEF:newnotsyn=3D".$mainsettings{'RRDLOG'}."/collectd/localhost/iptabl=
es-filter-NEWNOTSYN/ipt_bytes-DROP_NEWNOTSYN.rrd:value:AVERAGE",
>>   		"DEF:portscan=3D".$mainsettings{'RRDLOG'}."/collectd/localhost/iptable=
s-filter-PSCAN/ipt_bytes-DROP_PScan.rrd:value:AVERAGE",
>> +		"CDEF:outputb=3Doutput,8,*",
>> +		"CDEF:inputb=3Dinput,8,*",
>> +		"CDEF:forwardb=3Dforward,8,*",
>> +		"CDEF:newnotsynb=3Dnewnotsyn,8,*",
>> +		"CDEF:portscanb=3Dportscan,8,*",
>>   		"COMMENT:".sprintf("%-26s",$Lang::tr{'caption'}),
>>   		"COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}),
>>   		"COMMENT:".sprintf("%15s",$Lang::tr{'average'}),
>>   		"COMMENT:".sprintf("%14s",$Lang::tr{'minimal'}),
>>   		"COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j",
>> -		"AREA:output".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewa=
llhits'}." (OUTPUT)"),
>> -		"GPRINT:output:MAX:%8.1lf %sBps",
>> -		"GPRINT:output:AVERAGE:%8.1lf %sBps",
>> -		"GPRINT:output:MIN:%8.1lf %sBps",
>> -		"GPRINT:output:LAST:%8.1lf %sBps\\j",
>> -		"STACK:forward".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'fire=
wallhits'}." (FORWARD)"),
>> -		"GPRINT:forward:MAX:%8.1lf %sBps",
>> -		"GPRINT:forward:AVERAGE:%8.1lf %sBps",
>> -		"GPRINT:forward:MIN:%8.1lf %sBps",
>> -		"GPRINT:forward:LAST:%8.1lf %sBps\\j",
>> -		"STACK:input".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewa=
llhits'}." (INPUT)"),
>> -		"GPRINT:input:MAX:%8.1lf %sBps",
>> -		"GPRINT:input:AVERAGE:%8.1lf %sBps",
>> -		"GPRINT:input:MIN:%8.1lf %sBps",
>> -		"GPRINT:input:LAST:%8.1lf %sBps\\j",
>> -		"STACK:newnotsyn".$color{"color14"}."A0:".sprintf("%-25s","NewNotSYN"),
>> -		"GPRINT:newnotsyn:MAX:%8.1lf %sBps",
>> -		"GPRINT:newnotsyn:AVERAGE:%8.1lf %sBps",
>> -		"GPRINT:newnotsyn:MIN:%8.1lf %sBps",
>> -		"GPRINT:newnotsyn:LAST:%8.1lf %sBps\\j",
>> -		"STACK:portscan".$color{"color16"}."A0:".sprintf("%-25s",$Lang::tr{'por=
tscans'}),
>> -		"GPRINT:portscan:MAX:%8.1lf %sBps",
>> -		"GPRINT:portscan:AVERAGE:%8.1lf %sBps",
>> -		"GPRINT:portscan:MIN:%8.1lf %sBps",
>> -		"GPRINT:portscan:LAST:%8.1lf %sBps\\j",
>> +		"AREA:outputb".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firew=
allhits'}." (OUTPUT)"),
>> +		"GPRINT:outputb:MAX:%8.1lf %sbps",
>> +		"GPRINT:outputb:AVERAGE:%8.1lf %sbps",
>> +		"GPRINT:outputb:MIN:%8.1lf %sbps",
>> +		"GPRINT:outputb:LAST:%8.1lf %sbps\\j",
>> +		"STACK:forwardb".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'fir=
ewallhits'}." (FORWARD)"),
>> +		"GPRINT:forwardb:MAX:%8.1lf %sbps",
>> +		"GPRINT:forwardb:AVERAGE:%8.1lf %sbps",
>> +		"GPRINT:forwardb:MIN:%8.1lf %sbps",
>> +		"GPRINT:forwardb:LAST:%8.1lf %sbps\\j",
>> +		"STACK:inputb".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firew=
allhits'}." (INPUT)"),
>> +		"GPRINT:inputb:MAX:%8.1lf %sbps",
>> +		"GPRINT:inputb:AVERAGE:%8.1lf %sbps",
>> +		"GPRINT:inputb:MIN:%8.1lf %sbps",
>> +		"GPRINT:inputb:LAST:%8.1lf %sbps\\j",
>> +		"STACK:newnotsynb".$color{"color14"}."A0:".sprintf("%-25s","NewNotSYN"),
>> +		"GPRINT:newnotsynb:MAX:%8.1lf %sbps",
>> +		"GPRINT:newnotsynb:AVERAGE:%8.1lf %sbps",
>> +		"GPRINT:newnotsynb:MIN:%8.1lf %sbps",
>> +		"GPRINT:newnotsynb:LAST:%8.1lf %sbps\\j",
>> +		"STACK:portscanb".$color{"color16"}."A0:".sprintf("%-25s",$Lang::tr{'po=
rtscans'}),
>> +		"GPRINT:portscanb:MAX:%8.1lf %sbps",
>> +		"GPRINT:portscanb:AVERAGE:%8.1lf %sbps",
>> +		"GPRINT:portscanb:MIN:%8.1lf %sbps",
>> +		"GPRINT:portscanb:LAST:%8.1lf %sbps\\j",
>>   		);
>>   		$ERROR =3D RRDs::error;
>>   		return "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
>> @@ -1012,7 +1027,7 @@ sub updateqosgraph {
>>   		"-1".$period,
>>   		"-r",
>>   		"-t ".$Lang::tr{'Utilization on'}." (".$qossettings{'DEV'}.") ".$Lang:=
:tr{'graph per'}." ".$Lang::tr{$period."-graph"},
>> -		"-v ".$Lang::tr{'bytes per second'},
>> +		"-v ".$Lang::tr{'bits per second'},
>>   		"--color=3DSHADEA".$color{"color19"},
>>   		"--color=3DSHADEB".$color{"color19"},
>>   		"--color=3DBACK".$color{"color21"},
>> @@ -1039,21 +1054,24 @@ sub updateqosgraph {
>>   			}
>>  =20
>>   			if ( $classline[0] eq $qossettings{'DEV'} ){
>> -				push(@command, "DEF:$classline[1]=3D$mainsettings{'RRDLOG'}/class_$qo=
ssettings{'CLASSPRFX'}-$classline[1]_$qossettings{'DEV'}.rrd:bytes:AVERAGE");
>> +				# Found: ERROR: rpn expressions without DEF or CDEF variables are not=
 supported
>> +				# CDEF does not like a number as a variable name. ie. "204" from $cla=
ssline[1]
>> +				push(@command, "DEF:$classline[1]bit=3D$mainsettings{'RRDLOG'}/class_=
$qossettings{'CLASSPRFX'}-$classline[1]_$qossettings{'DEV'}.rrd:bytes:AVERAGE=
");
>> +				push(@command, "CDEF:$classline[8]=3D$classline[1]bit,8,*");
>>  =20
>>   				# get color to be used for this graph
>>   				my $graphColor =3D $colorMap{$colorKey};
>>  =20
>>   				if ($count eq "1") {
>> -					push(@command, "AREA:$classline[1]$graphColor:$Lang::tr{'Class'} $cl=
assline[1] -".sprintf("%15s",$classline[8]));
>> +					push(@command, "AREA:$classline[8]$graphColor:$Lang::tr{'Class'} $cl=
assline[1] -".sprintf("%15s",$classline[8]));
>>   				} else {
>> -					push(@command, "STACK:$classline[1]$graphColor:$Lang::tr{'Class'} $c=
lassline[1] -".sprintf("%15s",$classline[8]));
>> +					push(@command, "STACK:$classline[8]$graphColor:$Lang::tr{'Class'} $c=
lassline[1] -".sprintf("%15s",$classline[8]));
>>   				}
>>  =20
>> -				push(@command, "GPRINT:$classline[1]:MAX:%8.1lf %sBps"
>> -						, "GPRINT:$classline[1]:AVERAGE:%8.1lf %sBps"
>> -						, "GPRINT:$classline[1]:MIN:%8.1lf %sBps"
>> -						, "GPRINT:$classline[1]:LAST:%8.1lf %sBps\\j");
>> +				push(@command, "GPRINT:$classline[8]:MAX:%8.1lf %sbps"
>> +						, "GPRINT:$classline[8]:AVERAGE:%8.1lf %sbps"
>> +						, "GPRINT:$classline[8]:MIN:%8.1lf %sbps"
>> +						, "GPRINT:$classline[8]:LAST:%8.1lf %sbps\\j");
>>   				$count++;
>>   			}
>>   		}
>> diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
>> index dc1fd8d67b30..b0097074beb0 100644
>> --- a/langs/en/cgi-bin/en.pl
>> +++ b/langs/en/cgi-bin/en.pl
>> @@ -515,6 +515,7 @@
>>   'broken pipe' =3D> 'Broken pipe',
>>   'buffered memory' =3D> 'Buffered Memory',
>>   'buffers' =3D> 'buffers',
>> +'bits per second' =3D> 'Bits per Second',
>>   'bytes per second' =3D> 'Bytes per Second',
>>   'bytes received' =3D> 'Bytes Received',
>>   'bytes sent' =3D> 'Bytes Sent',
>> @@ -1431,10 +1432,10 @@
>>   'inactive' =3D> 'inactive',
>>   'include logfiles' =3D> 'Include logfiles',
>>   'incoming' =3D> 'incoming',
>> -'incoming compression in bytes per second' =3D> 'Incoming Compression',
>> +'incoming compression in bits per second' =3D> 'Incoming Compression',
>>   'incoming firewall access' =3D> 'Incoming Firewall Access',
>> -'incoming overhead in bytes per second' =3D> 'Incoming Overhead',
>> -'incoming traffic in bytes per second' =3D> 'Incoming Traffic',
>> +'incoming overhead in bits per second' =3D> 'Incoming Overhead',
>> +'incoming traffic in bits per second' =3D> 'Incoming Traffic',
>>   'incorrect password' =3D> 'Incorrect password',
>>   'info' =3D> 'Info',
>>   'init string' =3D> 'Init:',
>> @@ -1907,7 +1908,7 @@
>>   'our donors' =3D> 'Our donors',
>>   'out' =3D> 'Out',
>>   'outgoing' =3D> 'outgoing',
>> -'outgoing compression in bytes per second' =3D> 'Outgoing compression',
>> +'outgoing compression in bits per second' =3D> 'Outgoing compression',
>>   'outgoing firewall' =3D> 'Outgoing Firewall',
>>   'outgoing firewall access' =3D> 'Outgoing Firewall Access',
>>   'outgoing firewall add ip group' =3D> 'Add IP Address Group',
>> @@ -1930,8 +1931,8 @@
>>   'outgoing firewall reset' =3D> 'Reset all',
>>   'outgoing firewall view group' =3D> 'View group',
>>   'outgoing firewall warning' =3D> 'Not selecting source ip or mac ignores=
 them',
>> -'outgoing overhead in bytes per second' =3D> 'Outgoing Overhead',
>> -'outgoing traffic in bytes per second' =3D> 'Outgoing Traffic',
>> +'outgoing overhead in bits per second' =3D> 'Outgoing Overhead',
>> +'outgoing traffic in bits per second' =3D> 'Outgoing Traffic',
>>   'override mtu' =3D> 'Override default MTU',
>>   'ovpn' =3D> 'OpenVPN',
>>   'ovpn add conf' =3D> 'Additional configuration',
>>
>=20

--===============4179821030966196157==--