require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
+# Graph image size in pixel
+our %image_size = ('width' => 910, 'height' => 300);
+
+# List of all available time ranges
+our @time_ranges = ("hour", "day", "week", "month", "year");
+
my $ERROR;
+my @GRAPH_ARGS = (
+ # Output format
+ "--imgformat", "PNG",
+
+ # No border
+ "--border", "0",
+
+ # For a more 'organic' look
+ "--slope-mode",
+
+ # HxW define the size of the output image
+ "--full-size-mode",
+
+ # Watermark
+ "-W www.ipfire.org",
+
+ # Default size
+ "-w $image_size{'width'}",
+ "-h $image_size{'height'}",
+
+ # Use alternative grid
+ "--alt-y-grid",
+);
+
# Read the global settings files to get the current theme and after this load
# colors for this theme
# 3 if given is the height of the iframe default if nothing is given
sub makegraphbox {
- my $height = 285;
- my $width = 700;
-
- if ( $_[3] ne "" ){ $height = $_[3]; }
-
print "<center>";
print "<a href='".$_[0]."?".$_[1]."?hour' target='".$_[1]."box'><b>".$Lang::tr{'hour'}."</b></a>";
print " - ";
print "<a href='".$_[0]."?".$_[1]."?month' target='".$_[1]."box'><b>".$Lang::tr{'month'}."</b></a>";
print " - ";
print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>";
- print "</center>";
- print "<iframe src='".$_[0]."?".$_[1]."?".$_[2]."' width='".$width."' height='".$height."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
+ print "<br></center>";
+ print "<iframe class='graph' src='".$_[0]."?".$_[1]."?".$_[2]."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
}
# Generate the CPU Graph for the current period of time for values given by
my $cpucount = `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/cpu-*/ 2>/dev/null | wc -l`;
my $period = $_[0];
my @command = (
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 125",
"-l 0",
"-u 100",
"-r",
}
for(my $i = 2; $i < $cpucount; $i++) {
- $addstring .= "+,";
+ $addstring .= "ADDNAN,";
}
if ( $cpucount > 1){
push(@command,$nice,$interrupt,$steal,$user,$system,$idle,$iowait,$irq);
}
- push(@command,"CDEF:total=user,system,idle,iowait,irq,nice,interrupt,steal,+,+,+,+,+,+,+"
+ push(@command,"CDEF:total=user,system,idle,iowait,irq,nice,interrupt,steal,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN"
,"CDEF:userpct=100,user,total,/,*"
,"CDEF:nicepct=100,nice,total,/,*"
,"CDEF:interruptpct=100,interrupt,total,/,*"
,"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:MAX:%3.1lf%%"
,"GPRINT:userpct:AVERAGE:%3.2lf%%"
,"GPRINT:userpct:MIN:%3.2lf%%"
,"GPRINT:userpct:LAST:%3.2lf%%\\j"
sub updateloadgraph {
my $period = $_[0];
RRDs::graph(
+ @GRAPH_ARGS,
"-",
"--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."-graph"},
+ "-t ".$Lang::tr{'uptime load average'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
"-v ".$Lang::tr{'processes'},
"--color=SHADEA".$color{"color19"},
"--color=SHADEB".$color{"color19"},
"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'}.":",
+ "AREA:load1".$color{"color13"}."A0:1 ".$Lang::tr{'minute'},
"GPRINT:load1:LAST:%5.2lf",
- "AREA:load5".$color{"color18"}."A0:5 ".$Lang::tr{'minutes'}.":",
+ "AREA:load5".$color{"color18"}."A0:5 ".$Lang::tr{'minutes'},
"GPRINT:load5:LAST:%5.2lf",
- "AREA:load15".$color{"color14"}."A0:15 ".$Lang::tr{'minutes'}.":",
+ "AREA:load15".$color{"color14"}."A0:15 ".$Lang::tr{'minutes'},
"GPRINT:load15:LAST:%5.2lf\\j",
"LINE1:load5".$color{"color13"},
"LINE1:load1".$color{"color18"},
sub updatememorygraph {
my $period = $_[0];
RRDs::graph(
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 125",
"-l 0",
"-u 100",
"-r",
sub updateswapgraph {
my $period = $_[0];
RRDs::graph(
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 125",
"-l 0",
"-u 100",
"-r",
my $count="0";
my @command = (
+ @GRAPH_ARGS,
"-",
"--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."-graph"},
my $count="0";
my @command = (
+ @GRAPH_ARGS,
"-",
"--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."-graph"},
my $disk = $_[0];
my $period = $_[1];
RRDs::graph(
+ @GRAPH_ARGS,
"-",
"--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."-graph"},
+ "-t ".$disk." ".$Lang::tr{'disk access'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
"-v ".$Lang::tr{'bytes per second'},
"--color=SHADEA".$color{"color19"},
"--color=SHADEB".$color{"color19"},
"CDEF:writen=write,-1,*",
"DEF:standby=".$mainsettings{'RRDLOG'}."/hddshutdown-".$disk.".rrd:standby:AVERAGE",
"CDEF:st=standby,INF,*",
- "CDEF:st1=standby,-INF,*",
+ "CDEF:st1=standby,NEGINF,*",
"COMMENT:".sprintf("%-25s",$Lang::tr{'caption'}),
"COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}),
"COMMENT:".sprintf("%15s",$Lang::tr{'average'}),
my $interface = $_[0];
my $period = $_[1];
RRDs::graph(
+ @GRAPH_ARGS,
"-",
"--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."-graph"},
"-v ".$Lang::tr{'bytes per second'},
print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
}
+sub updatevpngraph {
+ my $interface = $_[0];
+ my $period = $_[1];
+ RRDs::graph(
+ @GRAPH_ARGS,
+ "-",
+ "--start",
+ "-1".$period,
+ "-r",
+ "-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
+ "-v ".$Lang::tr{'bytes per second'},
+ "--color=SHADEA".$color{"color19"},
+ "--color=SHADEB".$color{"color19"},
+ "--color=BACK".$color{"color21"},
+ "DEF:incoming=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive.rrd:rx:AVERAGE",
+ "DEF:outgoing=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive.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#00dd00:".sprintf("%-20s",$Lang::tr{'incoming traffic in bytes per second'}),
+ "GPRINT:incoming:MAX:%8.1lf %sBps",
+ "GPRINT:incoming:AVERAGE:%8.1lf %sBps",
+ "GPRINT:incoming:MIN:%8.1lf %sBps",
+ "GPRINT:incoming:LAST:%8.1lf %sBps\\j",
+ "AREA:outgoingn#dd0000:".sprintf("%-20s",$Lang::tr{'outgoing traffic in bytes per second'}),
+ "GPRINT:outgoing:MAX:%8.1lf %sBps",
+ "GPRINT:outgoing:AVERAGE:%8.1lf %sBps",
+ "GPRINT:outgoing:MIN:%8.1lf %sBps",
+ "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
+ );
+ $ERROR = RRDs::error;
+ print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
+}
+
+sub updatevpnn2ngraph {
+ my $interface = $_[0];
+ my $period = $_[1];
+ RRDs::graph(
+ @GRAPH_ARGS,
+ "-",
+ "--start",
+ "-1".$period,
+ "-r",
+ "-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
+ "-v ".$Lang::tr{'bytes per second'},
+ "--color=SHADEA".$color{"color19"},
+ "--color=SHADEB".$color{"color19"},
+ "--color=BACK".$color{"color21"},
+ "DEF:incoming=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive-traffic.rrd:rx:AVERAGE",
+ "DEF:outgoing=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive-traffic.rrd:tx:AVERAGE",
+ "DEF:overhead_in=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive-overhead.rrd:rx:AVERAGE",
+ "DEF:overhead_out=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive-overhead.rrd:tx:AVERAGE",
+ "DEF:compression_in=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/compression_derive-data_in.rrd:uncompressed:AVERAGE",
+ "DEF:compression_out=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/compression_derive-data_out.rrd:uncompressed:AVERAGE",
+ "CDEF:outgoingn=outgoing,-1,*",
+ "CDEF:overhead_outn=overhead_out,-1,*",
+ "CDEF:compression_outn=compression_out,-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#00dd00:".sprintf("%-23s",$Lang::tr{'incoming traffic in bytes per second'}),
+ "GPRINT:incoming:MAX:%8.1lf %sBps",
+ "GPRINT:incoming:AVERAGE:%8.1lf %sBps",
+ "GPRINT:incoming:MIN:%8.1lf %sBps",
+ "GPRINT:incoming:LAST:%8.1lf %sBps\\j",
+ "STACK:overhead_in#116B11:".sprintf("%-23s",$Lang::tr{'incoming overhead in bytes per second'}),
+ "GPRINT:overhead_in:MAX:%8.1lf %sBps",
+ "GPRINT:overhead_in:AVERAGE:%8.1lf %sBps",
+ "GPRINT:overhead_in:MIN:%8.1lf %sBps",
+ "GPRINT:overhead_in:LAST:%8.1lf %sBps\\j",
+ "LINE1:compression_in#ff00ff:".sprintf("%-23s",$Lang::tr{'incoming compression in bytes per second'}),
+ "GPRINT:compression_in:MAX:%8.1lf %sBps",
+ "GPRINT:compression_in:AVERAGE:%8.1lf %sBps",
+ "GPRINT:compression_in:MIN:%8.1lf %sBps",
+ "GPRINT:compression_in:LAST:%8.1lf %sBps\\j",
+ "AREA:outgoingn#dd0000:".sprintf("%-23s",$Lang::tr{'outgoing traffic in bytes per second'}),
+ "GPRINT:outgoing:MAX:%8.1lf %sBps",
+ "GPRINT:outgoing:AVERAGE:%8.1lf %sBps",
+ "GPRINT:outgoing:MIN:%8.1lf %sBps",
+ "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
+ "STACK:overhead_outn#870C0C:".sprintf("%-23s",$Lang::tr{'outgoing overhead in bytes per second'}),
+ "GPRINT:overhead_out:MAX:%8.1lf %sBps",
+ "GPRINT:overhead_out:AVERAGE:%8.1lf %sBps",
+ "GPRINT:overhead_out:MIN:%8.1lf %sBps",
+ "GPRINT:overhead_out:LAST:%8.1lf %sBps\\j",
+ "LINE1:compression_outn#000000:".sprintf("%-23s",$Lang::tr{'outgoing compression in bytes per second'}),
+ "GPRINT:compression_out:MAX:%8.1lf %sBps",
+ "GPRINT:compression_out:AVERAGE:%8.1lf %sBps",
+ "GPRINT:compression_out:MIN:%8.1lf %sBps",
+ "GPRINT:compression_out:LAST:%8.1lf %sBps\\j",
+ );
+ $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(
+ @GRAPH_ARGS,
"-",
"--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."-graph"},
"-v ".$Lang::tr{'bytes per second'},
"COMMENT:".sprintf("%15s",$Lang::tr{'average'}),
"COMMENT:".sprintf("%14s",$Lang::tr{'minimal'}),
"COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j",
- "AREA:output".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}."-OUTPUT"),
+ "AREA:output".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (OUTPUT)"),
"GPRINT:output:MAX:%8.1lf %sBps",
"GPRINT:output:AVERAGE:%8.1lf %sBps",
"GPRINT:output:MIN:%8.1lf %sBps",
"GPRINT:output:LAST:%8.1lf %sBps\\j",
- "STACK:forward".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}."-FORWARD"),
+ "STACK:forward".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (FORWARD)"),
"GPRINT:forward:MAX:%8.1lf %sBps",
"GPRINT:forward:AVERAGE:%8.1lf %sBps",
"GPRINT:forward:MIN:%8.1lf %sBps",
"GPRINT:forward:LAST:%8.1lf %sBps\\j",
- "STACK:input".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}."-INPUT"),
+ "STACK:input".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (INPUT)"),
"GPRINT:input:MAX:%8.1lf %sBps",
"GPRINT:input:AVERAGE:%8.1lf %sBps",
"GPRINT:input:MIN:%8.1lf %sBps",
"GPRINT:input:LAST:%8.1lf %sBps\\j",
- "STACK:newnotsyn".$color{"color14"}."A0:".sprintf("%-25s","NewNotSyn"),
+ "STACK:newnotsyn".$color{"color14"}."A0:".sprintf("%-25s","NewNotSYN"),
"GPRINT:newnotsyn:MAX:%8.1lf %sBps",
- "GPRINT:newnotsyn:MIN:%8.1lf %sBps",
"GPRINT:newnotsyn:AVERAGE:%8.1lf %sBps",
+ "GPRINT:newnotsyn:MIN:%8.1lf %sBps",
"GPRINT:newnotsyn:LAST:%8.1lf %sBps\\j",
"STACK:portscan".$color{"color16"}."A0:".sprintf("%-25s",$Lang::tr{'portscans'}),
"GPRINT:portscan:MAX:%8.1lf %sBps",
- "GPRINT:portscan:MIN:%8.1lf %sBps",
"GPRINT:portscan:AVERAGE:%8.1lf %sBps",
+ "GPRINT:portscan:MIN:%8.1lf %sBps",
"GPRINT:portscan:LAST:%8.1lf %sBps\\j",
);
$ERROR = RRDs::error;
my $period = $_[1];
my $host = $_[0];
RRDs::graph(
+ @GRAPH_ARGS,
"-",
"--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."-graph"},
my $period = $_[1];
my $interface = $_[0];
RRDs::graph(
+ @GRAPH_ARGS,
"-",
"--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."-graph"},
"-v dBm",
"--color=SHADEA".$color{"color19"},
my $disk = $_[0];
my $period = $_[1];
RRDs::graph(
+ @GRAPH_ARGS,
"-",
"--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."-graph"},
"-v Celsius",
"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",
+ "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",
+ "GPRINT:temperature:MAX:%3.0lf °C",
+ "GPRINT:temperature:AVERAGE:%3.0lf °C",
+ "GPRINT:temperature:MIN:%3.0lf °C",
+ "GPRINT:temperature:LAST:%3.0lf °C\\j",
);
$ERROR = RRDs::error;
print "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
my $period = $_[0];
my @command = (
+ @GRAPH_ARGS,
"-",
"--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."-graph"},
+ "-v Celsius",
"--color=SHADEA".$color{"color19"},
"--color=SHADEB".$color{"color19"},
"--color=BACK".$color{"color21"},
$_ =~ /\/(.*)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",);
+ 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",);
}
}
my $period = $_[0];
my @command = (
+ @GRAPH_ARGS,
"-",
"--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."-graph"},
"--color=SHADEA".$color{"color19"},
my $period = $_[0];
my @command = (
+ @GRAPH_ARGS,
"-",
"--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."-graph"},
"--color=SHADEA".$color{"color19"},
my $ERROR="";
my $count="1";
- my $color="#000000";
+ my %colorMap = (); # maps traffic classes to graph colors
my @command = (
+ @GRAPH_ARGS,
"-",
"--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."-graph"},
"-v ".$Lang::tr{'bytes per second'},
@classes = <FILE>;
close FILE;
- my $colorIndex = 0;
foreach $classentry (sort @classes){
@classline = split( /\;/, $classentry );
+
+ # create class <-> color mapping
+ my $colorKey = uc $classline[8]; # upper case class name as key
+ if(! exists $colorMap{$colorKey}) {
+ # add missing color to table, use colors 11-25
+ my $colorIndex = 11 + ((scalar keys %colorMap) % 15);
+ $colorMap{$colorKey} = "$color{\"color$colorIndex\"}";
+ }
+
if ( $classline[0] eq $qossettings{'DEV'} ){
- my $colorIndex = 10 + $count % 15;
- $color="$color{\"color$colorIndex\"}";
push(@command, "DEF:$classline[1]=$mainsettings{'RRDLOG'}/class_$qossettings{'CLASSPRFX'}-$classline[1]_$qossettings{'DEV'}.rrd:bytes:AVERAGE");
+ # get color to be used for this graph
+ my $graphColor = $colorMap{$colorKey};
+
if ($count eq "1") {
- push(@command, "AREA:$classline[1]$color:$Lang::tr{'Class'} $classline[1] -".sprintf("%15s",$classline[8]));
+ push(@command, "AREA:$classline[1]$graphColor:$Lang::tr{'Class'} $classline[1] -".sprintf("%15s",$classline[8]));
} else {
- push(@command, "STACK:$classline[1]$color:$Lang::tr{'Class'} $classline[1] -".sprintf("%15s",$classline[8]));
+ push(@command, "STACK:$classline[1]$graphColor:$Lang::tr{'Class'} $classline[1] -".sprintf("%15s",$classline[8]));
}
push(@command, "GPRINT:$classline[1]:MAX:%8.1lf %sBps"
my $cpucount = `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/cpu-*/ 2>/dev/null | wc -l`;
my $period = $_[0];
my @command = (
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 125",
"-r",
"-t ".$Lang::tr{'cpu frequency per'}." ".$Lang::tr{$period."-graph"},
"-v MHz",
my $thermalcount = `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/thermal-thermal_zone* 2>/dev/null | wc -l`;
my $period = $_[0];
my @command = (
+ @GRAPH_ARGS,
"-",
"--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."-graph"},
- "-v Grad Celsius",
+ "-t ".$Lang::tr{'acpitemp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
+ "-v Celsius",
"--color=SHADEA".$color{"color19"},
"--color=SHADEB".$color{"color19"},
"--color=BACK".$color{"color21"},
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");
+ ,"GPRINT:temp".$i.":MAX:%3.0lf °C"
+ ,"GPRINT:temp".$i.":AVERAGE:%3.0lf °C"
+ ,"GPRINT:temp".$i.":MIN:%3.0lf °C"
+ ,"GPRINT:temp".$i.":LAST:%3.0lf °C\\j");
}
RRDs::graph (@command);
sub updateentropygraph {
my $period = $_[0];
my @command = (
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 225",
"-r",
"--lower-limit","0",
- "-t $Lang::tr{'entropy'}",
+ "-t ".$Lang::tr{'entropy'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
"-v $Lang::tr{'bit'}",
"DEF:entropy=$mainsettings{'RRDLOG'}/collectd/localhost/entropy/entropy.rrd:entropy:AVERAGE",
- "CDEF:entropytrend=entropy,43200,TREND",
"LINE3:entropy#ff0000:" . sprintf("%-15s", $Lang::tr{'entropy'}),
"VDEF:entrmin=entropy,MINIMUM",
"VDEF:entrmax=entropy,MAXIMUM",
"GPRINT:entrmax:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'maximum'}),
"GPRINT:entrmin:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'minimum'}),
"GPRINT:entravg:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'average'}) . "\\n",
- "LINE3:entropytrend#000000",
+ "--color=BACK".$color{"color21"},
);
RRDs::graph (@command);
print "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
}
+
+sub updateconntrackgraph {
+ my $period = $_[0];
+ my @command = (
+ @GRAPH_ARGS,
+ "-",
+ "--start",
+ "-1" . $period,
+ "-r",
+ "--lower-limit","0",
+ "-t $Lang::tr{'connection tracking'}",
+ "-v $Lang::tr{'open connections'}",
+ "DEF:conntrack=$mainsettings{'RRDLOG'}/collectd/localhost/conntrack/conntrack.rrd:entropy:AVERAGE",
+ "LINE3:conntrack#ff0000:" . sprintf("%-15s", $Lang::tr{'open connections'}),
+ "VDEF:ctmin=conntrack,MINIMUM",
+ "VDEF:ctmax=conntrack,MAXIMUM",
+ "VDEF:ctavg=conntrack,AVERAGE",
+ "GPRINT:ctmax:" . sprintf("%15s\\: %%5.0lf", $Lang::tr{'maximum'}),
+ "GPRINT:ctmin:" . sprintf("%15s\\: %%5.0lf", $Lang::tr{'minimum'}),
+ "GPRINT:ctavg:" . sprintf("%15s\\: %%5.0lf", $Lang::tr{'average'}) . "\\n",
+ "--color=BACK" . $color{"color21"},
+ );
+
+ RRDs::graph(@command);
+ $ERROR = RRDs::error;
+
+ print STDERR "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
+}
projects / people / pmueller / ipfire-2.x.git / blobdiff