X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/28ef86a7ff052e69635caead95e42144ed93f846..412384fe580f11cb8478db079c19da97115f3193:/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 1f0a90fb6..2874f3d65 100644
--- a/cookbooks/hardware/templates/default/ohai.rb.erb
+++ b/cookbooks/hardware/templates/default/ohai.rb.erb
@@ -11,11 +11,47 @@ Ohai.plugin(:Hardware) do
   rescue Errno::ENOENT, Errno::EINVAL
   end
 
-  def parse_disk_size(size)
-    if size =~ /^(\d+(?:\.\d+))?\s*TB/i
-      format "%dTB", Regexp.last_match(1).to_f * 2**40 / 1_000_000_000_000
-    elsif size =~ /^(\d+(?:\.\d+))?\s*GB/i
-      format "%dGB", Regexp.last_match(1).to_f * 2**30 / 1000000000
+  def parse_memory_size(size)
+    if size =~ /^(\d+(?:\.\d+)?)\s*TB/i
+      Regexp.last_match(1).to_f * 2**30
+    elsif size =~ /^(\d+(?:\.\d+)?)\s*GB/i
+      Regexp.last_match(1).to_f * 2**20
+    elsif size =~ /^(\d+(?:\.\d+)?)\s*MB/i
+      Regexp.last_match(1).to_f * 2**10
+    end
+  end
+
+  def format_disk_size(kb)
+    if kb == 0
+      ""
+    else
+      kblog10 = Math.log10(kb)
+
+      if kblog10 >= 9
+        format "%gTB", 10**(kblog10 - 9)
+      elsif kblog10 >= 6
+        format "%dGB", 10**(kblog10 - 6)
+      else
+        format "%dMB", 10**(kblog10 - 3)
+      end
+    end
+  end
+
+  def memory_to_disk_size(size)
+    format_disk_size(parse_memory_size(size))
+  end
+
+  def find_sas_device(address)
+    file = Dir.glob("/sys/class/scsi_generic/sg*/device/sas_address").find do |file|
+      read_sysctl_file(file) == "0x#{address}"
+    end
+
+    if file
+      dir = File.dirname(file)
+      device = Dir.glob("#{dir}/block/*").first ||
+               Dir.glob("#{dir}/scsi_generic/*").first
+
+      "/dev/#{File.basename(device)}"
     end
   end
 
@@ -89,6 +125,7 @@ Ohai.plugin(:Hardware) do
 
     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
     # areca (/opt/areca/x86_64/cli64)
 
@@ -101,8 +138,7 @@ Ohai.plugin(:Hardware) do
     Dir.glob("/sys/class/scsi_host/host*") do |host|
       driver = read_sysctl_file("#{host}/proc_name")
 
-      if driver == "ahci" || driver == "mptsas" ||
-         driver == "mpt2sas" || driver == "mpt3sas"
+      if driver == "ahci" || driver == "mptsas"
         bus = host.sub("/sys/class/scsi_host/host", "")
 
         Dir.glob("/sys/bus/scsi/devices/#{bus}:0:*").each do |device|
@@ -118,19 +154,13 @@ Ohai.plugin(:Hardware) do
             model = Regexp.last_match(2)
           end
 
-          if size > 1_000_000_000_000
-            size = format "%d TB", size / 1_000_000_000_000
-          elsif size > 1000000000
-            size = format "%d GB", size / 1000000000
-          end
-
           devices[:disks] << {
             :id => devices[:disks].count,
             :device => "/dev/#{File.basename(block)}",
             :vendor => vendor,
             :model => model,
             :firmware_version => read_sysctl_file("#{device}/rev"),
-            :size => size,
+            :size => format_disk_size(size),
             :arrays => []
           }
         end
@@ -139,24 +169,28 @@ Ohai.plugin(:Hardware) do
   end
 
   def find_md_arrays(devices)
-    File.new("/proc/mdstat", "r").each do |line|
-      next unless line =~ /^(md\d+) : active raid(\d+)((?: [a-z]+\d+\[\d+\](?:\([A-Z]\))*)+)$/
+    array = nil
 
-      array = {
-        :id => devices[:arrays].count,
-        :device => "/dev/#{Regexp.last_match(1)}",
-        :raid_level => Regexp.last_match(2),
-        :disks => []
-      }
+    File.new("/proc/mdstat", "r").each do |line|
+      if line =~ /^(md\d+) : active raid(\d+)((?: [a-z]+\d+\[\d+\](?:\([A-Z]\))*)+)$/
+        array = {
+          :id => devices[:arrays].count,
+          :device => "/dev/#{Regexp.last_match(1)}",
+          :raid_level => Regexp.last_match(2),
+          :disks => []
+        }
 
-      Regexp.last_match(3).scan(/ ([a-z]+)\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).scan(/ ([a-z]+)\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]
+          end
         end
