Tidy up munin recipe

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

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index 775acc095adc9aa26a838c7c23456c19de33e955..51020994c8fcff0f3a52d2134ea1fb60cf895717 100644 (file)
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -85,7 +85,6 @@ else
 end
 
 # apcpdu_
-# api_
 munin_plugin "cpu"
 
 if File.exists?("/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state")
@@ -188,8 +187,6 @@ end
 
 munin_plugin "load"
 munin_plugin "memory"
-# mod_tile_
-# mysql_
 munin_plugin "netstat"
 
 if File.exists?("/proc/net/rpc/nfs")
@@ -213,10 +210,8 @@ else
   end
 end
 
-# nominatim_
 munin_plugin "open_files"
 munin_plugin "open_inodes"
-# passenger_
 
 munin_plugin "postfix_mailqueue" do
   action :delete
@@ -226,14 +221,44 @@ munin_plugin "postfix_mailvolume" do
   action :delete
 end
 
-# postgres_
 munin_plugin "processes"
 munin_plugin "proc_pri"
-# renderd_
-# replication_delay
-# sensors_
+
+Dir.glob("/sys/class/hwmon/hwmon*").each do |hwmon|
+  hwmon = "#{hwmon}/device" unless File.exists?("#{hwmon}/name")
+
+  if Dir.glob("#{hwmon}/fan*_input").empty?
+    munin_plugin "sensors_fan" do
+      action :delete
+    end
+  else
+    munin_plugin "sensors_fan" do
+      target "sensors_"
+    end
+  end
+
+  if Dir.glob("#{hwmon}/temp*_input").empty?
+    munin_plugin "sensors_temp" do
+      action :delete
+    end
+  else
+    munin_plugin "sensors_temp" do
+      target "sensors_"
+    end
+  end
+
+  if Dir.glob("#{hwmon}/in*_input").empty?
+    munin_plugin "sensors_volt" do
+      action :delete
+    end
+  else
+    munin_plugin "sensors_volt" do
+      target "sensors_"
+    end
+  end
+end
+
 # smart_
-# squid_
 munin_plugin "swap"
 munin_plugin "threads"
 munin_plugin "uptime"