X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f963ff457182611c62036674840eb588b48fd704..abd5ecd0198dd98d37c8cc13e457ce996b5b3d88:/cookbooks/munin/recipes/default.rb?ds=inline

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index 36ddd96b4..fb1225c2f 100644
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -29,7 +29,7 @@ service "munin-node" do
   supports :status => true, :restart => true, :reload => true
 end
 
-servers = search(:node, "recipes:munin\\:\\:server")
+servers = search(:node, "recipes:munin\\:\\:server") # ~FC010
 
 servers.each do |server|
   server.interfaces(:role => :external) do |interface|
@@ -180,6 +180,10 @@ munin_plugin "iostat"
 munin_plugin "iostat_ios"
 
 if Dir.glob("/dev/ipmi*").empty?
+  munin_plugin_conf "ipmi" do
+    action :delete
+  end
+
   munin_plugin "ipmi_fans" do
     action :delete
   end
@@ -193,6 +197,10 @@ if Dir.glob("/dev/ipmi*").empty?
     only_if { node[:lsb][:release].to_f >= 14.04 }
   end
 else
+  munin_plugin_conf "ipmi" do
+    template "ipmi.erb"
+  end
+
   munin_plugin "ipmi_fans" do
     target "ipmi_"
   end