ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/reports/rrdgraphing/graph.pl
(Generate patch)

Comparing projects/cms/source/reports/rrdgraphing/graph.pl (file contents):
Revision 1.5 by tdb, Tue May 21 15:01:43 2002 UTC vs.
Revision 1.10 by tdb, Sun Oct 13 15:14:00 2002 UTC

# Line 97 | Line 97 | if($opts{q}) {
97      $verbose = 0;
98   }
99  
100
100   # Read the contents of the base directory
101   # and pull out the list of subdirectories (except . and .. :)
102   opendir(DIR, $rrddir);
# Line 135 | Line 134 | foreach my $machine (@rrddirlist) {
134          if($rrd =~ /^(cpu)\.rrd$/) {
135              my(@data);
136              my(@rawdata);
137 <            push @data, "LINE2:$1:idle:idle#00FF00:idle cpu";
138 <            push @data, "LINE2:$1:user:user#0000FF:user cpu";
139 <            push @data, "LINE2:$1:kernel:kernel#00FFFF:kernel cpu";
140 <            push @data, "LINE2:$1:swap:swap#FF00FF:swap cpu";
141 <            push @data, "LINE2:$1:iowait:iowait#FF0000:iowait cpu";
137 >            push @data, "LINE2:$1:idle:idle#00FF00:OK:idle cpu  ";
138 >            push @data, "LINE2:$1:user:user#0000FF:OK:user cpu  ";
139 >            push @data, "LINE2:$1:kernel:kernel#00FFFF:OK:kernel cpu";
140 >            push @data, "LINE2:$1:swap:swap#FF00FF:OK:swap cpu  ";
141 >            push @data, "LINE2:$1:iowait:iowait#FF0000:OK:iowait cpu";
142              push @rawdata, "--upper-limit=100";
143 <            &makegraph($machine, $1, "CPU Usage for $machine", \@data, \@rawdata);
143 >            &makegraph($machine, $1, "CPU Usage for $machine", "% cpu time", \@data, \@rawdata);
144          }
145          if($rrd =~ /^(mem)\.rrd$/) {
146              my(@data);
147              my(@rawdata);
148              # we don't actually want to display free memory,
149              # although we need it to do inuse...
150 <            push @data, "NONE:$1:free:free#CCCCFF:free memory";
151 <            push @data, "LINE2:$1:total:total#0000FF:total memory";
150 >            push @data, "NONE:$1:free:free#CCCCFF:NONE:free memory";
151 >            push @data, "LINE2:$1:total:total#0000FF:NONE:total memory\\n";
152              # calculate inuse
153              push @rawdata, "CDEF:inuse=total,free,-";
154              # and add it to the graph
155              push @rawdata, "AREA:inuse#CCCCFF:memory in use";
156              push @rawdata, "--base=1024";
157 <            &makegraph($machine, $1, "Memory Usage for $machine", \@data, \@rawdata);
157 >            # add some nice values to the legend
158 >            &addlegend(\@rawdata, "inuse");
159 >            &makegraph($machine, $1, "Memory Usage for $machine", "megabytes", \@data, \@rawdata);
160          }
161          if($rrd =~ /^(load)\.rrd$/) {
162              my(@data);
163 <            push @data, "LINE2:$1:load1:load1#CCCCFF:1 minute load average";
164 <            push @data, "LINE2:$1:load5:load5#7777FF:5 minute load average";
165 <            push @data, "LINE2:$1:load15:load15#0000FF:15 minute load average";
166 <            &makegraph($machine, $1, "Loads for $machine", \@data);
163 >            push @data, "LINE2:$1:load1:load1#CCCCFF:OK: 1 min load average";
164 >            push @data, "LINE2:$1:load5:load5#7777FF:OK: 5 min load average";
165 >            push @data, "LINE2:$1:load15:load15#0000FF:OK:15 min load average";
166 >            &makegraph($machine, $1, "Loads for $machine", "load average", \@data);
167          }
168          if($rrd =~ /^(proc)\.rrd$/) {
169              my(@data);
170 <            push @data, "LINE2:$1:cpu:cpu#00FF00:cpu processes";
171 <            push @data, "LINE2:$1:sleeping:sleeping#0000FF:sleeping processes";
172 <            push @data, "LINE2:$1:stopped:stopped#00FFFF:stopped processes";
173 <            push @data, "LINE2:$1:total:total#FF00FF:total processes";
174 <            push @data, "LINE2:$1:zombie:zombie#FF0000:zombie processes";
175 <            &makegraph($machine, $1, "Processes on $machine", \@data);
170 >            push @data, "LINE2:$1:cpu:cpu#00FF00:OK:cpu processes     ";
171 >            push @data, "LINE2:$1:sleeping:sleeping#0000FF:OK:sleeping processes";
172 >            push @data, "LINE2:$1:stopped:stopped#00FFFF:OK:stopped processes ";
173 >            push @data, "LINE2:$1:total:total#FF00FF:OK:total processes   ";
174 >            push @data, "LINE2:$1:zombie:zombie#FF0000:OK:zombie processes  ";
175 >            &makegraph($machine, $1, "Processes on $machine", "no. of processes", \@data);
176          }
177          if($rrd =~ /^(swap)\.rrd$/) {
178              my(@data);
179              my(@rawdata);
180              # we don't actually want to display free swap,
181              # although we need it to do inuse...
182 <            push @data, "NONE:$1:free:free#CCCCFF:free swap";
183 <            push @data, "LINE2:$1:total:total#0000FF:total swap";
182 >            push @data, "NONE:$1:free:free#CCCCFF:NONE:free swap";
183 >            push @data, "LINE2:$1:total:total#0000FF:NONE:total swap\\n";
184              # calculate inuse
185              push @rawdata, "CDEF:inuse=total,free,-";
186              # and add it to the graph
187              push @rawdata, "AREA:inuse#CCCCFF:swap in use";
188              push @rawdata, "--base=1024";
189 <            &makegraph($machine, $1, "Swap Usage for $machine", \@data, \@rawdata);
189 >            # add some nice values to the legend
190 >            &addlegend(\@rawdata, "inuse");
191 >            &makegraph($machine, $1, "Swap Usage for $machine", "megabytes", \@data, \@rawdata);
192          }
193          if($rrd =~ /^(users)\.rrd$/) {
194              my(@data);
195 <            push @data, "AREA:$1:count:count#CCCCFF:user count";
196 <            &makegraph($machine, $1, "User Count for $machine", \@data);
195 >            push @data, "AREA:$1:count:count#CCCCFF:OK:user count";
196 >            &makegraph($machine, $1, "User Count for $machine", "no. of users", \@data);
197          }
198          if($rrd =~ /^(disk)-(\S+).rrd$/) {
199              my(@data);
200              my(@rawdata);
201 <            push @data, "LINE2:$1-$2:kbytes:kbytes#0000FF:total size";
202 <            push @data, "AREA:$1-$2:used:used#CCCCFF:used";
201 >            push @data, "LINE2:$1-$2:kbytes:kbytes#0000FF:NONE:total size\\n";
202 >            push @data, "AREA:$1-$2:used:used#CCCCFF:OK:used space";
203              push @rawdata, "--base=1024";
204              my($type) = $1;
205              my($name) = $2;
206              my($nicename) = $2;
207              $nicename =~ s/$hex_slash/\//g;
208              $nicename =~ s/$hex_underscore/_/g;
209 <            &makegraph($machine, "$type-$name", "Disk Usage for $machine on $nicename", \@data, \@rawdata);
209 >            &makegraph($machine, "$type-$name", "Disk Usage for $machine on $nicename", "kilobytes", \@data, \@rawdata);
210          }
211          # probably a queue with a name like this :)
212          if($rrd =~ /^(\d+)_0\.rrd$/) {
# Line 212 | Line 215 | foreach my $machine (@rrddirlist) {
215              my($baserrd) = $1;
216              my($i) = 0;
217              while( -f "$rrddir/$machine/$baserrd\_$i.rrd" ) {
218 <                push @data, "LINE2:$baserrd\_$i:size:size$i" . &get_colour($i) . ":queue$i size ";
218 >                push @data, "LINE2:$baserrd\_$i:size:size$i" . &get_colour($i) . ":OK:queue$i size ";
219                  ++$i;
220              }
221 <            push @data, "LINE2:$baserrd\_0:total:total#FF0000:packets/sec - currently";
219 <            push @rawdata, "GPRINT:total:LAST:%lf %spackets/sec";
221 >            push @data, "LINE2:$baserrd\_0:total:total#FF0000:OK:packets/sec ";
222              my($comment);
223              if(-f "$rrddir/$machine/$baserrd.def") {
224                  open(DEF, "$rrddir/$machine/$baserrd.def");
# Line 224 | Line 226 | foreach my $machine (@rrddirlist) {
226                  chomp $comment if defined $comment;
227              }
228              $comment = "unknown queue" if not defined $comment;
229 <            &makegraph($machine, $baserrd, $comment, \@data, \@rawdata);
229 >            &makegraph($machine, $baserrd, $comment, "", \@data, \@rawdata);
230          }
231      }
232      # have a last check, maybe we can remove the directory now?
# Line 293 | Line 295 | exit(0);
295   #              (eg. cpu)
296   # $title     = the title for the graph
297   #              (eg. kernow CPU usage)
298 + # $vlabel    = the vertical label to apply to the left side of the graph
299 + #              (eg. kb/s)
300   # $dataref   = a reference to an array containing information for the graph
301 < #              elements of format: "gtype:rrdname:dsname:name#colour:comment with spaces"
301 > #              elements of format: "gtype:rrdname:dsname:name#colour:legend:comment with spaces"
302   #              (if gtype is "NONE" only a DEF of 'name' will be defined, no line will be plotted)
303 + #              (if legend is "NONE" the latest/average/max/min legend won't be printed)
304   # $rawcmdref = a reference to an array containing raw rrd commands
305   #              elements a single command each, no spaces
306   #
307  
308   sub makegraph() {
309 <    my($machine, $type, $title, $dataref, $rawcmdref) = @_;
309 >    my($machine, $type, $title, $vlabel, $dataref, $rawcmdref) = @_;
310      # pass in these arrays by reference
311      my(@data) = @$dataref if defined $dataref;
312      my(@rawcmd) = @$rawcmdref if defined $rawcmdref;
# Line 313 | Line 318 | sub makegraph() {
318      }
319      my(@rrdcmd);
320      foreach my $dataitem (@data) {
321 <        # dataitem should be: "gtype:rrdname:dsname:name#colour:comment with spaces"
321 >        # dataitem should be: "gtype:rrdname:dsname:name#colour:legend:comment with spaces"
322          # (if gtype is "NONE" only a DEF of 'name' will be defined, no line will be plotted)
323 <        if($dataitem =~ /^(\S+):(\S+):(\S+):(\S+)#(.{6}):(.*)$/) {
323 >        # (if legend is "NONE" the latest/average/max/min legend won't be printed)
324 >        if($dataitem =~ /^(\S+):(\S+):(\S+):(\S+)#(.{6}):(\S+):(.*)$/) {
325              push @rrdcmd, "DEF:$4=$rrddir/$machine/$2.rrd:$3:AVERAGE";
326              if($1 ne "NONE") {
327 <                push @rrdcmd, "$1:$4#$5:$6";
327 >                push @rrdcmd, "$1:$4#$5:$7";
328 >                if($6 ne "NONE") {
329 >                    # add some nice values to the legend
330 >                    &addlegend(\@rrdcmd, $4);
331 >                }
332              }
333          }
334      }
335      push @rrdcmd, "--title=$title";
336      push @rrdcmd, "--imgformat=PNG";
337      push @rrdcmd, "--lower-limit=0";
338 +    push @rrdcmd, "--vertical-label=$vlabel";
339      # not entirely convinced this is good...
340      push @rrdcmd, "--alt-autoscale-max";
341      # add any further raw commands
# Line 350 | Line 361 | sub makegraph() {
361      &log("created $imgdir/$machine/$type-1y.png\n") unless $err_1y;
362      &error("Error generating 1y graph for $machine/$type: $err_1y\n") if $err_1y;
363      return;
364 + }
365 +
366 + # subroutine to add a legend
367 + # accepts reference to an array and a name
368 + sub addlegend() {
369 +    my($dataref, $name) = @_;
370 +    push @$dataref, "GPRINT:$name:LAST:Current\\: \%8.2lf %s";
371 +    push @$dataref, "GPRINT:$name:AVERAGE:Average\\: \%8.2lf %s";
372 +    push @$dataref, "GPRINT:$name:MAX:Max\\: \%8.2lf %s\\n";
373 +    #push @$dataref, "GPRINT:$name:MIN:Min\\: \%8.2lf %s\\n";
374   }
375  
376   # hacky subroutine to return a colour

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines