X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0b5222cd7e08c5c8fdcd7cfada9f75ecc1c7a4e2..a4c4a8a5a8cde7f9bf91ae49a9dc1ce23e77293b:/cookbooks/hardware/templates/default/ohai.rb.erb?ds=inline diff --git a/cookbooks/hardware/templates/default/ohai.rb.erb b/cookbooks/hardware/templates/default/ohai.rb.erb index f6b854c99..a2eb0ef96 100644 --- a/cookbooks/hardware/templates/default/ohai.rb.erb +++ b/cookbooks/hardware/templates/default/ohai.rb.erb @@ -253,19 +253,10 @@ Ohai.plugin(:Hardware) do end def find_md_arrays(devices) - controller = { - :id => devices[:controllers].count, - :type => "md", - :arrays => [], - :disks => [] - } - - devices[:controllers] << controller - array = nil File.new("/proc/mdstat", "r").each do |line| - if line =~ /^(md\d+) : active raid(\d+)((?: (?:sd[a-z]|nvme\d+n\d+)\d*\[\d+\](?:\([A-Z]\))*)+)$/ + if line =~ /^(md\d+) : active raid(\d+)((?: (?:sd[a-z]\d*|nvme\d+n\d+(?:p\d+)?)\[\d+\](?:\([A-Z]\))*)+)$/ array = { :id => devices[:arrays].count, :device => "/dev/#{Regexp.last_match(1)}", @@ -294,7 +285,6 @@ Ohai.plugin(:Hardware) do end devices[:arrays] << array - controller[:arrays] << array[:id] elsif array && line =~ /^\s+(\d+) blocks.*(?:\[([U_]+)\])?/ array[:size] = format_disk_size(Regexp.last_match(1).to_i) array[:status] = "degraded" if Regexp.last_match(2) =~ /_/ @@ -341,6 +331,7 @@ Ohai.plugin(:Hardware) do when "Hardware Revision" then controller[:hardware_version] = Regexp.last_match(2) when "Firmware Version" then controller[:firmware_version] = Regexp.last_match(2) when "PCI Address (Domain:Bus:Device.Function)" then controller[:pci_slot] = Regexp.last_match(2) + when "Battery/Capacitor Status" then controller[:battery_status] = Regexp.last_match(2).split.first.downcase end elsif controller && line =~ /^ Logical Drive: (\d+)$/ array = { @@ -413,6 +404,10 @@ Ohai.plugin(:Hardware) do end devices[:disks].each do |disk| + controller = disk[:controller] + + next unless devices[:controllers][controller][:type] == "hp" + disk[:smart_device] = "cciss,#{disks.find_index(disk[:location])}" if disk[:status] == "Failed" @@ -423,7 +418,7 @@ Ohai.plugin(:Hardware) do disk[:status] = "online" elsif disk[:status] == "OK" && disk[:drive_type] == "Spare Drive" disk[:status] = "hotspare" - elsif disk[:status] == "OK" && disk[:drive_type] == "Unassigned Drive" + elsif disk[:drive_type] == "Unassigned Drive" disk[:status] = "unconfigured" else disk[:status] = "unknown" @@ -436,6 +431,7 @@ Ohai.plugin(:Hardware) do def find_megaraid_disks(devices) controllers = [] arrays = [] + disks = [] controller = nil array = nil @@ -506,8 +502,11 @@ Ohai.plugin(:Hardware) do devices[:disks] << disk controller[:disks] << disk[:id] array[:disks] << disk[:id] - elsif disk && line =~ /^Firmware state:\s+(.*\S),\s*(.*\S)\s*$/ - case Regexp.last_match(1) + + disks << disk + elsif disk && line =~ /^Firmware state:\s+(\S.*)$/ + status, state = Regexp.last_match(1).split(/,\s*/) + case status when "Unconfigured(good)" then disk[:status] = "unconfigured" when "Unconfigured(bad)" then disk[:status] = "unconfigured" when "Hotspare" then disk[:status] = "hotspare" @@ -518,14 +517,14 @@ Ohai.plugin(:Hardware) do when "Copyback" then disk[:status] = "rebuilding" else disk[:status] = "unknown" end - case Regexp.last_match(2) + case state when "Spun Up" then disk[:state] = "spun_up" when "Spun down" then disk[:state] = "spun_down" else disk[:state] = "unknown" end elsif disk && line =~ /^(\S.*\S)\s*:\s+(\S.*)$/ case Regexp.last_match(1) - when "Device Id" then disk[:smart_device] = "megaraid,#{Regexp.last_match(2)}" + when "Device Id" then disk[:device_id] = Regexp.last_match(2) 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*\[.*\]$/, "")) @@ -555,7 +554,8 @@ Ohai.plugin(:Hardware) do controller = controllers[Regexp.last_match(1).to_i] elsif controller && line =~ /^Enclosure Device ID: \d+$/ disk = { - :controller => controller[:id] + :controller => controller[:id], + :arrays => [] } elsif disk && line =~ /^WWN:\s+(\S+)$/ unless devices[:disks].find { |d| d[:wwn] == Regexp.last_match(1) } @@ -563,9 +563,12 @@ Ohai.plugin(:Hardware) do disk[:wwn] = Regexp.last_match(1) devices[:disks] << disk + + disks << disk end - elsif disk && line =~ /^Firmware state:\s+(.*\S),\s*(.*\S)\s*$/ - case Regexp.last_match(1) + elsif disk && line =~ /^Firmware state:\s+(\S.*)$/ + status, state = Regexp.last_match(1).split(/,\s*/) + case status when "Unconfigured(good)" then disk[:status] = "unconfigured" when "Unconfigured(bad)" then disk[:status] = "unconfigured" when "Hotspare" then disk[:status] = "hotspare" @@ -576,14 +579,14 @@ Ohai.plugin(:Hardware) do when "Copyback" then disk[:status] = "rebuilding" else disk[:status] = "unknown" end - case Regexp.last_match(2) + case state when "Spun Up" then disk[:state] = "spun_up" when "Spun down" then disk[:state] = "spun_down" else disk[:state] = "unknown" end elsif disk && line =~ /^(\S.*\S)\s*:\s+(\S.*)$/ case Regexp.last_match(1) - when "Device Id" then disk[:smart_device] = "megaraid,#{Regexp.last_match(2)}" + when "Device Id" then disk[:device_id] = 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_number] = Regexp.last_match(2).split @@ -596,6 +599,18 @@ Ohai.plugin(:Hardware) do controller[:device] = "/dev/#{File.basename(device)}" end end + + disks.each do |disk| + controller = devices[:controllers][disk[:controller]] + + if id = disk.delete(:device_id) + if device = Dir.glob("/sys/bus/pci/devices/#{controller[:pci_slot]}/host*/target0:0:#{id}/0:0:#{id}:0/block/sd*").first + disk[:device] = "/dev/#{File.basename(device)}" + else + disk[:smart_device] = "megaraid,#{id}" + end + end + end end def find_mpt1_disks(devices)