Yet more rubucop cleanups

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

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index e83cac6f69690cc836e878c861a412d84defa02f..79c58df5800f5123ab21bd622e6a79405f371490 100644 (file)
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -22,7 +22,10 @@ include_recipe "networking"
 package "munin-node"
 
 service "munin-node" do
-  action [ :enable, :start ]
+  if node[:lsb][:release].to_f >= 14.04
+    provider Chef::Provider::Service::Upstart
+  end
+  action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end
 
@@ -87,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
@@ -124,43 +127,67 @@ else
   end
 end
 
-# hddtemp_smartctl
+disks = node[:block_device].select do |_, attributes|
+  ["ATA", "FUJITSU", "SEAGATE", "DELL", "COMPAQ", "IBM-ESXS"].include?(attributes[:vendor])
+end
 
-if File.exists?("/sbin/hpasmcli")
-  munin_plugin "hpasmcli_temp"
-  munin_plugin "hpasmcli_fans"
+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_"
+  end
+
+  munin_plugin "hpasmcli2_fans" do
+    target "hpasmcli2_"
+  end
 else
-  munin_plugin "hpasmcli_temp" do
+  munin_plugin "hpasmcli2_temp" do
     action :delete
   end
 
-  munin_plugin "hpasmcli_fans" do
+  munin_plugin "hpasmcli2_fans" do
     action :delete
   end
 end
 
+munin_plugin "hpasmcli_temp" do
+  action :delete
+end
+
+munin_plugin "hpasmcli_fans" do
+  action :delete
+end
+
 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
+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
+      target "if_"
+    end
+  else
+    munin_plugin "if_err_#{ifname}" do
+      action :delete
+    end
 
-      munin_plugin "if_#{ifname}" do
-        action :delete
-      end
+    munin_plugin "if_#{ifname}" do
+      action :delete
     end
   end
 end
@@ -177,6 +204,11 @@ if Dir.glob("/dev/ipmi*").empty?
   munin_plugin "ipmi_temp" do
     action :delete
   end
+
+  munin_plugin "ipmi_power" do
+    action :delete
+    only_if { node[:lsb][:release].to_f >= 14.04 }
+  end
 else
   munin_plugin "ipmi_fans" do
     target "ipmi_"
@@ -185,6 +217,11 @@ else
   munin_plugin "ipmi_temp" do
     target "ipmi_"
   end
+
+  munin_plugin "ipmi_power" do
+    target "ipmi_"
+    only_if { node[:lsb][:release].to_f >= 14.04 }
+  end
 end
 
 munin_plugin "irqstats"
@@ -192,7 +229,15 @@ munin_plugin "load"
 munin_plugin "memory"
 munin_plugin "netstat"
 
-if File.exists?("/proc/net/rpc/nfs")
+if node[:kernel][:modules].include?("nfsv3")
+  munin_plugin "nfs_client"
+else
+  munin_plugin "nfs_client" do
+    action :delete
+  end
+end
+
+if node[:kernel][:modules].include?("nfsv4")
   munin_plugin "nfs4_client"
 else
   munin_plugin "nfs4_client" do
@@ -200,7 +245,7 @@ else
   end
 end
 
-if File.exists?("/proc/net/rpc/nfsd")
+if node[:kernel][:modules].include?("nfsd")
   munin_plugin "nfsd"
   munin_plugin "nfsd4"
 else
@@ -232,15 +277,17 @@ sensors_temp = false
 sensors_volt = false
 
 Dir.glob("/sys/class/hwmon/hwmon*").each do |hwmon|
-  package "lm-sensors"
-
-  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?
   sensors_volt = true unless Dir.glob("#{hwmon}/in*_input").empty?
 end
 
+if sensors_fan || sensors_temp || sensors_volt
+  package "lm-sensors"
+end
+
 if sensors_fan
   munin_plugin "sensors_fan" do
     target "sensors_"
@@ -264,6 +311,7 @@ end
 if sensors_volt
   munin_plugin "sensors_volt" do
     target "sensors_"
+    conf "sensors_volt.erb"
   end
 else
   munin_plugin "sensors_volt" do
@@ -271,10 +319,12 @@ 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_"
+      conf "smart.erb"
+      conf_variables :disk => name
     end
   else
     munin_plugin "smart_#{name}" do
@@ -284,6 +334,7 @@ node[:block_device].each do |name,attributes|
 end
 
 munin_plugin "swap"
+munin_plugin "tcp"
 munin_plugin "threads"
 munin_plugin "uptime"
 munin_plugin "users"