X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2649213865c987de9551ba620c6031b306e63606..1a009f619cf5c96756ccaa1b8f14ddd9d4f34c0b:/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 1b08dbfc6..21790a804 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"
 
@@ -59,9 +61,10 @@ Ohai.plugin(:Hardware) do
   end
 
   def pci_devices
+    devices = {}
     device = nil
 
-    IO.popen(["lspci", "-Dkvmm"]).each_with_object(Mash.new) do |line, devices|
+    IO.popen(["lspci", "-Dkvmm"]).each do |line|
       if line =~ /^Slot:\s+((\h{4}):(\h{2}):(\h{2}).(\h))\s*$/
         device = {
           :slot => Regexp.last_match(1),
@@ -88,6 +91,24 @@ Ohai.plugin(:Hardware) do
         device = nil
       end
     end
+
+    IO.popen(["lspci", "-Dkvmmn"]).each do |line|
+      if line =~ /^Slot:\s+((\h{4}):(\h{2}):(\h{2}).(\h))\s*$/
+        device = devices[Regexp.last_match(1)]
+      elsif device && line =~ /^([A-Z]+):\s+(.*)\s*$/i
+        case Regexp.last_match(1)
+        when "Class" then device[:class_id] = Regexp.last_match(2)
+        when "Vendor" then device[:vendor_id] = Regexp.last_match(2)
+        when "Device" then device[:device_id] = Regexp.last_match(2)
+        when "SVendor" then device[:subsystem_vendor_id] = Regexp.last_match(2)
+        when "SDevice" then device[:subsystem_device_id] = Regexp.last_match(2)
+        end
+      elsif device && line =~ /^\s*$/
+        device = nil
+      end
+    end
+
+    devices
   end
 
   def network_devices
@@ -125,15 +146,43 @@ 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")
     find_mpt_disks(disk) if File.exist?("/usr/sbin/sas2ircu")
-    # aacraid
+    find_adaptec_disks(disk) if File.exist?("/usr/sbin/arcconf")
     find_areca_disks(disk) if File.exist?("/opt/areca/x86_64/cli64")
 
     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 +197,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_i * 512
-
-          if vendor == "ATA" && model =~ /^(\S+)\s+(.*)$/
-            vendor = Regexp.last_match(1)
-            model = Regexp.last_match(2)
-          end
+          size = read_sysctl_file("#{block}/size").to_f / 2
 
           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 +213,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 +263,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 +271,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 +333,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 +440,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 +470,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
@@ -488,6 +568,108 @@ Ohai.plugin(:Hardware) do
     end
   end
 
+  def find_adaptec_disks(devices)
+    controller_count = IO.popen(%w(arcconf getconfig 0)).first.scan(/^Controllers found: (\d+)$/).first.first.to_i
+
+    1.upto(controller_count).each do |controller_number|
+      controller = {
+        :id => devices[:controllers].count,
+        :number => controller_number,
+        :arrays => [],
+        :disks => []
+      }
+
+      devices[:controllers] << controller
+
+      arrays = []
+      disks = []
+
+      array = nil
+      disk = nil
+
+      IO.popen(["arcconf", "getconfig", controller_number.to_s]).each do |line|
+        if line =~ /^Logical device number (\d+)$/
+          array = {
+            :id => devices[:arrays].count,
+            :controller => controller[:id],
+            :number => Regexp.last_match(1).to_i,
+            :disks => []
+          }
+
+          devices[:arrays] << array
+          controller[:arrays] << array[:id]
+
+          arrays << array
+        elsif line =~ /^      Device #(\d+)$/
+          disk = nil
+        elsif line =~ /^         Device is a Hard drive$/
+          disk = {
+            :id => devices[:disks].count,
+            :controller => controller[:id],
+            :arrays => []
+          }
+
+          devices[:disks] << disk
+          controller[:disks] << disk[:id]
+
+          disks << disk
+        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(1)
+        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)
+          when "Vendor" then disk[:vendor] = Regexp.last_match(2)
+          when "Model" then disk[:model] = Regexp.last_match(2)
+          when "Firmware" then disk[:firmware_version] = Regexp.last_match(2)
+          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|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)
+          when "Size" then array[:size] = memory_to_disk_size(Regexp.last_match(2))
+          end
+        elsif line =~ /^   (\S.*\S)\s*:\s+(\S.*\S)\s*$/
+          case Regexp.last_match(1)
+          when "Controller Model" then controller[:model] = Regexp.last_match(2)
+          when "Controller Serial Number" then controller[:serial_number] = Regexp.last_match(2)
+          when "Controller World Wide Name" then controller[:wwn] = Regexp.last_match(2)
+          when "BIOS" then controller[:bios_version] = Regexp.last_match(2)
+          when "Firmware" then controller[:firmware_version] = Regexp.last_match(2)
+          end
+        end
+      end
+
+      host = Dir.glob("/sys/class/scsi_host/host*").find do |host|
+        read_sysctl_file("#{host}/serial_number") == controller[:serial_number]
+      end
+
+      arrays.each do |array|
+        array_number = array[:number]
+        device = Dir.glob("#{host}/device/target*:0:#{array_number}/*:0:#{array_number}:0/block/*").first
+
+        array[:device] = "/dev/#{File.basename(device)}"
+
+        array[:disks].map! do |location|
+          disk = disks.find { |disk| disk[:location] == location }
+
+          device_number = disk[:device_number]
+          device = Dir.glob("#{host}/device/target*:1:#{device_number}/*:1:#{device_number}:0/scsi_generic/*").first
+
+          disk[:device] = "/dev/#{File.basename(device)}"
+
+          disk[:arrays] << array[:id]
+          disk[:id]
+        end
+      end
+    end
+  end
+
   def find_areca_disks(devices)
     controller = {
       :id => devices[:controllers].count,
@@ -595,6 +777,41 @@ Ohai.plugin(:Hardware) do
     end
   end
 
+  def psu_devices
+    device = nil
+
+    IO.popen(["dmidecode", "-t", "39"]).each_with_object([]) do |line, devices|
+      if line =~ /^System Power Supply\s*$/
+        device = {}
+      elsif device && line =~ /^\s+([A-Z ]+):\s+(.*)\s*$/i
+        device[Regexp.last_match(1).tr(" ", "_").downcase.to_sym] = Regexp.last_match(2).strip
+      elsif device && line =~ /^\s*$/
+        devices << device
+        device = nil
+      end
+    end
+  end
+
+  def mc_device
+    device = {}
+
+    IO.popen(["ipmitool", "mc", "info"]).each_with_object([]) do |line, devices|
+      if line =~ /(Product [A-Z ]+[A-Z])\s*:\s+(.*\S)\s+\(.*\)\s*$/i
+        device[Regexp.last_match(1).tr(" ", "_").downcase.to_sym] = Regexp.last_match(2)
+      elsif line =~ /([A-Z ]+[A-Z])\s*:\s+(.*\S)\s*$/i
+        device[Regexp.last_match(1).tr(" ", "_").downcase.to_sym] = Regexp.last_match(2)
+      end
+    end
+
+    IO.popen(["ipmitool", "mc", "guid"]).each_with_object([]) do |line, devices|
+      if line =~ /^System GUID\s*:\s+(\S+)\s*$/
+        device[:system_guid] = Regexp.last_match(1)
+      end
+    end
+
+    device
+  end
+
   collect_data(:default) do
     hardware Mash.new
 
@@ -602,5 +819,7 @@ Ohai.plugin(:Hardware) do
     hardware[:network] = network_devices
     hardware[:memory] = memory_devices
     hardware[:disk] = disk_devices
+    hardware[:psu] = psu_devices
+    hardware[:mc] = mc_device
   end
 end