-      end
 
-      devices[:arrays] << array
+        devices[:arrays] << array
+      elsif line =~ /^\s+(\d+) blocks/
+        array[:size] = format_disk_size(Regexp.last_match(1).to_i)
+      end
     end
   end
 
@@ -289,10 +323,15 @@ Ohai.plugin(:Hardware) do
       if line =~ /^Adapter #(\d+)$/
         controller = controllers[Regexp.last_match(1).to_i]
       elsif controller && line =~ /^Virtual Drive: (\d+) \(Target Id: (\d+)\)$/
+        pci_slot = controller[:pci_slot]
+        target = Regexp.last_match(2)
+        device = Dir.glob("/sys/bus/pci/devices/#{pci_slot}/host*/target*:2:#{target}/*:2:#{target}:0/block/*").first
+
         array = {
           :id => devices[:arrays].count,
           :controller => controller[:id],
           :number => Regexp.last_match(1),
+          :device => "/dev/#{File.basename(device)}",
           :disks => []
         }
 
@@ -317,7 +356,7 @@ Ohai.plugin(:Hardware) do
         when "Device Id" then disk[:smart_devlce] = "megaraid,#{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] = parse_disk_size(Regexp.last_match(2).sub(/\s*\[.*\]$/, ""))
+        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
         end
       elsif array && line =~ /^(\S.*\S)\s*:\s+(\S.*)$/
@@ -347,7 +386,7 @@ Ohai.plugin(:Hardware) do
         when "Device Id" then disk[:smart_devlce] = "megaraid,#{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] = parse_disk_size(Regexp.last_match(2).sub(/\s*\[.*\]$/, ""))
+        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
         end
       end
@@ -360,6 +399,92 @@ Ohai.plugin(:Hardware) do
     end
   end
 
+  def find_mpt_disks(devices)
+    controllers = []
+
+    IO.popen(%w(sas2ircu list)).each do |line|
+      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,
+        :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 => [],
+        :disks => []
+      }
+
+      devices[:controllers] << controllers[Regexp.last_match(1).to_i]
+    end
+
+    controllers.each_with_index do |controller, index|
+      arrays = []
+      disks = []
+
+      array = nil
+      disk = nil
+
+      IO.popen(["sas2ircu", index.to_s, "display"]).each do |line|
+        if line =~ /^IR volume (\d+)$/
+          array = {
+            :id => devices[:arrays].count,
+            :controller => controller[:id],
+            :number => Regexp.last_match(1),
+            :disks => []
+          }
+
+          devices[:arrays] << array
+          controller[:arrays] << array[:id]
+
+          arrays << array
+        elsif line =~ /^Device is a Hard disk$/
+          disk = {
+            :id => devices[:disks].count,
+            :controller => controller[:id],
+            :arrays => []
+          }
+
+          devices[:disks] << disk
+          controller[:disks] << disk[:id]
+
+          disks << disk
+        elsif disk && line =~ /^  (\S.*\S)\s+:\s+(.*\S)\s*$/
+          case Regexp.last_match(1)
+          when "Enclosure #" then disk[:location] = Regexp.last_match(2)
+          when "Slot #" then disk[:location] = "#{disk[:location]}:#{Regexp.last_match(2)}"
+          when "SAS Address" then disk[:device] = find_sas_device(Regexp.last_match(2).tr("-", ""))
+          when "Size (in MB)/(in sectors)" then disk[:size] = memory_to_disk_size("#{Regexp.last_match(2).split('/').first} MB")
+          when "Manufacturer" then disk[:vendor] = Regexp.last_match(2)
+          when "Model Number" then disk[:model] = 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 "Protocol" then disk[:interface] = Regexp.last_match(2)
+          end
+        elsif array && line =~ /^  PHY\[\d+\] Enclosure#\/Slot#\s+:\s+(\d+:\d+)\s*$/
+          array[:disks] << Regexp.last_match(1)
+        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))
+          when "RAID level" then array[:raid_level] = Regexp.last_match(2).sub(/^RAID/, "")
+          when "Size (in MB)" then array[:size] = "#{Regexp.last_match(2)} MB"
+          end
+        elsif line =~ /^  (\S.*\S)\s+:\s+(.*\S)\s*$/
+          case Regexp.last_match(1)
+          when "BIOS version" then controller[:bios_version] = Regexp.last_match(2)
+          when "Firmware version" then controller[:firmware_version] = Regexp.last_match(2)
+          end
+        end
+      end
+
+      arrays.each do |array|
+        array[:disks].map! do |location|
+          disk = disks.find { |disk| disk[:location] == location }
+
+          disk[:arrays] << array[:id]
+          disk[:id]
+        end
+      end
+    end
+  end
+
   collect_data(:default) do
     hardware Mash.new