CPU Graph wieder auf Ticks umgestellt und erweitert

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@578 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 60951e644b698f4783183a101f14246cec12bb7b..fd43805b6a7ab6e9114f6bd91fd5257c8a6fd272 100644 (file)
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -49,172 +49,183 @@ if ((${Lang::language} eq 'el') ||
 
 
 sub updatecpugraph {
-       my $period    = $_[0];
-
-       RRDs::graph ("$graphs/cpu-$period.png",
-       "--start", "-1$period", "-aPNG", "-i", "-z",
-       "--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 $tr{'cpu usage per'} $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",
-       "AREA:iowait".$color{"color14"}.":$tr{'iowait'}",
-       "STACK:user".$color{"color11"}.":$tr{'user cpu usage'}",
-       "STACK:system".$color{"color13"}.":$tr{'system cpu usage'}",
-       "STACK:idle".$color{"color12"}.":$tr{'idle cpu usage'}\\j",
-       "COMMENT: \\j",
-       "COMMENT:$tr{'maximal'}",
-       "COMMENT:$tr{'average'}",
-       "COMMENT:$tr{'current'}\\j",
-       "GPRINT:user:MAX:$tr{'user cpu'}\\:%3.2lf%%",
-       "GPRINT:user:AVERAGE:$tr{'user cpu'}\\:%3.2lf%%",
-       "GPRINT:user:LAST:$tr{'user cpu'}\\:%3.2lf%%\\j",
-       "GPRINT:system:MAX:$tr{'system cpu'}\\:%3.2lf%%",
-       "GPRINT:system:AVERAGE:$tr{'system cpu'}\\:%3.2lf%%",
-       "GPRINT:system:LAST:$tr{'system cpu'}\\:%3.2lf%%\\j",
-       "GPRINT:idle:MAX:$tr{'idle cpu'}\\:%3.2lf%%",
-       "GPRINT:idle:AVERAGE:$tr{'idle cpu'}\\:%3.2lf%%",
-       "GPRINT:idle:LAST:$tr{'idle cpu'}\\:%3.2lf%%\\j",
-       "GPRINT:iowait:MAX:$tr{'iowait'}\\:%3.2lf%%",
-       "GPRINT:iowait:AVERAGE:$tr{'iowait'}\\:%3.2lf%%",
-       "GPRINT:iowait:LAST:$tr{'iowait'}\\:%3.2lf%%\\j");
-       $ERROR = RRDs::error;
-       print "Error in RRD::graph for cpu: $ERROR\n" if $ERROR;
+        my $period    = $_[0];
+
+        RRDs::graph ("$graphs/cpu-$period.png",
+        "--start", "-1$period", "-aPNG", "-i", "-z",
+        "--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 $tr{'cpu usage per'} $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,/,*",
+        "AREA:iowaitpct".$color{"color14"}.":$tr{'iowait'}",
+        "STACK:userpct".$color{"color11"}.":$tr{'user cpu usage'}",
+        "STACK:irqpct".$color{"color23"}.":IRQ CPU",
+        "STACK:systempct".$color{"color13"}.":$tr{'system cpu usage'}",
+        "STACK:idlepct".$color{"color12"}.":$tr{'idle cpu usage'}\\j",
+        "COMMENT: \\j",
+        "COMMENT:$tr{'maximal'}",
+        "COMMENT:$tr{'average'}",
+        "COMMENT:$tr{'current'}\\j",
+        "GPRINT:userpct:MAX:$tr{'user cpu'}\\:%3.2lf%%",
+        "GPRINT:userpct:AVERAGE:$tr{'user cpu'}\\:%3.2lf%%",
+        "GPRINT:userpct:LAST:$tr{'user cpu'}\\:%3.2lf%%\\j",
+        "GPRINT:irqpct:MAX:IRQ CPU\\:%3.2lf%%",
+        "GPRINT:irqpct:AVERAGE:IRQ CPU\\:%3.2lf%%",
+        "GPRINT:irqpct:LAST:IRQ CPU\\:%3.2lf%%\\j",
+        "GPRINT:systempct:MAX:$tr{'system cpu'}\\:%3.2lf%%",
+        "GPRINT:systempct:AVERAGE:$tr{'system cpu'}\\:%3.2lf%%",
+        "GPRINT:systempct:LAST:$tr{'system cpu'}\\:%3.2lf%%\\j",
+        "GPRINT:idlepct:MAX:$tr{'idle cpu'}\\:%3.2lf%%",
+        "GPRINT:idlepct:AVERAGE:$tr{'idle cpu'}\\:%3.2lf%%",
+        "GPRINT:idlepct:LAST:$tr{'idle cpu'}\\:%3.2lf%%\\j",
+        "GPRINT:iowaitpct:MAX:$tr{'iowait'}\\:%3.2lf%%",
+        "GPRINT:iowaitpct:AVERAGE:$tr{'iowait'}\\:%3.2lf%%",
+        "GPRINT:iowaitpct:LAST:$tr{'iowait'}\\:%3.2lf%%\\j");
+        $ERROR = RRDs::error;
+        print "Error in RRD::graph for cpu: $ERROR\n" if $ERROR;
 }
 
 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".$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 ("$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".$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;
 }
 
 sub updatememgraph {
-       my $period    = $_[0];
-
-       RRDs::graph ("$graphs/memory-$period.png",
-       "--start", "-1$period", "-aPNG", "-i", "-z",
-       "--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 $tr{'memory usage per'} $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,/,*",
-       "AREA:usedpct".$color{"color11"}.":$tr{'used memory'}",
-       "STACK:sharedpct".$color{"color13"}.":$tr{'shared memory'}",
-       "STACK:bufferpct".$color{"color23"}.":$tr{'buffered memory'}",
-       "STACK:cachepct".$color{"color14"}.":$tr{'cached memory'}",
-       "STACK:freepct".$color{"color12"}.":$tr{'free memory'}\\j",
-       "COMMENT: \\j",
-       "COMMENT:$tr{'maximal'}",
-       "COMMENT:$tr{'average'}",
-       "COMMENT:$tr{'current'}\\j",
-       "GPRINT:usedpct:MAX:$tr{'used memory'}\\:%3.2lf%%",
-       "GPRINT:usedpct:AVERAGE:$tr{'used memory'}\\:%3.2lf%%",
-       "GPRINT:usedpct:LAST:$tr{'used memory'}\\:%3.2lf%%\\j",
-       "GPRINT:sharedpct:MAX:$tr{'shared memory'}\\:%3.2lf%%",
-       "GPRINT:sharedpct:AVERAGE:$tr{'shared memory'}\\:%3.2lf%%",
-       "GPRINT:sharedpct:LAST:$tr{'shared memory'}\\:%3.2lf%%\\j",
-       "GPRINT:bufferpct:MAX:$tr{'buffered memory'}\\:%3.2lf%%",
-       "GPRINT:bufferpct:AVERAGE:$tr{'buffered memory'}\\:%3.2lf%%",
-       "GPRINT:bufferpct:LAST:$tr{'buffered memory'}\\:%3.2lf%%\\j",
-       "GPRINT:cachepct:MAX:$tr{'cached memory'}\\:%3.2lf%%",
-       "GPRINT:cachepct:AVERAGE:$tr{'cached memory'}\\:%3.2lf%%",
-       "GPRINT:cachepct:LAST:$tr{'cached memory'}\\:%3.2lf%%\\j",
-       "GPRINT:freepct:MAX:$tr{'free memory'}\\:%3.2lf%%",
-       "GPRINT:freepct:AVERAGE:$tr{'free memory'}\\:%3.2lf%%",
-       "GPRINT:freepct:LAST:$tr{'free memory'}\\:%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",
-       "--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 $tr{'swap usage per'} $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,/,*",
-       "AREA:usedpct".$color{"color11"}.":$tr{'used swap'}",
-       "STACK:freepct".$color{"color12"}.":$tr{'free swap'}\\j",
-       "COMMENT: \\j",
-       "COMMENT:$tr{'maximal'}",
-       "COMMENT:$tr{'average'}",
-       "COMMENT:$tr{'current'}\\j",
-       "GPRINT:usedpct:MAX:$tr{'used swap'}\\:%3.2lf%%",
-       "GPRINT:usedpct:AVERAGE:$tr{'used swap'}\\:%3.2lf%%",
-       "GPRINT:usedpct:LAST:$tr{'used swap'}\\:%3.2lf%%\\j",
-       "GPRINT:freepct:MAX:$tr{'free swap'}\\:%3.2lf%%",
-       "GPRINT:freepct:AVERAGE:$tr{'free swap'}\\:%3.2lf%%",
-       "GPRINT:freepct:LAST:$tr{'free swap'}\\:%3.2lf%%\\j");
-       $ERROR = RRDs::error;
-       print "Error in RRD::graph for swap: $ERROR\n" if $ERROR;
+        my $period    = $_[0];
+
+        RRDs::graph ("$graphs/memory-$period.png",
+        "--start", "-1$period", "-aPNG", "-i", "-z",
+        "--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 $tr{'memory usage per'} $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,/,*",
+        "AREA:usedpct".$color{"color11"}.":$tr{'used memory'}",
+        "STACK:sharedpct".$color{"color13"}.":$tr{'shared memory'}",
+        "STACK:bufferpct".$color{"color23"}.":$tr{'buffered memory'}",
+        "STACK:cachepct".$color{"color14"}.":$tr{'cached memory'}",
+        "STACK:freepct".$color{"color12"}.":$tr{'free memory'}\\j",
+        "COMMENT: \\j",
+        "COMMENT:$tr{'maximal'}",
+        "COMMENT:$tr{'average'}",
+        "COMMENT:$tr{'current'}\\j",
+        "GPRINT:usedpct:MAX:$tr{'used memory'}\\:%3.2lf%%",
+        "GPRINT:usedpct:AVERAGE:$tr{'used memory'}\\:%3.2lf%%",
+        "GPRINT:usedpct:LAST:$tr{'used memory'}\\:%3.2lf%%\\j",
+        "GPRINT:sharedpct:MAX:$tr{'shared memory'}\\:%3.2lf%%",
+        "GPRINT:sharedpct:AVERAGE:$tr{'shared memory'}\\:%3.2lf%%",
+        "GPRINT:sharedpct:LAST:$tr{'shared memory'}\\:%3.2lf%%\\j",
+        "GPRINT:bufferpct:MAX:$tr{'buffered memory'}\\:%3.2lf%%",
+        "GPRINT:bufferpct:AVERAGE:$tr{'buffered memory'}\\:%3.2lf%%",
+        "GPRINT:bufferpct:LAST:$tr{'buffered memory'}\\:%3.2lf%%\\j",
+        "GPRINT:cachepct:MAX:$tr{'cached memory'}\\:%3.2lf%%",
+        "GPRINT:cachepct:AVERAGE:$tr{'cached memory'}\\:%3.2lf%%",
+        "GPRINT:cachepct:LAST:$tr{'cached memory'}\\:%3.2lf%%\\j",
+        "GPRINT:freepct:MAX:$tr{'free memory'}\\:%3.2lf%%",
+        "GPRINT:freepct:AVERAGE:$tr{'free memory'}\\:%3.2lf%%",
+        "GPRINT:freepct:LAST:$tr{'free memory'}\\:%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",
+        "--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 $tr{'swap usage per'} $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,/,*",
+        "AREA:usedpct".$color{"color11"}.":$tr{'used swap'}",
+        "STACK:freepct".$color{"color12"}.":$tr{'free swap'}\\j",
+        "COMMENT: \\j",
+        "COMMENT:$tr{'maximal'}",
+        "COMMENT:$tr{'average'}",
+        "COMMENT:$tr{'current'}\\j",
+        "GPRINT:usedpct:MAX:$tr{'used swap'}\\:%3.2lf%%",
+        "GPRINT:usedpct:AVERAGE:$tr{'used swap'}\\:%3.2lf%%",
+        "GPRINT:usedpct:LAST:$tr{'used swap'}\\:%3.2lf%%\\j",
+        "GPRINT:freepct:MAX:$tr{'free swap'}\\:%3.2lf%%",
+        "GPRINT:freepct:AVERAGE:$tr{'free swap'}\\:%3.2lf%%",
+        "GPRINT:freepct:LAST:$tr{'free swap'}\\:%3.2lf%%\\j");
+        $ERROR = RRDs::error;
+        print "Error in RRD::graph for swap: $ERROR\n" if $ERROR;
 }
 
 sub updatediskgraph {
-       my $period    = $_[0];
-       my $disk    = $_[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".$color{"color19"},
-       "--color", "SHADEB".$color{"color19"},
-       "--color", "BACK".$color{"color21"},
-       "-t $tr{'disk access per'} $tr{$period} $disk",
-       "DEF:read=$rrdlog/disk-$disk.rrd:readsect:AVERAGE",
-       "DEF:write=$rrdlog/disk-$disk.rrd:writesect:AVERAGE",
-       "AREA:read".$color{"color11"}.":$tr{'sectors read from disk per second'}",
-       "STACK:write".$color{"color12"}.":$tr{'sectors written to disk per second'}\\j",
-       "COMMENT: \\j",
-       "COMMENT:$tr{'maximal'}",
-       "COMMENT:$tr{'average'}",
-       "COMMENT:$tr{'current'}\\j",
-       "GPRINT:read:MAX:$tr{'read sectors'}\\:%8.0lf",
-       "GPRINT:read:AVERAGE:$tr{'read sectors'}\\:%8.0lf",
-       "GPRINT:read:LAST:$tr{'read sectors'}\\:%8.0lf\\j",
-       "GPRINT:write:MAX:$tr{'written sectors'}\\:%8.0lf",
-       "GPRINT:write:AVERAGE:$tr{'written sectors'}\\:%8.0lf",
-       "GPRINT:write:LAST:$tr{'written sectors'}\\:%8.0lf\\j");
-       $ERROR = RRDs::error;
-       print "Error in RRD::graph for disk: $ERROR\n" if $ERROR;
+        my $period    = $_[0];
+        my $disk    = $_[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".$color{"color19"},
+        "--color", "SHADEB".$color{"color19"},
+        "--color", "BACK".$color{"color21"},
+        "-t $tr{'disk access per'} $tr{$period} $disk",
+        "DEF:read=$rrdlog/disk-$disk.rrd:readsect:AVERAGE",
+        "DEF:write=$rrdlog/disk-$disk.rrd:writesect:AVERAGE",
+        "AREA:read".$color{"color11"}.":$tr{'sectors read from disk per second'}",
+        "STACK:write".$color{"color12"}.":$tr{'sectors written to disk per second'}\\j",
+        "COMMENT: \\j",
+        "COMMENT:$tr{'maximal'}",
+        "COMMENT:$tr{'average'}",
+        "COMMENT:$tr{'current'}\\j",
+        "GPRINT:read:MAX:$tr{'read sectors'}\\:%8.0lf",
+        "GPRINT:read:AVERAGE:$tr{'read sectors'}\\:%8.0lf",
+        "GPRINT:read:LAST:$tr{'read sectors'}\\:%8.0lf\\j",
+        "GPRINT:write:MAX:$tr{'written sectors'}\\:%8.0lf",
+        "GPRINT:write:AVERAGE:$tr{'written sectors'}\\:%8.0lf",
+        "GPRINT:write:LAST:$tr{'written sectors'}\\:%8.0lf\\j");
+        $ERROR = RRDs::error;
+        print "Error in RRD::graph for disk: $ERROR\n" if $ERROR;
 }
 
 sub updateifgraph {

diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs
index 8343b33df97c82db1503133639f9a8398b06f2fb..c8a6bb3a8d94cb7f06e441ba2c2a081d9891b55a 100644 (file)
--- a/src/scripts/makegraphs
+++ b/src/scripts/makegraphs
@@ -115,10 +115,11 @@ sub gettraffic {
 sub updatecpudata {
         if ( ! -e "$rrdlog/cpu.rrd") {
                 RRDs::create ("$rrdlog/cpu.rrd", "--step=300",
-                        "DS:user:GAUGE:600:0:100",
-                        "DS:system:GAUGE:600:0:100",
-                        "DS:idle:GAUGE:600:0:100",
-                        "DS:iowait:GAUGE:600:0:100",
+                        "DS:user:COUNTER:600:0:500000000",
+                        "DS:system:COUNTER:600:0:500000000",
+                        "DS:idle:COUNTER:600:0:500000000",
+                        "DS:iowait:COUNTER:600:0:500000000",
+                        "DS:irq:COUNTER:600:0:500000000",
                         "RRA:AVERAGE:0.5:1:576",
                         "RRA:AVERAGE:0.5:6:672",
                         "RRA:AVERAGE:0.5:24:732",
@@ -127,15 +128,23 @@ sub updatecpudata {
                 print "Error in RRD::create for cpu: $ERROR\n" if $ERROR;
         }
 
-        my ($cpu, $user, $nice, $system, $idle, $trash, $iowait);
+        my ($cpu, $user, $nice, $system, $idle, $iowait, $irq, $softirq);
 
-        my $Zeilen = `/usr/bin/iostat -c | tail -2 | head -1`;
-        ($trash, $user, $nice, $system, $iowait, $trash, $idle) = split(/\s+/,$Zeilen);
+        open STAT, "/proc/stat";
+        while(<STAT>) {
+                chomp;
+                /^cpu\s/ or next;
+                ($cpu, $user, $nice, $system, $idle, $iowait, $irq, $softirq) = split /\s+/;
+                last;
+        }
+        close STAT;
         $user += $nice;
+        $irq += $softirq;
+        
 
         RRDs::update ("$rrdlog/cpu.rrd",
-                "-t", "user:system:idle:iowait", 
-                "N:$user:$system:$idle:$iowait");
+                "-t", "user:system:idle:iowait:irq", 
+                "N:$user:$system:$idle:$iowait:$irq");
         $ERROR = RRDs::error;
         print "Error in RRD::update for cpu: $ERROR\n" if $ERROR;