Changeset 688

Show
Ignore:
Timestamp:
01/29/05 19:21:41 (7 years ago)
Author:
jimmyo
Message:

Bugfix in munin-cgi-graph with hostnames including - (SF#1111510).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    • Property cvs2svn:cvs-rev changed from 1.277 to 1.278
    r675 r688  
    22 
    33  * Main: Fix bug with calculation of "Avg:" field when using graph_sums. 
    4   * Main: Make munin-limits work properly with perl 5.6 (SF#1109039). 
     4  * Main: Make munin-limits work properly with perl <5.8 (SF#1109039). 
     5  * Main: Bugfix in munin-cgi-graph with hostnames including - (SF#1111510). 
    56  * Main/Node: Added support for TLS. 
    67  * Plugin: linux/users now has proper hashbang. 

  • trunk/server/munin-cgi-graph.in

    • Property cvs2svn:cvs-rev changed from 1.5 to 1.6
    r566 r688  
    2222# 
    2323# $Log$ 
     24# Revision 1.6  2005/01/29 18:21:41  jimmyo 
     25# Bugfix in munin-cgi-graph with hostnames including - (SF#1111510). 
     26# 
    2427# Revision 1.5  2004/12/22 20:01:15  jimmyo 
    2528# Optimised munin-cgi-graph a bit. 
    …… 
    6366my $path = $ENV{PATH_INFO} || ""; 
    6467$path =~ s/^\///; 
    65 ($dom, $host) = split /\//, $path; 
    66 ($host, $serv, $scale) = split /-/, $host, 3; 
     68($dom, $host, $serv) = split /\//, $path;   
     69($serv, $scale) = split /-/, $serv, 2; 
    6770$scale =~ s/\.png$//; 
    6871 

  • trunk/server/munin-html.in

    • Property cvs2svn:cvs-rev changed from 1.41 to 1.42
    r610 r688  
    2121# 
    2222# $Log$ 
     23# Revision 1.42  2005/01/29 18:21:41  jimmyo 
     24# Bugfix in munin-cgi-graph with hostnames including - (SF#1111510). 
     25# 
    2326# Revision 1.41  2005/01/05 18:32:49  jimmyo 
    2427# Main: Tables in service-view now containt the correct "Type" when using data aliases. 
    …… 
    352355            if ($method eq "cgi") 
    353356            { 
    354                 $service{imgday}=$config->{'cgiurl_graph'}."/$domain/$node-$service-day.png"; 
    355                 $service{imgweek}=$config->{'cgiurl_graph'}."/$domain/$node-$service-week.png"; 
    356                 $service{imgmonth}=$config->{'cgiurl_graph'}."/$domain/$node-$service-month.png"; 
    357                 $service{imgyear}=$config->{'cgiurl_graph'}."/$domain/$node-$service-year.png"; 
     357                $service{imgday}=$config->{'cgiurl_graph'}."/$domain/$node/$service-day.png"; 
     358                $service{imgweek}=$config->{'cgiurl_graph'}."/$domain/$node/$service-week.png"; 
     359                $service{imgmonth}=$config->{'cgiurl_graph'}."/$domain/$node/$service-month.png"; 
     360                $service{imgyear}=$config->{'cgiurl_graph'}."/$domain/$node/$service-year.png"; 
    358361 
    359362                if (&munin_get_bool_val ($config->{domain}->{$domain}->{node}->{$node}->{client}->{$service}->{"graph_sums"}, 0)) 
    360363                { 
    361                     $service{imgweeksum} = $config->{'cgiurl_graph'}."/$domain/$node-$service-week-sum.png"; 
    362                     $service{imgyearsum} = $config->{'cgiurl_graph'}."/$domain/$node-$service-year-sum.png"; 
     364                    $service{imgweeksum} = $config->{'cgiurl_graph'}."/$domain/$node/$service-week-sum.png"; 
     365                    $service{imgyearsum} = $config->{'cgiurl_graph'}."/$domain/$node/$service-year-sum.png"; 
    363366                } 
    364367