X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ea0715b4be41a1d1600bba7a1f5d0b988708579f..e83395675fe4f9b35a1d83e99c50d1ea6fbe79fd:/cookbooks/munin/recipes/default.rb diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb index 28c05006b..36ddd96b4 100644 --- a/cookbooks/munin/recipes/default.rb +++ b/cookbooks/munin/recipes/default.rb @@ -125,21 +125,6 @@ else end end -disks = node[:block_device].select do |_, attributes| - ["ATA", "FUJITSU", "SEAGATE", "DELL", "COMPAQ", "IBM-ESXS"].include?(attributes[:vendor]) -end - -if disks.empty? - munin_plugin "hddtemp_smartctl" do - action :delete - end -else - munin_plugin "hddtemp_smartctl" do - conf "hddtemp.erb" - conf_variables :disks => disks - end -end - if File.exist?("/sbin/hpasmcli") munin_plugin "hpasmcli2_temp" do target "hpasmcli2_" @@ -317,20 +302,6 @@ else end end -node[:block_device].each do |name, attributes| - if attributes[:vendor] == "ATA" - munin_plugin "smart_#{name}" do - target "smart_" - conf "smart.erb" - conf_variables :disk => name - end - else - munin_plugin "smart_#{name}" do - action :delete - end - end -end - munin_plugin "swap" munin_plugin "tcp" munin_plugin "threads"