X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/fed88e97bda3be18be81caa624f2077f504bd6fd..d1523ca3533017306b1587db23638d188f2db524:/cookbooks/hardware/templates/default/ohai.rb.erb diff --git a/cookbooks/hardware/templates/default/ohai.rb.erb b/cookbooks/hardware/templates/default/ohai.rb.erb index e4678992c..87560b8dd 100644 --- a/cookbooks/hardware/templates/default/ohai.rb.erb +++ b/cookbooks/hardware/templates/default/ohai.rb.erb @@ -1,3 +1,5 @@ +require "pathname" + Ohai.plugin(:Hardware) do provides "hardware" @@ -125,6 +127,7 @@ Ohai.plugin(:Hardware) do disk[:disks] = [] find_direct_disks(disk) + find_nvme_disks(disk) find_hp_disks(disk) if File.exist?("/usr/sbin/hpssacli") find_megaraid_disks(disk) if File.exist?("/usr/sbin/megacli") @@ -134,6 +137,33 @@ Ohai.plugin(:Hardware) do find_md_arrays(disk) + disk[:disks].each do |disk| + if disk[:vendor] =~ /^CVPR/ && disk[:model] == "INTEL" + disk[:model] = disk[:serial_number] + disk[:serial_number] = disk[:vendor] + disk[:vendor] = "INTEL" + end + + if disk[:vendor].nil? && disk[:model] =~ /^ATA\s+(.*)$/ + disk[:vendor] = "ATA" + disk[:model] = Regexp.last_match(1) + end + + if disk[:vendor].nil? || disk[:vendor] == "ATA" + if disk[:model] =~ /^(\S+)\s+(.*)$/ + disk[:vendor] = Regexp.last_match(1) + disk[:model] = Regexp.last_match(2) + elsif disk[:model] =~ /^ST/ + disk[:vendor] = "SEAGATE" + elsif disk[:model] =~ /^C300-(.*)$/ + disk[:vendor] = "CRUCIAL" + disk[:model] = Regexp.last_match(1) + end + end + + disk[:model].sub!(/-.*$/, "") + end + disk end @@ -148,20 +178,13 @@ Ohai.plugin(:Hardware) do next unless File.exist?("#{device}/scsi_disk") block = Dir.glob("#{device}/block/*").first - vendor = read_sysctl_file("#{device}/vendor") - model = read_sysctl_file("#{device}/model") size = read_sysctl_file("#{block}/size").to_f / 2 - if vendor == "ATA" && model =~ /^(\S+)\s+(.*)$/ - vendor = Regexp.last_match(1) - model = Regexp.last_match(2) - end - devices[:disks] << { :id => devices[:disks].count, :device => "/dev/#{File.basename(block)}", - :vendor => vendor, - :model => model, + :vendor => read_sysctl_file("#{device}/vendor"), + :model => read_sysctl_file("#{device}/model"), :firmware_version => read_sysctl_file("#{device}/rev"), :size => format_disk_size(size), :arrays => [] @@ -171,11 +194,49 @@ Ohai.plugin(:Hardware) do end end + def find_nvme_disks(devices) + Dir.glob("/sys/class/misc/nvme*") do |device| + controller = { + :id => devices[:controllers].count, + :pci_slot => File.basename(Pathname.new("#{device}/device").realpath), + :arrays => [], + :disks => [] + } + + devices[:controllers] << controller + + IO.popen(["lspci", "-Dkvmm", "-s", controller[:pci_slot]]).each do |line| + if line =~ /^SVendor:\s+(\S.*\S)\s*$/ + controller[:vendor] = Regexp.last_match(1) + elsif line =~ /^SDevice:\s+(\S.*\S)\s*$/ + controller[:model] = Regexp.last_match(1) + end + end + + Dir.glob("#{device}/device/block/*").each do |block| + size = read_sysctl_file("#{block}/size").to_f / 2 + + disk = { + :id => devices[:disks].count, + :controller => controller[:id], + :device => "/dev/#{File.basename(block)}", + :vendor => controller[:vendor], + :model => controller[:model], + :size => format_disk_size(size), + :arrays => [] + } + + devices[:disks] << disk + controller[:disks] << disk[:id] + end + end + end + def find_md_arrays(devices) array = nil File.new("/proc/mdstat", "r").each do |line| - if line =~ /^(md\d+) : active raid(\d+)((?: [a-z]+\d+\[\d+\](?:\([A-Z]\))*)+)$/ + if line =~ /^(md\d+) : active raid(\d+)((?: (?:sd[a-z]|nvme\d+n\d+)\d*\[\d+\](?:\([A-Z]\))*)+)$/ array = { :id => devices[:arrays].count, :device => "/dev/#{Regexp.last_match(1)}", @@ -183,7 +244,7 @@ Ohai.plugin(:Hardware) do :disks => [] } - Regexp.last_match(3).scan(/ ([a-z]+)\d+\[\d+\](?:\([A-Z]\))*/).flatten.each do |device| + Regexp.last_match(3).scan(/ (sd[a-z]+|nvme\d+n\d+)\d*\[\d+\](?:\([A-Z]\))*/).flatten.each do |device| if disk = devices[:disks].find { |d| d[:device] == "/dev/#{device}" } disk[:arrays] << array[:id] array[:disks] << disk[:id] @@ -191,7 +252,7 @@ Ohai.plugin(:Hardware) do end devices[:arrays] << array - elsif line =~ /^\s+(\d+) blocks/ + elsif array && line =~ /^\s+(\d+) blocks/ array[:size] = format_disk_size(Regexp.last_match(1).to_i) end end @@ -253,16 +314,16 @@ Ohai.plugin(:Hardware) do devices[:disks] << disk controller[:disks] << disk[:id] array[:disks] << disk[:id] - elsif disk && line =~ /^ (\S[^:]+):\s+(.*)$/ + elsif disk && line =~ /^ (\S[^:]+):\s+(.*\S)\s*$/ case Regexp.last_match(1) when "Interface Type" then disk[:interface] = Regexp.last_match(2) when "Size" then disk[:size] = Regexp.last_match(2) when "Rotational Speed" then disk[:rpm] = Regexp.last_match(2) when "Firmware Revision" then disk[:firmware_version] = Regexp.last_match(2) when "Serial Number" then disk[:serial_number] = Regexp.last_match(2) - when "Model" then disk[:vendor], disk[:model] = Regexp.last_match(2).squeeze(" ").strip.sub(/^ATA /, "").split + when "Model" then disk[:model] = Regexp.last_match(2) end - elsif array && line =~ /^ (\S[^:]+):\s+(.*)$/ + elsif array && line =~ /^ (\S[^:]+):\s+(.*\S)\s*$/ case Regexp.last_match(1) when "Size" then array[:size] = Regexp.last_match(2) when "Fault Tolerance" then array[:raid_level] = Regexp.last_match(2) @@ -360,7 +421,7 @@ Ohai.plugin(:Hardware) do when "WWN" then disk[:wwn] = Regexp.last_match(2) when "PD Type" then disk[:interface] = Regexp.last_match(2) when "Raw Size" then disk[:size] = memory_to_disk_size(Regexp.last_match(2).sub(/\s*\[.*\]$/, "")) - when "Inquiry Data" then disk[:vendor], disk[:model], disk[:serial] = Regexp.last_match(2).split + when "Inquiry Data" then disk[:vendor], disk[:model], disk[:serial_number] = Regexp.last_match(2).split end elsif array && line =~ /^(\S.*\S)\s*:\s+(\S.*)$/ case Regexp.last_match(1) @@ -390,7 +451,7 @@ Ohai.plugin(:Hardware) do when "WWN" then disk[:wwn] = Regexp.last_match(2) when "PD Type" then disk[:interface] = Regexp.last_match(2) when "Raw Size" then disk[:size] = memory_to_disk_size(Regexp.last_match(2).sub(/\s*\[.*\]$/, "")) - when "Inquiry Data" then disk[:vendor], disk[:model], disk[:serial] = Regexp.last_match(2).split + when "Inquiry Data" then disk[:vendor], disk[:model], disk[:serial_number] = Regexp.last_match(2).split end end end @@ -521,11 +582,12 @@ Ohai.plugin(:Hardware) do arrays << array elsif line =~ /^ Device #(\d+)$/ + disk = nil + elsif line =~ /^ Device is a Hard drive$/ disk = { :id => devices[:disks].count, :controller => controller[:id], - :arrays => [], - :number => Regexp.last_match(1).to_i + :arrays => [] } devices[:disks] << disk @@ -544,9 +606,10 @@ Ohai.plugin(:Hardware) do when "Serial" then disk[:serial_number] = Regexp.last_match(2) when "World-wide name" then disk[:wwn] = Regexp.last_match(2) when "Total Size" then disk[:size] = memory_to_disk_size(Regexp.last_match(2)) + when "Size" then disk[:size] = memory_to_disk_size(Regexp.last_match(2)) end - elsif array && line =~ / Present \(Controller:\d+,Connector:(\d+),Device:(\d+)\) / - array[:disks] << "Connector #{Regexp.last_match(1)}, Device #{Regexp.last_match(2)}" + elsif array && line =~ / Present \(Controller:\d+,((?:Connector|Enclosure):\d+,(?:Device|Slot):\d+)\) / + array[:disks] << Regexp.last_match(1).tr(":", " ").gsub(",", ", ") elsif array && line =~ /^ (\S.*\S)\s*:\s+(\S.*\S)\s*$/ case Regexp.last_match(1) when "RAID level" then array[:raid_level] = Regexp.last_match(2)