Force Access-Control-Allow-Origin for taginfo api responses

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

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index ae5eb6caee1e537f97a26f58318d4c4d285eec38..847425e539f4aed4b430322cb4a122d0158ba918 100644 (file)
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -79,18 +79,6 @@ remote_directory "/etc/munin/plugin-conf.d" do
   notifies :restart, "service[munin-node]"
 end
 
   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
 if Dir.glob("/proc/acpi/thermal_zone/*/temperature").empty?
   munin_plugin "acpi" do
     action :delete


@@ -325,6 +313,7 @@ end
 if sensors_volt
   munin_plugin "sensors_volt" do
     target "sensors_"
 if sensors_volt
   munin_plugin "sensors_volt" do
     target "sensors_"

+    conf "sensors_volt.erb"

   end
 else
   munin_plugin "sensors_volt" do
   end
 else
   munin_plugin "sensors_volt" do


@@ -336,6 +325,8 @@ node[:block_device].each do |name,attributes|
   if attributes[:vendor] == "ATA"
     munin_plugin "smart_#{name}" do
       target "smart_"
   if attributes[:vendor] == "ATA"
     munin_plugin "smart_#{name}" do
       target "smart_"

+      conf "smart.erb"
+      conf_variables :disk => name

     end
   else
     munin_plugin "smart_#{name}" do
     end
   else
     munin_plugin "smart_#{name}" do