sub updatecpugraph {
- my $period = $_[0];
+ my $period = $_[0];
RRDs::graph ("$graphs/cpu-$period.png",
- "--start", "-1$period", "-aPNG", "-i", "-z", "-W www.ipfire.org",
- "--alt-y-grid", "-w 600", "-h 100", "-l 0", "-u 100", "-r",
+ "--start", "-1$period", "-aPNG", "-i", "-z", "-W www.ipfire.org",, "-v $Lang::tr{'percentage'}",
+ "--alt-y-grid", "-w 600", "-h 150", "-l 0", "-u 100", "-r",
"--color", "SHADEA".$color{"color19"},
"--color", "SHADEB".$color{"color19"},
"--color", "BACK".$color{"color21"},
"-t $Lang::tr{'cpu usage per'} $Lang::tr{$period}",
- "DEF:iowait=$rrdlog/cpu.rrd:iowait:AVERAGE",
- "DEF:user=$rrdlog/cpu.rrd:user:AVERAGE",
- "DEF:system=$rrdlog/cpu.rrd:system:AVERAGE",
- "DEF:idle=$rrdlog/cpu.rrd:idle:AVERAGE",
- "DEF:irq=$rrdlog/cpu.rrd:irq:AVERAGE",
- "CDEF:total=user,system,idle,iowait,irq,+,+,+,+",
+ "DEF:iowait=$rrdlog/collectd/localhost/cpu-0/cpu-wait.rrd:value:AVERAGE",
+ "DEF:nice=$rrdlog/collectd/localhost/cpu-0/cpu-nice.rrd:value:AVERAGE",
+ "DEF:interrupt=$rrdlog/collectd/localhost/cpu-0/cpu-interrupt.rrd:value:AVERAGE",
+ "DEF:steal=$rrdlog/collectd/localhost/cpu-0/cpu-steal.rrd:value:AVERAGE",
+ "DEF:user=$rrdlog/collectd/localhost/cpu-0/cpu-user.rrd:value:AVERAGE",
+ "DEF:system=$rrdlog/collectd/localhost/cpu-0/cpu-system.rrd:value:AVERAGE",
+ "DEF:idle=$rrdlog/collectd/localhost/cpu-0/cpu-idle.rrd:value:AVERAGE",
+ "DEF:irq=$rrdlog/collectd/localhost/cpu-0/cpu-softirq.rrd:value:AVERAGE",
+ "CDEF:total=user,system,idle,iowait,irq,nice,interrupt,steal,+,+,+,+,+,+,+",
"CDEF:userpct=100,user,total,/,*",
+ "CDEF:nicepct=100,nice,total,/,*",
+ "CDEF:interruptpct=100,interrupt,total,/,*",
+ "CDEF:stealpct=100,steal,total,/,*",
"CDEF:systempct=100,system,total,/,*",
"CDEF:idlepct=100,idle,total,/,*",
"CDEF:iowaitpct=100,iowait,total,/,*",
"CDEF:irqpct=100,irq,total,/,*",
- "COMMENT:$Lang::tr{'caption'}\\t\\t\\t ",
+ "COMMENT:".sprintf("%-29s",$Lang::tr{'caption'}),
"COMMENT:$Lang::tr{'maximal'}",
"COMMENT:$Lang::tr{'average'}",
"COMMENT:$Lang::tr{'minimal'}",
"COMMENT:$Lang::tr{'current'}\\j",
- "AREA:iowaitpct".$color{"color14"}.":$Lang::tr{'iowait'}",
+ "AREA:iowaitpct".$color{"color14"}.":".sprintf("%-25s",$Lang::tr{'cpu iowait usage'}),
"GPRINT:iowaitpct:MAX:%3.2lf%%",
"GPRINT:iowaitpct:AVERAGE:%3.2lf%%",
"GPRINT:iowaitpct:MIN:%3.2lf%%",
"GPRINT:iowaitpct:LAST:%3.2lf%%\\j",
- "STACK:irqpct".$color{"color23"}.":$Lang::tr{'cpu irq usage'}",
+ "STACK:irqpct".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'cpu irq usage'}),
"GPRINT:irqpct:MAX:%3.2lf%%",
"GPRINT:irqpct:AVERAGE:%3.2lf%%",
"GPRINT:irqpct:MIN:%3.2lf%%",
"GPRINT:irqpct:LAST:%3.2lf%%\\j",
- "STACK:userpct".$color{"color11"}.":$Lang::tr{'user cpu usage'}",
+ "STACK:nicepct".$color{"color16"}."A0:".sprintf("%-25s",$Lang::tr{'cpu nice usage'}),
+ "GPRINT:nicepct:MAX:%3.2lf%%",
+ "GPRINT:nicepct:AVERAGE:%3.2lf%%",
+ "GPRINT:nicepct:MIN:%3.2lf%%",
+ "GPRINT:nicepct:LAST:%3.2lf%%\\j",
+ "STACK:interruptpct".$color{"color15"}."A0:".sprintf("%-25s",$Lang::tr{'cpu interrupt usage'}),
+ "GPRINT:interruptpct:MAX:%3.2lf%%",
+ "GPRINT:interruptpct:AVERAGE:%3.2lf%%",
+ "GPRINT:interruptpct:MIN:%3.2lf%%",
+ "GPRINT:interruptpct:LAST:%3.2lf%%\\j",
+ "STACK:stealpct".$color{"color18"}."A0:".sprintf("%-25s",$Lang::tr{'cpu steal usage'}),
+ "GPRINT:stealpct:MAX:%3.2lf%%",
+ "GPRINT:stealpct:AVERAGE:%3.2lf%%",
+ "GPRINT:stealpct:MIN:%3.2lf%%",
+ "GPRINT:stealpct:LAST:%3.2lf%%\\j",
+ "STACK:userpct".$color{"color11"}."A0:".sprintf("%-25s",$Lang::tr{'cpu user usage'}),
"GPRINT:userpct:MAX:%3.2lf%%",
"GPRINT:userpct:AVERAGE:%3.2lf%%",
"GPRINT:userpct:MIN:%3.2lf%%",
"GPRINT:userpct:LAST:%3.2lf%%\\j",
- "STACK:systempct".$color{"color13"}.":$Lang::tr{'system cpu usage'}",
+ "STACK:systempct".$color{"color13"}."A0:".sprintf("%-25s",$Lang::tr{'cpu system usage'}),
"GPRINT:systempct:MAX:%3.2lf%%",
"GPRINT:systempct:AVERAGE:%3.2lf%%",
"GPRINT:systempct:MIN:%3.2lf%%",
"GPRINT:systempct:LAST:%3.2lf%%\\j",
- "STACK:idlepct".$color{"color12"}.":$Lang::tr{'idle cpu usage'}",
+ "STACK:idlepct".$color{"color12"}."A0:".sprintf("%-25s",$Lang::tr{'cpu idle usage'}),
"GPRINT:idlepct:MAX:%3.2lf%%",
"GPRINT:idlepct:AVERAGE:%3.2lf%%",
"GPRINT:idlepct:MIN:%3.2lf%%",
RRDs::graph ("$graphs/load-$period.png",
"--start", "-1$period", "-aPNG",
- "-w 600", "-h 100", "-i", "-z", "-W www.ipfire.org", "-l 0", "-r", "--alt-y-grid",
+ "-w 600", "-h 150", "-i", "-z", "-W www.ipfire.org", "-l 0", "-r", "--alt-y-grid",
"-t Load Average $Lang::tr{'graph per'} $Lang::tr{$period}",
"--color", "SHADEA".$color{"color19"},
"--color", "SHADEB".$color{"color19"},
"--color", "BACK".$color{"color21"},
- "DEF:load1=$rrdlog/load.rrd:load1:AVERAGE",
- "DEF:load5=$rrdlog/load.rrd:load5:AVERAGE",
- "DEF:load15=$rrdlog/load.rrd:load15:AVERAGE",
- "AREA:load1".$color{"color13"}.":1 Minute, letzter:",
+ "DEF:load1=$rrdlog/collectd/localhost/load/load.rrd:shortterm:AVERAGE",
+ "DEF:load5=$rrdlog/collectd/localhost/load/load.rrd:midterm:AVERAGE",
+ "DEF:load15=$rrdlog/collectd/localhost/load/load.rrd:longterm:AVERAGE",
+ "AREA:load1".$color{"color13"}."A0:1 Minute, letzter:",
"GPRINT:load1:LAST:%5.2lf",
- "AREA:load5".$color{"color18"}.":5 Minuten, letzter:",
+ "AREA:load5".$color{"color18"}."A0:5 Minuten, letzter:",
"GPRINT:load5:LAST:%5.2lf",
- "AREA:load15".$color{"color14"}.":15 Minuten, letzter:",
+ "AREA:load15".$color{"color14"}."A0:15 Minuten, letzter:",
"GPRINT:load15:LAST:%5.2lf\\j",
"LINE1:load5".$color{"color13"},
"LINE1:load1".$color{"color18"});
my $period = $_[0];
RRDs::graph ("$graphs/memory-$period.png",
- "--start", "-1$period", "-aPNG", "-i", "-z", "-W www.ipfire.org",
- "--alt-y-grid", "-w 600", "-h 100", "-l 0", "-u 100", "-r",
+ "--start", "-1$period", "-aPNG", "-i", "-z", "-W www.ipfire.org", "-v $Lang::tr{'percentage'}",
+ "--alt-y-grid", "-w 600", "-h 150", "-l 0", "-u 100", "-r",
"--color", "SHADEA".$color{"color19"},
"--color", "SHADEB".$color{"color19"},
"--color", "BACK".$color{"color21"},
"-t $Lang::tr{'memory usage per'} $Lang::tr{$period}",
- "DEF:used=$rrdlog/mem.rrd:memused:AVERAGE",
- "DEF:free=$rrdlog/mem.rrd:memfree:AVERAGE",
- "DEF:shared=$rrdlog/mem.rrd:memshared:AVERAGE",
- "DEF:buffer=$rrdlog/mem.rrd:membuffers:AVERAGE",
- "DEF:cache=$rrdlog/mem.rrd:memcache:AVERAGE",
- "CDEF:total=used,free,+",
- "CDEF:used2=used,buffer,cache,shared,+,+,-",
- "CDEF:usedpct=100,used2,total,/,*",
- "CDEF:sharedpct=100,shared,total,/,*",
- "CDEF:bufferpct=100,buffer,total,/,*",
- "CDEF:cachepct=100,cache,total,/,*",
- "CDEF:freepct=100,free,total,/,*",
- "COMMENT:$Lang::tr{'caption'}\\t\\t\\t",
+ "DEF:used=$rrdlog/collectd/localhost/memory/memory-used.rrd:value:AVERAGE",
+ "DEF:free=$rrdlog/collectd/localhost/memory/memory-free.rrd:value:AVERAGE",
+ "DEF:buffer=$rrdlog/collectd/localhost/memory/memory-buffered.rrd:value:AVERAGE",
+ "DEF:cache=$rrdlog/collectd/localhost/memory/memory-cached.rrd:value:AVERAGE",
+ "CDEF:total=used,free,cache,buffer,+,+,+",
+ "CDEF:usedpct=used,total,/,100,*",
+ "CDEF:bufferpct=buffer,total,/,100,*",
+ "CDEF:cachepct=cache,total,/,100,*",
+ "CDEF:freepct=free,total,/,100,*",
+ "COMMENT:$Lang::".sprintf("%-29s",$Lang::tr{'caption'}),
"COMMENT:$Lang::tr{'maximal'}",
"COMMENT:$Lang::tr{'average'}",
"COMMENT:$Lang::tr{'minimal'}",
"COMMENT:$Lang::tr{'current'}\\j",
- "AREA:usedpct".$color{"color11"}.":$Lang::tr{'used memory'}",
+ "AREA:usedpct".$color{"color11"}."A0:".sprintf("%-25s",$Lang::tr{'used memory'}),
"GPRINT:usedpct:MAX:%3.2lf%%",
"GPRINT:usedpct:AVERAGE:%3.2lf%%",
"GPRINT:usedpct:MIN:%3.2lf%%",
"GPRINT:usedpct:LAST:%3.2lf%%\\j",
- "STACK:sharedpct".$color{"color13"}.":$Lang::tr{'shared memory'}",
- "GPRINT:sharedpct:MAX:%3.2lf%%",
- "GPRINT:sharedpct:AVERAGE:%3.2lf%%",
- "GPRINT:sharedpct:MIN:%3.2lf%%",
- "GPRINT:sharedpct:LAST:%3.2lf%%\\j",
- "STACK:bufferpct".$color{"color23"}.":$Lang::tr{'buffered memory'}",
+ "STACK:bufferpct".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'buffered memory'}),
"GPRINT:bufferpct:MAX:%3.2lf%%",
"GPRINT:bufferpct:AVERAGE:%3.2lf%%",
"GPRINT:bufferpct:MIN:%3.2lf%%",
"GPRINT:bufferpct:LAST:%3.2lf%%\\j",
- "STACK:cachepct".$color{"color14"}.":$Lang::tr{'cached memory'}",
+ "STACK:cachepct".$color{"color14"}."A0:".sprintf("%-25s",$Lang::tr{'cached memory'}),
"GPRINT:cachepct:MAX:%3.2lf%%",
"GPRINT:cachepct:AVERAGE:%3.2lf%%",
"GPRINT:cachepct:MIN:%3.2lf%%",
"GPRINT:cachepct:LAST:%3.2lf%%\\j",
- "STACK:freepct".$color{"color12"}.":$Lang::tr{'free memory'}",
+ "STACK:freepct".$color{"color12"}."A0:".sprintf("%-25s",$Lang::tr{'free memory'}),
"GPRINT:freepct:MAX:%3.2lf%%",
"GPRINT:freepct:AVERAGE:%3.2lf%%",
"GPRINT:freepct:MIN:%3.2lf%%",
print "Error in RRD::graph for mem: $ERROR\n" if $ERROR;
RRDs::graph ("$graphs/swap-$period.png",
- "--start", "-1$period", "-aPNG", "-i", "-z", "-W www.ipfire.org",
- "--alt-y-grid", "-w 600", "-h 100", "-l 0", "-u 100", "-r",
+ "--start", "-1$period", "-aPNG", "-i", "-z", "-W www.ipfire.org", "-v $Lang::tr{'percentage'}",
+ "--alt-y-grid", "-w 600", "-h 150", "-l 0", "-u 100", "-r",
"--color", "SHADEA".$color{"color19"},
"--color", "SHADEB".$color{"color19"},
"--color", "BACK".$color{"color21"},
"-t $Lang::tr{'swap usage per'} $Lang::tr{$period}",
- "DEF:used=$rrdlog/mem.rrd:swapused:AVERAGE",
- "DEF:free=$rrdlog/mem.rrd:swapfree:AVERAGE",
- "CDEF:total=used,free,+",
+ "DEF:used=$rrdlog/collectd/localhost/swap/swap-used.rrd:value:AVERAGE",
+ "DEF:free=$rrdlog/collectd/localhost/swap/swap-free.rrd:value:AVERAGE",
+ "DEF:cached=$rrdlog/collectd/localhost/swap/swap-cached.rrd:value:AVERAGE",
+ "CDEF:total=used,free,cached,+,+",
"CDEF:usedpct=100,used,total,/,*",
"CDEF:freepct=100,free,total,/,*",
- "COMMENT:$Lang::tr{'caption'}\\t\\t",
+ "CDEF:cachedpct=100,cached,total,/,*",
+ "COMMENT:$Lang::".sprintf("%-29s",$Lang::tr{'caption'}),
"COMMENT:$Lang::tr{'maximal'}",
"COMMENT:$Lang::tr{'average'}",
"COMMENT:$Lang::tr{'minimal'}",
"COMMENT:$Lang::tr{'current'}\\j",
- "AREA:usedpct".$color{"color11"}.":$Lang::tr{'used swap'}",
+ "AREA:usedpct".$color{"color11"}."A0:".sprintf("%-25s",$Lang::tr{'used swap'}),
"GPRINT:usedpct:MAX:%3.2lf%%",
"GPRINT:usedpct:AVERAGE:%3.2lf%%",
"GPRINT:usedpct:MIN:%3.2lf%%",
"GPRINT:usedpct:LAST:%3.2lf%%\\j",
- "STACK:freepct".$color{"color12"}.":$Lang::tr{'free swap'}",
+ "STACK:freepct".$color{"color12"}."A0:".sprintf("%-25s",$Lang::tr{'free swap'}),
"GPRINT:freepct:MAX:%3.2lf%%",
"GPRINT:freepct:AVERAGE:%3.2lf%%",
"GPRINT:freepct:MIN:%3.2lf%%",
- "GPRINT:freepct:LAST:%3.2lf%%\\j");
+ "GPRINT:freepct:LAST:%3.2lf%%\\j",
+ "STACK:cachedpct".$color{"color13"}."A0:".sprintf("%-25s",$Lang::tr{'cached swap'}),
+ "GPRINT:cachedpct:MAX:%3.2lf%%",
+ "GPRINT:cachedpct:AVERAGE:%3.2lf%%",
+ "GPRINT:cachedpct:MIN:%3.2lf%%",
+ "GPRINT:cachedpct:LAST:%3.2lf%%\\j");
$ERROR = RRDs::error;
print "Error in RRD::graph for swap: $ERROR\n" if $ERROR;
}
my $disk = $_[1];
RRDs::graph ("$graphs/disk-$disk-$period.png",
- "--start", "-1$period", "-aPNG", "-i", "-z", "-W www.ipfire.org",
- "--alt-y-grid", "-w 600", "-h 100", "-l 0", "-r",
- "--color", "SHADEA".$color{"color19"},
+ "--start", "-1$period", "-aPNG", "-i", "-W www.ipfire.org", "-v $Lang::tr{'bytes per second'}",
+ "--alt-y-grid", "-w 600", "-h 150", "-r", "-z",
+ "--color", "SHADEA".$color{"color19"},
"--color", "SHADEB".$color{"color19"},
"--color", "BACK".$color{"color21"},
"-t $disk $Lang::tr{'disk access per'} $Lang::tr{$period}",
- "DEF:read=$rrdlog/disk-$disk.rrd:readsect:AVERAGE",
- "DEF:write=$rrdlog/disk-$disk.rrd:writesect:AVERAGE",
+ "DEF:read=$rrdlog/collectd/localhost/disk-$disk/disk_octets.rrd:read:AVERAGE",
+ "DEF:write=$rrdlog/collectd/localhost/disk-$disk/disk_octets.rrd:write:AVERAGE",
+ "CDEF:writen=write,-1,*",
"DEF:standby=$rrdlog/hddshutdown-$disk.rrd:standby:AVERAGE",
"CDEF:st=standby,INF,*",
- "AREA:st".$color{"color20"}.":standby\\j",
- "AREA:read".$color{"color11"}.":$Lang::tr{'sectors read from disk per second'}",
- "STACK:write".$color{"color12"}.":$Lang::tr{'sectors written to disk per second'}\\j",
- "COMMENT: \\j",
+ "COMMENT:$Lang::".sprintf("%-25s",$Lang::tr{'caption'}),
"COMMENT:$Lang::tr{'maximal'}",
"COMMENT:$Lang::tr{'average'}",
+ "COMMENT:$Lang::tr{'minimal'}",
"COMMENT:$Lang::tr{'current'}\\j",
- "GPRINT:read:MAX:$Lang::tr{'read sectors'}\\:%8.0lf",
- "GPRINT:read:AVERAGE:$Lang::tr{'read sectors'}\\:%8.0lf",
- "GPRINT:read:LAST:$Lang::tr{'read sectors'}\\:%8.0lf\\j",
- "GPRINT:write:MAX:$Lang::tr{'written sectors'}\\:%8.0lf",
- "GPRINT:write:AVERAGE:$Lang::tr{'written sectors'}\\:%8.0lf",
- "GPRINT:write:LAST:$Lang::tr{'written sectors'}\\:%8.0lf\\j");
+ "AREA:st".$color{"color20"}.":standby\\j",
+ "AREA:read".$color{"color14"}."A0:".sprintf("%-25s",$Lang::tr{'read bytes'}),
+ "GPRINT:read:MAX:%8.1lf %sBps",
+ "GPRINT:read:AVERAGE:%8.1lf %sBps",
+ "GPRINT:read:MIN:%8.1lf %sBps",
+ "GPRINT:read:LAST:%8.1lf %sBps\\j",
+ "AREA:writen".$color{"color13"}."A0:".sprintf("%-25s",$Lang::tr{'written bytes'}),
+ "GPRINT:write:MAX:%8.1lf %sBps",
+ "GPRINT:write:AVERAGE:%8.1lf %sBps",
+ "GPRINT:write:MIN:%8.1lf %sBps",
+ "GPRINT:write:LAST:%8.1lf %sBps\\j");
$ERROR = RRDs::error;
print "Error in RRD::graph for disk: $ERROR\n" if $ERROR;
}
sub updateifgraph {
- my $interface = $_[0];
- my $period = $_[1];
-
- RRDs::graph ("$graphs/$interface-$period.png",
- "--start", "-1$period", "-aPNG", "-i", "-z", "-W www.ipfire.org",
- "--alt-y-grid", "-w 600", "-h 100",
- "--color", "SHADEA".$color{"color19"},
- "--color", "SHADEB".$color{"color19"},
- "--color", "BACK".$color{"color21"},
- "-t $Lang::tr{'traffic on'} $interface $Lang::tr{'graph per'} $Lang::tr{$period}",
- "-v$Lang::tr{'bytes per second'}",
- "DEF:incoming=$rrdlog/$interface.rrd:incoming:AVERAGE",
- "DEF:outgoing=$rrdlog/$interface.rrd:outgoing:AVERAGE",
- "AREA:incoming".$color{"color11"}.":$Lang::tr{'incoming traffic in bytes per second'}",
- "AREA:outgoing".$color{"color12"}.":$Lang::tr{'outgoing traffic in bytes per second'}\\j",
- "COMMENT: \\j",
- "COMMENT:$Lang::tr{'maximal'}",
- "COMMENT:$Lang::tr{'average'}",
- "COMMENT:$Lang::tr{'minimal'}",
- "COMMENT:$Lang::tr{'current'}\\j",
- "GPRINT:incoming:MAX:$Lang::tr{'in'}\\:%8.3lf %sBps",
- "GPRINT:incoming:AVERAGE:$Lang::tr{'in'}\\:%8.3lf %sBps",
- "GPRINT:incoming:MIN:$Lang::tr{'in'}\\:%8.3lf %sBps",
- "GPRINT:incoming:LAST:$Lang::tr{'in'}\\:%8.3lf %sBps\\j",
- "GPRINT:outgoing:MAX:$Lang::tr{'out'}\\:%8.3lf %sBps",
- "GPRINT:outgoing:AVERAGE:$Lang::tr{'out'}\\:%8.3lf %sBps",
- "GPRINT:outgoing:MIN:$Lang::tr{'out'}\\:%8.3lf %sBps",
- "GPRINT:outgoing:LAST:$Lang::tr{'out'}\\:%8.3lf %sBps\\j");
- $ERROR = RRDs::error;
- print "Error in RRD::graph for $interface: $ERROR\n" if $ERROR;
+ my $interface = $_[0];
+ my $period = $_[1];
+
+ RRDs::graph ("$graphs/$interface-$period.png",
+ "--start", "-1$period", "-aPNG", "-i", "-W www.ipfire.org", "-v $Lang::tr{'bytes per second'}",
+ "--alt-y-grid", "-w 600", "-h 150", "-z", "-r",
+ "--color", "SHADEA".$color{"color19"},
+ "--color", "SHADEB".$color{"color19"},
+ "--color", "BACK".$color{"color21"},
+ "-t $Lang::tr{'traffic on'} $interface $Lang::tr{'graph per'} $Lang::tr{$period}",
+ "-v$Lang::tr{'bytes per second'}",
+ "DEF:incoming=$rrdlog/collectd/localhost/interface/if_octets-$interface.rrd:rx:AVERAGE",
+ "DEF:outgoing=$rrdlog/collectd/localhost/interface/if_octets-$interface.rrd:tx:AVERAGE",
+ "CDEF:outgoingn=outgoing,-1,*",
+ "COMMENT:$Lang::".sprintf("%-20s",$Lang::tr{'caption'}),
+ "COMMENT:$Lang::tr{'maximal'}",
+ "COMMENT:$Lang::tr{'average'}",
+ "COMMENT:$Lang::tr{'minimal'}",
+ "COMMENT:$Lang::tr{'current'}\\j",
+ "AREA:incoming".$color{"color12"}."A0:$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".$color{"color13"}."A0:$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");
+ $ERROR = RRDs::error;
+ print "Error in RRD::graph for $interface: $ERROR\n" if $ERROR;
}
sub updatefwhitsgraph {
- my $period = $_[0];
-
- RRDs::graph ("$graphs/firewallhits-$period-area.png",
- "--start", "-1$period", "-aPNG", "-i", "-z", "-W www.ipfire.org",
- "--alt-y-grid", "-w 600", "-h 100",
- "--color", "SHADEA".$color{"color19"},
- "--color", "SHADEB".$color{"color19"},
- "--color", "BACK".$color{"color21"},
- "-t $Lang::tr{'firewall hits per'} $Lang::tr{$period}",
- "DEF:amount=$rrdlog/firewallhits.rrd:amount:AVERAGE",
- "DEF:portamount=$rrdlog/firewallhits.rrd:portamount:AVERAGE",
- "COMMENT:$Lang::tr{'caption'}\\t\\t\\t",
- "COMMENT:$Lang::tr{'maximal'}",
- "COMMENT:$Lang::tr{'average'}",
- "COMMENT:$Lang::tr{'minimal'}",
- "COMMENT:$Lang::tr{'current'}\\j",
- "AREA:amount".$color{"color24"}.":$Lang::tr{'firewallhits'}/5 min",
- "GPRINT:amount:MAX:%2.2lf %S",
- "GPRINT:amount:AVERAGE:%2.2lf %S",
- "GPRINT:amount:MIN:%2.2lf %S",
- "GPRINT:amount:LAST:%2.2lf %S\\j",
- "STACK:portamount".$color{"color25"}.":$Lang::tr{'portscans'}/5 min",
- "GPRINT:portamount:MAX:%2.2lf %S",
- "GPRINT:portamount:MIN:%2.2lf %S",
- "GPRINT:portamount:AVERAGE:%2.2lf %S",
- "GPRINT:portamount:LAST:%2.2lf %S\\j");
- $ERROR = RRDs::error;
- print "Error in RRD::graph for Firewallhits: $ERROR\n" if $ERROR;
+ my $period = $_[0];
+ RRDs::graph ("$graphs/fwhits-$period.png",
+ "--start", "-1$period", "-aPNG", "-i", "-z", "-W www.ipfire.org",
+ "--alt-y-grid", "-w 600", "-h 150", "-r", "-v $Lang::tr{'bytes per second'}",
+ "--color", "SHADEA".$color{"color19"},
+ "--color", "SHADEB".$color{"color19"},
+ "--color", "BACK".$color{"color21"},
+ "-t $Lang::tr{'firewall hits per'} $Lang::tr{$period}",
+ "DEF:output=$rrdlog/collectd/localhost/iptables-filter-FORWARD/ipt_bytes-DROP_OUTPUT.rrd:value:AVERAGE",
+ "DEF:input=$rrdlog/collectd/localhost/iptables-filter-INPUT/ipt_bytes-DROP_INPUT.rrd:value:AVERAGE",
+ "DEF:newnotsyn=$rrdlog/collectd/localhost/iptables-filter-NEWNOTSYN/ipt_bytes-DROP_NEWNOTSYN.rrd:value:AVERAGE",
+ "DEF:portscan=$rrdlog/collectd/localhost/iptables-filter-PSCAN/ipt_bytes-DROP_PScan.rrd:value:AVERAGE",
+ "CDEF:amount=output,input,newnotsyn,+,+",
+ "COMMENT:$Lang::".sprintf("%-20s",$Lang::tr{'caption'}),
+ "COMMENT:$Lang::tr{'maximal'}",
+ "COMMENT:$Lang::tr{'average'}",
+ "COMMENT:$Lang::tr{'minimal'}",
+ "COMMENT:$Lang::tr{'current'}\\j",
+ "AREA:amount".$color{"color24"}."A0:".sprintf("%-20s",$Lang::tr{'firewallhits'}),
+ "GPRINT:amount:MAX:%8.1lf %sBps",
+ "GPRINT:amount:AVERAGE:%8.1lf %sBps",
+ "GPRINT:amount:MIN:%8.1lf %sBps",
+ "GPRINT:amount:LAST:%8.1lf %sBps\\j",
+ "STACK:portscan".$color{"color25"}."A0:".sprintf("%-20s",$Lang::tr{'portscans'}),
+ "GPRINT:portscan:MAX:%8.1lf %sBps",
+ "GPRINT:portscan:MIN:%8.1lf %sBps",
+ "GPRINT:portscan:AVERAGE:%8.1lf %sBps",
+ "GPRINT:portscan:LAST:%8.1lf %sBps\\j");
+ $ERROR = RRDs::error;
+ print "Error in RRD::graph for Firewallhits: $ERROR\n" if $ERROR;
}
sub updatelqgraph {
- my $period = $_[0];
- RRDs::graph ("$graphs/lq-$period.png",
- "--start", "-1$period", "-aPNG", "-i", "-z", "-W www.ipfire.org",
- "--alt-y-grid", "-w 600", "-h 100", "-l 0", "-r",
- "-t $Lang::tr{'linkq'} $Lang::tr{'graph per'} $Lang::tr{$period}",
- "--lazy",
- "--color", "SHADEA".$color{"color19"},
- "--color", "SHADEB".$color{"color19"},
- "--color", "BACK".$color{"color21"},
- "-v ms / pkts (% x10)",
- "DEF:roundtrip=$rrdlog/lq.rrd:roundtrip:AVERAGE",
- "DEF:loss=$rrdlog/lq.rrd:loss:AVERAGE",
- "CDEF:roundavg=roundtrip,PREV(roundtrip),+,2,/",
- "CDEF:loss10=loss,10,*",
- "CDEF:r0=roundtrip,30,MIN",
- "CDEF:r1=roundtrip,70,MIN",
- "CDEF:r2=roundtrip,150,MIN",
- "CDEF:r3=roundtrip,300,MIN",
- "AREA:roundtrip".$color{"color25"}.":>300 ms",
- "AREA:r3".$color{"color18"}.":150-300 ms",
- "AREA:r2".$color{"color14"}.":70-150 ms",
- "AREA:r1".$color{"color17"}.":30-70 ms",
- "AREA:r0".$color{"color12"}.":<30 ms",
- "AREA:loss10".$color{"color13"}.":Packet loss (x10)\\j",
- "COMMENT: \\j",
- "COMMENT:$Lang::tr{'maximal'}",
- "COMMENT:$Lang::tr{'average'}",
- "COMMENT:$Lang::tr{'minimal'}",
- "COMMENT:$Lang::tr{'current'}\\j",
- "LINE1:roundtrip#707070:",
- "GPRINT:roundtrip:MAX:Time\\:%3.2lf ms",
- "GPRINT:roundtrip:AVERAGE:Time\\:%3.2lf ms",
- "GPRINT:roundtrip:MIN:Time\\:%3.2lf ms",
- "GPRINT:roundtrip:LAST:Time\\:%3.2lf ms\\j",
- "GPRINT:loss:MAX:Loss\\:%3.2lf%%",
- "GPRINT:loss:AVERAGE:Loss\\:%3.2lf%%",
- "GPRINT:loss:MIN:Loss\\:%3.2lf%%",
- "GPRINT:loss:LAST:Loss\\:%3.2lf%%\\j"
- );
- $ERROR = RRDs::error;
- print "Error in RRD::graph for Link Quality: $ERROR\n" if $ERROR;
+ my $period = $_[0];
+ RRDs::graph ("$graphs/lq-$period.png",
+ "--start", "-1$period", "-aPNG", "-i", "-W www.ipfire.org",
+ "--alt-y-grid", "-w 600", "-h 150", "-l 0", "-r", "-v ms",
+ "-t $Lang::tr{'linkq'} $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",
+ "COMMENT:$Lang::".sprintf("%-20s",$Lang::tr{'caption'})."\\j",
+ "CDEF:r0=roundtrip,30,-",
+ "CDEF:r1=r0,70,-",
+ "CDEF:r2=r1,150,-",
+ "CDEF:r3=r2,300,-",
+ "AREA:r0".$color{"color12"}."A0:<30 ms",
+ "STACK:r1".$color{"color17"}."A0:30-70 ms",
+ "STACK:r2".$color{"color14"}."A0:70-150 ms",
+ "STACK:r3".$color{"color18"}."A0:150-300 ms",
+ "STACK:roundtrip".$color{"color25"}.":>300 ms\\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",
+ "GPRINT:roundtrip:MIN:%3.2lf ms",
+ "GPRINT:roundtrip:LAST:%3.2lf ms\\j");
+ $ERROR = RRDs::error;
+ print "Error in RRD::graph for Link Quality: $ERROR\n" if $ERROR;
}
sub updatehddgraph {
RRDs::graph ("$graphs/hddtemp-$disk-$period.png",
"--start", "-1$period", "-aPNG", "-i", "-z", "-W www.ipfire.org",
- "--alt-y-grid", "-w 600", "-h 100",
+ "--alt-y-grid", "-w 600", "-h 150",
"--color", "SHADEA".$color{"color19"},
"--color", "SHADEB".$color{"color19"},
"--color", "BACK".$color{"color21"},
@args = ("$graphs/mbmon-$type-$period.png",
"--start", "-1$period", "-aPNG", "-i", "-z", "-W www.ipfire.org",
- "--alt-y-grid", "-w 600", "-h 100", "--alt-autoscale",
+ "--alt-y-grid", "-w 600", "-h 150", "--alt-autoscale",
"--color", "SHADEA".$color{"color19"},
"--color", "SHADEB".$color{"color19"},
"--color", "BACK".$color{"color21"},
my $count = "11";
@args = ("$graphs/mbmon-$type-$period.png", "--start", "-1$period", "-aPNG", "-i", "-z", "-W www.ipfire.org",
- "--alt-y-grid", "-w 600", "-h 100", "--alt-autoscale",
+ "--alt-y-grid", "-w 600", "-h 150", "--alt-autoscale",
"--color", "SHADEA".$color{"color19"},
"--color", "SHADEB".$color{"color19"},
"--color", "BACK".$color{"color21"},
my $count = "11";
@args = ("$graphs/mbmon-$type-$period.png", "--start", "-1$period", "-aPNG", "-i", "-z", "-W www.ipfire.org",
- "--alt-y-grid", "-w 600", "-h 100", "--alt-autoscale",
+ "--alt-y-grid", "-w 600", "-h 150", "--alt-autoscale",
"--color", "SHADEA".$color{"color19"},
"--color", "SHADEB".$color{"color19"},
"--color", "BACK".$color{"color21"},
projects / ipfire-2.x.git / blobdiff