X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/630dcad9e1518ff4d54f35c96d1bfffb54c7cdef..0826de111e02616451c918ac73e1a167a0e79c7c:/cookbooks/munin/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index 4bf1f8703..0bcccbb93 100644
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -22,6 +22,9 @@ include_recipe "networking"
 package "munin-node"
 
 service "munin-node" do
+  if node[:lsb][:release].to_f >= 14.04
+    provider Chef::Provider::Service::Upstart
+  end
   action [ :enable, :start ]
   supports :status => true, :restart => true, :reload => true
 end
@@ -76,6 +79,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