X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Fscripts%2Fmakegraphs;h=03a53fedeb5ad517abb128e7648bd8cccad527d5;hp=1120fd84886bdbf0848490cad398764351829707;hb=207cc1cf86ff540c9e30639d5858cae8acff96eb;hpb=39a7cc119ab47d4ef5c06d61c99abbeb09a9f130

diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs
index 1120fd8488..03a53fedeb 100644
--- a/src/scripts/makegraphs
+++ b/src/scripts/makegraphs
@@ -21,18 +21,18 @@
 # Copyright (C) 2004-01-19 Mark Wormgoor <mark@wormgoor.com>.              #
 #                                                                          #
 ############################################################################
-#
-# $Id: makegraphs,v 1.19.2.18 2006/01/08 13:41:04 eoberlander Exp $
-#
+
 use strict;
 #use warnings;
 
 use RRDs;
-require "CONFIG_ROOT/general-functions.pl";
+require "/var/ipfire/general-functions.pl";
 require "${General::swroot}/lang.pl";
 
 my (%settings, @ipacsum, $iface, $ERROR);
 &General::readhash("${General::swroot}/ethernet/settings", \%settings);
+my %mbmon_settings = ();
+&General::readhash("${General::swroot}/mbmon/settings", \%mbmon_settings);
 
 # Added for conversion of utf-8 characters
 use Encode 'from_to';
