X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=config%2Fcfgroot%2Fgraphs.pl;h=5eb96d8f771721e8e9eef6163391a026859ea0e3;hp=97c3a7a3e77878772729293433f2703edb2273cc;hb=1abbf741cc7985ccaf9671102af8e80dffa0846f;hpb=fbfdb241c196f3a9f3f009c1fbcd70909ecacf16
diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 97c3a7a3e7..5eb96d8f77 100644
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -1,7 +1,24 @@
#!/usr/bin/perl
# Generate Graphs exported from Makegraphs to minimize system load an only generate the Graphs when displayed
-# This is part of the IPFire Firewall
-
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2005-2010 IPFire Team #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see . #
+# #
+###############################################################################
package Graphs;
@@ -13,560 +30,1073 @@ require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
my $ERROR;
-my $rrdlog = "/var/log/rrd";
-my $graphs = "/srv/web/ipfire/html/graphs";
-$ENV{PATH}="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin";
+
+# Read the global settings files to get the current theme and after this load
+# colors for this theme
my %color = ();
my %mainsettings = ();
+my %sensorsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
-my %mbmon_settings = ();
-&General::readhash("${General::swroot}/mbmon/settings", \%mbmon_settings);
+if ( $mainsettings{'RRDLOG'} eq "" ){
+ $mainsettings{'RRDLOG'}="/var/log/rrd";
+ &General::writehash("${General::swroot}/main/settings", \%mainsettings);
+}
-my %mbmon_values = ();
-&General::readhash("/var/log/mbmon-values", \%mbmon_values);
+# If the collection deamon is working and collecting lm_sensors data there will be
+# some data source named after a common scheme, with the sensorssettingsfile
+# the user is able to deactivate some of this parameters, in case not to show
+# false collected values may be disable. The user has the ability to enter
+# custom graph names in order to change temp0 to cpu or motherboard
-my $key;
-my $value;
-my @args = ();
my $count = 0;
+my @sensorsgraphs = ();
+my @sensorsdir = `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/sensors-*/ 2>/dev/null`;
+foreach (@sensorsdir){
+ chomp($_);chop($_);
+ foreach (`ls $_/*`){
+ chomp($_);
+ push(@sensorsgraphs,$_);
+ $_ =~ /\/(.*)sensors-(.*)\/(.*)\.rrd/;
+ my $label = $2.$3;$label=~ s/-//g;
+ $sensorsettings{'LABEL-'.$label}="$label";
+ $sensorsettings{'LINE-'.$label}="checked";
+ }
+}
+
+&General::readhash("${General::swroot}/sensors/settings", \%sensorsettings);
+
+# Generate a nice box for selection of time range in graphs
+# this will generate a nice iframe for the cgi every klick for
+# the graph will be handled inside the iframe
+# 0 is the cgi refering to
+# 1 is the graph name
+# 2 is the time range for the graph
+# 3 if given is the height of the iframe default if nothing is given
+
+sub makegraphbox {
+ my $height = 285;
+ my $width = 700;
-use Encode 'from_to';
-
-my %tr=();
-if ((${Lang::language} eq 'el') ||
- (${Lang::language} eq 'fa') ||
- (${Lang::language} eq 'ru') ||
- (${Lang::language} eq 'th') ||
- (${Lang::language} eq 'vi') ||
- (${Lang::language} eq 'zh') ||
- (${Lang::language} eq 'zt')) {
- eval `/bin/cat "${General::swroot}/langs/en.pl"`;
-} else {
- %tr=%Lang::tr; # use translated version for other languages
+ if ( $_[3] ne "" ){ $height = $_[3]; }
+
+ print "";
+ print "".$Lang::tr{'hour'}."";
+ print " - ";
+ print "".$Lang::tr{'day'}."";
+ print " - ";
+ print "".$Lang::tr{'week'}."";
+ print " - ";
+ print "".$Lang::tr{'month'}."";
+ print " - ";
+ print "".$Lang::tr{'year'}."";
+ print "";
+ print "";
}
+# Generate the CPU Graph for the current period of time for values given by
+# collectd we are now able to handle any kind of cpucount
sub updatecpugraph {
- 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",
- "--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,+,+,+,+",
- "CDEF:userpct=100,user,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:$Lang::tr{'maximal'}",
- "COMMENT:$Lang::tr{'average'}",
- "COMMENT:$Lang::tr{'minimal'}",
- "COMMENT:$Lang::tr{'current'}\\j",
- "AREA:iowaitpct".$color{"color14"}.":$Lang::tr{'iowait'}",
- "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'}",
- "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'}",
- "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'}",
- "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'}",
- "GPRINT:idlepct:MAX:%3.2lf%%",
- "GPRINT:idlepct:AVERAGE:%3.2lf%%",
- "GPRINT:idlepct:MIN:%3.2lf%%",
- "GPRINT:idlepct:LAST:%3.2lf%%\\j");
- $ERROR = RRDs::error;
- print "Error in RRD::graph for cpu: $ERROR\n" if $ERROR;
+ my $cpucount = `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/cpu-*/ 2>/dev/null | wc -l`;
+ my $period = $_[0];
+ my @command = (
+ "-",
+ "--start",
+ "-1".$period,
+ "-aPNG",
+ "-i",
+ "-z",
+ "-W www.ipfire.org",
+ "--alt-y-grid",
+ "-w 600",
+ "-h 125",
+ "-l 0",
+ "-u 100",
+ "-r",
+ "-t ".$Lang::tr{'cpu usage per'}." ".$Lang::tr{$period},
+ "-v ".$Lang::tr{'percentage'},
+ "--color=SHADEA".$color{"color19"},
+ "--color=SHADEB".$color{"color19"},
+ "--color=BACK".$color{"color21"},
+ "COMMENT:".sprintf("%-29s",$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"
+ );
+
+ my $nice = "CDEF:nice=";
+ my $interrupt = "CDEF:interrupt=";
+ my $steal = "CDEF:steal=";
+ my $user = "CDEF:user=";
+ my $system = "CDEF:system=";
+ my $idle = "CDEF:idle=";
+ my $iowait = "CDEF:iowait=";
+ my $irq = "CDEF:irq=";
+ my $addstring = "";
+
+ for(my $i = 0; $i < $cpucount; $i++) {
+ push(@command,"DEF:iowait".$i."=".$mainsettings{'RRDLOG'}."/collectd/localhost/cpu-".$i."/cpu-wait.rrd:value:AVERAGE"
+ ,"DEF:nice".$i."=".$mainsettings{'RRDLOG'}."/collectd/localhost/cpu-".$i."/cpu-nice.rrd:value:AVERAGE"
+ ,"DEF:interrupt".$i."=".$mainsettings{'RRDLOG'}."/collectd/localhost/cpu-".$i."/cpu-interrupt.rrd:value:AVERAGE"
+ ,"DEF:steal".$i."=".$mainsettings{'RRDLOG'}."/collectd/localhost/cpu-".$i."/cpu-steal.rrd:value:AVERAGE"
+ ,"DEF:user".$i."=".$mainsettings{'RRDLOG'}."/collectd/localhost/cpu-".$i."/cpu-user.rrd:value:AVERAGE"
+ ,"DEF:system".$i."=".$mainsettings{'RRDLOG'}."/collectd/localhost/cpu-".$i."/cpu-system.rrd:value:AVERAGE"
+ ,"DEF:idle".$i."=".$mainsettings{'RRDLOG'}."/collectd/localhost/cpu-".$i."/cpu-idle.rrd:value:AVERAGE"
+ ,"DEF:irq".$i."=".$mainsettings{'RRDLOG'}."/collectd/localhost/cpu-".$i."/cpu-softirq.rrd:value:AVERAGE");
+
+ $nice .= "nice".$i.",";
+ $interrupt .= "interrupt".$i.",";
+ $steal .= "steal".$i.",";
+ $user .= "user".$i.",";
+ $system .= "system".$i.",";
+ $idle .= "idle".$i.",";
+ $iowait .= "iowait".$i.",";
+ $irq .= "irq".$i.",";
+ }
+
+ for(my $i = 2; $i < $cpucount; $i++) {
+ $addstring .= "+,";
+ }
+
+ if ( $cpucount > 1){
+ $addstring .= "+";
+ push(@command,$nice.$addstring
+ ,$interrupt.$addstring
+ ,$steal.$addstring
+ ,$user.$addstring
+ ,$system.$addstring
+ ,$idle.$addstring
+ ,$iowait.$addstring
+ ,$irq.$addstring);
+ }else{
+ chop($nice),chop($interrupt),chop($steal),chop($user),chop($system),chop($idle),chop($iowait),chop($irq);
+ push(@command,$nice,$interrupt,$steal,$user,$system,$idle,$iowait,$irq);
+ }
+
+ push(@command,"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,/,*"
+ ,"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"}."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: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"}."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"}."A0:".sprintf("%-25s",$Lang::tr{'cpu idle usage'})
+ ,"GPRINT:idlepct:MAX:%3.2lf%%"
+ ,"GPRINT:idlepct:AVERAGE:%3.2lf%%"
+ ,"GPRINT:idlepct:MIN:%3.2lf%%"
+ ,"GPRINT:idlepct:LAST:%3.2lf%%\\j");
+
+ RRDs::graph (@command);
+ $ERROR = RRDs::error;
+ print "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
}
+# Generate the Load Graph for the current period of time for values given by collecd
+
sub updateloadgraph {
- my $period = $_[0];
-
- 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",
- "-t Load Average",
- "--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:",
- "GPRINT:load1:LAST:%5.2lf",
- "AREA:load5".$color{"color18"}.":5 Minuten, letzter:",
- "GPRINT:load5:LAST:%5.2lf",
- "AREA:load15".$color{"color14"}.":15 Minuten, letzter:",
- "GPRINT:load15:LAST:%5.2lf\\j",
- "LINE1:load5".$color{"color13"},
- "LINE1:load1".$color{"color18"});
- $ERROR = RRDs::error;
- print "Error in RRD::graph for load: $ERROR\n" if $ERROR;
+ my $period = $_[0];
+ RRDs::graph(
+ "-",
+ "--start",
+ "-1".$period,
+ "-aPNG",
+ "-i",
+ "-z",
+ "-W www.ipfire.org",
+ "--alt-y-grid",
+ "-w 600",
+ "-h 125",
+ "-l 0",
+ "-r",
+ "-t Load Average ".$Lang::tr{'graph per'}." ".$Lang::tr{$period},
+ "-v ".$Lang::tr{'processes'},
+ "--color=SHADEA".$color{"color19"},
+ "--color=SHADEB".$color{"color19"},
+ "--color=BACK".$color{"color21"},
+ "DEF:load1=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:shortterm:AVERAGE",
+ "DEF:load5=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:midterm:AVERAGE",
+ "DEF:load15=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:longterm:AVERAGE",
+ "AREA:load1".$color{"color13"}."A0:1 ".$Lang::tr{'minute'}.":",
+ "GPRINT:load1:LAST:%5.2lf",
+ "AREA:load5".$color{"color18"}."A0:5 ".$Lang::tr{'minutes'}.":",
+ "GPRINT:load5:LAST:%5.2lf",
+ "AREA:load15".$color{"color14"}."A0:15 ".$Lang::tr{'minutes'}.":",
+ "GPRINT:load15:LAST:%5.2lf\\j",
+ "LINE1:load5".$color{"color13"},
+ "LINE1:load1".$color{"color18"},
+ );
+ $ERROR = RRDs::error;
+ print "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
+}
+
+# Generate the Memory Graph for the current period of time for values given by collecd
+
+sub updatememorygraph {
+ my $period = $_[0];
+ RRDs::graph(
+ "-",
+ "--start",
+ "-1".$period,
+ "-aPNG",
+ "-i",
+ "-z",
+ "-W www.ipfire.org",
+ "--alt-y-grid",
+ "-w 600",
+ "-h 125",
+ "-l 0",
+ "-u 100",
+ "-r",
+ "-t ".$Lang::tr{'memory usage per'}." ".$Lang::tr{$period},
+ "-v ".$Lang::tr{'percentage'},
+ "--color=SHADEA".$color{"color19"},
+ "--color=SHADEB".$color{"color19"},
+ "--color=BACK".$color{"color21"},
+ "DEF:used=".$mainsettings{'RRDLOG'}."/collectd/localhost/memory/memory-used.rrd:value:AVERAGE",
+ "DEF:free=".$mainsettings{'RRDLOG'}."/collectd/localhost/memory/memory-free.rrd:value:AVERAGE",
+ "DEF:buffer=".$mainsettings{'RRDLOG'}."/collectd/localhost/memory/memory-buffered.rrd:value:AVERAGE",
+ "DEF:cache=".$mainsettings{'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:".sprintf("%-29s",$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: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: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"}."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"}."A0:".sprintf("%-25s",$Lang::tr{'free memory'}),
+ "GPRINT:freepct:MAX:%3.2lf%%",
+ "GPRINT:freepct:AVERAGE:%3.2lf%%",
+ "GPRINT:freepct:MIN:%3.2lf%%",
+ "GPRINT:freepct:LAST:%3.2lf%%\\j",
+ );
+ $ERROR = RRDs::error;
+ print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
}
-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",
- "--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",
- "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'}",
- "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'}",
- "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'}",
- "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'}",
- "GPRINT:freepct:MAX:%3.2lf%%",
- "GPRINT:freepct:AVERAGE:%3.2lf%%",
- "GPRINT:freepct:MIN:%3.2lf%%",
- "GPRINT:freepct:LAST:%3.2lf%%\\j");
- $ERROR = RRDs::error;
- 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",
- "--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,+",
- "CDEF:usedpct=100,used,total,/,*",
- "CDEF:freepct=100,free,total,/,*",
- "COMMENT:$Lang::tr{'caption'}\\t\\t",
- "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'}",
- "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'}",
- "GPRINT:freepct:MAX:%3.2lf%%",
- "GPRINT:freepct:AVERAGE:%3.2lf%%",
- "GPRINT:freepct:MIN:%3.2lf%%",
- "GPRINT:freepct:LAST:%3.2lf%%\\j");
- $ERROR = RRDs::error;
- print "Error in RRD::graph for swap: $ERROR\n" if $ERROR;
+# Generate the Swap Graph for the current period of time for values given by collecd
+
+sub updateswapgraph {
+ my $period = $_[0];
+ RRDs::graph(
+ "-",
+ "--start",
+ "-1".$period,
+ "-aPNG",
+ "-i",
+ "-z",
+ "-W www.ipfire.org",
+ "--alt-y-grid",
+ "-w 600",
+ "-h 125",
+ "-l 0",
+ "-u 100",
+ "-r",
+ "-t ".$Lang::tr{'swap usage per'}." ".$Lang::tr{$period},
+ "-v ".$Lang::tr{'percentage'},
+ "--color=SHADEA".$color{"color19"},
+ "--color=SHADEB".$color{"color19"},
+ "--color=BACK".$color{"color21"},
+ "DEF:free=".$mainsettings{'RRDLOG'}."/collectd/localhost/swap/swap-free.rrd:value:AVERAGE",
+ "DEF:used=".$mainsettings{'RRDLOG'}."/collectd/localhost/swap/swap-used.rrd:value:AVERAGE",
+ "DEF:cached=".$mainsettings{'RRDLOG'}."/collectd/localhost/swap/swap-cached.rrd:value:AVERAGE",
+ "CDEF:total=used,free,cached,+,+",
+ "CDEF:usedpct=100,used,total,/,*",
+ "CDEF:freepct=100,free,total,/,*",
+ "CDEF:cachedpct=100,cached,total,/,*",
+ "COMMENT:".sprintf("%-29s",$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: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: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",
+ "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",
+ );
+ $ERROR = RRDs::error;
+ print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
}
+# Generate the Process Cpu Graph for the current period of time for values given by collecd
+
+sub updateprocessescpugraph {
+ my @processesgraph = getprocesses();
+ my $period = $_[0];
+ my $count="0";
+
+ my @command = (
+ "-",
+ "--start",
+ "-1".$period,
+ "-aPNG",
+ "-i",
+ "-z",
+ "-W www.ipfire.org",
+ "--alt-y-grid",
+ "-w 600",
+ "-h 125",
+ "-l 0",
+ "-r",
+ "-t ".$Lang::tr{'processes'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period},
+ "--color=SHADEA".$color{"color19"},
+ "--color=SHADEB".$color{"color19"},
+ "--color=BACK".$color{"color21"}
+ );
+
+ foreach(@processesgraph){
+ chomp($_);my @name=split(/\-/,$_);chop($name[1]);
+ push(@command,"DEF:".$name[1]."user=".$_."ps_cputime.rrd:user:AVERAGE");
+ push(@command,"DEF:".$name[1]."system=".$_."ps_cputime.rrd:syst:AVERAGE");
+ push(@command,"CDEF:".$name[1]."=".$name[1]."user,".$name[1]."system,+");
+ }
+
+ push(@command,"COMMENT:".$Lang::tr{'caption'}."\\j");
+
+ foreach(@processesgraph){
+ chomp($_);my @name=split(/\-/,$_);chop($name[1]);
+ if ($count eq "0"){
+ push(@command,"AREA:".$name[1].random_hex_color(6)."A0:".$name[1]);
+ }else{
+ push(@command,"STACK:".$name[1].random_hex_color(6)."A0:".$name[1]);
+ }
+ $count++;
+ }
+
+ RRDs::graph (@command);
+ $ERROR = RRDs::error;
+ print "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
+}
+
+# Generate the Process Memory Graph for the current period of time for values given by collecd
+
+sub updateprocessesmemorygraph {
+ my @processesgraph = getprocesses();
+ my $period = $_[0];
+ my $count="0";
+
+ my @command = (
+ "-",
+ "--start",
+ "-1".$period,
+ "-aPNG",
+ "-i",
+ "-z",
+ "-W www.ipfire.org",
+ "--alt-y-grid",
+ "-w 600",
+ "-h 125",
+ "-l 0",
+ "-r",
+ "-t ".$Lang::tr{'processes'}." ".$Lang::tr{'memory'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period},
+ "-v ".$Lang::tr{'bytes'},
+ "--color=SHADEA".$color{"color19"},
+ "--color=SHADEB".$color{"color19"},
+ "--color=BACK".$color{"color21"}
+ );
+
+ foreach(@processesgraph){
+ chomp($_);my @name=split(/\-/,$_);chop($name[1]);
+ push(@command,"DEF:".$name[1]."=".$_."ps_rss.rrd:value:AVERAGE");
+ }
+
+ push(@command,"COMMENT:".$Lang::tr{'caption'}."\\j");
+
+ foreach(@processesgraph){
+ chomp($_);my @name=split(/\-/,$_);chop($name[1]);
+ if ($count eq "0"){
+ push(@command,"AREA:".$name[1].random_hex_color(6)."A0:".$name[1]);
+ }else{
+ push(@command,"STACK:".$name[1].random_hex_color(6)."A0:".$name[1]);
+ }
+ $count++;
+ }
+
+ RRDs::graph (@command);
+ $ERROR = RRDs::error;
+ print "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
+}
+
+# Generate the Disk Graph for the current period of time for values given by collecd
+
sub updatediskgraph {
- my $period = $_[0];
- 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"},
- "--color", "SHADEB".$color{"color19"},
- "--color", "BACK".$color{"color21"},
- "-t $Lang::tr{'disk access per'} $Lang::tr{$period} $disk",
- "DEF:read=$rrdlog/disk-$disk.rrd:readsect:AVERAGE",
- "DEF:write=$rrdlog/disk-$disk.rrd:writesect:AVERAGE",
- "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::tr{'maximal'}",
- "COMMENT:$Lang::tr{'average'}",
- "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");
- $ERROR = RRDs::error;
- print "Error in RRD::graph for disk: $ERROR\n" if $ERROR;
+ my $disk = $_[0];
+ my $period = $_[1];
+ RRDs::graph(
+ "-",
+ "--start",
+ "-1".$period,
+ "-aPNG",
+ "-i",
+ "-z",
+ "-W www.ipfire.org",
+ "--alt-y-grid",
+ "-w 600",
+ "-h 125",
+ "-r",
+ "-t ".$disk." ".$Lang::tr{'disk access per'}." ".$Lang::tr{$period},
+ "-v ".$Lang::tr{'bytes per second'},
+ "--color=SHADEA".$color{"color19"},
+ "--color=SHADEB".$color{"color19"},
+ "--color=BACK".$color{"color21"},
+ "DEF:read=".$mainsettings{'RRDLOG'}."/collectd/localhost/disk-$disk/disk_octets.rrd:read:AVERAGE",
+ "DEF:write=".$mainsettings{'RRDLOG'}."/collectd/localhost/disk-$disk/disk_octets.rrd:write:AVERAGE",
+ "CDEF:writen=write,-1,*",
+ "DEF:standby=".$mainsettings{'RRDLOG'}."/hddshutdown-".$disk.".rrd:standby:AVERAGE",
+ "CDEF:st=standby,INF,*",
+ "CDEF:st1=standby,-INF,*",
+ "COMMENT:".sprintf("%-25s",$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:st".$color{"color20"}."A0:",
+ "AREA:st1".$color{"color20"}."A0:standby\\j",
+ "AREA:read".$color{"color12"}."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;
}
+# Generate the Interface Graph for the current period of time for values given by collecd
+
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(
+ "-",
+ "--start",
+ "-1".$period,
+ "-aPNG",
+ "-i",
+ "-z",
+ "-W www.ipfire.org",
+ "--alt-y-grid",
+ "-w 600",
+ "-h 125",
+ "-r",
+ "-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period},
+ "-v ".$Lang::tr{'bytes per second'},
+ "--color=SHADEA".$color{"color19"},
+ "--color=SHADEB".$color{"color19"},
+ "--color=BACK".$color{"color21"},
+ "DEF:incoming=".$mainsettings{'RRDLOG'}."/collectd/localhost/interface/if_octets-".$interface.".rrd:rx:AVERAGE",
+ "DEF:outgoing=".$mainsettings{'RRDLOG'}."/collectd/localhost/interface/if_octets-".$interface.".rrd:tx:AVERAGE",
+ "CDEF:outgoingn=outgoing,-1,*",
+ "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{'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:".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",
+ );
+ $ERROR = RRDs::error;
+ print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
}
+# Generate the Firewall Graph for the current period of time for values given by collecd
+
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(
+ "-",
+ "--start",
+ "-1".$period,
+ "-aPNG",
+ "-i",
+ "-z",
+ "-W www.ipfire.org",
+ "--alt-y-grid",
+ "-w 600",
+ "-h 125",
+ "-r",
+ "-t ".$Lang::tr{'firewall hits per'}." ".$Lang::tr{$period},
+ "-v ".$Lang::tr{'bytes per second'},
+ "--color=SHADEA".$color{"color19"},
+ "--color=SHADEB".$color{"color19"},
+ "--color=BACK".$color{"color21"},
+ "DEF:output=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-FORWARD/ipt_bytes-DROP_OUTPUT.rrd:value:AVERAGE",
+ "DEF:input=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-INPUT/ipt_bytes-DROP_INPUT.rrd:value:AVERAGE",
+ "DEF:newnotsyn=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-NEWNOTSYN/ipt_bytes-DROP_NEWNOTSYN.rrd:value:AVERAGE",
+ "DEF:portscan=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-PSCAN/ipt_bytes-DROP_PScan.rrd:value:AVERAGE",
+ "CDEF:amount=output,input,newnotsyn,+,+",
+ "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: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;
+# Generate the Line Quality Graph for the current period of time for values given by collecd
+
+sub updatepinggraph {
+ my $period = $_[1];
+ my $host = $_[0];
+ RRDs::graph(
+ "-",
+ "--start",
+ "-1".$period,
+ "-aPNG",
+ "-i",
+ "-z",
+ "-W www.ipfire.org",
+ "--alt-y-grid",
+ "-w 600",
+ "-h 125",
+ "-l 0",
+ "-r",
+ "-t ".$Lang::tr{'linkq'}." ".$host." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period},
+ "-v ms",
+ "--color=SHADEA".$color{"color19"},
+ "--color=SHADEB".$color{"color19"},
+ "--color=BACK".$color{"color21"},
+ "DEF:roundtrip=".$mainsettings{'RRDLOG'}."/collectd/localhost/ping/ping-".$host.".rrd:ping:AVERAGE",
+ "COMMENT:".sprintf("%-20s",$Lang::tr{'caption'})."\\j",
+ "CDEF:roundavg=roundtrip,PREV(roundtrip),+,2,/",
+ "CDEF:r0=roundtrip,30,MIN",
+ "CDEF:r1=roundtrip,70,MIN",
+ "CDEF:r2=roundtrip,150,MIN",
+ "CDEF:r3=roundtrip,300,MIN",
+ "AREA:roundtrip".$color{"color25"}."A0:>300 ms",
+ "AREA:r3".$color{"color18"}."A0:150-300 ms",
+ "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:$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 {
+sub updatewirelessgraph {
+ my $period = $_[1];
+ my $interface = $_[0];
+ RRDs::graph(
+ "-",
+ "--start",
+ "-1".$period,
+ "-aPNG",
+ "-i",
+ "-z",
+ "-W www.ipfire.org",
+ "--alt-y-grid",
+ "-w 600",
+ "-h 125",
+ "-t Wireless ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period},
+ "-v dBm",
+ "--color=SHADEA".$color{"color19"},
+ "--color=SHADEB".$color{"color19"},
+ "--color=BACK".$color{"color21"},
+ "DEF:noise=".$mainsettings{'RRDLOG'}."/collectd/localhost/wireless-".$interface."/signal_noise.rrd:value:AVERAGE",
+ "DEF:power=".$mainsettings{'RRDLOG'}."/collectd/localhost/wireless-".$interface."/signal_power.rrd:value:AVERAGE",
+ "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",
+ "LINE1:noise".$color{"color11"}."A0:".sprintf("%-20s","Signal Noise Ratio"),
+ "GPRINT:noise:MAX:%5.1lf %sdBm",
+ "GPRINT:noise:AVERAGE:%5.1lf %sdBm",
+ "GPRINT:noise:MIN:%5.1lf %sdBm",
+ "GPRINT:noise:LAST:%5.1lf %sdBm\\j",
+ "LINE1:power".$color{"color12"}."A0:".sprintf("%-20s","Signal Power Ratio"),
+ "GPRINT:power:MAX:%5.1lf %sdBm",
+ "GPRINT:power:AVERAGE:%5.1lf %sdBm",
+ "GPRINT:power:MIN:%5.1lf %sdBm",
+ "GPRINT:power:LAST:%5.1lf %sdBm\\j",
+ );
+ $ERROR = RRDs::error;
+ print "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
+}
+
+# Generate the HDD Temp Graph for the current period of time for values given by collecd and lm_sensors
- my $disk = $_[0];
- my $period = $_[1];
-
- RRDs::graph ("$graphs/hddtemp-$disk-$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{'harddisk temperature'} ($Lang::tr{'graph per'} $Lang::tr{$period})",
- "DEF:temperature=$rrdlog/hddtemp-$disk.rrd:temperature:AVERAGE",
- "LINE2:temperature".$color{"color11"}.":$Lang::tr{'hdd temperature in'} C\\j",
- "COMMENT:$Lang::tr{'maximal'}",
- "COMMENT:$Lang::tr{'average'}",
- "COMMENT:$Lang::tr{'minimal'}",
- "COMMENT:$Lang::tr{'current'}\\j",
- "GPRINT:temperature:MAX:%3.0lf Grad C",
- "GPRINT:temperature:AVERAGE:%3.0lf Grad C",
- "GPRINT:temperature:MIN:%3.0lf Grad C",
- "GPRINT:temperature:LAST:%3.0lf Grad C\\j",
- );
- $ERROR = RRDs::error;
- print "Error in RRD::graph for hdd-$disk: $ERROR\n" if $ERROR;
+sub updatehddgraph {
+ my $disk = $_[0];
+ my $period = $_[1];
+ RRDs::graph(
+ "-",
+ "--start",
+ "-1".$period,
+ "-aPNG",
+ "-i",
+ "-z",
+ "-W www.ipfire.org",
+ "--alt-y-grid",
+ "-w 600",
+ "-h 125",
+ "-r",
+ "-t ".$disk." ".$Lang::tr{'harddisk temperature'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period},
+ "-v Celsius",
+ "--color=SHADEA".$color{"color19"},
+ "--color=SHADEB".$color{"color19"},
+ "--color=BACK".$color{"color21"},
+ "DEF:temperature=".$mainsettings{'RRDLOG'}."/hddtemp-$disk.rrd:temperature:AVERAGE",
+ "DEF:standby=".$mainsettings{'RRDLOG'}."/hddshutdown-$disk.rrd:standby:AVERAGE",
+ "CDEF:st=standby,INF,*",
+ "AREA:st".$color{"color20"}."A0:standby",
+ "LINE3:temperature".$color{"color11"}."A0:$Lang::tr{'hdd temperature in'} C\\j",
+ "COMMENT:$Lang::tr{'maximal'}",
+ "COMMENT:$Lang::tr{'average'}",
+ "COMMENT:$Lang::tr{'minimal'}",
+ "COMMENT:$Lang::tr{'current'}\\j",
+ "GPRINT:temperature:MAX:%3.0lf Grad C",
+ "GPRINT:temperature:AVERAGE:%3.0lf Grad C",
+ "GPRINT:temperature:MIN:%3.0lf Grad C",
+ "GPRINT:temperature:LAST:%3.0lf Grad C\\j",
+ );
+ $ERROR = RRDs::error;
+ print "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
}
-sub updatetempgraph
-{
- my $type = "temp";
- my $period = $_[0];
- 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",
- "--color", "SHADEA".$color{"color19"},
- "--color", "SHADEB".$color{"color19"},
- "--color", "BACK".$color{"color21"},
- "-t $Lang::tr{'mbmon temp'} ($Lang::tr{'graph per'} $Lang::tr{$period})",
- "COMMENT:$Lang::tr{'caption'}\\t\\t",
- "COMMENT:$Lang::tr{'maximal'}",
- "COMMENT:$Lang::tr{'average'}",
- "COMMENT:$Lang::tr{'minimal'}",
- "COMMENT:$Lang::tr{'current'}\\j",);
-
- foreach $key ( sort(keys %mbmon_values) )
- {
- if ( (index($key, $type) != -1) && ($mbmon_settings{'LINE-'.$key} eq 'on') )
- {
- if ( !defined($mbmon_settings{'LABEL-'.$key}) || ($mbmon_settings{'LABEL-'.$key} eq '') )
- {
- $mbmon_settings{'LABEL-'.$key} = $key;
- }
- push (@args, "DEF:$key=$rrdlog/mbmon.rrd:$key:AVERAGE");
- push (@args, "LINE2:".$key.$color{"color$count"}.":$mbmon_settings{'LABEL-'.$key} Grad C");
- push (@args, "GPRINT:$key:MAX:%3.1lf");
- push (@args, "GPRINT:$key:AVERAGE:%3.1lf");
- push (@args, "GPRINT:$key:MIN:%3.1lf");
- push (@args, "GPRINT:$key:LAST:%3.1lf\\j");
- $count++;
- }
- }
-
- RRDs::graph ( @args );
- $ERROR = RRDs::error;
- print("Error in RRD::graph for temp: $ERROR\n")if $ERROR;
+# Generate the Temp Graph for the current period of time for values given by collecd and lm_sensors
+
+sub updatehwtempgraph {
+ my $period = $_[0];
+
+ my @command = (
+ "-",
+ "--start",
+ "-1".$period,
+ "-aPNG",
+ "-i",
+ "-z",
+ "-W www.ipfire.org",
+ "--alt-y-grid",
+ "-w 600",
+ "-h 125",
+ "-r",
+ "-t ".$Lang::tr{'mbmon temp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period},
+ "--color=SHADEA".$color{"color19"},
+ "--color=SHADEB".$color{"color19"},
+ "--color=BACK".$color{"color21"},
+ "COMMENT:".sprintf("%-29s",$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"
+ );
+
+ foreach(@sensorsgraphs){
+ chomp($_);
+ if ( $_ =~ /temperature/ ) {
+ $_ =~ /\/(.*)sensors-(.*)\/(.*)\.rrd/;
+ my $label = $2.$3;$label=~ s/-//g;
+ if ( $sensorsettings{'LINE-'.$label} eq "off" ){next;}
+ push(@command,"DEF:".$sensorsettings{'LABEL-'.$label}."=".$_.":value:AVERAGE");
+ }
+ }
+
+ foreach(@sensorsgraphs){
+ chomp($_);
+ if ( $_ =~ /temperature/ ){
+ $_ =~ /\/(.*)sensors-(.*)\/(.*)\.rrd/;
+ my $label = $2.$3;$label=~ s/-//g;
+ if ( $sensorsettings{'LINE-'.$label} eq "off" ){next;}
+ push(@command,"LINE3:".$sensorsettings{'LABEL-'.$label}.random_hex_color(6)."A0:".sprintf("%-25s",$sensorsettings{'LABEL-'.$label}),"GPRINT:".$sensorsettings{'LABEL-'.$label}.":MAX:%3.2lf C","GPRINT:".$sensorsettings{'LABEL-'.$label}.":AVERAGE:%3.2lf C","GPRINT:".$sensorsettings{'LABEL-'.$label}.":MIN:%3.2lf C","GPRINT:".$sensorsettings{'LABEL-'.$label}.":LAST:%3.2lf C\\j",);
+ }
+ }
+
+ RRDs::graph (@command);
+ $ERROR = RRDs::error;
+ print "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
}
-sub updatefangraph
-{
- my $type = "fan";
- my $period = $_[0];
- 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",
- "--color", "SHADEA".$color{"color19"},
- "--color", "SHADEB".$color{"color19"},
- "--color", "BACK".$color{"color21"},
- "-t $Lang::tr{'mbmon fan'} ($Lang::tr{'graph per'} $Lang::tr{$period})",
- "COMMENT:$Lang::tr{'caption'}\\t\\t",
- "COMMENT:$Lang::tr{'maximal'}",
- "COMMENT:$Lang::tr{'average'}",
- "COMMENT:$Lang::tr{'minimal'}",
- "COMMENT:$Lang::tr{'current'}\\j",);
-
- foreach $key ( sort(keys %mbmon_values) )
- {
- if ( (index($key, $type) != -1) && ($mbmon_settings{'LINE-'.$key} eq 'on') )
- {
- if ( !defined($mbmon_settings{'LABEL-'.$key}) || ($mbmon_settings{'LABEL-'.$key} eq '') )
- {
- $mbmon_settings{'LABEL-'.$key} = $key;
- }
-
- push(@args, "DEF:$key=$rrdlog/mbmon.rrd:$key:AVERAGE");
- push(@args, "LINE2:".$key.$color{"color$count"}.":$mbmon_settings{'LABEL-'.$key} rpm");
- push(@args, "GPRINT:$key:MAX:%5.0lf");
- push(@args, "GPRINT:$key:AVERAGE:%5.0lf");
- push(@args, "GPRINT:$key:MIN:%5.0lf");
- push(@args, "GPRINT:$key:LAST:%5.0lf\\j");
- $count++;
- }
- }
- RRDs::graph ( @args );
- $ERROR = RRDs::error;
- print("Error in RRD::graph for temp: $ERROR\n")if $ERROR;
+# Generate the Fan Graph for the current period of time for values given by collecd and lm_sensors
+
+sub updatehwfangraph {
+ my $period = $_[0];
+
+ my @command = (
+ "-",
+ "--start",
+ "-1".$period,
+ "-aPNG",
+ "-i",
+ "-z",
+ "-W www.ipfire.org",
+ "--alt-y-grid",
+ "-w 600",
+ "-h 125",
+ "-r",
+ "-t ".$Lang::tr{'mbmon fan'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period},
+ "--color=SHADEA".$color{"color19"},
+ "--color=SHADEB".$color{"color19"},
+ "--color=BACK".$color{"color21"},
+ "COMMENT:".sprintf("%-29s",$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"
+ );
+
+ foreach(@sensorsgraphs){
+ chomp($_);
+ if ( $_ =~ /fanspeed/ ) {
+ $_ =~ /\/(.*)sensors-(.*)\/(.*)\.rrd/;
+ my $label = $2.$3;$label=~ s/-//g;
+ if ( $sensorsettings{'LINE-'.$label} eq "off" ){next;}
+ push(@command,"DEF:".$sensorsettings{'LABEL-'.$label}."=".$_.":value:AVERAGE");
+ }
+ }
+
+ foreach(@sensorsgraphs){
+ chomp($_);
+ if ( $_ =~ /fanspeed/ ){
+ $_ =~ /\/(.*)sensors-(.*)\/(.*)\.rrd/;
+ my $label = $2.$3;$label=~ s/-//g;
+ if ( $sensorsettings{'LINE-'.$label} eq "off" ){next;}
+ push(@command,"LINE3:".$sensorsettings{'LABEL-'.$label}.random_hex_color(6)."A0:".sprintf("%-25s",$sensorsettings{'LABEL-'.$label}),"GPRINT:".$sensorsettings{'LABEL-'.$label}.":MAX:%3.2lf RPM","GPRINT:".$sensorsettings{'LABEL-'.$label}.":AVERAGE:%3.2lf RPM","GPRINT:".$sensorsettings{'LABEL-'.$label}.":MIN:%3.2lf RPM","GPRINT:".$sensorsettings{'LABEL-'.$label}.":LAST:%3.2lf RPM\\j",);
+ }
+ }
+
+ RRDs::graph (@command);
+ $ERROR = RRDs::error;
+ print "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
}
-sub updatevoltgraph
-{
- my $type = "volt";
- my $period = $_[0];
- 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",
- "--color", "SHADEA".$color{"color19"},
- "--color", "SHADEB".$color{"color19"},
- "--color", "BACK".$color{"color21"},
- "-t $Lang::tr{'mbmon volt'} ($Lang::tr{'graph per'} $Lang::tr{$period})",
- "COMMENT:$Lang::tr{'caption'}\\t",
- "COMMENT:$Lang::tr{'maximal'}",
- "COMMENT:$Lang::tr{'average'}",
- "COMMENT:$Lang::tr{'minimal'}",
- "COMMENT:$Lang::tr{'current'}\\j",);
-
- foreach $key ( sort(keys %mbmon_values) )
- {
- my $v = substr($key,0,1);
- if ( ($v eq 'v') && ($mbmon_settings{'LINE-'.$key} eq 'on') )
- {
- if ( !defined($mbmon_settings{'LABEL-'.$key}) || ($mbmon_settings{'LABEL-'.$key} eq '') )
- {
- $mbmon_settings{'LABEL-'.$key} = $key;
- }
-
- push(@args, "DEF:$key=$rrdlog/mbmon.rrd:$key:AVERAGE");
- push(@args, "LINE2:".$key.$color{"color$count"}.":$mbmon_settings{'LABEL-'.$key} Volt");
- push(@args, "GPRINT:$key:MAX:%3.2lf");
- push(@args, "GPRINT:$key:AVERAGE:%3.2lf");
- push(@args, "GPRINT:$key:MIN:%3.2lf");
- push(@args, "GPRINT:$key:LAST:%3.2lf\\j");
- $count++;
- }
- }
-
- RRDs::graph ( @args );
- $ERROR = RRDs::error;
- print("Error in RRD::graph for temp: $ERROR\n")if $ERROR;
+# Generate the Voltage Graph for the current period of time for values given by collecd and lm_sensors
+
+sub updatehwvoltgraph {
+ my $period = $_[0];
+
+ my @command = (
+ "-",
+ "--start",
+ "-1".$period,
+ "-aPNG",
+ "-i",
+ "-z",
+ "-W www.ipfire.org",
+ "--alt-y-grid",
+ "-w 600",
+ "-h 125",
+ "-r",
+ "-t ".$Lang::tr{'mbmon volt'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period},
+ "--color=SHADEA".$color{"color19"},
+ "--color=SHADEB".$color{"color19"},
+ "--color=BACK".$color{"color21"},
+ "COMMENT:".sprintf("%-29s",$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"
+ );
+
+ foreach(@sensorsgraphs){
+ chomp($_);
+ if ( $_ =~ /voltage/ ) {
+ $_ =~ /\/(.*)sensors-(.*)\/(.*)\.rrd/;
+ my $label = $2.$3;$label=~ s/-//g;
+ if ( $sensorsettings{'LINE-'.$label} eq "off" ){next;}
+ push(@command,"DEF:".$sensorsettings{'LABEL-'.$label}."=".$_.":value:AVERAGE");
+ }
+ }
+
+ foreach(@sensorsgraphs){
+ chomp($_);
+ if ( $_ =~ /voltage/ ){
+ $_ =~ /\/(.*)sensors-(.*)\/(.*)\.rrd/;
+ my $label = $2.$3;$label=~ s/-//g;
+ if ( $sensorsettings{'LINE-'.$label} eq "off" ){next;}
+ push(@command,"LINE3:".$sensorsettings{'LABEL-'.$label}.random_hex_color(6)."A0:".sprintf("%-25s",$sensorsettings{'LABEL-'.$label}),"GPRINT:".$sensorsettings{'LABEL-'.$label}.":MAX:%3.2lf V","GPRINT:".$sensorsettings{'LABEL-'.$label}.":AVERAGE:%3.2lf V","GPRINT:".$sensorsettings{'LABEL-'.$label}.":MIN:%3.2lf V","GPRINT:".$sensorsettings{'LABEL-'.$label}.":LAST:%3.2lf V\\j",);
+ }
+ }
+
+ RRDs::graph (@command);
+ $ERROR = RRDs::error;
+ print "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
}
-sub overviewgraph {
-
- my $period = $_[0];
- my $periodstring;
- my $description;
- my %qossettings = ();
- &General::readhash("${General::swroot}/qos/settings", \%qossettings);
- my $classentry = "";
- my @classes = ();
- my @classline = ();
- my $classfile = "/var/ipfire/qos/classes";
-
- $qossettings{'DEV'} = $_[1];
- if ( $qossettings{'DEV'} eq $qossettings{'RED_DEV'} ) {
+
+# Generate the QoS Graph for the current period of time
+
+sub updateqosgraph {
+
+ my $period = $_[1];
+ my %qossettings = ();
+ &General::readhash("${General::swroot}/qos/settings", \%qossettings);
+
+ my $classentry = "";
+ my @classes = ();
+ my @classline = ();
+ my $classfile = "/var/ipfire/qos/classes";
+
+ $qossettings{'DEV'} = $_[0];
+ if ( $qossettings{'DEV'} eq $qossettings{'RED_DEV'} ) {
$qossettings{'CLASSPRFX'} = '1';
- } else {
+ } else {
$qossettings{'CLASSPRFX'} = '2';
}
-
- if ( $period ne '3240' ){ $periodstring = "-1$period";}else{ $periodstring = "-".$period;}
- if ( $period ne '3240' ){ $description = "-t $Lang::tr{'Utilization on'} ($qossettings{'DEV'}) ($Lang::tr{'graph per'} $Lang::tr{$period})";}else{ $description = "-t $Lang::tr{'Utilization on'} ($qossettings{'DEV'})";}
-
+
my $ERROR="";
my $count="1";
my $color="#000000";
- my @command=("/srv/web/ipfire/html/graphs/qos-graph-$qossettings{'DEV'}-$period.png",
- "--start", $periodstring, "-aPNG", "-i", "-z", "-W www.ipfire.org",
- "--alt-y-grid", "-w 600", "-h 150", "-r",
- "--color", "SHADEA".$color{"color19"},
- "--color", "SHADEB".$color{"color19"},
- "--color", "BACK".$color{"color21"},
- $description
+
+ my @command = (
+ "-",
+ "--start",
+ "-1".$period,
+ "-aPNG",
+ "-i",
+ "-z",
+ "-W www.ipfire.org",
+ "--alt-y-grid",
+ "-w 600",
+ "-h 125",
+ "-r",
+ "-t ".$Lang::tr{'Utilization on'}." (".$qossettings{'DEV'}.") ".$Lang::tr{'graph per'}." ".$Lang::tr{$period},
+ "-v ".$Lang::tr{'bytes per second'},
+ "--color=SHADEA".$color{"color19"},
+ "--color=SHADEB".$color{"color19"},
+ "--color=BACK".$color{"color21"},
+ "COMMENT:".sprintf("%-28s",$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"
);
- open( FILE, "< $classfile" ) or die "Unable to read $classfile";
- @classes = ;
- close FILE;
- foreach $classentry (sort @classes)
- {
- @classline = split( /\;/, $classentry );
- if ( $classline[0] eq $qossettings{'DEV'} )
- {
- $color=random_hex_color(6);
- push(@command, "DEF:$classline[1]=/var/log/rrd/class_$qossettings{'CLASSPRFX'}-$classline[1]_$qossettings{'DEV'}.rrd:bytes:AVERAGE");
-
- if ($count eq "1") {
- push(@command, "AREA:$classline[1]$color:Klasse $classline[1] - $classline[8]\\j");
- } else {
- push(@command, "STACK:$classline[1]$color:Klasse $classline[1] - $classline[8]\\j");
+
+ open( FILE, "< $classfile" ) or die "Unable to read $classfile";
+ @classes = ;
+ close FILE;
+
+ foreach $classentry (sort @classes){
+ @classline = split( /\;/, $classentry );
+ if ( $classline[0] eq $qossettings{'DEV'} ){
+ $color=random_hex_color(6);
+ push(@command, "DEF:$classline[1]=$mainsettings{'RRDLOG'}/class_$qossettings{'CLASSPRFX'}-$classline[1]_$qossettings{'DEV'}.rrd:bytes:AVERAGE");
+
+ if ($count eq "1") {
+ push(@command, "AREA:$classline[1]$color:Klasse $classline[1] -".sprintf("%15s",$classline[8]));
+ } else {
+ push(@command, "STACK:$classline[1]$color:Klasse $classline[1] -".sprintf("%15s",$classline[8]));
+
+ }
+
+ 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");
+ $count++;
}
- $count++;
}
+ RRDs::graph (@command);
+ $ERROR = RRDs::error;
+ print "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
+}
+
+# Generate the CPU Frequency Graph for the current period of time for values given by collectd an lm_sensors
+
+sub updatecpufreqgraph {
+ my $cpucount = `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/cpu-*/ 2>/dev/null | wc -l`;
+ my $period = $_[0];
+ my @command = (
+ "-",
+ "--start",
+ "-1".$period,
+ "-aPNG",
+ "-i",
+ "-z",
+ "-W www.ipfire.org",
+ "--alt-y-grid",
+ "-w 600",
+ "-h 125",
+ "-l 0",
+ "-r",
+ "-t ".$Lang::tr{'cpu frequency per'}." ".$Lang::tr{$period},
+ "-v MHz",
+ "--color=SHADEA".$color{"color19"},
+ "--color=SHADEB".$color{"color19"},
+ "--color=BACK".$color{"color21"},
+ "COMMENT:".sprintf("%-10s",$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"
+ );
+
+ for(my $i = 0; $i < $cpucount; $i++) {
+ my $j=$i+1;
+ push(@command,"DEF:cpu".$i."_=".$mainsettings{'RRDLOG'}."/collectd/localhost/cpufreq/cpufreq-".$i.".rrd:value:AVERAGE"
+ ,"CDEF:cpu".$i."=cpu".$i."_,1000000,/"
+ ,"LINE1:cpu".$i.$color{"color1$j"}."A0:cpu ".$i." "
+ ,"GPRINT:cpu".$i.":MAX:%3.0lf Mhz"
+ ,"GPRINT:cpu".$i.":AVERAGE:%3.0lf Mhz"
+ ,"GPRINT:cpu".$i.":MIN:%3.0lf Mhz"
+ ,"GPRINT:cpu".$i.":LAST:%3.0lf Mhz\\j");
}
+
RRDs::graph (@command);
$ERROR = RRDs::error;
- print "$ERROR";
+ print "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
}
+# Generate the Thermal Zone Temp CPU Graph
+
+sub updatethermaltempgraph {
+ my $thermalcount = `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/thermal-thermal_zone* 2>/dev/null | wc -l`;
+ my $period = $_[0];
+ my @command = (
+ "-",
+ "--start",
+ "-1".$period,
+ "-aPNG",
+ "-i",
+ "-z",
+ "-W www.ipfire.org",
+ "--alt-y-grid",
+ "-w 600",
+ "-h 125",
+ "-r",
+ "-t "."ACPI Thermal-Zone Temperature"." - ".$Lang::tr{$period},
+ "-v Grad Celsius",
+ "--color=SHADEA".$color{"color19"},
+ "--color=SHADEB".$color{"color19"},
+ "--color=BACK".$color{"color21"},
+ "COMMENT:".sprintf("%-10s",$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"
+ );
+
+ for(my $i = 0; $i < $thermalcount; $i++) {
+ my $j=$i+1;
+ push(@command,"DEF:temp".$i."_=".$mainsettings{'RRDLOG'}."/collectd/localhost/thermal-thermal_zone".$i."/temperature-temperature.rrd:value:AVERAGE"
+ ,"CDEF:temp".$i."=temp".$i."_,1,/"
+ ,"LINE3:temp".$i.$color{"color1$j"}."A0:Temp ".$i." "
+ ,"GPRINT:temp".$i.":MAX:%3.0lf Grad C"
+ ,"GPRINT:temp".$i.":AVERAGE:%3.0lf Grad C"
+ ,"GPRINT:temp".$i.":MIN:%3.0lf Grad C"
+ ,"GPRINT:temp".$i.":LAST:%3.0lf Grad C\\j");
+ }
+
+ RRDs::graph (@command);
+ $ERROR = RRDs::error;
+ print "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
+}
+
+
+# Generate a random color, used by Qos Graph to be independent from the amount of values
+
sub random_hex_color {
- my $size = shift;
- $size = 6 if $size !~ /^3|6$/;
- my @hex = ( 0 .. 9, 'a' .. 'f' );
- my @color;
- push @color, @hex[rand(@hex)] for 1 .. $size;
- return join('', '#', @color);
+ my $size = shift;
+ $size = 6 if $size !~ /^3|6$/;
+ my @hex = ( 0 .. 9, 'a' .. 'f' );
+ my @color;
+ push @color, @hex[rand(@hex)] for 1 .. $size;
+ return join('', '#', @color);
+}
+
+sub getprocesses {
+ my @processesgraph = `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/processes-*/ 2>/dev/null`;
+ return @processesgraph;
}