X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/288dd19ce2d0f922ee77fe782227726e68e2174b..e61233b42038a7b4cbb793b19c49a0109c7c9c09:/cookbooks/munin/recipes/default.rb

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index 2626aca4a..41d722e0c 100644
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -101,7 +101,9 @@ munin_plugin "diskstats"
 munin_plugin "entropy"
 munin_plugin "forks"
 
-if File.exists?("/proc/net/ip_conntrack") or File.exists?("/proc/net/nf_conntrack")
+if node[:kernel][:modules].include?("nf_conntrack")
+  package "conntrack"
+
   munin_plugin "fw_conntrack"
   munin_plugin "fw_forwarded_local"
 else
@@ -242,39 +244,47 @@ end
 munin_plugin "processes"
 munin_plugin "proc_pri"
 
+sensors_fan = false
+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")
 
-  if Dir.glob("#{hwmon}/fan*_input").empty?
-    munin_plugin "sensors_fan" do
-      action :delete
-    end
-  else
-    munin_plugin "sensors_fan" do
-      target "sensors_"
-    end
+  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
+  munin_plugin "sensors_fan" do
+    target "sensors_"
   end
+else
+  munin_plugin "sensors_fan" do
+    action :delete
+  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
+if sensors_temp
+  munin_plugin "sensors_temp" do
+    target "sensors_"
   end
+else
+  munin_plugin "sensors_temp" do
+    action :delete
+  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
+if sensors_volt
+  munin_plugin "sensors_volt" do
+    target "sensors_"
+  end
+else
+  munin_plugin "sensors_volt" do
+    action :delete
   end
 end