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

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index f02730ebc..ac6c4d843 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,18 +79,6 @@ 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
@@ -152,40 +143,51 @@ else
 end
 
 if File.exists?("/sbin/hpasmcli")
-  munin_plugin "hpasmcli_temp"
-  munin_plugin "hpasmcli_fans"
+  munin_plugin "hpasmcli2_temp" do
+    target "hpasmcli2_"
+  end
+
+  munin_plugin "hpasmcli2_fans" do
+    target "hpasmcli2_"
+  end
 else
-  munin_plugin "hpasmcli_temp" do
+  munin_plugin "hpasmcli2_temp" do
     action :delete
   end
 
-  munin_plugin "hpasmcli_fans" do
+  munin_plugin "hpasmcli2_fans" do
     action :delete
   end
 end
 
+munin_plugin "hpasmcli_temp" do
+  action :delete
+end
+
+munin_plugin "hpasmcli_fans" do
+  action :delete
+end
+
 munin_plugin "http_loadtime" do
   action :delete
 end
 
 node[:network][:interfaces].each do |ifname,ifattr|
-  if ifname =~ /^eth\d+$/
-    if ifattr[:flags] and ifattr[:flags].include?("UP")
-      munin_plugin "if_err_#{ifname}" do
-        target "if_err_"
-      end
+  if ifattr[:encapsulation] == "Ethernet" and ifattr[:state] == "up"
+    munin_plugin "if_err_#{ifname}" do
+      target "if_err_"
+    end
 
-      munin_plugin "if_#{ifname}" do
-        target "if_"
-      end
-    else
-      munin_plugin "if_err_#{ifname}" do
-        action :delete
-      end
+    munin_plugin "if_#{ifname}" do
+      target "if_"
+    end
+  else
+    munin_plugin "if_err_#{ifname}" do
+      action :delete
+    end
 
-      munin_plugin "if_#{ifname}" do
-        action :delete
-      end
+    munin_plugin "if_#{ifname}" do
+      action :delete
     end
   end
 end
@@ -202,6 +204,11 @@ if Dir.glob("/dev/ipmi*").empty?
   munin_plugin "ipmi_temp" do
     action :delete
   end
+
+  munin_plugin "ipmi_power" do
+    action :delete
+    only_if { node[:lsb][:release].to_f >= 14.04 }
+  end
 else
   munin_plugin "ipmi_fans" do
     target "ipmi_"
@@ -210,6 +217,11 @@ else
   munin_plugin "ipmi_temp" do
     target "ipmi_"
   end
+
+  munin_plugin "ipmi_power" do
+    target "ipmi_"
+    only_if { node[:lsb][:release].to_f >= 14.04 }
+  end
 end
 
 munin_plugin "irqstats"
@@ -299,6 +311,7 @@ end
 if sensors_volt
   munin_plugin "sensors_volt" do
     target "sensors_"
+    conf "sensors_volt.erb"
   end
 else
   munin_plugin "sensors_volt" do
@@ -310,6 +323,8 @@ node[:block_device].each do |name,attributes|
   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