@@ -57,6 +57,42 @@ if ((${Lang::language} eq 'el') ||
 my $rrdlog = "/var/log/rrd";
 my $graphs = "/home/httpd/html/graphs";
 $ENV{PATH}="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin";
+my $hdd_device = "/dev/harddisk";
+my $temp = '';
+my %mbmon_values = ();
+my $key;
+my $value;
+my @args = ();
+my $count = 0;
+my $ERROR;
+my $dbg = 0;
+my $path_smartctl = "/usr/sbin/smartctl";
+my $path_hddtemp = "/usr/sbin/hddtemp";
+
+my %colors = ();
+$colors{"1"} = "#0000FF";
+$colors{"2"} = "#00FF00";
+$colors{"3"} = "#FF0000";
+$colors{"4"} = "#FFD700";
+$colors{"5"} = "#CCCCCC";
+$colors{"6"} = "#40E0D0";
+$colors{"7"} = "#90EE90";
+$colors{"8"} = "#F4A460";
+
+open(MBMON_OUT, ">/var/log/mbmon-values");
+open(FD, "/usr/bin/mbmon -rc1|" ) || die "ERROR: Cannot run mbmon\n" ;
+
+while( $_ = <FD> ) 
+{
+  next unless( /^([A-Za-z][^:\s]+)\s*:\s*([+\-]{0,1}[\d\.]+)/ ) ;
+  $key = $1 ;
+  $value = $2 ;
+  $key =~ y/A-Z/a-z/ ;
+  $mbmon_values{$key} = $value;
+  print(MBMON_OUT "$key=$value\n");
+}
+close(FD);
+close(MBMON_OUT);
 
 sub gettraffic {
 	my $interface = $_[0];
@@ -148,6 +184,47 @@ sub updatecpudata {
 
 }
 
+sub updateloadgraph {
+	my $period    = $_[0];
+
+	RRDs::graph ("$graphs/load-$period.png",
+		"--start", "-1$period", "-aPNG",
+		"-w 600", "-h 100", "-i", "-z", "-l 0", "-r", "--alt-y-grid",
+		"-t Load Average",
+		"--color", "SHADEA#EAE9EE",
+		"--color", "SHADEB#EAE9EE",
+		"--color", "BACK#FFFFFF",
+		"DEF:load1=$rrdlog/load.rrd:load1:AVERAGE",
+		"DEF:load5=$rrdlog/load.rrd:load5:AVERAGE",
+		"DEF:load15=$rrdlog/load.rrd:load15:AVERAGE",
+		"AREA:load1#ff0000:1 Minute, letzter\:",
+		"GPRINT:load1:LAST:%5.2lf\n",
+		"AREA:load5#ff9900:5 Minuten, letzter\:",
+		"GPRINT:load5:LAST:%5.2lf\n",
+		"AREA:load15#ffff00:15 Minuten, letzter\:",
+		"GPRINT:load15:LAST:%5.2lf",
+		"LINE1:load5#ff9900:",
+		"LINE1:load1#ff0000:");
+	$ERROR = RRDs::error;
+	print "Error in RRD::graph for load: $ERROR\n" if $ERROR;
+}
+
+sub updateloaddata {
+	if ( ! -e "$rrdlog/load.rrd") {
+		RRDs::create ("$rrdlog/load.rrd", "--step=60",
+			"DS:load1:GAUGE:120:0:U",
+			"DS:load5:GAUGE:120:0:U",
+			"DS:load15:GAUGE:120:0:U",
+			"RRA:AVERAGE:0.5:1:2160",
+			"RRA:AVERAGE:0.5:5:2016",
+			"RRA:AVERAGE:0.5:15:2880",
+			"RRA:AVERAGE:0.5:60:8760");
+
+		$ERROR = RRDs::error;
+		print "Error in RRD::create for cpu: $ERROR\n" if $ERROR;
+	}
+}
+
 sub updatememgraph {
 	my $period    = $_[0];
 
@@ -341,6 +418,107 @@ sub updatediskdata {
 	}
 }
 
+sub updatediskgraphnew {
+	my $disk      = $_[0];
+	my $period    = $_[1];
+
+	RRDs::graph ("$graphs/disk-$disk-$period.png",
+		"--start", "-1$period", "-aPNG", "-i", "-z",
+		"--alt-y-grid", "-w 600", "-h 100", "-l 0", "-r",
+		"--color", "SHADEA#EAE9EE",
+		"--color", "SHADEB#EAE9EE",
+		"--color", "BACK#FFFFFF",
+		"-t $tr{'disk access per'} $tr{$period}",
+		"DEF:read=$rrdlog/disk-$disk.rrd:readsect:AVERAGE",
+		"DEF:write=$rrdlog/disk-$disk.rrd:writesect:AVERAGE",
+		"DEF:sleep=$rrdlog/disk-$disk.rrd:sleeping:AVERAGE",
+		"CDEF:sl_state=sleep,INF,*",
+
+                "AREA:sl_state#a0a0a0:disk standby\\j",
+		"AREA:read#0000FF:$tr{'sectors read from disk per second'}\\j",
+		"STACK:write#00FF00:$tr{'sectors written to disk per second'}\\j",
+	
+		"GPRINT:read:MAX:$tr{'maximal'} $tr{'read sectors'}\\:%8.0lf",
+		"GPRINT:read:AVERAGE:$tr{'average'} $tr{'read sectors'}\\:%8.0lf",
+		"GPRINT:read:LAST:$tr{'current'} $tr{'read sectors'}\\:%8.0lf\\j",
+		"GPRINT:write:MAX:$tr{'maximal'} $tr{'written sectors'}\\:%8.0lf",
+		"GPRINT:write:AVERAGE:$tr{'average'} $tr{'written sectors'}\\:%8.0lf",
+		"GPRINT:write:LAST:$tr{'current'} $tr{'written sectors'}\\:%8.0lf\\j");
+	$ERROR = RRDs::error;
+	print "Error in RRD::graph for disk-$disk: $ERROR\n" if $ERROR;
+}
+
+sub updatediskdatanew {
+	my $disk = $_[0];
+
+	my ($readwritereq, $readreq, $readsect, $writereq, $writesect);
+	if ( ! -e "$rrdlog/disk-$disk.rrd") {
+		RRDs::create ("$rrdlog/disk-$disk.rrd", "--step=300",
+			"DS:readsect:COUNTER:600:0:5000000000",
+			"DS:writesect:COUNTER:600:0:5000000000",
+			"DS:sleeping:GAUGE:600:0:1",
+			"RRA:AVERAGE:0.5:1:576",
+			"RRA:AVERAGE:0.5:6:672",
+			"RRA:AVERAGE:0.5:24:732",
+			"RRA:AVERAGE:0.5:144:1460");
+		$ERROR = RRDs::error;
+		print "Error in RRD::create for disk-$disk: $ERROR\n" if $ERROR;
+	}
+
+	my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size,
+		$atime, $mtime, $ctime, $blksize, $blocks) = stat("/dev/$disk");
+
+	my $major = $rdev >> 8;
+	my $minor = ($rdev & 0xFF) >>6;
+
+	open STAT, "/proc/stat";
+	my @diskstat = <STAT>;
+	close (STAT);
+	foreach my $line (@diskstat)
+	{
+		chomp ($line);
+		my @temp = split(/\:\ /,$line);
+		if ($temp[1]) {
+			my @devicestat = split(/\ /,$temp[1]);
+			foreach my $stats (@devicestat)
+			{
+				chomp ($stats);
+				my @fields = split(/\((\d+),(\d+)\):\((\d+),(\d+),(\d+),(\d+),(\d+)/,$stats);
+				if ($major eq $fields[1] and $minor eq $fields[2])
+				{
+					$readwritereq = $fields[3];
+					$readreq      = $fields[4];
+					$readsect     = $fields[5];
+					$writereq     = $fields[6];
+					$writesect    = $fields[7];
+				}
+			}
+		}
+	}
+
+	my $sleeping=0;
+	my $lastsleepstate=0;
+
+	if ( -e "/tmp/hddshutdown-$disk" ) {
+		open STAT,"/tmp/hddshutdown-$disk";
+		$lastsleepstate = <STAT>;
+		close (STAT);
+		if ($lastsleepstate==$readwritereq) {
+			$sleeping=1;
+		}
+	}       
+
+	if ($readsect && $writesect) {
+		RRDs::update ("$rrdlog/disk-$disk.rrd",
+			"-t", "readsect:writesect:sleeping",
+			"N:$readsect:$writesect:$sleeping");
+		$ERROR = RRDs::error;
+		print "Error in RRD::update for disk-$disk: $ERROR\n" if $ERROR;
+	} else {
+		print "Error in RRD::update for disk-$disk: no data available\n";
+	}
+}
+
 sub updateifgraph {
 	my $interface = $_[0];
 	my $period    = $_[1];
@@ -402,14 +580,14 @@ sub updatefwhitsgraph {
 		"-t firewall hits over the last $interval",
 		"DEF:amount=$rrdlog/firewallhits.rrd:amount:AVERAGE",
 		"AREA:amount#6464FF:firewallhits",
-		"GPRINT:amount:MAX:   Max\\: %2.2lf %S",
-		"GPRINT:amount:AVERAGE: Avg\\: %2.2lf %S",
-		"GPRINT:amount:LAST: Current\\: %2.2lf %Shits/5 min\\n",
+		"GPRINT:amount:MAX:   $tr{'maximal'}\\: %2.2lf %S",
+		"GPRINT:amount:AVERAGE: $tr{'average'}\\: %2.2lf %S",
+		"GPRINT:amount:LAST: $tr{'current'}\\: %2.2lf %Shits/5 min\\n",
 		"DEF:portamount=$rrdlog/firewallhits.rrd:portamount:AVERAGE",
 		"AREA:portamount#FF6464:portscans",
-		"GPRINT:portamount:MAX:      Max\\: %2.2lf %S",
-		"GPRINT:portamount:AVERAGE: Avg\\: %2.2lf %S",
-		"GPRINT:portamount:LAST: Current\\: %2.2lf %Shits/5 min");
+		"GPRINT:portamount:MAX:      $tr{'maximal'}\\: %2.2lf %S",
+		"GPRINT:portamount:AVERAGE: $tr{'average'}\\: %2.2lf %S",
+		"GPRINT:portamount:LAST: $tr{'current'}\\: %2.2lf %Shits/5 min");
 	$ERROR = RRDs::error;
 	print "Error in RRD::graph for Firewallhits: $ERROR\n" if $ERROR;
 
@@ -422,14 +600,14 @@ sub updatefwhitsgraph {
 		"-t firewall hits over the last $interval",
 		"DEF:amount=$rrdlog/firewallhits.rrd:amount:AVERAGE",
 		"LINE2:amount#6464FF:firewallhits",
-		"GPRINT:amount:MAX:   Max\\: %2.2lf %S",
-		"GPRINT:amount:AVERAGE: Avg\\: %2.2lf %S",
-		"GPRINT:amount:LAST: Current\\: %2.2lf %Shits/5 min\\n",
+		"GPRINT:amount:MAX:   $tr{'maximal'}\\: %2.2lf %S",
+		"GPRINT:amount:AVERAGE: $tr{'average'}\\: %2.2lf %S",
+		"GPRINT:amount:LAST: $tr{'current'}\\: %2.2lf %Shits/5 min\\n",
 		"DEF:portamount=$rrdlog/firewallhits.rrd:portamount:AVERAGE",
 		"LINE2:portamount#FF6464:portscans",
-		"GPRINT:portamount:MAX:      Max\\: %2.2lf %S",
-		"GPRINT:portamount:AVERAGE: Avg\\: %2.2lf %S",
-		"GPRINT:portamount:LAST: Current\\: %2.2lf %Shits/5 min");
+		"GPRINT:portamount:MAX:      $tr{'maximal'}\\: %2.2lf %S",
+		"GPRINT:portamount:AVERAGE: $tr{'average'}\\: %2.2lf %S",
+		"GPRINT:portamount:LAST: $tr{'current'}\\: %2.2lf %Shits/5 min");
 	$ERROR = RRDs::error;
 	print "Error in RRD::graph for Firewallhits: $ERROR\n" if $ERROR;
 }
