--- projects/cms/source/reports/rrdgraphing/graph.pl 2002/06/20 13:46:54 1.7 +++ projects/cms/source/reports/rrdgraphing/graph.pl 2002/10/13 02:04:03 1.8 @@ -26,7 +26,7 @@ # Generates graphs from rrd databases for i-scream data. # # $Author: tdb $ -# $Id: graph.pl,v 1.7 2002/06/20 13:46:54 tdb Exp $ +# $Id: graph.pl,v 1.8 2002/10/13 02:04:03 tdb Exp $ #------------------------------------------------------------ ## TODO @@ -34,7 +34,7 @@ # -- allow configurable periods of graphs # -- comments, types, etc -my($version) = '$Id: graph.pl,v 1.7 2002/06/20 13:46:54 tdb Exp $'; +my($version) = '$Id: graph.pl,v 1.8 2002/10/13 02:04:03 tdb Exp $'; $| = 1; @@ -97,7 +97,6 @@ if($opts{q}) { $verbose = 0; } - # Read the contents of the base directory # and pull out the list of subdirectories (except . and .. :) opendir(DIR, $rrddir); @@ -135,10 +134,10 @@ foreach my $machine (@rrddirlist) { if($rrd =~ /^(cpu)\.rrd$/) { my(@data); my(@rawdata); - push @data, "LINE2:$1:idle:idle#00FF00:OK:idle cpu"; - push @data, "LINE2:$1:user:user#0000FF:OK:user cpu"; + push @data, "LINE2:$1:idle:idle#00FF00:OK:idle cpu "; + push @data, "LINE2:$1:user:user#0000FF:OK:user cpu "; push @data, "LINE2:$1:kernel:kernel#00FFFF:OK:kernel cpu"; - push @data, "LINE2:$1:swap:swap#FF00FF:OK:swap cpu"; + push @data, "LINE2:$1:swap:swap#FF00FF:OK:swap cpu "; push @data, "LINE2:$1:iowait:iowait#FF0000:OK:iowait cpu"; push @rawdata, "--upper-limit=100"; &makegraph($machine, $1, "CPU Usage for $machine", \@data, \@rawdata); @@ -149,11 +148,11 @@ foreach my $machine (@rrddirlist) { # we don't actually want to display free memory, # although we need it to do inuse... push @data, "NONE:$1:free:free#CCCCFF:NONE:free memory"; - push @data, "LINE2:$1:total:total#0000FF:NONE:total memory"; + push @data, "LINE2:$1:total:total#0000FF:NONE:total memory\\n"; # calculate inuse push @rawdata, "CDEF:inuse=total,free,-"; # and add it to the graph - push @rawdata, "AREA:inuse#CCCCFF:memory in use\\l"; + push @rawdata, "AREA:inuse#CCCCFF:memory in use"; push @rawdata, "--base=1024"; # add some nice values to the legend &addlegend(\@rawdata, "inuse"); @@ -161,18 +160,18 @@ foreach my $machine (@rrddirlist) { } if($rrd =~ /^(load)\.rrd$/) { my(@data); - push @data, "LINE2:$1:load1:load1#CCCCFF:OK:1 minute load average"; - push @data, "LINE2:$1:load5:load5#7777FF:OK:5 minute load average"; - push @data, "LINE2:$1:load15:load15#0000FF:OK:15 minute load average"; + push @data, "LINE2:$1:load1:load1#CCCCFF:OK: 1 min load average"; + push @data, "LINE2:$1:load5:load5#7777FF:OK: 5 min load average"; + push @data, "LINE2:$1:load15:load15#0000FF:OK:15 min load average"; &makegraph($machine, $1, "Loads for $machine", \@data); } if($rrd =~ /^(proc)\.rrd$/) { my(@data); - push @data, "LINE2:$1:cpu:cpu#00FF00:OK:cpu processes"; + push @data, "LINE2:$1:cpu:cpu#00FF00:OK:cpu processes "; push @data, "LINE2:$1:sleeping:sleeping#0000FF:OK:sleeping processes"; - push @data, "LINE2:$1:stopped:stopped#00FFFF:OK:stopped processes"; - push @data, "LINE2:$1:total:total#FF00FF:OK:total processes"; - push @data, "LINE2:$1:zombie:zombie#FF0000:OK:zombie processes"; + push @data, "LINE2:$1:stopped:stopped#00FFFF:OK:stopped processes "; + push @data, "LINE2:$1:total:total#FF00FF:OK:total processes "; + push @data, "LINE2:$1:zombie:zombie#FF0000:OK:zombie processes "; &makegraph($machine, $1, "Processes on $machine", \@data); } if($rrd =~ /^(swap)\.rrd$/) { @@ -181,11 +180,11 @@ foreach my $machine (@rrddirlist) { # we don't actually want to display free swap, # although we need it to do inuse... push @data, "NONE:$1:free:free#CCCCFF:NONE:free swap"; - push @data, "LINE2:$1:total:total#0000FF:NONE:total swap"; + push @data, "LINE2:$1:total:total#0000FF:NONE:total swap\\n"; # calculate inuse push @rawdata, "CDEF:inuse=total,free,-"; # and add it to the graph - push @rawdata, "AREA:inuse#CCCCFF:swap in use\\l"; + push @rawdata, "AREA:inuse#CCCCFF:swap in use"; push @rawdata, "--base=1024"; # add some nice values to the legend &addlegend(\@rawdata, "inuse"); @@ -199,8 +198,8 @@ foreach my $machine (@rrddirlist) { if($rrd =~ /^(disk)-(\S+).rrd$/) { my(@data); my(@rawdata); - push @data, "LINE2:$1-$2:kbytes:kbytes#0000FF:NONE:total size"; - push @data, "AREA:$1-$2:used:used#CCCCFF:OK:used"; + push @data, "LINE2:$1-$2:kbytes:kbytes#0000FF:NONE:total size\\n"; + push @data, "AREA:$1-$2:used:used#CCCCFF:OK:used space"; push @rawdata, "--base=1024"; my($type) = $1; my($name) = $2; @@ -323,7 +322,7 @@ sub makegraph() { if($dataitem =~ /^(\S+):(\S+):(\S+):(\S+)#(.{6}):(\S+):(.*)$/) { push @rrdcmd, "DEF:$4=$rrddir/$machine/$2.rrd:$3:AVERAGE"; if($1 ne "NONE") { - push @rrdcmd, "$1:$4#$5:$7\\s"; + push @rrdcmd, "$1:$4#$5:$7"; if($6 ne "NONE") { # add some nice values to the legend &addlegend(\@rrdcmd, $4); @@ -365,10 +364,10 @@ sub makegraph() { # accepts reference to an array and a name sub addlegend() { my($dataref, $name) = @_; - push @$dataref, "GPRINT:$name:LAST:latest=\%lf\\r"; - push @$dataref, "GPRINT:$name:AVERAGE:average=\%lf"; - push @$dataref, "GPRINT:$name:MAX:max=\%lf"; - push @$dataref, "GPRINT:$name:MIN:min=\%lf\\r"; + push @$dataref, "GPRINT:$name:LAST:Current\\: \%8.2lf %s"; + push @$dataref, "GPRINT:$name:AVERAGE:Average\\: \%8.2lf %s"; + push @$dataref, "GPRINT:$name:MAX:Max\\: \%8.2lf %s\\n"; + #push @$dataref, "GPRINT:$name:MIN:Min\\: \%8.2lf %s\\n"; } # hacky subroutine to return a colour