X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/dd35c593b7471ccbe5298f8e720d7b9b4ee6a967..0208aa8cceeedcd647c2157921e9da55ad01940a:/cookbooks/hardware/recipes/default.rb

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 837c8ce23..739901cf0 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -65,6 +65,18 @@ when "HP"
     supports :status => true, :restart => true
   end
 
+  if product.end_with?("Gen8", "Gen9")
+    package "hp-ams" do
+      action :install
+      notifies :restart, "service[hp-ams]"
+    end
+
+    service "hp-ams" do
+      action [:enable, :start]
+      supports :status => true, :restart => true
+    end
+  end
+
   units << "1"
 when "TYAN"
   units << "0"
@@ -72,7 +84,7 @@ when "TYAN Computer Corporation"
   units << "0"
 when "Supermicro"
   case product
-  when "H8DGU", "X9SCD", "X7DBU", "X7DW3", "X9DR7/E-(J)LN4F", "X9DR3-F", "X9DRW", "SYS-2028U-TN24R4T+", "Super Server"
+  when "H8DGU", "X9SCD", "X7DBU", "X7DW3", "X9DR7/E-(J)LN4F", "X9DR3-F", "X9DRW", "SYS-1028U-TN10RT+", "SYS-2028U-TN24R4T+", "Super Server"
     units << "1"
   else
     units << "0"
@@ -81,45 +93,9 @@ when "IBM"
   units << "0"
 end
 
-# Remove legacy HP G4 support which breaks modern hp-health 10.4
-if manufacturer == "HP"
-  %w[/opt/hp/hp-health/bin/hpasmd /usr/lib/libhpasmintrfc.so.3.0 /usr/lib/libhpasmintrfc.so.3 /usr/lib/libhpasmintrfc.so].each do |filename|
-    file filename do
-      action :delete
-      manage_symlink_source false
-    end
-  end
-
-  directory "/opt/hp/hp-legacy" do
-    action :delete
-    recursive true
-  end
-end
-
 units.sort.uniq.each do |unit|
-  if node[:lsb][:release].to_f >= 16.04
-    service "serial-getty@ttyS#{unit}" do
-      action [:enable, :start]
-    end
-  else
-    file "/etc/init/ttySttyS#{unit}.conf" do
-      action :delete
-    end
-
-    template "/etc/init/ttyS#{unit}.conf" do
-      source "tty.conf.erb"
-      owner "root"
-      group "root"
-      mode 0o644
-      variables :unit => unit
-    end
-
-    service "ttyS#{unit}" do
-      provider Chef::Provider::Service::Upstart
-      action [:enable, :start]
-      supports :status => true, :restart => true, :reload => false
-      subscribes :restart, "template[/etc/init/ttyS#{unit}.conf]"
-    end
+  service "serial-getty@ttyS#{unit}" do
+    action [:enable, :start]
   end
 end
 
@@ -201,24 +177,6 @@ service "lldpd" do
   supports :status => true, :restart => true, :reload => true
 end
 
-if node[:hardware][:mcelog][:enabled]
-  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
-end
-
 tools_packages = []
 status_packages = {}
 
@@ -336,7 +294,7 @@ if !intel_ssds.empty? || !intel_nvmes.empty?
   package "unzip"
 
   remote_file "#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_3.0.13_Linux.zip" do
-    source "https://downloadmirror.intel.com/27863/eng/Intel_SSD_Data_Center_Tool_3.0.13_Linux.zip"
+    source "https://downloadmirror.intel.com/28460/eng/Intel_SSD_Data_Center_Tool_3.0.17_Linux.zip"
   end
 
   execute "#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_3.0.13_Linux.zip" do
@@ -354,20 +312,23 @@ if !intel_ssds.empty? || !intel_nvmes.empty?
 end
 
 disks = disks.map do |disk|
-  next if disk[:state] == "spun_down"
+  next if disk[:state] == "spun_down" || %w[unconfigured failed].any?(disk[:status])
 
   if disk[:smart_device]
     controller = node[:hardware][:disk][:controllers][disk[:controller]]
-    device = controller[:device].sub("/dev/", "")
-    smart = disk[:smart_device]
-
-    if device.start_with?("cciss/") && smart =~ /^cciss,(\d+)$/
-      array = node[:hardware][:disk][:arrays][disk[:arrays].first]
-      munin = "cciss-3#{array[:wwn]}-#{Regexp.last_match(1)}"
-    elsif smart =~ /^.*,(\d+)$/
-      munin = "#{device}-#{Regexp.last_match(1)}"
-    elsif smart =~ %r{^.*,(\d+)/(\d+)$}
-      munin = "#{device}-#{Regexp.last_match(1)}:#{Regexp.last_match(2)}"
+
+    if controller && controller[:device]
+      device = controller[:device].sub("/dev/", "")
+      smart = disk[:smart_device]
+
+      if device.start_with?("cciss/") && smart =~ /^cciss,(\d+)$/
+        array = node[:hardware][:disk][:arrays][disk[:arrays].first]
+        munin = "cciss-3#{array[:wwn]}-#{Regexp.last_match(1)}"
+      elsif smart =~ /^.*,(\d+)$/
+        munin = "#{device}-#{Regexp.last_match(1)}"
+      elsif smart =~ %r{^.*,(\d+)/(\d+)$}
+        munin = "#{device}-#{Regexp.last_match(1)}:#{Regexp.last_match(2)}"
+      end
     end
   elsif disk[:device]
     device = disk[:device].sub("/dev/", "")
@@ -384,12 +345,6 @@ disks = disks.map do |disk|
   ]
 end
 
-smartd_service = if node[:lsb][:release].to_f >= 16.04
-                   "smartd"
-                 else
-                   "smartmontools"
-                 end
-
 disks = disks.compact
 
 if disks.count.positive?
@@ -417,7 +372,7 @@ if disks.count.positive?
     mode 0o644
   end
 
-  service smartd_service do
+  service "smartd" do
     action [:enable, :start]
     subscribes :reload, "template[/etc/smartd.conf]"
     subscribes :restart, "template[/etc/default/smartmontools]"
@@ -437,7 +392,7 @@ if disks.count.positive?
     end
   end
 else
-  service smartd_service do
+  service "smartd" do
     action [:stop, :disable]
   end
 end
@@ -460,6 +415,7 @@ plugins = Dir.glob("/etc/munin/plugins/smart_*").map { |p| File.basename(p) } -
 plugins.each do |plugin|
   munin_plugin plugin do
     action :delete
+    conf "munin.smart.erb"
   end
 end