@@ -524,7 +702,7 @@ sub updatelq {
 	my $roundtrip=0;
 	my $test=0;
 #	LQ_GATEWAY is the ip of your isp's public ip facing you
-       my $LQ_GATEWAY=`netstat -r | grep ^default | awk '{print \$2}'`;
+       my $LQ_GATEWAY='www.heise.de';
 	my $NUMPINGS=10;
 	my $pingoutput = `ping -c $NUMPINGS -q $LQ_GATEWAY`;
 	chomp;
@@ -562,9 +740,9 @@ sub updatelqgraph {
 		"AREA:r0#80FF80:<30 ms",
 		"AREA:loss10#800000:Packet loss (x10)",
 		"LINE1:roundtrip#707070:",
-		"GPRINT:roundtrip:MAX:$tr{'maximal'} $tr{'linkq'}\\:%3.2lf ms",
-		"GPRINT:roundtrip:AVERAGE:$tr{'average'} $tr{'linkq'}\\:%3.2lf ms",
-		"GPRINT:roundtrip:LAST:$tr{'current'} $tr{'linkq'}\\:%3.2lf ms\\j",
+		"GPRINT:roundtrip:MAX:$tr{'maximal'}\\:%3.2lf ms",
+		"GPRINT:roundtrip:AVERAGE:$tr{'average'}\\:%3.2lf ms",
+		"GPRINT:roundtrip:LAST:$tr{'current'}\\:%3.2lf ms\\j",
 		"GPRINT:loss:MAX:$tr{'maximal'} Loss\\:%3.2lf%%",
 		"GPRINT:loss:AVERAGE:$tr{'average'} Loss\\:%3.2lf%%",
 		"GPRINT:loss:LAST:$tr{'current'} Loss\\:%3.2lf%%\\j"
@@ -573,6 +751,267 @@ sub updatelqgraph {
 	print "Error in RRD::graph for Link Quality: $ERROR\n" if $ERROR;
 }
 
+sub updatehdddata 
+{
+  if ( ! -e "$rrdlog/hddtemp.rrd") 
+  {
+    # database did not exist -> create
+    RRDs::create ("$rrdlog/hddtemp.rrd", "--step=300",
+      "DS:temperature:GAUGE:600:0:100",
+      "RRA:AVERAGE:0.5:1:576",
+      "RRA:AVERAGE:0.5:6:672",
+      "RRA:AVERAGE:0.5:24:732",
+      "RRA:AVERAGE:0.5:144:1460");
+    $ERROR = RRDs::error;
+    print "Error in RRD::create for hdd: $ERROR\n" if $ERROR;
+  }
+
+  $temp = 0;
+  my $hdd_output = '';
+  my $smart_output = '';
+
+  if ( -e "$path_smartctl" )
+  {
+    system("$path_smartctl -iHA $hdd_device > /var/log/hddgraph_smartctl_out");
+  }
+
+  if ( -e "$path_hddtemp" )
+  {
+    $hdd_output = `$path_hddtemp -qn $hdd_device`;
+
+    # I know 4 response possible responses:
+    #
+    # /dev/harddisk: harddisk type: S.M.A.R.T. not available
+    # /dev/harddisk: harddisk type: no sensor
+    # /dev/harddisk: harddisk type: 37°C or °F
+    # 37
+
+    if ( index($hdd_output, "S.M.A.R.T.") != -1 )
+    {
+      $temp = 0;
+    }
+    elsif ( index($hdd_output, "no sensor") != -1 )
+    {
+      $temp = 1;
+    }
+    elsif ( index($hdd_output, "$hdd_device") != -1 )
+    {
+      $hdd_output =~ /.*:.*:\s*(\d+).*\s/;
+      $temp = $1;
+    }
+    else
+    {
+      $hdd_output =~ /(\d+)\s/;
+      $temp = $1;
+    }
+  }
+  elsif ( -e "/var/log/hddgraph_smartctl_out" )
+  {
+    $hdd_output = `cat /var/log/hddgraph_smartctl_out | grep Temperature_`;
+    my @t = split(/\s+/,$hdd_output);
+    $temp = $t[9];
+  }
+  else
+  {
+    $temp = 0;
+  }
+
+#  print "hdd  $hdd_output \n";
+#  print "temp $temp \n";
+
+  RRDs::update ("$rrdlog/hddtemp.rrd", "-t", "temperature", "N:$temp");
+
+  $ERROR = RRDs::error;
+  print "Error in RRD::update for hdd: $ERROR\n" if $ERROR;
+}
+
+sub updatehddgraph {
+  my $period    = $_[0];
+
+  RRDs::graph ("$graphs/hddtemp-$period.png",
+    "--start", "-1$period", "-aPNG", "-i", "-z",
+    "--alt-y-grid", "-w 600", "-h 100",
+    "--color", "SHADEA#EAE9EE",
+    "--color", "SHADEB#EAE9EE",
+    "--color", "BACK#FFFFFF",
+    "-t $tr{'harddisk temperature'} ($tr{'graph per'} $tr{$period})",
+    "DEF:temperature=$rrdlog/hddtemp.rrd:temperature:AVERAGE",
+    "LINE2:temperature#0000FF:$tr{'hdd temperature in'} °C",
+    "GPRINT:temperature:MAX:$tr{'maximal'}\\:%3.0lf °C",
+    "GPRINT:temperature:AVERAGE:$tr{'average'}\\:%3.0lf °C",
+    "GPRINT:temperature:LAST:$tr{'current'}\\:%3.0lf °C",
+  );
+  $ERROR = RRDs::error;
+  print "Error in RRD::graph for cpu: $ERROR\n" if $ERROR;
+}
+
+sub updatembmondata 
+{
+  if ( ! -e "$rrdlog/mbmon.rrd" )
+  {
+    # database did not exist -> create
+
+    @args = ("$rrdlog/mbmon.rrd");
+
+    push(@args, "--step=300");
+    foreach $key ( sort(keys %mbmon_values) ) 
+    {
+      push(@args, "DS:$key:GAUGE:600:U:U");
+    }
+    push(@args, "RRA:AVERAGE:0.5:1:576");
+    push(@args, "RRA:AVERAGE:0.5:6:672");
+    push(@args, "RRA:AVERAGE:0.5:24:732");
+    push(@args, "RRA:AVERAGE:0.5:144:1460");
+
+    print("create ". join( ", ", @args)) if ( $dbg );
+   
+    RRDs::create (@args);
+    $ERROR = RRDs::error;
+    print("Error in RRD::create for mbmon: $ERROR\n") if $ERROR;
+  }
+
+  my @ds;
+  my @val;
+  my $template;
+
+  foreach $key ( sort(keys %mbmon_values) )
+  {
+    push(@ds, $key);
+    push(@val, $mbmon_values{$key});
+  }
+
+  $template = join(':', @ds);
+  $value    = "N:".join(':', @val);
+
+  print("update template = '$template'\n") if ( $dbg );
+  print("update value    = '$value'\n") if ( $dbg );
+
+  RRDs::update("$rrdlog/mbmon.rrd", "-t", $template, $value);
+  $ERROR = RRDs::error;
+  print("Error in RRD::update for mbmon: $ERROR\n") if $ERROR;
+}
+
+sub updatetempgraph
+{
+  my $type   = "temp";
+  my $period = $_[0];
+
+  @args = ("$graphs/mbmon-$type-$period.png", "--start", "-1$period", "-aPNG", "-i", "-z",
+    "--alt-y-grid", "-w 600", "-h 100", "--alt-autoscale",
+    "--color", "SHADEA#EAE9EE",
+    "--color", "SHADEB#EAE9EE",
+    "--color", "BACK#FFFFFF",
+    "-t $tr{'mbmon temp'} ($tr{'graph per'} $tr{$period})" );
+
+  $count = 1;
+  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$colors{$count}:$mbmon_settings{'LABEL-'.$key} $tr{'mbmon temp in'} °C");
+      push(@args, "GPRINT:$key:MAX:$tr{'maximal'}\\:%5.1lf °C");
+      push(@args, "GPRINT:$key:AVERAGE:$tr{'average'}\\:%5.1lf °C");
+      push(@args, "GPRINT:$key:LAST:$tr{'current'}\\:%5.1lf °C\\j");
+
+      $count++;
+    }
+  }
+
+  if ( $count > 1 )
+  {
+    RRDs::graph ( @args );
+    $ERROR = RRDs::error;
+    print("Error in RRD::graph for temp: $ERROR\n")if $ERROR;
+  }
+}
+
+sub updatefangraph
+{
+  my $type   = "fan";
+  my $period = $_[0];
+
+  @args = ("$graphs/mbmon-$type-$period.png", "--start", "-1$period", "-aPNG", "-i", "-z",
+    "--alt-y-grid", "-w 600", "-h 100", "--alt-autoscale",
+    "--color", "SHADEA#EAE9EE",
+    "--color", "SHADEB#EAE9EE",
+    "--color", "BACK#FFFFFF",
+    "-t $tr{'mbmon temp'} ($tr{'graph per'} $tr{$period})" );
+
+  $count = 1;
+  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$colors{$count}:$mbmon_settings{'LABEL-'.$key} $tr{'mbmon fan in'} rpm");
+      push(@args, "GPRINT:$key:MAX:$tr{'maximal'}\\:%5.0lf rpm");
+      push(@args, "GPRINT:$key:AVERAGE:$tr{'average'}\\:%5.0lf rpm");
+      push(@args, "GPRINT:$key:LAST:$tr{'current'}\\:%5.0lf rpm\\j");
+
+      $count++;
+    }
+  }
+
+  if ( $count > 1 )
+  {
+    RRDs::graph ( @args );
+    $ERROR = RRDs::error;
+    print("Error in RRD::graph for temp: $ERROR\n")if $ERROR;
+  }
+}
+
+sub updatevoltgraph
+{
+  my $type   = "volt";
+  my $period = $_[0];
+
+  @args = ("$graphs/mbmon-$type-$period.png", "--start", "-1$period", "-aPNG", "-i", "-z",
+    "--alt-y-grid", "-w 600", "-h 100", "--alt-autoscale",
+    "--color", "SHADEA#EAE9EE",
+    "--color", "SHADEB#EAE9EE",
+    "--color", "BACK#FFFFFF",
+    "-t $tr{'mbmon temp'} ($tr{'graph per'} $tr{$period})" );
+
+  $count = 1;
+  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$colors{$count}:$mbmon_settings{'LABEL-'.$key} V");
+      push(@args, "GPRINT:$key:MAX:$tr{'maximal'}\\:%5.2lf V");
+      push(@args, "GPRINT:$key:AVERAGE:$tr{'average'}\\:%5.2lf V");
+      push(@args, "GPRINT:$key:LAST:$tr{'current'}\\:%5.2lf V\\j");
+
+      $count++;
+    }
+  }
+
+  if ( $count > 1 )
+  {
+    RRDs::graph ( @args );
+    $ERROR = RRDs::error;
+    print("Error in RRD::graph for temp: $ERROR\n")if $ERROR;
+  }
+}
+
 ## Update ipac logs
 system ('/usr/sbin/fetchipac');
 sleep 8;
