Apply a 10s timeout to ipmi munin plugins

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index 36ddd96b44e0997439d5dd7b6ff77d5a0c22b4ad..3bffa27a6ed32869a20a874e46d0a5bcbf79a82e 100644 (file)
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -180,6 +180,10 @@ munin_plugin "iostat"
 munin_plugin "iostat_ios"
 
 if Dir.glob("/dev/ipmi*").empty?
 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
   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
     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
   munin_plugin "ipmi_fans" do
     target "ipmi_"
   end

diff --git a/cookbooks/munin/templates/default/ipmi.erb b/cookbooks/munin/templates/default/ipmi.erb
new file mode 100644 (file)
index 0000000..a52fa50
--- /dev/null
+++ b/cookbooks/munin/templates/default/ipmi.erb
@@ -0,0 +1,4 @@
+# DO NOT EDIT - This file is being maintained by Chef
+
+[ipmi_*]
+timeout 10