X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/9b7e8a0e7ae0d274c4e1fc54d04cdd5cbef38664..e5f294d3dc676675b2803915571c28337468c3b3:/cookbooks/hardware/recipes/default.rb

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index c7834a6e2..472db1817 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -21,7 +21,7 @@ include_recipe "tools"
 include_recipe "munin"
 
 ohai_plugin "hardware" do
-  template "ohai.rb.erb"
+  template_source "ohai.rb.erb"
 end
 
 case node[:cpu][:"0"][:vendor_id]
@@ -55,11 +55,8 @@ case manufacturer
 when "HP"
   package "hponcfg"
 
-  # Downgrade hp-health to 10.0.0.1.3-4. as 10.40-1815.49 has issues with reliable startup
   package "hp-health" do
     action :install
-    version "10.0.0.1.3-4."
-    options "--force-yes"
     notifies :restart, "service[hp-health]"
   end
 
@@ -203,16 +200,32 @@ service "lldpd" do
   supports :status => true, :restart => true, :reload => true
 end
 
+package "mcelog"
+
+%w[bus cache dimm iomca page socket-memory unknown].each do |trigger|
+  template "/etc/mcelog/#{trigger}-error-trigger.local" do
+    source "mcelog-trigger.erb"
+    owner "root"
+    group "root"
+    mode 0o755
+  end
+end
+
+service "mcelog" do
+  action [:start, :enable]
+  supports :status => true, :restart => true, :reload => false
+end
+
 tools_packages = []
 status_packages = {}
 
 node[:kernel][:modules].each_key do |modname|
   case modname
   when "cciss"
-    tools_packages << "hpssacli"
+    tools_packages << "ssacli"
     status_packages["cciss-vol-status"] ||= []
   when "hpsa"
-    tools_packages << "hpssacli"
+    tools_packages << "ssacli"
     status_packages["cciss-vol-status"] ||= []
   when "mptsas"
     tools_packages << "lsiutil"
@@ -246,7 +259,7 @@ node[:block_device].each do |name, attributes|
   end
 end
 
-%w[hpssacli lsiutil sas2ircu megactl megacli arcconf].each do |tools_package|
+%w[ssacli lsiutil sas2ircu megactl megacli arcconf].each do |tools_package|
   if tools_packages.include?(tools_package)
     package tools_package
   else
@@ -332,7 +345,7 @@ if !intel_ssds.empty? || !intel_nvmes.empty?
   end
 
   dpkg_package "isdct" do
-    version "3.0.7.401"
+    version "3.0.7.401-17"
     source "#{Chef::Config[:file_cache_path]}/isdct_3.0.7.401-17_amd64.deb"
   end
 end
@@ -411,7 +424,7 @@ if disks.count.positive?
   # an Areca controller as they only allow one thing to
   # talk to the controller at a time and smartd will
   # throw errors if it clashes with munin
-  disks = disks.reject { |disk| disk[:smart] && disk[:smart].start_with?("areca,") }
+  disks = disks.reject { |disk| disk[:smart]&.start_with?("areca,") }
 
   disks.each do |disk|
     munin_plugin "smart_#{disk[:munin]}" do