]> git.openstreetmap.org Git - chef.git/blobdiff - cookbooks/hardware/templates/default/ohai.rb.erb
Handle disks attached to a Fusion-MPT controller but not in an array
[chef.git] / cookbooks / hardware / templates / default / ohai.rb.erb
index e78e0c6bc5ad1bc83c2a5c7c31ced24c7c03d196..2874f3d65898bf9371ad680f3afdb8792380267c 100644 (file)
@@ -11,16 +11,36 @@ Ohai.plugin(:Hardware) do
   rescue Errno::ENOENT, Errno::EINVAL
   end
 
-  def parse_disk_size(size)
+  def parse_memory_size(size)
     if size =~ /^(\d+(?:\.\d+)?)\s*TB/i
-      format "%dTB", Regexp.last_match(1).to_f * 2**40 / 1_000_000_000_000
+      Regexp.last_match(1).to_f * 2**30
     elsif size =~ /^(\d+(?:\.\d+)?)\s*GB/i
-      format "%dGB", Regexp.last_match(1).to_f * 2**30 / 1000000000
+      Regexp.last_match(1).to_f * 2**20
     elsif size =~ /^(\d+(?:\.\d+)?)\s*MB/i
-      format "%dGB", Regexp.last_match(1).to_f * 2**20 / 1000000000
+      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}"
@@ -134,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
@@ -155,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
 
@@ -305,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 => []
         }
 
@@ -333,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.*)$/
@@ -363,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
@@ -380,17 +403,16 @@ Ohai.plugin(:Hardware) do
     controllers = []
 
     IO.popen(%w(sas2ircu list)).each do |line|
-      if line =~ /^\s+(\d+)\s+(\S+)\s+\h+h\s+\h+h\s+(\S+)\s+\h+h\s+\h+h\s*$/
-        controllers[$1.to_i] = {
-          :id => devices[:controllers].count,
-          :model => $2,
-          :pci_slot => $3.sub(/^(\h{2})h:(\h{2})h:(\h{2})h:0(\h)h$/, "00\\1:\\2:\\3.\\4"),
-          :arrays => [],
-          :disks => []
-        }
+      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[$1.to_i]
-      end
+      devices[:controllers] << controllers[Regexp.last_match(1).to_i]
     end
 
     controllers.each_with_index do |controller, index|
@@ -413,9 +435,7 @@ Ohai.plugin(:Hardware) do
           controller[:arrays] << array[:id]
 
           arrays << array
-
-          disk = nil
-        elsif array && line =~ /^Device is a Hard disk$/
+        elsif line =~ /^Device is a Hard disk$/
           disk = {
             :id => devices[:disks].count,
             :controller => controller[:id],
@@ -431,7 +451,7 @@ Ohai.plugin(:Hardware) do
           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] = parse_disk_size("#{Regexp.last_match(2).split("/").first} MB")
+          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)
@@ -439,7 +459,7 @@ Ohai.plugin(:Hardware) do
           when "Protocol" then disk[:interface] = Regexp.last_match(2)
           end
         elsif array && line =~ /^  PHY\[\d+\] Enclosure#\/Slot#\s+:\s+(\d+:\d+)\s*$/
-          array[:disks] << $1
+          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))
@@ -465,8 +485,6 @@ Ohai.plugin(:Hardware) do
     end
   end
 
-  disk_devices
-
   collect_data(:default) do
     hardware Mash.new