Merge remote-tracking branch 'github/pull/565'

[chef.git] / roles / hp-dl360-g6.rb

diff --git a/roles/hp-dl360-g6.rb b/roles/hp-dl360-g6.rb
index 3f0cfd6004f04b72e7574bf9fd236c9eec0c92f6..c7a14cda43d48ee589d8c54c2357f60669789242 100644 (file)
--- a/roles/hp-dl360-g6.rb
+++ b/roles/hp-dl360-g6.rb
@@ -2,8 +2,17 @@ name "hp-dl360-g6"
 description "Role applied to all HP DL360 G6 machines"
 
 default_attributes(
+  :hardware => {
+    :blacklisted_modules => %w[acpi_power_meter]
+  },
   :munin => {
     :plugins => {
+      :hpasmcli2_fans => {
+        :fan1 => { :warning => "85", :critical => "90" },
+        :fan2 => { :warning => "85", :critical => "90" },
+        :fan3 => { :warning => "85", :critical => "90" },
+        :fan4 => { :warning => "85", :critical => "90" }
+      },
       :ipmi_temp => {
         :Temp1 => { :label => "External Environment" },
         :Temp2 => { :warning => ":", :label => "CPU 1" },