mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-28 11:43:25 +02:00
Corrected guardian
build lcd4linux startet integrating collection deamon git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1151 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
maniacikarus
@@ -52,52 +52,73 @@ if ((${Lang::language} eq 'el') ||
|
||||
|
||||
|
||||
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%%",
|
||||
@@ -111,19 +132,19 @@ sub updateloadgraph {
|
||||
|
||||
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"});
|
||||
@@ -135,50 +156,42 @@ sub updatememgraph {
|
||||
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%%",
|
||||
@@ -187,32 +200,39 @@ sub updatememgraph {
|
||||
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;
|
||||
}
|
||||
@@ -222,139 +242,135 @@ sub updatediskgraph {
|
||||
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];
|
||||
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;
|
||||
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 {
|
||||
@@ -364,7 +380,7 @@ 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"},
|
||||
@@ -395,7 +411,7 @@ sub updatetempgraph
|
||||
|
||||
@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"},
|
||||
@@ -436,7 +452,7 @@ sub updatefangraph
|
||||
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"},
|
||||
@@ -477,7 +493,7 @@ sub updatevoltgraph
|
||||
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"},
|
||||
|
||||
214
config/collectd/collectd.conf
Normal file
214
config/collectd/collectd.conf
Normal file
@@ -0,0 +1,214 @@
|
||||
#
|
||||
# Config file for collectd(1).
|
||||
# Please read collectd.conf(5) for a list of options.
|
||||
# http://collectd.org/
|
||||
#
|
||||
|
||||
Hostname "localhost"
|
||||
BaseDir "/var/log/rrd/collectd"
|
||||
PIDFile "/var/run/collectd.pid"
|
||||
PluginDir "/usr/lib/collectd"
|
||||
TypesDB "/usr/lib/collectd/types.db"
|
||||
Interval 30
|
||||
ReadThreads 3
|
||||
|
||||
#LoadPlugin apache
|
||||
#LoadPlugin battery
|
||||
LoadPlugin cpu
|
||||
#LoadPlugin cpufreq
|
||||
#LoadPlugin df
|
||||
LoadPlugin disk
|
||||
#LoadPlugin dns
|
||||
#LoadPlugin email
|
||||
#LoadPlugin entropy
|
||||
#LoadPlugin exec
|
||||
#LoadPlugin hddtemp
|
||||
LoadPlugin interface
|
||||
LoadPlugin iptables
|
||||
#LoadPlugin ipvs
|
||||
#LoadPlugin irq
|
||||
LoadPlugin load
|
||||
#LoadPlugin logfile
|
||||
#LoadPlugin mbmon
|
||||
#LoadPlugin memcached
|
||||
LoadPlugin memory
|
||||
#LoadPlugin multimeter
|
||||
#LoadPlugin mysql
|
||||
#LoadPlugin netlink
|
||||
#LoadPlugin network
|
||||
#LoadPlugin nfs
|
||||
#LoadPlugin nginx
|
||||
#LoadPlugin ntpd
|
||||
#LoadPlugin nut
|
||||
#LoadPlugin perl
|
||||
LoadPlugin ping
|
||||
#LoadPlugin processes
|
||||
LoadPlugin rrdtool
|
||||
#LoadPlugin sensors
|
||||
#LoadPlugin serial
|
||||
LoadPlugin swap
|
||||
LoadPlugin syslog
|
||||
#LoadPlugin tape
|
||||
#LoadPlugin tcpconns
|
||||
#LoadPlugin unixsock
|
||||
#LoadPlugin users
|
||||
|
||||
#<Plugin apache>
|
||||
# URL "http://localhost/status?auto"
|
||||
# User "www-user"
|
||||
# Password "secret"
|
||||
# CACert "/etc/ssl/ca.crt"
|
||||
#</Plugin>
|
||||
|
||||
|
||||
#<Plugin df>
|
||||
# Device "/dev/hda"
|
||||
# Device "192.168.0.2:/mnt/nfs"
|
||||
# MountPoint "/home"
|
||||
# FSType "ext3"
|
||||
# IgnoreSelected false
|
||||
#</Plugin>
|
||||
|
||||
#<Plugin dns>
|
||||
# Interface "eth0"
|
||||
# IgnoreSource "192.168.0.1"
|
||||
#</Plugin>
|
||||
|
||||
#<Plugin email>
|
||||
# SocketFile "/usr/var/run/collectd-email"
|
||||
# SocketGroup "collectd"
|
||||
# SocketPerms "0770"
|
||||
# MaxConns 5
|
||||
#</Plugin>
|
||||
|
||||
#<Plugin exec>
|
||||
# Exec "user:group" "/path/to/exec"
|
||||
#</Plugin>
|
||||
|
||||
#<Plugin hddtemp>
|
||||
# Host "127.0.0.1"
|
||||
# Port "7634"
|
||||
#</Plugin>
|
||||
|
||||
<Plugin interface>
|
||||
Interface "ppp0"
|
||||
Interface "lo"
|
||||
Interface "ipsec1"
|
||||
Interface "ipsec2"
|
||||
Interface "ipsec3"
|
||||
IgnoreSelected true
|
||||
</Plugin>
|
||||
|
||||
<Plugin iptables>
|
||||
Chain filter INPUT DROP_INPUT
|
||||
Chain filter FORWARD DROP_OUTPUT
|
||||
Chain filter PSCAN DROP_PScan
|
||||
Chain filter NEWNOTSYN DROP_NEWNOTSYN
|
||||
Chain filter OUTGOINGFW DROP_OUTGOINGFW
|
||||
</Plugin>
|
||||
|
||||
#<Plugin irq>
|
||||
# Irq 7
|
||||
# Irq 8
|
||||
# Irq 9
|
||||
# IgnoreSelected true
|
||||
#</Plugin>
|
||||
|
||||
#<Plugin logfile>
|
||||
# LogLevel info
|
||||
# File STDOUT
|
||||
#</Plugin>
|
||||
|
||||
#<Plugin mbmon>
|
||||
# Host "127.0.0.1"
|
||||
# Port "411"
|
||||
#</Plugin>
|
||||
|
||||
#<Plugin memcached>
|
||||
# Host "127.0.0.1"
|
||||
# Port "11211"
|
||||
#</Plugin>
|
||||
|
||||
#<Plugin mysql>
|
||||
# Host "database.serv.er"
|
||||
# User "db_user"
|
||||
# Password "secret"
|
||||
# Database "db_name"
|
||||
#</Plugin>
|
||||
|
||||
#<Plugin netlink>
|
||||
# Interface "All"
|
||||
# VerboseInterface "All"
|
||||
# QDisc "eth0" "pfifo_fast-1:0"
|
||||
# Class "ppp0" "htb-1:10"
|
||||
# Filter "ppp0" "u32-1:0"
|
||||
#</Plugin>
|
||||
|
||||
#<Plugin network>
|
||||
# Server "ff18::efc0:4a42" "25826"
|
||||
# Server "239.192.74.66" "25826"
|
||||
# Listen "ff18::efc0:4a42" "25826"
|
||||
# Listen "239.192.74.66" "25826"
|
||||
# TimeToLive "128"
|
||||
# Forward false
|
||||
# CacheFlush 1800
|
||||
#</Plugin>
|
||||
|
||||
#<Plugin nginx>
|
||||
# URL "http://localhost/status?auto"
|
||||
# User "www-user"
|
||||
# Password "secret"
|
||||
# CACert "/etc/ssl/ca.crt"
|
||||
#</Plugin>
|
||||
|
||||
#<Plugin ntpd>
|
||||
# Host "localhost"
|
||||
# Port 123
|
||||
#</Plugin>
|
||||
|
||||
#<Plugin nut>
|
||||
# UPS "upsname@hostname:port"
|
||||
#</Plugin>
|
||||
|
||||
#<Plugin perl>
|
||||
# IncludeDir "/my/include/path"
|
||||
# BaseName "Collectd::Plugin"
|
||||
# LoadPlugin foo
|
||||
#</Plugin>
|
||||
|
||||
<Plugin ping>
|
||||
Host "gateway"
|
||||
</Plugin>
|
||||
|
||||
<Plugin processes>
|
||||
Process "collectd"
|
||||
</Plugin>
|
||||
|
||||
<Plugin rrdtool>
|
||||
DataDir "/var/log/rrd/collectd"
|
||||
CacheTimeout 300
|
||||
CacheFlush 900
|
||||
</Plugin>
|
||||
|
||||
#<Plugin sensors>
|
||||
# Sensor "it8712-isa-0290/temperature-temp1"
|
||||
# Sensor "it8712-isa-0290/fanspeed-fan3"
|
||||
# Sensor "it8712-isa-0290/voltage-in8"
|
||||
# IgnoreSelected false
|
||||
#</Plugin>
|
||||
|
||||
<Plugin syslog>
|
||||
LogLevel info
|
||||
</Plugin>
|
||||
|
||||
#<Plugin tcpconns>
|
||||
# ListeningPorts false
|
||||
# LocalPort "6882"
|
||||
# RemotePort "80"
|
||||
#</Plugin>
|
||||
|
||||
#<Plugin unixsock>
|
||||
# SocketFile "/usr/var/run/collectd-unixsock"
|
||||
# SocketGroup "collectd"
|
||||
# SocketPerms "0660"
|
||||
#</Plugin>
|
||||
@@ -23,7 +23,14 @@
|
||||
'title' => "$Lang::tr{'network red'}",
|
||||
'enabled' => 1,
|
||||
};
|
||||
$substatus->{'41.networkother'} = {
|
||||
$substatus->{'41.networkinternal'} = {
|
||||
'caption' => "$Lang::tr{'network internal'}",
|
||||
'uri' => '/cgi-bin/network.cgi',
|
||||
'vars' => 'network=internal',
|
||||
'title' => "$Lang::tr{'network internal'}",
|
||||
'enabled' => 1,
|
||||
};
|
||||
$substatus->{'42.networkother'} = {
|
||||
'caption' => "$Lang::tr{'network other'}",
|
||||
'uri' => '/cgi-bin/network.cgi',
|
||||
'vars' => 'network=other',
|
||||
@@ -42,12 +49,6 @@
|
||||
'title' => "$Lang::tr{'hardware graphs'}",
|
||||
'enabled' => 1,
|
||||
};
|
||||
$substatus->{'70.fwhits'} = {
|
||||
'caption' => "$Lang::tr{'firewall graphs'}",
|
||||
'uri' => '/cgi-bin/fwhits.cgi',
|
||||
'title' => "$Lang::tr{'firewall graphs'}",
|
||||
'enabled' => 1,
|
||||
};
|
||||
$substatus->{'71.connections'} = {
|
||||
'caption' => $Lang::tr{'connections'},
|
||||
'uri' => '/cgi-bin/connections.cgi',
|
||||
|
||||
@@ -90,7 +90,7 @@ if ( $outfwsettings{'POLICY'} eq 'MODE1' ) {
|
||||
} elsif ( $outfwsettings{'POLICY'} eq 'MODE2' ) {
|
||||
$outfwsettings{'STATE'} = "DENY";
|
||||
$POLICY = "ACCEPT";
|
||||
$DO = "DROP";
|
||||
$DO = "DROP -m comment --comment 'DROP_OUTGOINGFW'";
|
||||
}
|
||||
|
||||
### Initialize IPTables
|
||||
@@ -167,9 +167,9 @@ foreach $configentry (sort @configs)
|
||||
|
||||
if ($configline[9] eq "aktiv") {
|
||||
if ($DEBUG) {
|
||||
print "$CMD -m state --state NEW -m limit --limit 10/minute -j LOG --log-prefix 'OUTGOINGFW '\n";
|
||||
print "$CMD -m limit --limit 10/minute -j LOG --log-prefix 'OUTGOINGFW '\n";
|
||||
} else {
|
||||
system("$CMD -m state --state NEW -m limit --limit 10/minute -j LOG --log-prefix 'OUTGOINGFW '");
|
||||
system("$CMD -m limit --limit 10/minute -j LOG --log-prefix 'OUTGOINGFW '");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -213,7 +213,7 @@ if ($P2PSTRING) {
|
||||
}
|
||||
|
||||
if ( $outfwsettings{'POLICY'} eq 'MODE1' ) {
|
||||
$CMD = "/sbin/iptables -A OUTGOINGFW -o $netsettings{'RED_DEV'} -j DROP";
|
||||
$CMD = "/sbin/iptables -A OUTGOINGFW -o $netsettings{'RED_DEV'} -j DROP -m comment --comment 'DROP_OUTGOINGFW'";
|
||||
if ($DEBUG) {
|
||||
print "$CMD\n";
|
||||
} else {
|
||||
|
||||
0
config/rootfiles/packages/collectd
Normal file
0
config/rootfiles/packages/collectd
Normal file
1
config/rootfiles/packages/lcd4linux
Normal file
1
config/rootfiles/packages/lcd4linux
Normal file
@@ -0,0 +1 @@
|
||||
usr/bin/lcd4linux
|
||||
Reference in New Issue
Block a user