X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/2ec62d46e6d050fe6384df90a2869036662d1b51..1613ad2ccaf85558a7fdcc3021992ad4d1734fc2:/cookbooks/munin/recipes/default.rb

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index c3e43cdd8..f02730ebc 100644
--- 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,19 @@ 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 node[:dmi] and node[:dmi][:system] and node[:dmi][:system][:manufacturer] == "HP"
+  case node[:dmi][:system][:product_name]
+  when "ProLiant DL360 G6", "ProLiant DL360 G7"
+    template "/etc/sensors.d/disable-bad-acpi-sensor.conf" do
+      source "disable-bad-acpi-sensor.conf.erb"
+      owner "root"
+      group "root"
+      mode 0644
+    end
+  end
 end
 
 if Dir.glob("/proc/acpi/thermal_zone/*/temperature").empty?
@@ -101,7 +113,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
@@ -114,7 +128,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 +136,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,28 +213,19 @@ 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"
 
-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
@@ -215,7 +233,7 @@ else
   end
 end
 
-if File.exists?("/proc/net/rpc/nfsd")
+if node[:kernel][:modules].include?("nfsd")
   munin_plugin "nfsd"
   munin_plugin "nfsd4"
 else
@@ -242,42 +260,66 @@ 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|
   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 || sensors_temp || sensors_volt
+  package "lm-sensors"
+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
+if sensors_volt
+  munin_plugin "sensors_volt" do
+    target "sensors_"
+  end
+else
+  munin_plugin "sensors_volt" do
+    action :delete
+  end
+end
+
+node[:block_device].each do |name,attributes|
+  if attributes[:vendor] == "ATA"
+    munin_plugin "smart_#{name}" do
+      target "smart_"
     end
   else
-    munin_plugin "sensors_volt" do
-      target "sensors_"
+    munin_plugin "smart_#{name}" do
+      action :delete
     end
   end
 end
 
-# smart_
 munin_plugin "swap"
+munin_plugin "tcp"
 munin_plugin "threads"
 munin_plugin "uptime"
 munin_plugin "users"