From 33b8b2f7de89ad88ff7f11aca5c349c9c9e5fdad Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 14 Nov 2021 11:58:43 +0000 Subject: [PATCH] Enable discretereading workaround in ipmi_exporter for older HPs --- cookbooks/hardware/attributes/default.rb | 6 ++++++ cookbooks/hardware/templates/default/ipmi_local.yml.erb | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb index f0b0f73b1..d86e0347e 100644 --- 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][:ipmi][:custom_args] = [] 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 + + 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 diff --git a/cookbooks/hardware/templates/default/ipmi_local.yml.erb b/cookbooks/hardware/templates/default/ipmi_local.yml.erb index 4250a62eb..b6ebbd6d0 100644 --- 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 + 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 %> -- 2.39.5