From: Tom Hughes <tom@compton.nu>
Date: Thu, 21 Jan 2021 18:36:53 +0000 (+0000)
Subject: Ignore unconnected IPMI sensors on gorynych
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/011a86b80a30eb69ae1a1cb6ab2e0fda83604db1

Ignore unconnected IPMI sensors on gorynych
---

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index fdf843d63..c7b160608 100644
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,6 +1,7 @@
 default[:hardware][:modules] = %w[lp]
 default[:hardware][:grub][:cmdline] = %w[nomodeset]
 default[:hardware][:sensors] = {}
+default[:hardware][:ipmi][:excluded_sensors] = []
 
 if node[:dmi] && node[:dmi][:system]
   case node[:dmi][:system][:manufacturer]
diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 271e26754..df7af6e50 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -178,8 +178,17 @@ if node[:kernel][:modules].include?("ipmi_si")
   package "ipmitool"
   package "freeipmi-tools"
 
+  template "/etc/prometheus/ipmi_local.yml" do
+    source "ipmi_local.yml.erb"
+    owner "root"
+    group "root"
+    mode "644"
+  end
+
   prometheus_exporter "ipmi" do
     port 9290
+    options "--config.file=/etc/prometheus/ipmi_local.yml"
+    subscribes :restart, "template[/etc/prometheus/ipmi_local.yml]"
   end
 end
 
diff --git a/cookbooks/hardware/templates/default/ipmi_local.yml.erb b/cookbooks/hardware/templates/default/ipmi_local.yml.erb
new file mode 100644
index 000000000..4250a62eb
--- /dev/null
+++ b/cookbooks/hardware/templates/default/ipmi_local.yml.erb
@@ -0,0 +1,13 @@
+# DO NOT EDIT - This file is being maintained by Chef
+
+modules:
+  default:
+    collectors:
+      - bmc
+      - ipmi
+      - dcmi
+      - chassis
+    exclude_sensor_ids:
+<% node[:hardware][:ipmi][:excluded_sensors].each do |sensor| -%>
+      - <%= sensor %>
+<% end -%>
diff --git a/roles/gorynych.rb b/roles/gorynych.rb
index 5a172a546..c57c56e0f 100644
--- a/roles/gorynych.rb
+++ b/roles/gorynych.rb
@@ -3,6 +3,9 @@ description "Master role applied to gorynych"
 
 default_attributes(
   :hardware => {
+    :ipmi => {
+      :excluded_sensors => [3, 4]
+    },
     :shm_size => "20g"
   },
   :munin => {