X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/45479cd73476809c38704ab5f221c16c86504f2f..0a97a0dc8db53359fee0af041c4608a212b0c30f:/cookbooks/munin/recipes/default.rb diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb index fb9807931..1b4ae6d75 100644 --- a/cookbooks/munin/recipes/default.rb +++ b/cookbooks/munin/recipes/default.rb @@ -162,7 +162,7 @@ end node[:network][:interfaces].each do |ifname, ifattr| if ifattr[:encapsulation] == "Ethernet" && ifattr[:state] == "up" - if node[:hardware][:network][ifname][:device] =~ /^virtio/ + if node[:hardware] && node[:hardware][:network][ifname][:device] =~ /^virtio/ munin_plugin_conf "if_#{ifname}" do template "if.erb" variables :ifname => ifname @@ -291,9 +291,7 @@ Dir.glob("/sys/class/hwmon/hwmon*").each do |hwmon| sensors_volt = true unless Dir.glob("#{hwmon}/in*_input").empty? end -if sensors_fan || sensors_temp || sensors_volt - package "lm-sensors" -end +package "lm-sensors" if sensors_fan || sensors_temp || sensors_volt if sensors_fan munin_plugin "sensors_fan" do