X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7c971436c2db59a460cf84080b0fd7bb67c3df1e..036734d15e6cd4fbc57e031ceca870f6c90e53bf:/cookbooks/hardware/recipes/default.rb?ds=inline diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb index 2938b763c..d7c508d9a 100644 --- a/cookbooks/hardware/recipes/default.rb +++ b/cookbooks/hardware/recipes/default.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: hardware +# Cookbook:: hardware # Recipe:: default # -# Copyright 2012, OpenStreetMap Foundation +# Copyright:: 2012, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # 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, @@ -17,17 +17,26 @@ # limitations under the License. # -include_recipe "tools" +include_recipe "apt" +include_recipe "git" include_recipe "munin" +include_recipe "prometheus" +include_recipe "sysfs" +include_recipe "tools" -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 "AuthenticAMD" - if node[:lsb][:release].to_f >= 14.04 +if platform?("debian") + package "firmware-linux" +end + +if node[:cpu] && node[:cpu][:"0"] && node[:cpu][:"0"][:vendor_id] + case node[:cpu][:"0"][:vendor_id] + when "GenuineIntel" + package "intel-microcode" + when "AuthenticAMD" package "amd64-microcode" end end @@ -46,78 +55,105 @@ else product = "Unknown" end +units = [] + +if node[:roles].include?("bytemark") || node[:roles].include?("exonetric") || node[:roles].include?("prgmr") + units << "0" +end + case manufacturer -when "HP" +when "HP", "HPE" + include_recipe "apt::management-component-pack" + 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" + execute "update-ilo" do + action :nothing + command "/usr/sbin/hponcfg -f /etc/ilo-defaults.xml" + not_if { kitchen? } + end - git "/opt/hp/hp-legacy" do - action :sync - repository "git://chef.openstreetmap.org/hp-legacy.git" - user "root" + template "/etc/ilo-defaults.xml" do + source "ilo-defaults.xml.erb" + owner "root" group "root" - ignore_failure true + mode "644" + notifies :run, "execute[update-ilo]" end - link "/opt/hp/hp-health/bin/hpasmd" do - to "/opt/hp/hp-legacy/hpasmd" + package "hp-health" do + action :install + notifies :restart, "service[hp-health]" + only_if { platform?("ubuntu") && node[:lsb][:release].to_f < 22.04 } end - link "/usr/lib/libhpasmintrfc.so.3.0" do - to "/opt/hp/hp-legacy/libhpasmintrfc.so.3.0" + service "hp-health" do + action [:enable, :start] + supports :status => true, :restart => true + only_if { platform?("ubuntu") && node[:lsb][:release].to_f < 22.04 } end - link "/usr/lib/libhpasmintrfc.so.3" do - to "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" do - to "libhpasmintrfc.so.3.0" + service "hp-ams" do + action [:enable, :start] + supports :status => true, :restart => true + end + elsif product.end_with?("Gen10") + package "amsd" do + action :install + notifies :restart, "service[amsd]" + end + + service "amsd" do + action [:enable, :start] + supports :status => true, :restart => true + end end -end -unless unit.nil? - file "/etc/init/ttySttyS#{unit}.conf" do + units << if product.end_with?("Gen10") + "0" + else + "1" + end +when "TYAN" + units << "0" +when "TYAN Computer Corporation" + units << "0" +when "Supermicro" + units << "1" +when "IBM" + units << "0" +when "VMware, Inc." + package "open-vm-tools" + + # Remove timeSync plugin completely + # https://github.com/vmware/open-vm-tools/issues/302 + file "/usr/lib/open-vm-tools/plugins/vmsvc/libtimeSync.so" do action :delete + notifies :restart, "service[open-vm-tools]" end - template "/etc/init/ttyS#{unit}.conf" do - source "tty.conf.erb" - owner "root" - group "root" - mode 0644 - variables :unit => unit, :speed => speed + # Attempt to tell Host we are not interested in timeSync + execute "vmware-toolbox-cmd-timesync-disable" do + command "/usr/bin/vmware-toolbox-cmd timesync disable" + ignore_failure true + end + + service "open-vm-tools" do + action [:enable, :start] + supports :status => true, :restart => true end +end - service "ttyS#{unit}" do - provider Chef::Provider::Service::Upstart +units.sort.uniq.each do |unit| + service "serial-getty@ttyS#{unit}" do action [:enable, :start] - supports :status => true, :restart => true, :reload => false - subscribes :restart, "template[/etc/init/ttyS#{unit}.conf]" + not_if { kitchen? } end end @@ -131,6 +167,7 @@ if node[:hardware][:grub][:kernel] 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 @@ -143,18 +180,21 @@ if File.exist?("/etc/default/grub") execute "update-grub" do action :nothing command "/usr/sbin/update-grub" + not_if { kitchen? } end template "/etc/default/grub" do source "grub.erb" owner "root" group "root" - mode 0644 - variables :unit => unit, :speed => speed, :entry => grub_entry + mode "644" + variables :units => units, :entry => grub_entry notifies :run, "execute[update-grub]" end end +package "initramfs-tools" + execute "update-initramfs" do action :nothing command "update-initramfs -u -k all" @@ -166,80 +206,127 @@ template "/etc/initramfs-tools/conf.d/mdadm" do source "initramfs-mdadm.erb" owner "root" group "root" - mode 0644 + mode "644" notifies :run, "execute[update-initramfs]" end -package "haveged" -service "haveged" do - action [:enable, :start] +# haveged is only required on older kernels +# /dev/random is not blocking anymore in 5.15+ +if Chef::Util.compare_versions(node[:kernel][:release], [5, 15]).negative? + package "haveged" + service "haveged" do + action [:enable, :start] + end +else + service "haveged" do + action [:stop, :disable] + end + package "haveged" do + action :remove + end end if node[:kernel][:modules].include?("ipmi_si") package "ipmitool" -end - -if node[:lsb][:release].to_f >= 12.10 - package "irqbalance" + package "freeipmi-tools" - template "/etc/default/irqbalance" do - source "irqbalance.erb" + template "/etc/prometheus/ipmi_local.yml" do + source "ipmi_local.yml.erb" owner "root" group "root" - mode 0644 + mode "644" end - service "irqbalance" do - action [:start, :enable] - supports :status => false, :restart => true, :reload => false - subscribes :restart, "template[/etc/default/irqbalance]" + prometheus_exporter "ipmi" do + port 9290 + user "root" + private_devices false + protect_clock false + system_call_filter ["@system-service", "@raw-io"] + options "--config.file=/etc/prometheus/ipmi_local.yml" + subscribes :restart, "template[/etc/prometheus/ipmi_local.yml]" end end +package "irqbalance" + +service "irqbalance" do + action [:start, :enable] + supports :status => false, :restart => true, :reload => false +end + +package "lldpd" + +service "lldpd" do + action [:start, :enable] + supports :status => true, :restart => true, :reload => true +end + +ohai_plugin "lldp" do + template "lldp.rb.erb" +end + +package %w[ + rasdaemon + ruby-sqlite3 +] + +service "rasdaemon" do + action [:enable, :start] +end + +prometheus_exporter "rasdaemon" do + port 9797 + user "root" +end + tools_packages = [] status_packages = {} -node[:kernel][:modules].each_key do |modname| - case modname - when "cciss" - tools_packages << "hpssacli" - status_packages["cciss-vol-status"] ||= [] - when "hpsa" - tools_packages << "hpssacli" - status_packages["cciss-vol-status"] ||= [] - when "mptsas" - tools_packages << "lsiutil" - # status_packages["mpt-status"] ||= [] - when "mpt2sas", "mpt3sas" - tools_packages << "sas2ircu" - status_packages["sas2ircu-status"] ||= [] - when "megaraid_mm" - tools_packages << "megactl" - status_packages["megaraid-status"] ||= [] - when "megaraid_sas" - tools_packages << "megacli" - status_packages["megaclisas-status"] ||= [] - when "aacraid" - tools_packages << "arcconf" - status_packages["aacraid-status"] ||= [] - when "arcmsr" - tools_packages << "areca" - end -end - -node[:block_device].each do |name, attributes| - next unless attributes[:vendor] == "HP" && attributes[:model] == "LOGICAL VOLUME" - - if name =~ /^cciss!(c[0-9]+)d[0-9]+$/ - status_packages["cciss-vol-status"] |= ["cciss/#{Regexp.last_match[1]}d0"] - else - Dir.glob("/sys/block/#{name}/device/scsi_generic/*").each do |sg| - status_packages["cciss-vol-status"] |= [File.basename(sg)] +if node[:virtualization][:role] != "guest" || + (node[:virtualization][:system] != "lxc" && + node[:virtualization][:system] != "lxd" && + node[:virtualization][:system] != "openvz") + + node[:kernel][:modules].each_key do |modname| + case modname + when "cciss" + tools_packages << "ssacli" + status_packages["cciss-vol-status"] ||= [] + when "hpsa" + tools_packages << "ssacli" + status_packages["cciss-vol-status"] ||= [] + when "mptsas" + tools_packages << "lsiutil" + status_packages["mpt-status"] ||= [] + when "mpt2sas", "mpt3sas" + tools_packages << "sas2ircu" + status_packages["sas2ircu-status"] ||= [] + when "megaraid_sas" + tools_packages << "megacli" + status_packages["megaclisas-status"] ||= [] + when "aacraid" + tools_packages << "arcconf" + status_packages["aacraid-status"] ||= [] + when "arcmsr" + tools_packages << "areca" + end + end + + node[:block_device].each do |name, attributes| + next unless attributes[:vendor] == "HP" && attributes[:model] == "LOGICAL VOLUME" + + if name =~ /^cciss!(c[0-9]+)d[0-9]+$/ + status_packages["cciss-vol-status"] |= ["cciss/#{Regexp.last_match[1]}d0"] + else + Dir.glob("/sys/block/#{name}/device/scsi_generic/*").each do |sg| + status_packages["cciss-vol-status"] |= [File.basename(sg)] + end end 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 @@ -254,9 +341,11 @@ 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" + depth 1 user "root" group "root" + not_if { kitchen? } end else directory "/opt/areca" do @@ -265,185 +354,188 @@ else end end -["cciss-vol-status", "mpt-status", "sas2ircu-status", "megaraid-status", "megaclisas-status", "aacraid-status"].each do |status_package| +include_recipe "apt::hwraid" unless status_packages.empty? + +%w[cciss-vol-status mpt-status sas2ircu-status megaclisas-status aacraid-status].each do |status_package| if status_packages.include?(status_package) package status_package - template "/etc/default/#{status_package}d" do - source "raid.default.erb" - owner "root" - group "root" - mode 0644 - variables :devices => status_packages[status_package] + service "#{status_package}d" do + action [:stop, :disable] end - service "#{status_package}d" do - action [:start, :enable] - supports :status => false, :restart => true, :reload => false - subscribes :restart, "template[/etc/default/#{status_package}d]" + file "/etc/default/#{status_package}d" do + action :delete end else package status_package do action :purge end - - file "/etc/default/#{status_package}d" do - action :delete - end end end -disks = [] - -node[:block_device].each do |name, attributes| - disks << { :device => name } if attributes[:vendor] == "ATA" +systemd_service "cciss-vol-statusd" do + action :delete 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 +template "/usr/local/bin/cciss-vol-statusd" do + action :delete end -if status_packages["megaclisas-status"] - controller = 0 - - Dir.glob("/sys/class/scsi_host/host*") do |host| - driver = File.new("#{host}/proc_name").read.chomp - - next unless driver == "megaraid_sas" - - bus = host.sub("/sys/class/scsi_host/host", "") - device = File.basename(Dir.glob("/sys/bus/scsi/devices/#{bus}:*/scsi_generic/*").first) +disks = if node[:hardware][:disk] + node[:hardware][:disk][:disks] + else + [] + end - 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]+)$/ +intel_ssds = disks.select { |d| d[:vendor] == "INTEL" && d[:model] =~ /^SSD/ } - disks.pop if line =~ /^Firmware state: Hotspare, Spun down$/ - end +nvmes = if node[:hardware][:pci] + node[:hardware][:pci].values.select { |pci| pci[:driver] == "nvme" } + else + [] + end - controller += 1 - end +unless nvmes.empty? + package "nvme-cli" 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" +intel_nvmes = nvmes.select { |pci| pci[:vendor_name] == "Intel Corporation" } - 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 - end -end +if !intel_ssds.empty? || !intel_nvmes.empty? + package "unzip" -if status_packages["sas2ircu-status"] - Dir.glob("/sys/class/scsi_host/host*") do |host| - driver = File.new("#{host}/proc_name").read.chomp + sst_tool_version = "1.3" + sst_package_version = "#{sst_tool_version}.208-0" - next unless driver == "mpt2sas" || driver == "mpt3sas" + # remote_file "#{Chef::Config[:file_cache_path]}/SST_CLI_Linux_#{sst_tool_version}.zip" do + # source "https://downloadmirror.intel.com/743764/SST_CLI_Linux_#{sst_tool_version}.zip" + # end - bus = host.sub("/sys/class/scsi_host/host", "") + execute "#{Chef::Config[:file_cache_path]}/SST_CLI_Linux_#{sst_tool_version}.zip" do + command "unzip SST_CLI_Linux_#{sst_tool_version}.zip sst_#{sst_package_version}_amd64.deb" + cwd Chef::Config[:file_cache_path] + user "root" + group "root" + not_if { ::File.exist?("#{Chef::Config[:file_cache_path]}/sst_#{sst_package_version}_amd64.deb") } + end - Dir.glob("/sys/bus/scsi/devices/#{bus}:0:*/scsi_generic/*").each do |sg| - next if File.directory?("#{sg}/../../block") + dpkg_package "sst" do + version "#{sst_package_version}" + source "#{Chef::Config[:file_cache_path]}/sst_#{sst_package_version}_amd64.deb" + end - disks << { :device => File.basename(sg) } - end + dpkg_package "intelmas" do + action :purge 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]) + + if disk[:smart_device] + controller = node[:hardware][:disk][:controllers][disk[:controller]] - next unless driver == "aacraid" + if controller && controller[:device] + device = controller[:device].sub("/dev/", "") + smart = disk[:smart_device] - bus = host.sub("/sys/class/scsi_host/host", "") + 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 + elsif disk[:device] + device = disk[: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 smart =~ /^.*,(\d+),(\d+),(\d+)$/ + munin = "#{device}-#{Regexp.last_match(1)}:#{Regexp.last_match(2)}:#{Regexp.last_match(3)}" + end end + elsif disk[:device] =~ %r{^/dev/(nvme\d+)n\d+$} + device = Regexp.last_match(1) + munin = device + 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 - IO.popen(["/opt/areca/x86_64/cli64", "disk", "info"]).each do |line| - next if line =~ /N\.A\./ + next if device.nil? || munin.nil? - 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.uniq - 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 "/etc/cron.daily/update-smart-drivedb" do + source "update-smart-drivedb.erb" + owner "root" + group "root" + mode "755" end - disk[:hddtemp] = disk[:munin].tr("-:", "_") -end - -if disks.count > 0 - package "smartmontools" - template "/usr/local/bin/smartd-mailer" do source "smartd-mailer.erb" owner "root" group "root" - mode 0755 + mode "755" end template "/etc/smartd.conf" do source "smartd.conf.erb" owner "root" group "root" - mode 0644 + mode "644" 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 "644" end service "smartmontools" do action [:enable, :start] - supports :status => true, :restart => true, :reload => true + subscribes :reload, "template[/etc/smartd.conf]" + subscribes :restart, "template[/etc/default/smartmontools]" + end + + template "/etc/prometheus/collectors/smart.devices" do + source "smart.devices.erb" + owner "root" + group "root" + mode "644" + variables :disks => disks + end + + prometheus_collector "smart" do + interval "15m" + user "root" + capability_bounding_set %w[CAP_DAC_OVERRIDE CAP_SYS_ADMIN CAP_SYS_RAWIO] + private_devices false + private_users false + protect_clock false 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 @@ -452,18 +544,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 @@ -473,6 +568,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 @@ -486,34 +582,30 @@ if File.exist?("/etc/mdadm/mdadm.conf") file "/etc/mdadm/mdadm.conf" do owner "root" group "root" - mode 0644 + mode "644" content mdadm_conf end - service "mdadm" do + service "mdmonitor" do action :nothing subscribes :restart, "file[/etc/mdadm/mdadm.conf]" end end -template "/etc/modules" do - source "modules.erb" - owner "root" - group "root" - mode 0644 +file "/etc/modules" do + action :delete 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]" +node[:hardware][:modules].each do |module_name| + kernel_module module_name do + action :install + not_if { kitchen? } end -else - service "kmod" do - provider Chef::Provider::Service::Upstart - action :nothing - subscribes :start, "template[/etc/modules]" +end + +node[:hardware][:blacklisted_modules].each do |module_name| + kernel_module module_name do + action :blacklist end end @@ -524,7 +616,7 @@ if node[:hardware][:watchdog] source "watchdog.erb" owner "root" group "root" - mode 0644 + mode "644" variables :module => node[:hardware][:watchdog] end @@ -536,6 +628,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" @@ -547,7 +663,35 @@ unless Dir.glob("/sys/class/hwmon/hwmon*").empty? source "sensors.conf.erb" owner "root" group "root" - mode 0644 + mode "644" notifies :run, "execute[/etc/sensors.d/chef.conf]" end end + +if node[:hardware][:shm_size] + execute "remount-dev-shm" do + action :nothing + command "/bin/mount -o remount /dev/shm" + user "root" + group "root" + end + + mount "/dev/shm" do + action :enable + device "tmpfs" + fstype "tmpfs" + options "rw,nosuid,nodev,size=#{node[:hardware][:shm_size]}" + notifies :run, "execute[remount-dev-shm]" + end +end + +prometheus_collector "ohai" do + interval "15m" + user "root" + proc_subset "all" + capability_bounding_set %w[CAP_DAC_OVERRIDE CAP_SYS_ADMIN CAP_SYS_RAWIO] + private_devices false + private_users false + protect_clock false + protect_kernel_modules false +end