Use hpasmcli2_ instead of hpasmcli_

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

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index 0bcccbb93c4f248d88ae0994cee9bd51c2665ce5..ae5eb6caee1e537f97a26f58318d4c4d285eec38 100644 (file)
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -155,18 +155,31 @@ 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
@@ -205,6 +218,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_"
@@ -213,6 +231,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"