| 1 | | --- munin-1.0.0pre1.orig/server/munin-graph.in Thu Jan 15 16:20:01 2004 |
|---|
| 2 | | +++ munin-1.0.0pre1/server/munin-graph.in Sun Jan 25 18:06:00 2004 |
|---|
| 3 | | @@ -727,25 +727,25 @@ |
|---|
| 4 | | foreach my $field (keys %$service) |
|---|
| 5 | | { |
|---|
| 6 | | next unless ($field =~ /^(.+)\.label$/); |
|---|
| 7 | | - my $field = $1; my $rrdname = $field; |
|---|
| 8 | | - if (length $field > 15) # Use hash instead. |
|---|
| 9 | | + my $fieldname = $1; my $rrdname = $fieldname; |
|---|
| 10 | | + if (length $fieldname > 15) # Use hash instead. |
|---|
| 11 | | { |
|---|
| 12 | | - $rrdname = substr (Digest::MD5::md5_hex ($field), -15); |
|---|
| 13 | | + $rrdname = substr (Digest::MD5::md5_hex ($fieldname), -15); |
|---|
| 14 | | } |
|---|
| 15 | | - if (exists $service->{$field.".cdef"} and |
|---|
| 16 | | - length $service->{$field.".cdef"} and |
|---|
| 17 | | - $cdef =~ /\b$field\b/ and |
|---|
| 18 | | - $field ne $cfield) |
|---|
| 19 | | + if (exists $service->{$fieldname.".cdef"} and |
|---|
| 20 | | + length $service->{$fieldname.".cdef"} and |
|---|
| 21 | | + $cdef =~ /\b$fieldname\b/ and |
|---|
| 22 | | + $fieldname ne $cfield) |
|---|
| 23 | | { |
|---|
| 24 | | - $max =~ s/([,=])$field([,=]|$)/$1ca$rrdname$2/g; |
|---|
| 25 | | - $min =~ s/([,=])$field([,=]|$)/$1ci$rrdname$2/g; |
|---|
| 26 | | - $avg =~ s/([,=])$field([,=]|$)/$1cg$rrdname$2/g; |
|---|
| 27 | | + $max =~ s/([,=])$fieldname([,=]|$)/$1ca$rrdname$2/g; |
|---|
| 28 | | + $min =~ s/([,=])$fieldname([,=]|$)/$1ci$rrdname$2/g; |
|---|
| 29 | | + $avg =~ s/([,=])$fieldname([,=]|$)/$1cg$rrdname$2/g; |
|---|
| 30 | | } |
|---|
| 31 | | - if ($cdef =~ /\b$field\b/) |
|---|
| 32 | | + if ($cdef =~ /\b$fieldname\b/) |
|---|
| 33 | | { |
|---|
| 34 | | - $max =~ s/([,=])$field([,=]|$)/$1a$rrdname$2/g; |
|---|
| 35 | | - $min =~ s/([,=])$field([,=]|$)/$1i$rrdname$2/g; |
|---|
| 36 | | - $avg =~ s/([,=])$field([,=]|$)/$1g$rrdname$2/g; |
|---|
| 37 | | + $max =~ s/([,=])$fieldname([,=]|$)/$1a$rrdname$2/g; |
|---|
| 38 | | + $min =~ s/([,=])$fieldname([,=]|$)/$1i$rrdname$2/g; |
|---|
| 39 | | + $avg =~ s/([,=])$fieldname([,=]|$)/$1g$rrdname$2/g; |
|---|
| 40 | | } |
|---|
| 41 | | } |
|---|
| 42 | | |
|---|
| 43 | | @@ -755,7 +755,8 @@ |
|---|
| | 1 | --- munin-1.0.0pre2.orig/server/munin-graph.in Fri Jan 30 16:04:02 2004 |
|---|
| | 2 | +++ munin-1.0.0pre2/server/munin-graph.in Sun Feb 1 13:56:11 2004 |
|---|
| | 3 | @@ -761,7 +761,8 @@ |
|---|
