X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/41140b569c7401130afc08c91554e57688ef9b91..3a4d52bd4c0f8e6ae7679145846b7bc7845d8ace:/cookbooks/munin/recipes/default.rb diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb index ac6c4d843..59dc6e456 100644 --- a/cookbooks/munin/recipes/default.rb +++ b/cookbooks/munin/recipes/default.rb @@ -90,7 +90,7 @@ end # apcpdu_ munin_plugin "cpu" -if File.exists?("/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state") +if File.exist?("/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state") munin_plugin "cpuspeed" else munin_plugin "cpuspeed" do @@ -127,7 +127,7 @@ else end end -disks = node[:block_device].select do |name,attributes| +disks = node[:block_device].select do |_, attributes| [ "ATA", "FUJITSU", "SEAGATE", "DELL", "COMPAQ", "IBM-ESXS" ].include?(attributes[:vendor]) end @@ -142,7 +142,7 @@ else end end -if File.exists?("/sbin/hpasmcli") +if File.exist?("/sbin/hpasmcli") munin_plugin "hpasmcli2_temp" do target "hpasmcli2_" end @@ -172,8 +172,8 @@ munin_plugin "http_loadtime" do action :delete end -node[:network][:interfaces].each do |ifname,ifattr| - if ifattr[:encapsulation] == "Ethernet" and ifattr[:state] == "up" +node[:network][:interfaces].each do |ifname, ifattr| + if ifattr[:encapsulation] == "Ethernet" && ifattr[:state] == "up" munin_plugin "if_err_#{ifname}" do target "if_err_" end @@ -277,7 +277,7 @@ sensors_temp = false sensors_volt = false Dir.glob("/sys/class/hwmon/hwmon*").each do |hwmon| - hwmon = "#{hwmon}/device" unless File.exists?("#{hwmon}/name") + hwmon = "#{hwmon}/device" unless File.exist?("#{hwmon}/name") sensors_fan = true unless Dir.glob("#{hwmon}/fan*_input").empty? sensors_temp = true unless Dir.glob("#{hwmon}/temp*_input").empty? @@ -319,7 +319,7 @@ else end end -node[:block_device].each do |name,attributes| +node[:block_device].each do |name, attributes| if attributes[:vendor] == "ATA" munin_plugin "smart_#{name}" do target "smart_"