X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=config%2Fcfgroot%2Fgraphs.pl;h=4783e67f7e60f0b20e0ce4c08d31a54dc0b57ae1;hb=8ffdc78c49e128755e0024dbb55a3f3d3796f7cd;hp=7b92992b631e814710182d33d768297abe27f02e;hpb=a249ccd2e4e56798fcfe01b24a180eb461999626;p=ipfire-2.x.git

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 7b92992b63..4783e67f7e 100644
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -112,7 +112,7 @@ sub makegraphbox {
 	print " - ";
 	print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>";
 	print "<br></center>";
-	print "<iframe class='graph' src='".$_[0]."?".$_[1]."?".$_[2]." scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
+	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
@@ -172,7 +172,7 @@ sub updatecpugraph {
 	}
 	
 	for(my $i = 2; $i < $cpucount; $i++) {
-		$addstring .= "+,";
+		$addstring .= "ADDNAN,";
 	}
 
 	if ( $cpucount > 1){
@@ -190,7 +190,7 @@ sub updatecpugraph {
 		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,/,*"
@@ -225,7 +225,7 @@ sub updatecpugraph {
 			,"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"
@@ -256,7 +256,7 @@ sub updateloadgraph {
 		"-1".$period,
 		"-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"},
@@ -683,22 +683,22 @@ sub updatefwhitsgraph {
 		"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",
@@ -1088,7 +1088,7 @@ sub updatethermaltempgraph {
 		"--start",
 		"-1".$period,
 		"-r",
-		"-t "."ACPI Thermal-Zone Temperature"." - ".$Lang::tr{$period."-graph"},
+		"-t ".$Lang::tr{'acpitemp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
 		"-v Grad Celsius",
 		"--color=SHADEA".$color{"color19"},
 		"--color=SHADEB".$color{"color19"},
@@ -1160,3 +1160,31 @@ sub updateentropygraph {
 
 	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;
+}