From: Tom Hughes <tom@compton.nu>
Date: Tue, 31 Mar 2015 23:23:54 +0000 (+0100)
Subject: Enable API munin plugins on backends as well as frontends
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/3dbe7eb650cfff8ea0a830ea2110bd937673ab34

Enable API munin plugins on backends as well as frontends
---

diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb
index 0a1a73284..6f62f3186 100644
--- a/cookbooks/web/recipes/frontend.rb
+++ b/cookbooks/web/recipes/frontend.rb
@@ -47,13 +47,3 @@ template "/etc/logrotate.d/apache2" do
   group "root"
   mode 0644
 end
-
-munin_plugin "api_calls_num"
-
-munin_plugin "api_calls_#{node[:hostname]}" do
-  target "api_calls_"
-end
-
-munin_plugin "api_waits_#{node[:hostname]}" do
-  target "api_waits_"
-end
diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 52a49aee8..bb7eeef2c 100644
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -90,3 +90,13 @@ service "api-statistics" do
   subscribes :restart, "template[/usr/local/bin/api-statistics]"
   subscribes :restart, "template[/etc/init.d/api-statistics]"
 end
+
+munin_plugin "api_calls_num"
+
+munin_plugin "api_calls_#{node[:hostname]}" do
+  target "api_calls_"
+end
+
+munin_plugin "api_waits_#{node[:hostname]}" do
+  target "api_waits_"
+end