Enable discretereading workaround in ipmi_exporter for older HPs

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index f0b0f73b1fe2316dbbfb08c2379df655b1ea802f..d86e0347e999a4ff2a2cbd6b996c27d545d1ff90 100644 (file)
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -4,6 +4,7 @@ default[:hardware][:grub][:cmdline] = %w[nomodeset]
 default[:hardware][:sensors] = {}
 default[:hardware][:hwmon] = {}
 default[:hardware][:ipmi][:excluded_sensors] = []
 default[:hardware][:sensors] = {}
 default[:hardware][:hwmon] = {}
 default[:hardware][:ipmi][:excluded_sensors] = []

+default[:hardware][:ipmi][:custom_args] = []

 
 if node[:dmi] && node[:dmi][:system]
   case node[:dmi][:system][:manufacturer]
 
 if node[:dmi] && node[:dmi][:system]
   case node[:dmi][:system][:manufacturer]


@@ -14,6 +15,11 @@ if node[:dmi] && node[:dmi][:system]
     when "ProLiant DL360 G6", "ProLiant DL360 G7", "ProLiant SE326M1R2"
       default[:hardware][:sensors][:"power_meter-*"][:power][:power1] = { :ignore => true }
     end
     when "ProLiant DL360 G6", "ProLiant DL360 G7", "ProLiant SE326M1R2"
       default[:hardware][:sensors][:"power_meter-*"][:power][:power1] = { :ignore => true }
     end

+
+    case node[:dmi][:system][:product_name]
+    when "ProLiant DL360 G6", "ProLiant DL360 G7", "ProLiant SE326M1R2", "ProLiant DL360e Gen8", "ProLiant DL360p Gen8"
+      default[:hardware][:ipmi][:custom_args] |= ["--workaround-flags=discretereading"]
+    end

   end
 end
 
   end
 end
 

diff --git a/cookbooks/hardware/templates/default/ipmi_local.yml.erb b/cookbooks/hardware/templates/default/ipmi_local.yml.erb
index 4250a62eb338d6b3ccd070ce9534e3a714f3c92a..b6ebbd6d0de3f1e2691409851961a3a48ac1306b 100644 (file)
--- a/cookbooks/hardware/templates/default/ipmi_local.yml.erb
+++ b/cookbooks/hardware/templates/default/ipmi_local.yml.erb
@@ -7,6 +7,11 @@ modules:
       - ipmi
       - dcmi
       - chassis
       - ipmi
       - dcmi
       - chassis

+    custom_args:
+      ipmi:
+<% node[:hardware][:ipmi][:custom_args].each do |arg| -%>
+        - <%= arg %>
+<% end -%>

     exclude_sensor_ids:
 <% node[:hardware][:ipmi][:excluded_sensors].each do |sensor| -%>
       - <%= sensor %>
     exclude_sensor_ids:
 <% node[:hardware][:ipmi][:excluded_sensors].each do |sensor| -%>
       - <%= sensor %>