X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6fac9148d15864c1f4e09d9adfbb9db3b01181fa..77c15edb86c1c5a78904db4da60a4806cc3e1bb6:/cookbooks/hardware/recipes/default.rb?ds=inline diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb index f19446969..2fa629adf 100644 --- a/cookbooks/hardware/recipes/default.rb +++ b/cookbooks/hardware/recipes/default.rb @@ -8,7 +8,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -20,16 +20,15 @@ include_recipe "tools" include_recipe "munin" -case node[:cpu][:"0"][:vendor_id] -when "GenuineIntel" - package "intel-microcode" +ohai_plugin "hardware" do + template "ohai.rb.erb" end case node[:cpu][:"0"][:vendor_id] +when "GenuineIntel" + package "intel-microcode" when "AuthenticAMD" - if node[:lsb][:release].to_f >= 14.04 - package "amd64-microcode" - end + package "amd64-microcode" end if node[:dmi] && node[:dmi][:system] @@ -46,78 +45,77 @@ else product = "Unknown" end +units = [] + +if node[:roles].include?("bytemark") || node[:roles].include?("exonetric") + units << "0" +end + case manufacturer when "HP" package "hponcfg" - package "hp-health" - unit = "1" - speed = "115200" -when "TYAN" - unit = "0" - speed = "115200" -when "TYAN Computer Corporation" - unit = "0" - speed = "115200" -when "Supermicro" - case product - when "H8DGU", "X9SCD", "X7DBU", "X7DW3", "X9DR7/E-(J)LN4F", "X9DR3-F", "X9DRW" - unit = "1" - speed = "115200" - else - unit = "0" - speed = "115200" - end -when "IBM" - unit = "0" - speed = "115200" -end -if manufacturer == "HP" && node[:lsb][:release].to_f > 11.10 - include_recipe "git" - - git "/opt/hp/hp-legacy" do - action :sync - repository "git://chef.openstreetmap.org/hp-legacy.git" - user "root" - group "root" + package "hp-health" do + action :install + notifies :restart, "service[hp-health]" end - link "/opt/hp/hp-health/bin/hpasmd" do - to "/opt/hp/hp-legacy/hpasmd" + service "hp-health" do + action [:enable, :start] + supports :status => true, :restart => true end - link "/usr/lib/libhpasmintrfc.so.3.0" do - to "/opt/hp/hp-legacy/libhpasmintrfc.so.3.0" - end + if product.end_with?("Gen8", "Gen9") + package "hp-ams" do + action :install + notifies :restart, "service[hp-ams]" + end - link "/usr/lib/libhpasmintrfc.so.3" do - to "libhpasmintrfc.so.3.0" + service "hp-ams" do + action [:enable, :start] + supports :status => true, :restart => true + end end - link "/usr/lib/libhpasmintrfc.so" do - to "libhpasmintrfc.so.3.0" + units << "1" +when "TYAN" + units << "0" +when "TYAN Computer Corporation" + units << "0" +when "Supermicro" + case product + 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" end +when "IBM" + units << "0" end -unless unit.nil? - file "/etc/init/ttySttyS#{unit}.conf" do - action :delete +units.sort.uniq.each do |unit| + service "serial-getty@ttyS#{unit}" do + action [:enable, :start] end +end - template "/etc/init/ttyS#{unit}.conf" do - source "tty.conf.erb" - owner "root" - group "root" - mode 0644 - variables :unit => unit, :speed => speed - end +# if we need a different / special kernel version to make the hardware +# work (e.g: https://github.com/openstreetmap/operations/issues/45) then +# ensure that we have the package installed. the grub template will +# make sure that this is the default on boot. +if node[:hardware][:grub][:kernel] + kernel_version = node[:hardware][:grub][:kernel] - 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 + package "linux-image-#{kernel_version}-generic" + package "linux-image-extra-#{kernel_version}-generic" + package "linux-headers-#{kernel_version}-generic" + package "linux-tools-#{kernel_version}-generic" + + boot_device = IO.popen(["df", "/boot"]).readlines.last.split.first + boot_uuid = IO.popen(["blkid", "-o", "value", "-s", "UUID", boot_device]).readlines.first.chomp + grub_entry = "gnulinux-advanced-#{boot_uuid}>gnulinux-#{kernel_version}-advanced-#{boot_uuid}" +else + grub_entry = "0" end if File.exist?("/etc/default/grub") @@ -130,8 +128,8 @@ if File.exist?("/etc/default/grub") source "grub.erb" owner "root" group "root" - mode 0644 - variables :unit => unit, :speed => speed + mode 0o644 + variables :units => units, :entry => grub_entry notifies :run, "execute[update-grub]" end end @@ -147,7 +145,7 @@ template "/etc/initramfs-tools/conf.d/mdadm" do source "initramfs-mdadm.erb" owner "root" group "root" - mode 0644 + mode 0o644 notifies :run, "execute[update-initramfs]" end @@ -156,25 +154,28 @@ service "haveged" do action [:enable, :start] end -if node[:kernel][:modules].include?("ipmi_si") - package "ipmitool" -end +package "ipmitool" if node[:kernel][:modules].include?("ipmi_si") -if node[:lsb][:release].to_f >= 12.10 - package "irqbalance" +package "irqbalance" - template "/etc/default/irqbalance" do - source "irqbalance.erb" - owner "root" - group "root" - mode 0644 - end +template "/etc/default/irqbalance" do + source "irqbalance.erb" + owner "root" + group "root" + mode 0o644 +end - service "irqbalance" do - action [:start, :enable] - supports :status => false, :restart => true, :reload => false - subscribes :restart, "template[/etc/default/irqbalance]" - end +service "irqbalance" do + action [:start, :enable] + supports :status => false, :restart => true, :reload => false + subscribes :restart, "template[/etc/default/irqbalance]" +end + +# Link Layer Discovery Protocol Daemon +package "lldpd" +service "lldpd" do + action [:start, :enable] + supports :status => true, :restart => true, :reload => true end tools_packages = [] @@ -183,14 +184,14 @@ status_packages = {} node[:kernel][:modules].each_key do |modname| case modname when "cciss" - tools_packages << "hpacucli" + tools_packages << "ssacli" status_packages["cciss-vol-status"] ||= [] when "hpsa" - tools_packages << "hpacucli" + tools_packages << "ssacli" status_packages["cciss-vol-status"] ||= [] when "mptsas" tools_packages << "lsiutil" - # status_packages["mpt-status"] ||= [] + status_packages["mpt-status"] ||= [] when "mpt2sas", "mpt3sas" tools_packages << "sas2ircu" status_packages["sas2ircu-status"] ||= [] @@ -220,7 +221,7 @@ node[:block_device].each do |name, attributes| end end -%w(hpacucli 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 @@ -235,7 +236,7 @@ if tools_packages.include?("areca") git "/opt/areca" do action :sync - repository "git://chef.openstreetmap.org/areca.git" + repository "https://git.openstreetmap.org/private/areca.git" user "root" group "root" end @@ -254,7 +255,7 @@ end source "raid.default.erb" owner "root" group "root" - mode 0644 + mode 0o644 variables :devices => status_packages[status_package] end @@ -274,148 +275,117 @@ end end end -disks = [] - -node[:block_device].each do |name, attributes| - disks << { :device => name } if attributes[:vendor] == "ATA" -end - -if status_packages["cciss-vol-status"] && File.exist?("/usr/sbin/cciss_vol_status") - status_packages["cciss-vol-status"].each do |device| - IO.popen(["cciss_vol_status", "-V", "/dev/#{device}"]).each do |line| - disks << { :device => device, :driver => "cciss", :id => Regexp.last_match[1].to_i - 1 } if line =~ / bay ([0-9]+) +HP / - end - end -end - -if status_packages["megaclisas-status"] - controller = 0 +disks = if node[:hardware][:disk] + node[:hardware][:disk][:disks] + else + [] + end - Dir.glob("/sys/class/scsi_host/host*") do |host| - driver = File.new("#{host}/proc_name").read.chomp +intel_ssds = disks.select { |d| d[:vendor] == "INTEL" && d[:model] =~ /^SSD/ } - next unless driver == "megaraid_sas" +nvmes = if node[:hardware][:pci] + node[:hardware][:pci].values.select { |pci| pci[:driver] == "nvme" } + else + [] + end - bus = host.sub("/sys/class/scsi_host/host", "") - device = File.basename(Dir.glob("/sys/bus/scsi/devices/#{bus}:*/scsi_generic/*").first) +intel_nvmes = nvmes.select { |pci| pci[:vendor_name] == "Intel Corporation" } - IO.popen(["megacli", "-PDList", "-a#{controller}", "-NoLog"]).each do |line| - disks << { :device => device, :driver => "megaraid", :id => Regexp.last_match[1] } if line =~ /^Device Id: ([0-9]+)$/ +if !intel_ssds.empty? || !intel_nvmes.empty? + package "unzip" - disks.pop if line =~ /^Firmware state: Hotspare, Spun down$/ - end + intel_ssd_tool_version = "3.0.19" - controller += 1 + remote_file "#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.zip" do + source "https://downloadmirror.intel.com/28639/eng/Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.zip" end -end - -if tools_packages.include?("lsiutil") - Dir.glob("/sys/class/scsi_host/host*") do |host| - driver = File.new("#{host}/proc_name").read.chomp - - next unless driver == "mptsas" - bus = host.sub("/sys/class/scsi_host/host", "") - - Dir.glob("/sys/bus/scsi/devices/#{bus}:0:*/scsi_generic/*").each do |sg| - disks << { :device => File.basename(sg) } - end + execute "#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.zip" do + command "unzip Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.zip isdct_#{intel_ssd_tool_version}-1_amd64.deb" + cwd Chef::Config[:file_cache_path] + user "root" + group "root" + not_if { File.exist?("#{Chef::Config[:file_cache_path]}/isdct_#{intel_ssd_tool_version}-1_amd64.deb") } end -end - -if status_packages["sas2ircu-status"] - Dir.glob("/sys/class/scsi_host/host*") do |host| - driver = File.new("#{host}/proc_name").read.chomp - - next unless driver == "mpt2sas" || driver == "mpt3sas" - bus = host.sub("/sys/class/scsi_host/host", "") - - Dir.glob("/sys/bus/scsi/devices/#{bus}:0:*/scsi_generic/*").each do |sg| - disks << { :device => File.basename(sg) } - end + dpkg_package "isdct" do + version "#{intel_ssd_tool_version}-1" + source "#{Chef::Config[:file_cache_path]}/isdct_#{intel_ssd_tool_version}-1_amd64.deb" end end -if status_packages["aacraid-status"] - Dir.glob("/sys/class/scsi_host/host*") do |host| - driver = File.new("#{host}/proc_name").read.chomp +disks = disks.map do |disk| + next if disk[:state] == "spun_down" || %w[unconfigured failed].any?(disk[:status]) - next unless driver == "aacraid" + if disk[:smart_device] + controller = node[:hardware][:disk][:controllers][disk[:controller]] - bus = host.sub("/sys/class/scsi_host/host", "") + if controller && controller[:device] + device = controller[:device].sub("/dev/", "") + smart = disk[:smart_device] - Dir.glob("/sys/bus/scsi/devices/#{bus}:1:*/scsi_generic/*").each do |sg| - disks << { :device => File.basename(sg) } + 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/", "") + munin = device end -end -if tools_packages.include?("areca") && File.exist?("/opt/areca/x86_64/cli64") - device = IO.popen(["lsscsi", "-g"]).grep(%r{Areca +RAID controller .*/dev/(sg[0-9]+)}) do - Regexp.last_match[1] - end.first + next if device.nil? - IO.popen(["/opt/areca/x86_64/cli64", "disk", "info"]).each do |line| - next if line =~ /N\.A\./ - - if line =~ /^ +[0-9]+ +0*([0-9]+) +(?:Slot#|SLOT )0*([0-9]+) +/ - enc = Regexp.last_match[1] - slot = Regexp.last_match[2] - - disks << { :device => device, :driver => "areca", :id => "#{slot}/#{enc}" } - elsif line =~ /^ +([0-9]+) +[0-9]+ +/ - disks << { :device => device, :driver => "areca", :id => Regexp.last_match[1] } - end - end + Hash[ + :device => device, + :smart => smart, + :munin => munin, + :hddtemp => munin.tr("-:", "_") + ] end -disks.each do |disk| - if disk[:device] =~ %r{^cciss/(.*)$} - id = File.read("/sys/bus/cciss/devices/#{Regexp.last_match[1]}/unique_id").chomp +disks = disks.compact - disk[:munin] = "cciss-3#{id.downcase}" - else - disk[:munin] = disk[:device] - end +if disks.count.positive? + package "smartmontools" - if disk[:id] - disk[:munin] = "#{disk[:munin]}-#{disk[:id].to_s.tr('/', ':')}" + template "/usr/local/bin/smartd-mailer" do + source "smartd-mailer.erb" + owner "root" + group "root" + mode 0o755 end - disk[:hddtemp] = disk[:munin].tr("-:", "_") -end - -if disks.count > 0 - package "smartmontools" - template "/etc/smartd.conf" do source "smartd.conf.erb" owner "root" group "root" - mode 0644 + mode 0o644 variables :disks => disks - notifies :reload, "service[smartmontools]" end template "/etc/default/smartmontools" do source "smartmontools.erb" owner "root" group "root" - mode 0644 - notifies :restart, "service[smartmontools]" + mode 0o644 end - service "smartmontools" do + service "smartd" do action [:enable, :start] - supports :status => true, :restart => true, :reload => true + subscribes :reload, "template[/etc/smartd.conf]" + subscribes :restart, "template[/etc/default/smartmontools]" end # Don't try and do munin monitoring of disks behind # 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[:driver] == "areca" } + disks = disks.reject { |disk| disk[:smart]&.start_with?("areca,") } disks.each do |disk| munin_plugin "smart_#{disk[:munin]}" do @@ -424,18 +394,21 @@ if disks.count > 0 conf_variables :disk => disk end end +else + service "smartd" do + action [:stop, :disable] + end +end +if disks.count.positive? munin_plugin "hddtemp_smartctl" do conf "munin.hddtemp.erb" conf_variables :disks => disks end else - service "smartmontools" do - action [:stop, :disable] - end - munin_plugin "hddtemp_smartctl" do action :delete + conf "munin.hddtemp.erb" end end @@ -445,6 +418,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 @@ -458,7 +432,7 @@ if File.exist?("/etc/mdadm/mdadm.conf") file "/etc/mdadm/mdadm.conf" do owner "root" group "root" - mode 0644 + mode 0o644 content mdadm_conf end @@ -472,21 +446,12 @@ template "/etc/modules" do source "modules.erb" owner "root" group "root" - mode 0644 + mode 0o644 end -if node[:lsb][:release].to_f <= 12.10 - service "module-init-tools" do - provider Chef::Provider::Service::Upstart - action :nothing - subscribes :start, "template[/etc/modules]" - end -else - service "kmod" do - provider Chef::Provider::Service::Upstart - action :nothing - subscribes :start, "template[/etc/modules]" - end +service "kmod" do + action :nothing + subscribes :start, "template[/etc/modules]" end if node[:hardware][:watchdog] @@ -496,7 +461,7 @@ if node[:hardware][:watchdog] source "watchdog.erb" owner "root" group "root" - mode 0644 + mode 0o644 variables :module => node[:hardware][:watchdog] end @@ -508,6 +473,30 @@ end unless Dir.glob("/sys/class/hwmon/hwmon*").empty? package "lm-sensors" + Dir.glob("/sys/devices/platform/coretemp.*").each do |coretemp| + cpu = File.basename(coretemp).sub("coretemp.", "").to_i + chip = format("coretemp-isa-%04d", cpu) + + temps = if File.exist?("#{coretemp}/name") + Dir.glob("#{coretemp}/temp*_input").map do |temp| + File.basename(temp).sub("temp", "").sub("_input", "").to_i + end.sort + else + Dir.glob("#{coretemp}/hwmon/hwmon*/temp*_input").map do |temp| + File.basename(temp).sub("temp", "").sub("_input", "").to_i + end.sort + end + + if temps.first == 1 + node.default[:hardware][:sensors][chip][:temps][:temp1][:label] = "CPU #{cpu}" + temps.shift + end + + temps.each_with_index do |temp, index| + node.default[:hardware][:sensors][chip][:temps]["temp#{temp}"][:label] = "CPU #{cpu} Core #{index}" + end + end + execute "/etc/sensors.d/chef.conf" do action :nothing command "/usr/bin/sensors -s" @@ -519,7 +508,7 @@ unless Dir.glob("/sys/class/hwmon/hwmon*").empty? source "sensors.conf.erb" owner "root" group "root" - mode 0644 + mode 0o644 notifies :run, "execute[/etc/sensors.d/chef.conf]" end end