@@ -615,6 +1054,12 @@ updatecpugraph ("week");
 updatecpugraph ("month");
 updatecpugraph ("year");
 
+updateloaddata();
+updateloadgraph ("day");
+updateloadgraph ("week");
+updateloadgraph ("month");
+updateloadgraph ("year");
+
 updatememdata();
 updatememgraph ("day");
 updatememgraph ("week");
@@ -627,6 +1072,110 @@ updatediskgraph ("week");
 updatediskgraph ("month");
 updatediskgraph ("year");
 
+if (open STAT,"/dev/hda") {
+  close STAT; 
+  updatediskdatanew ("hda");
+  updatediskgraphnew ("hda","day");
+  updatediskgraphnew ("hda","week");
+  updatediskgraphnew ("hda","month");
+  updatediskgraphnew ("hda","year");
+} else {
+  if (-e "$graphs/disk-hda-day.png") {
+     system("rm $graphs/disk-hda-day.png");
+  }
+}
+
+if (open STAT,"/dev/hdb") {
+  close STAT; 
+  updatediskdatanew ("hdb");
+  updatediskgraphnew ("hdb","day");
+  updatediskgraphnew ("hdb","week");
+  updatediskgraphnew ("hdb","month");
+  updatediskgraphnew ("hdb","year");
+} else {
+  if (-e "$graphs/disk-hdb-day.png") {
+     system("rm $graphs/disk-hdb-day.png");
+  }
+}
+
+if (open STAT,"/dev/hdc") {
+  close STAT; 
+  updatediskdatanew ("hdc");
+  updatediskgraphnew ("hdc","day");
+  updatediskgraphnew ("hdc","week");
+  updatediskgraphnew ("hdc","month");
+  updatediskgraphnew ("hdc","year");
+} else {
+  if (-e "$graphs/disk-hdc-day.png") {
+     system("rm $graphs/disk-hdc-day.png");
+  }
+}
+
+if (open STAT,"/dev/hdd") {
+  close STAT; 
+  updatediskdatanew ("hdd");
+  updatediskgraphnew ("hdd","day");
+  updatediskgraphnew ("hdd","week");
+  updatediskgraphnew ("hdd","month");
+  updatediskgraphnew ("hdd","year");
+} else {
+  if (-e "$graphs/disk-hdd-day.png") {
+     system("rm $graphs/disk-hdd-day.png");
+  }
+}
+
+if (open STAT,"/dev/hde") {
+  close STAT; 
+  updatediskdatanew ("hde");
+  updatediskgraphnew ("hde","day");
+  updatediskgraphnew ("hde","week");
+  updatediskgraphnew ("hde","month");
+  updatediskgraphnew ("hde","year");
+} else {
+  if (-e "$graphs/disk-hde-day.png") {
+     system("rm $graphs/disk-hde-day.png");
+  }
+}
+
+if (open STAT,"/dev/hdf") {
+  close STAT; 
+  updatediskdatanew ("hdf");
+  updatediskgraphnew ("hdf","day");
+  updatediskgraphnew ("hdf","week");
+  updatediskgraphnew ("hdf","month");
+  updatediskgraphnew ("hdf","year");
+} else {
+  if (-e "$graphs/disk-hdf-day.png") {
+     system("rm $graphs/disk-hdf-day.png");
+  }
+}
+
+if (open STAT,"/dev/hdg") {
+  close STAT; 
+  updatediskdatanew ("hdg");
+  updatediskgraphnew ("hdg","day");
+  updatediskgraphnew ("hdg","week");
+  updatediskgraphnew ("hdg","month");
+  updatediskgraphnew ("hdg","year");
+} else {
+  if (-e "$graphs/disk-hdg-day.png") {
+     system("rm $graphs/disk-hdg-day.png");
+  }
+}
+
+if (open STAT,"/dev/hdh") {
+  close STAT; 
+  updatediskdatanew ("hdh");
+  updatediskgraphnew ("hdh","day");
+  updatediskgraphnew ("hdh","week");
+  updatediskgraphnew ("hdh","month");
+  updatediskgraphnew ("hdh","year");
+} else {
+  if (-e "$graphs/disk-hdh-day.png") {
+     system("rm $graphs/disk-hdh-day.png");
+  }
+}
+
 ###
 ### Firewallhits
 ###
