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

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index 6ad33e40a..f02730ebc 100644
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -76,6 +76,18 @@ remote_directory "/etc/munin/plugin-conf.d" do
   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?
   munin_plugin "acpi" do
     action :delete
@@ -253,8 +265,6 @@ 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")
 
   sensors_fan = true unless Dir.glob("#{hwmon}/fan*_input").empty?
@@ -262,6 +272,10 @@ Dir.glob("/sys/class/hwmon/hwmon*").each do |hwmon|
   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_"