Upgrade ridley and ouroboros to chef 12

[chef.git] / cookbooks / munin / recipes / default.rb

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index 847425e539f4aed4b430322cb4a122d0158ba918..36ddd96b44e0997439d5dd7b6ff77d5a0c22b4ad 100644 (file)
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -25,7 +25,7 @@ service "munin-node" do
   if node[:lsb][:release].to_f >= 14.04
     provider Chef::Provider::Service::Upstart
   end
-  action [ :enable, :start ]
+  action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end
 
@@ -33,16 +33,14 @@ servers = search(:node, "recipes:munin\\:\\:server")
 
 servers.each do |server|
   server.interfaces(:role => :external) do |interface|
-    if interface[:zone]
-      firewall_rule "accept-munin-#{server}" do
-        action :accept
-        family interface[:family]
-        source "#{interface[:zone]}:#{interface[:address]}"
-        dest "fw"
-        proto "tcp:syn"
-        dest_ports "munin"
-        source_ports "1024:"
-      end
+    firewall_rule "accept-munin-#{server}" do
+      action :accept
+      family interface[:family]
+      source "#{interface[:zone]}:#{interface[:address]}"
+      dest "fw"
+      proto "tcp:syn"
+      dest_ports "munin"
+      source_ports "1024:"
     end
   end
 end
@@ -90,7 +88,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,22 +125,7 @@ else
   end
 end
 
-disks = node[:block_device].select do |name,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.exists?("/sbin/hpasmcli")
+if File.exist?("/sbin/hpasmcli")
   munin_plugin "hpasmcli2_temp" do
     target "hpasmcli2_"
   end
@@ -160,7 +143,7 @@ else
   end
 end
 
-munin_plugin "hpasmcli_temp" do
+munin_plugin "hpasmcli_temp" do # ~FC005
   action :delete
 end
 
@@ -172,24 +155,22 @@ munin_plugin "http_loadtime" do
   action :delete
 end
 
-node[:network][:interfaces].each do |ifname,ifattr|
-  if ifname =~ /^eth\d+$/
-    if ifattr[:flags] and ifattr[:flags].include?("UP")
-      munin_plugin "if_err_#{ifname}" do
-        target "if_err_"
-      end
-
-      munin_plugin "if_#{ifname}" do
-        target "if_"
-      end
-    else
-      munin_plugin "if_err_#{ifname}" do
-        action :delete
-      end
-
-      munin_plugin "if_#{ifname}" do
-        action :delete
-      end
+node[:network][:interfaces].each do |ifname, ifattr|
+  if ifattr[:encapsulation] == "Ethernet" && ifattr[:state] == "up"
+    munin_plugin "if_err_#{ifname}" do
+      target "if_err_"
+    end
+
+    munin_plugin "if_#{ifname}" do
+      target "if_"
+    end
+  else
+    munin_plugin "if_err_#{ifname}" do
+      action :delete
+    end
+
+    munin_plugin "if_#{ifname}" do
+      action :delete
     end
   end
 end
@@ -279,7 +260,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?
@@ -321,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"