Changeset 1140

Show
Ignore:
Timestamp:
10/17/06 12:20:35 (5 years ago)
Author:
bjorn
Message:

Merged changeset 1047 to 1.2-stable

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.2-stable/server/munin-graph.in

    r1117 r1140  
    660660            } 
    661661 
     662            my $custom_colour = $node->{client}->{$service}->{$field.".colour"}; 
     663            $custom_colour = "#" . $custom_colour if $custom_colour; 
     664 
    662665            push (@rrd, ($node->{client}->{$service}->{$field.".draw"} || "LINE2") . 
    663666                  ":g$rrdname" .  
    664                   ($single_value ? $single_colour : $COLOUR[$field_count++%@COLOUR]) . ":" . 
     667                  ($custom_colour || ($single_value ? $single_colour : $COLOUR[$field_count++%@COLOUR])) . ":" . 
    665668                  (escape ($node->{client}->{$service}->{"$field.label"}) || escape ($field)) 
    666669                  . (" " x ($max_field_len + 1 -