Add newer version of fw_conntrack munin plugin

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

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index fca04dfebf315a19804722d73d310e60211b921d..41d722e0cdc64113ce703c9117f8423df1be0350 100644 (file)
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -85,7 +85,6 @@ else
 end
 
 # apcpdu_
 end
 
 # apcpdu_

-# api_

 munin_plugin "cpu"
 
 if File.exists?("/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state")
 munin_plugin "cpu"
 
 if File.exists?("/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state")


@@ -102,7 +101,9 @@ munin_plugin "diskstats"
 munin_plugin "entropy"
 munin_plugin "forks"
 
 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
   munin_plugin "fw_conntrack"
   munin_plugin "fw_forwarded_local"
 else


@@ -167,7 +168,25 @@ end
 munin_plugin "interrupts"
 munin_plugin "iostat"
 munin_plugin "iostat_ios"
 munin_plugin "interrupts"
 munin_plugin "iostat"
 munin_plugin "iostat_ios"

-# ipmi_
+
+if Dir.glob("/dev/ipmi*").empty?
+  munin_plugin "ipmi_fans" do
+    action :delete
+  end
+
+  munin_plugin "ipmi_temp" do
+    action :delete
+  end
+else
+  munin_plugin "ipmi_fans" do
+    target "ipmi_"
+  end
+
+  munin_plugin "ipmi_temp" do
+    target "ipmi_"
+  end
+end
+

 munin_plugin "irqstats"
 
 Dir.new("/sys/block").each do |device|
 munin_plugin "irqstats"
 
 Dir.new("/sys/block").each do |device|


@@ -188,8 +207,6 @@ end
 
 munin_plugin "load"
 munin_plugin "memory"
 
 munin_plugin "load"
 munin_plugin "memory"

-# mod_tile_
-# mysql_

 munin_plugin "netstat"
 
 if File.exists?("/proc/net/rpc/nfs")
 munin_plugin "netstat"
 
 if File.exists?("/proc/net/rpc/nfs")


@@ -213,10 +230,8 @@ else
   end
 end
 
   end
 end
 

-# nominatim_

 munin_plugin "open_files"
 munin_plugin "open_inodes"
 munin_plugin "open_files"
 munin_plugin "open_inodes"

-# passenger_

 
 munin_plugin "postfix_mailqueue" do
   action :delete
 
 munin_plugin "postfix_mailqueue" do
   action :delete


@@ -226,48 +241,54 @@ munin_plugin "postfix_mailvolume" do
   action :delete
 end
 
   action :delete
 end
 

-# postgres_

 munin_plugin "processes"
 munin_plugin "proc_pri"
 munin_plugin "processes"
 munin_plugin "proc_pri"

-# renderd_
-# replication_delay
+
+sensors_fan = false
+sensors_temp = false
+sensors_volt = false

 
 Dir.glob("/sys/class/hwmon/hwmon*").each do |hwmon|
 
 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.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

+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
   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
 
 # smart_
   end
 end
 
 # smart_

-# squid_

 munin_plugin "swap"
 munin_plugin "threads"
 munin_plugin "uptime"
 munin_plugin "swap"
 munin_plugin "threads"
 munin_plugin "uptime"