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.15 by tdb, Thu Feb 10 17:35:58 2005 UTC vs.
Revision 1.17 by tdb, Wed Jun 15 10:41:25 2005 UTC

# Line 48 | Line 48 | use RRDs;
48   use vars qw{
49      $imgdir $rrddir
50      $maxrrdage $maximgage $deleterrds $deleteimgs
51 <    $hex_slash $hex_underscore $hex_space $hex_colon $hex_bslash
51 >    $hex_slash $hex_underscore $hex_space $hex_colon $hex_bslash $hex_rbracket
52 >    $hex_lbracket $hex_plus
53      $rrdstep $retry_wait
54      $verbose $quiet
55   };
# Line 156 | Line 157 | foreach my $machine (@rrddirlist) {
157              push @data, "NONE:$1:free:free#CCCCFF:NONE:free memory";
158              push @data, "NONE:$1:total:total#0000FF:NONE:total memory\\n";
159              push @data, "NONE:$1:cache:cache#0000FF:NONE:cache memory\\n";
160 <            # calculate peruse - note that we only use 'free' if it's less than total
161 <            # (this is to avoid negative percentages :)
162 <            push @rawdata, "CDEF:peruse=total,free,total,LT,free,0,IF,-,total,/,100,*";
163 <            push @rawdata, "CDEF:percacuse=cache,total,LT,cache,0,IF,total,/,100,*";
160 >            # calculate peruse - note that we only use 'free' if it's
161 >            # less or equal to total (this is to avoid negative percentages :)
162 >            push @rawdata, "CDEF:peruse=total,free,total,LE,free,0,IF,-,total,/,100,*";
163 >            push @rawdata, "CDEF:percacuse=cache,total,LE,cache,0,IF,total,/,100,*";
164              # and add it to the graph
165              push @rawdata, "AREA:peruse#CCCCFF:% memory in use";
166              &addlegend(\@rawdata, "peruse");
# Line 194 | Line 195 | foreach my $machine (@rrddirlist) {
195              # although we need it to work out peruse...
196              push @data, "NONE:$1:free:free#CCCCFF:NONE:free swap";
197              push @data, "NONE:$1:total:total#0000FF:NONE:total swap\\n";
198 <            # calculate peruse - note that we only use 'free' if it's less than total
199 <            # (this is to avoid negative percentages :)
200 <            push @rawdata, "CDEF:peruse=total,free,total,LT,free,0,IF,-,total,/,100,*";
198 >            # calculate peruse - note that we only use 'free' if it's
199 >            # less or equal to total (this is to avoid negative percentages :)
200 >            push @rawdata, "CDEF:peruse=total,free,total,LE,free,0,IF,-,total,/,100,*";
201              # and add it to the graph
202              push @rawdata, "AREA:peruse#CCCCFF:% swap in use";
203              push @rawdata, "--upper-limit=100";
# Line 257 | Line 258 | foreach my $machine (@rrddirlist) {
258              push @data, "AREA:$1-$2:rbytes:rbytes#00FF00:OK:read bytes ";
259              push @data, "LINE2:$1-$2:wbytes:wbytes#0000FF:OK:write bytes";
260              push @rawdata, "--base=1024";
261 <            # some name tidting
261 >            # some name tidying
262              my($type) = $1;
263              my($name) = $2;
264              my($nicename) = $2;
# Line 274 | Line 275 | foreach my $machine (@rrddirlist) {
275              push @data, "AREA:$1-$2:rx:rx#00FF00:OK:received bytes  ";
276              push @data, "LINE2:$1-$2:tx:tx#0000FF:OK:transfered bytes";
277              push @rawdata, "--base=1024";
278 <            # some name tidting
278 >            # some name tidying
279              my($type) = $1;
280              my($name) = $2;
281              my($nicename) = $2;
# Line 283 | Line 284 | foreach my $machine (@rrddirlist) {
284              $nicename =~ s/$hex_bslash/\\/g;
285              $nicename =~ s/$hex_space/ /g;
286              $nicename =~ s/$hex_colon/:/g;
287 +            $nicename =~ s/$hex_rbracket/(/g;
288 +            $nicename =~ s/$hex_lbracket/)/g;
289 +            $nicename =~ s/$hex_plus/+/g;
290              &makegraph($machine, "$type-$name", "Network IO for $machine on $nicename", "bytes per second", \@data, \@rawdata);
291          }
292          if($rrd =~ /^(mailq)-(\S+)\.rrd$/) {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines