Updated samba to stable 30

Added Multi Ping Destination Option for Graphs
This commit is contained in:
Christian Schmidt
2008-05-31 00:25:48 +02:00
committed by Arne Fitzenreiter
parent 78c655ac8a
commit cee25dda28
6 changed files with 49 additions and 20 deletions

View File

@@ -405,16 +405,17 @@ sub updatefwhitsgraph {
# Generate the Line Quality Graph for the current period of time for values given by collecd
sub updatelqgraph {
sub updatepinggraph {
my $period = $_[0];
RRDs::graph ("$graphs/lq-$period.png",
my $host = $_[1];
RRDs::graph ("$graphs/$host-$period.png",
"--start", "-1$period", "-aPNG", "-i", "-W www.ipfire.org",
"--alt-y-grid", "-w 600", "-h 125", "-l 0", "-r", "-v ms",
"-t $Lang::tr{'linkq'} $Lang::tr{'graph per'} $Lang::tr{$period}",
"-t $Lang::tr{'linkq'} $host $Lang::tr{'graph per'} $Lang::tr{$period}",
"--color", "SHADEA".$color{"color19"},
"--color", "SHADEB".$color{"color19"},
"--color", "BACK".$color{"color21"},
"DEF:roundtrip=$rrdlog/collectd/localhost/ping/ping-gateway.rrd:ping:AVERAGE",
"DEF:roundtrip=$rrdlog/collectd/localhost/ping/ping-$host.rrd:ping:AVERAGE",
"COMMENT:$Lang::".sprintf("%-20s",$Lang::tr{'caption'})."\\j",
"CDEF:roundavg=roundtrip,PREV(roundtrip),+,2,/",
"CDEF:r0=roundtrip,30,MIN",
@@ -426,10 +427,9 @@ sub updatelqgraph {
"AREA:r2".$color{"color14"}."A0:70-150 ms",
"AREA:r1".$color{"color17"}."A0:30-70 ms",
"AREA:r0".$color{"color12"}."A0:<30 ms\\j",
"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",
"COMMENT:$Lang::tr{'maximal'}",
"COMMENT:$Lang::tr{'average'}",
"COMMENT:$Lang::tr{'minimal'}","COMMENT:$Lang::tr{'current'}\\j",
"LINE1:roundtrip#707070:",
"GPRINT:roundtrip:MAX:%3.2lf ms",
"GPRINT:roundtrip:AVERAGE:%3.2lf ms",

View File

@@ -4,4 +4,7 @@ usr/bin/bc
usr/bin/dc
srv/web/ipfire/cgi-bin/pakfire.cgi
srv/web/ipfire/cgi-bin/qos.cgi
srv/web/ipfire/cgi-bin/network.cgi
srv/web/ipfire/cgi-bin/graphs.cgi
var/ipfire/langs
var/ipfire/graphs.pl