From 0c9f4308c9617adcf6bb6ef1a5d4e81c4e4faadf Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 30 Jul 2015 21:30:25 +0100 Subject: [PATCH] Apply a 10s timeout to ipmi munin plugins --- cookbooks/munin/recipes/default.rb | 8 ++++++++ cookbooks/munin/templates/default/ipmi.erb | 4 ++++ 2 files changed, 12 insertions(+) create mode 100644 cookbooks/munin/templates/default/ipmi.erb diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb index 36ddd96b4..3bffa27a6 100644 --- 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_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 diff --git a/cookbooks/munin/templates/default/ipmi.erb b/cookbooks/munin/templates/default/ipmi.erb new file mode 100644 index 000000000..a52fa50a0 --- /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 -- 2.43.2