Changeset 240

Show
Ignore:
Timestamp:
24/06/04 16:32:18 (8 years ago)
Author:
jimmyo
Message:

More work on output_graphs (renamed to graph_strategy, amongst others).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    • Property cvs2svn:cvs-rev changed from 1.107 to 1.108
    r239 r240  
    1414  * Added dist-directory for Solaris packages. 
    1515  * Created munin-cgi-graph, which creates dynamic graphs.  
    16   * Added munin.conf option "output_graphs (cgi|cron)" which defaults to cron. 
     16  * Added munin.conf option "graph_strategy (cgi|cron)" which defaults to 
     17    cron. 
    1718  * Bugfix in cdef calculations. 
    1819 

  • trunk/INSTALL

    • Property cvs2svn:cvs-rev changed from 1.3 to 1.4
    r48 r240  
    1010        - create a cron-entry to run "munin-cron" as the user "munin" every 5 
    1111          minutes 
     12        - if you want to use the dynamic graphs, configure the cgi directory 
     13          (an example for apache can be found in README-apache-cgi). 
    1214 
    1315To install the documentation: 

  • trunk/Makefile

    • Property cvs2svn:cvs-rev changed from 1.16 to 1.17
    r209 r240  
    4444        $(INSTALL) -m 0755 build/server/munin-graph $(LIBDIR)/ 
    4545        $(INSTALL) -m 0755 build/server/munin-html $(LIBDIR)/ 
     46        $(INSTALL) -m 0755 build/server/munin-cgi-graph $(CGIDIR)/ 
    4647 
    4748        $(INSTALL) -m 0644 build/server/Munin.pm $(PERLLIB)/ 
    …… 
    131132                    -e 's|@@VERSION@@|$(VERSION)|g'                     \ 
    132133                    -e 's|@@PLUGSTATE@@|$(PLUGSTATE)|g'                 \ 
     134                    -e 's|@@CGIDIR@@|$(CGIDIR)|g'                       \ 
    133135                    $$file > build/$$destname;                          \ 
    134136        done 

  • trunk/Makefile.config

    • Property cvs2svn:cvs-rev changed from 1.4 to 1.5
    r137 r240  
    3030# Server only - Output directory 
    3131HTMLDIR    = $(PREFIX)/var/www 
     32CGIDIR     = $(HTMLDIR)/cgi 
    3233 
    3334# Client only - Where to put RRD files and other intenal data 

  • trunk/server/Munin.pm.in

    • Property cvs2svn:cvs-rev changed from 1.11 to 1.12
    r238 r240  
    55# 
    66# $Log$ 
     7# Revision 1.12  2004/06/24 14:32:17  jimmyo 
     8# More work on output_graphs (renamed to graph_strategy, amongst others). 
     9# 
    710# Revision 1.11  2004/06/23 17:38:39  jimmyo 
    811# * Created munin-cgi-graph, which creates dynamic graphs. 
    …… 
    150153        "nsca", "nsca_server", "nsca_config", "extinfo", "fetch_data", 
    151154        "filename", "max_processes", "nagios", "info", "graph_info",  
    152         "graph_category", "output_graphs", 
     155        "graph_category", "graph_strategy", 
    153156    ); 
    154157 

  • trunk/server/munin-graph.in

    • Property cvs2svn:cvs-rev changed from 1.20 to 1.21
    r239 r240  
    66# 
    77# $Log$ 
     8# Revision 1.21  2004/06/24 14:32:17  jimmyo 
     9# More work on output_graphs (renamed to graph_strategy, amongst others). 
     10# 
    811# Revision 1.20  2004/06/23 17:48:06  jimmyo 
    912# Bugfix in cdef calculations. 
    …… 
    214217my $config= &munin_config ($conffile); 
    215218 
    216 if (&munin_get_val ($config, "output_graphs", "cron") ne "cron" and $cron) 
     219if (&munin_get_val ($config, "graph_strategy", "cron") ne "cron" and $cron) 
    217220{ # We're run from cron, but munin.conf says we use dynamic graph generation 
    218221    exit 0; 

  • trunk/server/munin-html.in

    • Property cvs2svn:cvs-rev changed from 1.17 to 1.18
    r238 r240  
    44# 
    55# $Log$ 
     6# Revision 1.18  2004/06/24 14:32:18  jimmyo 
     7# More work on output_graphs (renamed to graph_strategy, amongst others). 
     8# 
    69# Revision 1.17  2004/06/23 17:38:40  jimmyo 
    710# * Created munin-cgi-graph, which creates dynamic graphs. 
    …… 
    232235            $service{label}=$config->{domain}->{$domain}->{node}->{$node}->{client}->{$service}->{graph_title}; 
    233236                 
    234                 my $method = &munin_get_val ($config, "output_graphs", "cron"); 
     237                my $method = &munin_get_val ($config, "graph_strategy", "cron"); 
    235238                if ($method eq "cgi") 
    236239                {