Ticket #480: munin-html.patch

File munin-html.patch, 1.6 kB (added by rune.skillingstad@ntnu.no, 5 years ago)

patch for rrdtools 1.2.11

  • munin-html

    old new  
    687687        my $serv   = shift; 
    688688 
    689689        # base size of graph rectangle + space outside graph rectangle 
    690         my $height = munin_get ($config, "graph_height", 100, $domain, $node, $serv) + 156; 
    691         my $width  = munin_get ($config, "graph_width" , 400, $domain, $node, $serv) + 93; 
     690        my $height = munin_get ($config, "graph_height", 100, $domain, $node, $serv) + 147; 
     691        my $width  = munin_get ($config, "graph_width" , 400, $domain, $node, $serv) + 95; 
    692692 
    693693        # In addition, the height increases by 15 pixels for each label underneath 
    694694        foreach my $field (keys %{$config->{domain}->{$domain}->{node}->{$node}->{client}->{$serv}}) 
    …… 
    697697            { 
    698698                if (munin_draw_field ($config->{domain}->{$domain}->{node}->{$node}, $serv, $1)) 
    699699                { 
    700                     $height += 15; 
     700                    $height += 12; 
    701701                    my $tmpline = munin_get ($config, "line", undef, $domain, $node, $serv, $1); 
    702702                    if ($tmpline) 
    703703                    { 
    704704                        my @tmparr = ($tmpline =~ /:/g); 
    705705                        if (scalar (@tmparr) > 2) 
    706706                        { # We've got line definitions with labels... 
    707                             $height += 15; 
     707                            $height += 12; 
    708708                        } 
    709709                    } 
    710710                } 
    711711            } 
    712712        } 
    713713        # ...and +15 if there's a graph total 
    714         $height += 15 if (munin_get ($config, "graph_total", undef, $domain, $node, $serv)); 
     714        $height += 12 if (munin_get ($config, "graph_total", undef, $domain, $node, $serv)); 
    715715        # ...and +15 if there's min/max-headers above the labels 
    716         $height += 15 if (munin_graph_column_headers ($config, $domain, $node, $serv)); 
     716        $height += 12 if (munin_graph_column_headers ($config, $domain, $node, $serv)); 
    717717 
    718718        return ($width, $height); 
    719719}