Configure HDD temperature monitoring for all directly attached disks

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

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index eac718fc004b2c23ab1e50be8246a53f334f449c..0f6c67d86b4bc55659e5036ae889f11698f09f5b 100644 (file)
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -50,7 +50,7 @@ template "/etc/munin/munin-node.conf" do
   group "root"
   mode 0644
   variables :servers => servers
-  notifies :restart, resources(:service => "munin-node")
+  notifies :restart, "service[munin-node]"
 end
 
 remote_directory "/usr/local/share/munin/plugins" do
@@ -73,7 +73,7 @@ remote_directory "/etc/munin/plugin-conf.d" do
   files_group "root"
   files_mode 0644
   purge false
-  notifies :restart, resources(:service => "munin-node")
+  notifies :restart, "service[munin-node]"
 end
 
 if Dir.glob("/proc/acpi/thermal_zone/*/temperature").empty?
@@ -102,6 +102,8 @@ munin_plugin "entropy"
 munin_plugin "forks"
 
 if node[:kernel][:modules].include?("nf_conntrack")
+  package "conntrack"
+
   munin_plugin "fw_conntrack"
   munin_plugin "fw_forwarded_local"
 else
@@ -114,7 +116,7 @@ else
   end
 end
 
-if %x{sysctl -n net.ipv4.ip_forward}.chomp == "1"
+if File.read("/proc/sys/net/ipv4/ip_forward").chomp == "1"
   munin_plugin "fw_packets"
 else
   munin_plugin "fw_packets" do
@@ -122,7 +124,20 @@ else
   end
 end
 
-# hddtemp_smartctl
+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")
   munin_plugin "hpasmcli_temp"
@@ -186,23 +201,6 @@ else
 end
 
 munin_plugin "irqstats"
-
-Dir.new("/sys/block").each do |device|
-  if device.match(/^sd/)
-    munin_plugin "linux_diskstat_iops_#{device}" do
-      target "linux_diskstat_"
-    end
-
-    munin_plugin "linux_diskstat_latency_#{device}" do
-      target "linux_diskstat_"
-    end
-
-    munin_plugin "linux_diskstat_throughput_#{device}" do
-      target "linux_diskstat_"
-    end
-  end
-end
-
 munin_plugin "load"
 munin_plugin "memory"
 munin_plugin "netstat"
@@ -286,7 +284,18 @@ else
   end
 end
 
-# smart_
+node[:block_device].each do |name,attributes|
+  if attributes[:vendor] == "ATA"
+    munin_plugin "smart_#{name}" do
+      target "smart_"
+    end
+  else
+    munin_plugin "smart_#{name}" do
+      action :delete
+    end
+  end
+end
+
 munin_plugin "swap"
 munin_plugin "threads"
 munin_plugin "uptime"