Switch to generating munin graphs on demand

diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb
index 3e72ea160194a10cacbf5dea978fa837dd3aa502..84c739e49caa6f4eaec49fdb484f8c2ced74d78e 100644 (file)
--- a/cookbooks/munin/recipes/server.rb
+++ b/cookbooks/munin/recipes/server.rb
@@ -21,6 +21,7 @@ include_recipe "apache"
 
 package "munin"
 package "rrdcached"
 
 package "munin"
 package "rrdcached"

+package "libcgi-fast-perl"

 
 template "/etc/default/rrdcached" do
   source "rrdcached.erb"
 
 template "/etc/default/rrdcached" do
   source "rrdcached.erb"


@@ -62,6 +63,9 @@ template "/etc/munin/munin.conf" do
   variables :expiry_time => expiry_time, :clients => clients, :frontends => frontends, :backends => backends, :tilecaches => tilecaches, :renderers => renderers
 end
 
   variables :expiry_time => expiry_time, :clients => clients, :frontends => frontends, :backends => backends, :tilecaches => tilecaches, :renderers => renderers
 end
 

+apache_module "fcgid"
+apache_module "rewrite"
+

 apache_site "munin.openstreetmap.org" do
   template "apache.erb"
 end
 apache_site "munin.openstreetmap.org" do
   template "apache.erb"
 end

diff --git a/cookbooks/munin/templates/default/apache.erb b/cookbooks/munin/templates/default/apache.erb
index 59598acabf3fedb2ff4a0efab68b5591c9ee1c3d..aaf8b5c909664b18e4c19c01c858b3d09f96f227 100644 (file)
--- a/cookbooks/munin/templates/default/apache.erb
+++ b/cookbooks/munin/templates/default/apache.erb
@@ -9,8 +9,18 @@
        ErrorLog /var/log/apache2/munin.openstreetmap.org-error.log
 
        DocumentRoot /var/cache/munin/www
        ErrorLog /var/log/apache2/munin.openstreetmap.org-error.log
 
        DocumentRoot /var/cache/munin/www

+       ScriptAlias /munin-cgi/ /usr/lib/munin/cgi/
+
+       RewriteEngine on
+       RewriteRule ^(/.*\.html)?$ /munin-cgi/munin-cgi-html/$1 [PT]

 </VirtualHost>
 
 <Directory /var/cache/munin/www>
        Require all granted
 </Directory>
 </VirtualHost>
 
 <Directory /var/cache/munin/www>
        Require all granted
 </Directory>

+
+<Directory /usr/lib/munin/cgi>
+       Options +ExecCGI
+       SetHandler fcgid-script
+       Require all granted
+</Directory>

diff --git a/cookbooks/munin/templates/default/munin.conf.erb b/cookbooks/munin/templates/default/munin.conf.erb
index 71484c237f5208e4a45b0670dcf851877ebe8787..c560717a035fe80cc751a6da04599d536ef67642 100644 (file)
--- a/cookbooks/munin/templates/default/munin.conf.erb
+++ b/cookbooks/munin/templates/default/munin.conf.erb
@@ -3,6 +3,14 @@
 # Set maximum number of update processes to run at once
 max_processes 64
 
 # Set maximum number of update processes to run at once
 max_processes 64
 

+# Maximum number of graphs to generate at once
+max_graph_jobs 24
+max_cgi_graph_jobs 24
+
+# Render pages and graphs on demand
+html_strategy cgi
+graph_strategy cgi
+

 # Use rrdcached
 rrdcached_socket /var/run/rrdcached.sock
 
 # Use rrdcached
 rrdcached_socket /var/run/rrdcached.sock