From cad29d0634cd10b0ee94e5e4974210e0ca01ae6f Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 24 Jul 2022 15:02:01 +0100 Subject: [PATCH] Extend OHAI hardware plugin to gather disk and RAID array status --- .../hardware/templates/default/ohai.rb.erb | 185 +++++++++++++++--- 1 file changed, 159 insertions(+), 26 deletions(-) diff --git a/cookbooks/hardware/templates/default/ohai.rb.erb b/cookbooks/hardware/templates/default/ohai.rb.erb index c3308eb8c..5f1cee9d7 100644 --- a/cookbooks/hardware/templates/default/ohai.rb.erb +++ b/cookbooks/hardware/templates/default/ohai.rb.erb @@ -253,6 +253,15 @@ 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| @@ -260,20 +269,41 @@ Ohai.plugin(:Hardware) do array = { :id => devices[:arrays].count, :device => "/dev/#{Regexp.last_match(1)}", + :status => "optimal", :raid_level => Regexp.last_match(2), :disks => [] } - 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] + Regexp.last_match(3).split(" ").each do |member| + if member =~ /^(sd[a-z]+|nvme\d+n\d+).*/ + device = Regexp.last_match(1) + + if disk = devices[:disks].find { |d| d[:device] == "/dev/#{device}" } + if member =~ /\(F\)/ + disk[:status] = "failed" + elsif member =~ /\(S\)/ + disk[:status] = "hotspare" + else + disk[:status] = "online" + end + + disk[:arrays] << array[:id] + array[:disks] << disk[:id] + end end end devices[:arrays] << array - elsif array && line =~ /^\s+(\d+) blocks/ + 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) =~ /_/ + elsif array && line =~ /^\s+\[.*\]\s+(\S+)\s+=/ + case Regexp.last_match(1) + when "recovery" then array[:status] = "rebuilding" + when "resync" then array[:status] = "rebuilding" + when "checking" then array[:status] = "checking" + end end end end @@ -290,6 +320,7 @@ Ohai.plugin(:Hardware) do if line =~ /^Smart (?:Array|HBA) (\S+) / controller = { :id => devices[:controllers].count, + :type => "hp", :model => Regexp.last_match(1), :arrays => [], :disks => [] @@ -334,6 +365,8 @@ Ohai.plugin(:Hardware) do array[:disks] << disk[:id] elsif disk && line =~ /^ (\S[^:]+):\s+(.*\S)\s*$/ case Regexp.last_match(1) + when "Status" then disk[:status] = Regexp.last_match(2) + when "Drive Type" then disk[:drive_type] = Regexp.last_match(2) 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) @@ -341,10 +374,16 @@ Ohai.plugin(:Hardware) do when "Serial Number" then disk[:serial_number] = Regexp.last_match(2) when "Model" then disk[:model] = Regexp.last_match(2) end + elsif array && line =~ /^ Status:\s+(.*\S)\s*$/ + case Regexp.last_match(1) + when "OK" then array[:status] = "optimal" + else array[:status] = "unknown" + end 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) + when "Status" then array[:status] = Regexp.last_match(2) when "Disk Name" then array[:device] = Regexp.last_match(2).strip when "Mount Points" then array[:mount_point] = Regexp.last_match(2).split.first when "Unique Identifier" then array[:wwn] = Regexp.last_match(2) @@ -371,7 +410,19 @@ Ohai.plugin(:Hardware) do end devices[:disks].each do |disk| - disk[:smart_device] = "cciss,#{disks.find_index(disk[:location])}" + disk[:smart_device] = "cciss,#{disks.find_index(disk[:location])}" + + if disk[:status] == "Failed" + disk[:status] = "failed" + elsif disk[:status] == "OK" && disk[:drive_type] == "Data Drive" + disk[:status] = "online" + elsif disk[:status] == "OK" && disk[:drive_type] == "Spare Drive" + disk[:status] = "hotspare" + else + disk[:status] = "unknown" + end + + disk.delete(:drive_type) end end @@ -387,6 +438,7 @@ Ohai.plugin(:Hardware) do if line =~ /^PCI information for Controller (\d+)$/ controller = { :id => devices[:controllers].count, + :type => "megaraid", :arrays => [], :disks => [] } @@ -447,16 +499,22 @@ Ohai.plugin(:Hardware) do devices[:disks] << disk controller[:disks] << disk[:id] array[:disks] << disk[:id] - elsif disk && line =~ /^Firmware state:\s+(.*\S)\s*$/ - Regexp.last_match(1).split(/,\s*/).each do |state| - case state - when "Unconfigured(bad)" then disk[:status] = "unconfigured" - when "Online" then disk[:status] = "online" - when "Hotspare" then disk[:status] = "hotspare" - when "Failed" then disk[:status] = "failed" - when "Spun Up" then disk[:state] = "spun_up" - when "Spun down" then disk[:state] = "spun_down" - end + elsif disk && line =~ /^Firmware state:\s+(.*\S),\s*(.*\S)\s*$/ + case Regexp.last_match(1) + when "Unconfigured(good)" then disk[:status] = "unconfigured" + when "Unconfigured(bad)" then disk[:status] = "unconfigured" + when "Hotspare" then disk[:status] = "hotspare" + when "Offline" then disk[:status] = "offline" + when "Online" then disk[:status] = "online" + when "Rebuild" then disk[:status] = "rebuilding" + when "Failed" then disk[:status] = "failed" + when "Copyback" then disk[:status] = "rebuilding" + else disk[:status] = "unknown" + end + case Regexp.last_match(2) + 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) @@ -466,6 +524,17 @@ Ohai.plugin(:Hardware) do 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 end + elsif array && line =~ /^State\s*:\s+(.*\S)\s*$/ + case Regexp.last_match(1) + when "Partially Degraded" then array[:status] = "degraded" + when "Degraded" then array[:status] = "degraded" + when "Optimal" then array[:status] = "optimal" + when "Consistency Check" then array[:status] = "checking" + when "Background Initialization" then array[:status] = "initialising" + when "Initialization" then array[:status] = "initialising" + when "Reconstruction" then array[:status] = "rebuilding" + else array[:status] = "unknown" + end elsif array && line =~ /^(\S.*\S)\s*:\s+(\S.*)$/ case Regexp.last_match(1) when "RAID Level" then array[:raid_level] = Regexp.last_match(2).scan(/Primary-(\d+)/).first.first @@ -488,16 +557,22 @@ Ohai.plugin(:Hardware) do devices[:disks] << disk end - elsif disk && line =~ /^Firmware state:\s+(.*\S)\s*$/ - Regexp.last_match(1).split(/,\s*/).each do |state| - case state - when "Unconfigured(bad)" then disk[:status] = "unconfigured" - when "Online" then disk[:status] = "online" - when "Hotspare" then disk[:status] = "hotspare" - when "Failed" then disk[:status] = "failed" - when "Spun Up" then disk[:state] = "spun_up" - when "Spun down" then disk[:state] = "spun_down" - end + elsif disk && line =~ /^Firmware state:\s+(.*\S),\s*(.*\S)\s*$/ + case Regexp.last_match(1) + when "Unconfigured(good)" then disk[:status] = "unconfigured" + when "Unconfigured(bad)" then disk[:status] = "unconfigured" + when "Hotspare" then disk[:status] = "hotspare" + when "Offline" then disk[:status] = "offline" + when "Online" then disk[:status] = "online" + when "Rebuild" then disk[:status] = "rebuilding" + when "Failed" then disk[:status] = "failed" + when "Copyback" then disk[:status] = "rebuilding" + else disk[:status] = "unknown" + end + case Regexp.last_match(2) + 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) @@ -526,6 +601,7 @@ Ohai.plugin(:Hardware) do if line =~ /^\/proc\/mpt\/ioc(\d+)\s+LSI Logic\s+(\S+)\s+/ controller = { :id => devices[:controllers].count, + :type => "mpt1", :model => Regexp.last_match(1), :arrays => [], :disks => [] @@ -602,6 +678,7 @@ Ohai.plugin(:Hardware) do next unless line =~ /^\s+(\d+)\s+(\S+)\s+\h+h\s+\h+h\s+(\S+)\s+\h+h\s+\h+h\s*$/ controllers[Regexp.last_match(1).to_i] = { :id => devices[:controllers].count, + :type => "mpt2", :model => Regexp.last_match(2), :pci_slot => Regexp.last_match(3).sub(/^(\h{2})h:(\h{2})h:(\h{2})h:0(\h)h$/, "00\\1:\\2:\\3.\\4"), :arrays => [], @@ -642,6 +719,23 @@ Ohai.plugin(:Hardware) do controller[:disks] << disk[:id] disks << disk + elsif disk && line =~ /^ State\s+:\s+(.*\S)\s*$/ + Regexp.last_match(1).split(/,\s*/).each do |state| + case state + when "Online (ONL)" then disk[:status] = "online" + when "Hot Spare (HSP)" then disk[:status] = "hotspare" + when "Ready (RDY)" then disk[:status] = "unconfigured" + when "Available (AVL)" then disk[:status] = "unconfigured" + when "Failed (FLD)" then disk[:status] = "failed" + when "Missing (MIS)" then disk[:status] = "missing" + when "Standby (SBY)" then disk[:status] = "unconfigured" + when "Out of Sync (OSY)" then disk[:status] = "degraded" + when "Degraded (DGD)" then disk[:status] = "degraded" + when "Rebuilding (RBLD)" then disk[:status] = "rebuilding" + when "Optimal (OPT)" then disk[:status] = "online" + else disk[:status] = "unknown" + end + end elsif disk && line =~ /^ (\S.*\S)\s+:\s+(.*\S)\s*$/ case Regexp.last_match(1) when "Enclosure #" then disk[:location] = Regexp.last_match(2) @@ -656,6 +750,18 @@ Ohai.plugin(:Hardware) do end elsif array && line =~ /^ PHY\[\d+\] Enclosure#\/Slot#\s+:\s+(\d+:\d+)\s*$/ array[:disks] << Regexp.last_match(1) + elsif array && line =~ /^ Status of volume\s+:\s+(.*\S)\s*$/ + Regexp.last_match(1).split(/,\s*/).each do |state| + case state + when "Okay (OKY)" then array[:status] = "optimal" + when "Degraded (DGD)" then array[:status] = "degraded" + when "Failed (FLD)" then array[:status] = "failed" + when "Missing (MIS)" then array[:status] = "missing" + when "Initializing (INIT)" then array[:status] = "initialising" + when "Online (ONL)" then array[:status] = "optimal" + else array[:status] = "unknown" + end + end elsif array && line =~ /^ (\S.*\S)\s+:\s+(.*\S)\s*$/ case Regexp.last_match(1) when "Volume wwid" then array[:device] = find_sas_device(Regexp.last_match(2)) @@ -688,6 +794,7 @@ Ohai.plugin(:Hardware) do controller = { :id => devices[:controllers].count, :number => controller_number, + :type => "adaptec", :arrays => [], :disks => [] } @@ -729,6 +836,16 @@ Ohai.plugin(:Hardware) do elsif disk && line =~ /^ Reported Channel,Device\(T:L\)\s*:\s+(\d+),(\d+)\(\d+:0\)\s*$/ disk[:channel_number] = Regexp.last_match(1) disk[:device_number] = Regexp.last_match(2) + elsif disk && line =~ /^ State\s*:\s+(\S.*\S)\s*$/ + case Regexp.last_match(1) + when "Online" then disk[:status] = "online" + when "Online (JBOD)" then disk[:status] = "online" + when "Hot Spare" then disk[:status] = "hotspare" + when "Ready" then disk[:status] = "unconfigured" + when "Global Hot-Spare" then disk[:status] = "hostspare" + when "Dedicated Hot-Spare" then disk[:status] = "hotspare" + else disk[:status] = "unknown" + end elsif disk && line =~ /^ (\S.*\S)\s*:\s+(\S.*\S)\s*$/ case Regexp.last_match(1) when "Reported Location" then disk[:location] = Regexp.last_match(2) @@ -744,6 +861,11 @@ Ohai.plugin(:Hardware) do end elsif array && line =~ / Present \(.*((?:Connector|Enclosure):\d+,\s*(?:Device|Slot):\d+)\) / array[:disks] << Regexp.last_match(1).tr(":", " ").gsub(/,\s*/, ", ") + elsif array && line =~ /^ Status of Logical Device\s*:\s+(\S.*\S)\s*$/ + case Regexp.last_match(1) + when "Optimal" then array[:status] = "optimal" + else array[:status] = "unknown" + end 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) @@ -792,6 +914,7 @@ Ohai.plugin(:Hardware) do def find_areca_disks(devices) controller = { :id => devices[:controllers].count, + :type => "areca", :arrays => [], :disks => [] } @@ -844,6 +967,11 @@ Ohai.plugin(:Hardware) do device = Dir.glob("/sys/bus/pci/devices/#{pci_slot}/host*/target*:0:0/0:#{channel}:#{id}:#{lun}/block/*").first array[:device] = "/dev/#{File.basename(device)}" + elsif line =~ /^Volume State\s+:\s+(.*\S)\s*$/ + case Regexp.last_match(1) + when "Normal" then array[:status] = "optimal" + else array[:status] = "unknown" + end elsif line =~ /^(\S.*\S)\s+:\s+(.*\S)\s*$/ case Regexp.last_match(1) when "Volume Set Name" then array[:volume_set] = Regexp.last_match(2) @@ -885,6 +1013,11 @@ Ohai.plugin(:Hardware) do disk[:smart_device] = "areca,#{Regexp.last_match(1)}" elsif line =~ /^Device Location\s+:\s+Enclosure#(\d+) Slot#?\s*0*(\d+)\s*$/i disk[:smart_device] = "areca,#{Regexp.last_match(2)}/#{Regexp.last_match(1)}" + elsif line =~ /^Device State\s+:\s+(.*\S)\s*$/ + case Regexp.last_match(1) + when "NORMAL" then disk[:status] = "online" + else disk[:status] = "unknown" + end elsif line =~ /^(\S.*\S)\s+:\s+(.*\S)\s*$/ case Regexp.last_match(1) when "Model Name" then disk[:vendor], disk[:model] = Regexp.last_match(2).split -- 2.43.2