@@ -646,6 +1195,39 @@ updatelqgraph("week");
 updatelqgraph("month");
 updatelqgraph("year");
 
+###
+### HDDTEMP-Graphs for /dev/harddisk
+###
+updatehdddata();
+updatehddgraph ("day");
+updatehddgraph ("week");
+updatehddgraph ("month");
+updatehddgraph ("year");
+
+updatembmondata();
+
+if ( $mbmon_settings{'GRAPH_TEMP'} == 1 )
+{
+  updatetempgraph ("day");
+  updatetempgraph ("week");
+  updatetempgraph ("month");
+  updatetempgraph ("year");
+}
+if ( $mbmon_settings{'GRAPH_TEMP'} == 1 )
+{
+  updatefangraph ("day");
+  updatefangraph ("week");
+  updatefangraph ("month");
+  updatefangraph ("year");
+}
+if ( $mbmon_settings{'GRAPH_VOLT'} == 1 )
+{
+  updatevoltgraph ("day");
+  updatevoltgraph ("week");
+  updatevoltgraph ("month");
+  updatevoltgraph ("year");
+}
+
 ###
 ### Network Graphs
 ###
@@ -688,7 +1270,6 @@ if ($settings{'CONFIG_TYPE'} =~ /^(4|5|6|7)$/ && -e "$rrdlog/BLUE.rrd") {
 	updateifgraph ("BLUE", "year");
 }
 
-#chmod 777 /home/httpd/html/{graphs,sgraph} -R
 system("chmod -R 0777 /home/httpd/html/graphs");
 system("chmod -R 0777 /home/httpd/html/sgraph");