Changeset 1296

Show
Ignore:
Timestamp:
08/28/07 12:53:24 (4 years ago)
Author:
jo
Message:

Bugfixing in the new multigroup branch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • people/jo/multilevel-groups/server/Munin.pm.in

    r1293 r1296  
    729729            return "$ret/$node-$plugin-$scale-sum.png"; 
    730730    } else { 
    731             return "$ret/$node-$plugin-$scale-sum.png"; 
     731            return "$ret/$node-$plugin-$scale.png"; 
    732732    } 
    733733} 

  • people/jo/multilevel-groups/server/munin-graph.in

    r1293 r1296  
    935935    my ($max, $min, $avg) = ("CDEF:a$new_field=$cdef", "CDEF:i$new_field=$cdef", "CDEF:g$new_field=$cdef"); 
    936936 
    937     foreach my $field (keys %$service) 
    938     { 
    939         next unless ($field =~ /^(.+)\.label$/); 
    940         my $fieldname = $1;              
     937    foreach my $field (@{munin_find_field ($service, "label")}) { 
     938        my $fieldname = munin_get_node_name ($field); 
    941939        my $rrdname = &orig_to_cdef ($service, $fieldname); 
    942         if ($cdef =~ /\b$fieldname\b/) 
    943         { 
     940        if ($cdef =~ /\b$fieldname\b/) { 
    944941                $max =~ s/([,=])$fieldname([,=]|$)/$1a$rrdname$2/g; 
    945942                $min =~ s/([,=])$fieldname([,=]|$)/$1i$rrdname$2/g;