nginx: add munin monitoring

diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb
index 95c9f8b17cdfc5664fd58aeb31a97a7b8359388a..ade13504d442c513ac861ca255553fdd5aa24588 100644 (file)
--- a/cookbooks/nginx/recipes/default.rb
+++ b/cookbooks/nginx/recipes/default.rb
@@ -50,3 +50,10 @@ service "nginx" do
   supports :status => true, :restart => true, :reload => true
   subscribes :restart, "template[/etc/nginx/nginx.conf]"
 end
   supports :status => true, :restart => true, :reload => true
   subscribes :restart, "template[/etc/nginx/nginx.conf]"
 end

+
+munin_plugin_conf "nginx" do
+  template "munin.erb"
+end
+
+munin_plugin "nginx_request"
+munin_plugin "nginx_status"

diff --git a/cookbooks/nginx/templates/default/munin.erb b/cookbooks/nginx/templates/default/munin.erb
new file mode 100644 (file)
index 0000000..56a2eff
--- /dev/null
+++ b/cookbooks/nginx/templates/default/munin.erb
@@ -0,0 +1,2 @@
+[nginx*]
+  env.url http://localhost:8050/nginx_status

diff --git a/cookbooks/nginx/templates/default/nginx.conf.erb b/cookbooks/nginx/templates/default/nginx.conf.erb
index 03671bbe005e1105e417be1bbda46d3daf440b1c..a16d2581237258dd9117963ae8784c5a3cccab5e 100644 (file)
--- a/cookbooks/nginx/templates/default/nginx.conf.erb
+++ b/cookbooks/nginx/templates/default/nginx.conf.erb
@@ -57,5 +57,17 @@ http {
     proxy_cache_path /var/cache/nginx/proxy-cache levels=1:2 use_temp_path=off keys_zone=<%= node['nginx']['cache']['proxy']['keys_zone'] %> inactive=<%= node['nginx']['cache']['proxy']['inactive'] %> max_size=<%= node['nginx']['cache']['proxy']['max_size'] %>;
     <% end -%>
 
     proxy_cache_path /var/cache/nginx/proxy-cache levels=1:2 use_temp_path=off keys_zone=<%= node['nginx']['cache']['proxy']['keys_zone'] %> inactive=<%= node['nginx']['cache']['proxy']['inactive'] %> max_size=<%= node['nginx']['cache']['proxy']['max_size'] %>;
     <% end -%>
 

+    # Internal site for munin monitoring
+    server {
+      listen 127.0.0.1:8050;
+      server_name localhost;
+      location /nginx_status {
+        stub_status on;
+        access_log off;
+        allow 127.0.0.1;
+        deny all;
+      }
+    }
+

     include /etc/nginx/conf.d/*.conf;
 }
     include /etc/nginx/conf.d/*.conf;
 }