Changeset 3880

Show
Ignore:
Timestamp:
08/30/10 21:14:28 (1 year ago)
Author:
steve.schnepp
Message:

- ${graph_period} substitution should happens in graph_title & fieldname (closes #881, thx stavros)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/master/lib/Munin/Master/GraphOld.pm

    r3777 r3880  
    369369    } 
    370370 
    371     return (munin_get($service, "graph_title", $service) . " - $scale_text"); 
     371    my $title = munin_get($service, "graph_title", $service); 
     372 
     373    # Substitute ${graph_period} in title 
     374    my $period = munin_get($service, "graph_period", "second"); 
     375    $title =~ s/\$\{graph_period\}/$period/g; 
     376 
     377    return ("$title - $scale_text"); 
    372378} 
    373379 
     
    956962 
    957963        my $tmplabel = munin_get($field, "label", $fname); 
     964 
     965        # Substitute ${graph_period} 
     966        my $period  = munin_get($service, "graph_period", "second"); 
     967        $tmplabel =~ s/\$\{graph_period\}/$period/g; 
    958968 
    959969        push(@rrd,