Switch 2 new switch2osm.org site

[chef.git] / 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 5916ecc06e4d9dcb60e54e18e65f34c31a150b2a..82194acf29769c5cbd7405c81c4d8107505e5898 100644 (file)
--- a/cookbooks/hardware/templates/default/ohai.rb.erb
+++ b/cookbooks/hardware/templates/default/ohai.rb.erb
@@ -5,12 +5,12 @@ Ohai.plugin(:Hardware) do
 
   def read_sysctl_link(file)
     File.basename(File.readlink(file))
 
   def read_sysctl_link(file)
     File.basename(File.readlink(file))

-  rescue Errno::ENOENT
+  rescue Errno::ENOENT, Errno::ENOTDIR

   end
 
   def read_sysctl_file(file)
     IO.read(file).strip
   end
 
   def read_sysctl_file(file)
     IO.read(file).strip

-  rescue Errno::ENOENT, Errno::EINVAL
+  rescue Errno::ENOENT, Errno::ENOTDIR, Errno::EINVAL

   end
 
   def parse_memory_size(size)
   end
 
   def parse_memory_size(size)


@@ -148,16 +148,17 @@ Ohai.plugin(:Hardware) do
     find_direct_disks(disk)
     find_nvme_disks(disk)
 
     find_direct_disks(disk)
     find_nvme_disks(disk)
 

-    find_hp_disks(disk) if File.exist?("/usr/sbin/hpssacli")
+    find_hp_disks(disk) if File.exist?("/usr/sbin/ssacli")

     find_megaraid_disks(disk) if File.exist?("/usr/sbin/megacli")
     find_megaraid_disks(disk) if File.exist?("/usr/sbin/megacli")

-    find_mpt_disks(disk) if File.exist?("/usr/sbin/sas2ircu")
+    find_mpt1_disks(disk) if File.exist?("/usr/sbin/lsiutil")
+    find_mpt2_disks(disk) if File.exist?("/usr/sbin/sas2ircu")

     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|
     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"
+      if disk[:vendor] =~ /^(BTWA|CVPR|PHDV)/ && disk[:model] == "INTEL"

         disk[:model] = disk[:serial_number]
         disk[:serial_number] = disk[:vendor]
         disk[:vendor] = "INTEL"
         disk[:model] = disk[:serial_number]
         disk[:serial_number] = disk[:vendor]
         disk[:vendor] = "INTEL"


@@ -180,7 +181,7 @@ Ohai.plugin(:Hardware) do
         end
       end
 
         end
       end
 

-      disk[:model].sub!(/-.*$/, "")
+      disk[:model].sub!(/-.*$/, "") if disk[:model]

     end
 
     disk
     end
 
     disk


@@ -190,7 +191,7 @@ Ohai.plugin(:Hardware) do
     Dir.glob("/sys/class/scsi_host/host*") do |host|
       driver = read_sysctl_file("#{host}/proc_name")
 
     Dir.glob("/sys/class/scsi_host/host*") do |host|
       driver = read_sysctl_file("#{host}/proc_name")
 

-      if driver == "ahci" || driver == "mptsas"
+      if %w(ahci mptsas sata_mv sata_nv).include?(driver)

         bus = host.sub("/sys/class/scsi_host/host", "")
 
         Dir.glob("/sys/bus/scsi/devices/#{bus}:0:*").each do |device|
         bus = host.sub("/sys/class/scsi_host/host", "")
 
         Dir.glob("/sys/bus/scsi/devices/#{bus}:0:*").each do |device|


@@ -214,7 +215,7 @@ Ohai.plugin(:Hardware) do
   end
 
   def find_nvme_disks(devices)
   end
 
   def find_nvme_disks(devices)

-    Dir.glob("/sys/class/misc/nvme*") do |device|
+    Dir.glob("/sys/class/nvme/nvme*") do |device|

       controller = {
         :id => devices[:controllers].count,
         :pci_slot => File.basename(Pathname.new("#{device}/device").realpath),
       controller = {
         :id => devices[:controllers].count,
         :pci_slot => File.basename(Pathname.new("#{device}/device").realpath),


@@ -232,7 +233,7 @@ Ohai.plugin(:Hardware) do
         end
       end
 
         end
       end
 

-      Dir.glob("#{device}/device/block/*").each do |block|
+      Dir.glob("#{device}/nvme*").each do |block|

         size = read_sysctl_file("#{block}/size").to_f / 2
 
         disk = {
         size = read_sysctl_file("#{block}/size").to_f / 2
 
         disk = {


@@ -285,7 +286,7 @@ Ohai.plugin(:Hardware) do
     array = nil
     disk = nil
 
     array = nil
     disk = nil
 

-    IO.popen(%w(hpssacli controller all show config detail)).each do |line|
+    IO.popen(%w(ssacli controller all show config detail)).each do |line|

       if line =~ /^Smart Array (\S+) /
         controller = {
           :id => devices[:controllers].count,
       if line =~ /^Smart Array (\S+) /
         controller = {
           :id => devices[:controllers].count,


@@ -358,6 +359,8 @@ Ohai.plugin(:Hardware) do
         controller[:device] = File.basename(device).sub(/^cciss(\d+)$/, "/dev/cciss/c\\1d0")
       elsif device = Dir.glob("/sys/bus/pci/devices/#{controller[:pci_slot]}/host*/target*:3:0/*:3:0:0/scsi_generic/sg*").first
         controller[:device] = "/dev/#{File.basename(device)}"
         controller[:device] = File.basename(device).sub(/^cciss(\d+)$/, "/dev/cciss/c\\1d0")
       elsif device = Dir.glob("/sys/bus/pci/devices/#{controller[:pci_slot]}/host*/target*:3:0/*:3:0:0/scsi_generic/sg*").first
         controller[:device] = "/dev/#{File.basename(device)}"

+      elsif device = Dir.glob("/sys/bus/pci/devices/#{controller[:pci_slot]}/host*/target*:1:0/*:1:0:*/scsi_generic/sg*").first
+        controller[:device] = "/dev/#{File.basename(device)}"

       end
     end
   end
       end
     end
   end


@@ -437,10 +440,12 @@ Ohai.plugin(:Hardware) do
       elsif disk && line =~ /^Firmware state:\s+(.*\S)\s*$/
         Regexp.last_match(1).split(/,\s*/).each do |state|
           case state
       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 "Online" then disk[:status] = "online"
           when "Hotspare" then disk[:status] = "hotspare"

-          when "Spun Up" then disk[:spun_down] = false
-          when "Spun down" then disk[:spun_down] = true
+          when "Failed" then disk[:status] = "failed"
+          when "Spun Up" then disk[:state] = "spun_up"
+          when "Spun down" then disk[:state] = "spun_down"

           end
         end
       elsif disk && line =~ /^(\S.*\S)\s*:\s+(\S.*)$/
           end
         end
       elsif disk && line =~ /^(\S.*\S)\s*:\s+(\S.*)$/


@@ -476,8 +481,10 @@ Ohai.plugin(:Hardware) do
       elsif disk && line =~ /^Firmware state:\s+(.*\S)\s*$/
         Regexp.last_match(1).split(/,\s*/).each do |state|
           case state
       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 "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
           when "Spun Up" then disk[:state] = "spun_up"
           when "Spun down" then disk[:state] = "spun_down"
           end


@@ -499,7 +506,86 @@ Ohai.plugin(:Hardware) do
     end
   end
 
     end
   end
 

-  def find_mpt_disks(devices)
+  def find_mpt1_disks(devices)
+    controllers = []
+    disks = []
+
+    controller = nil
+
+    IO.popen(%w(lsiutil -s)).each do |line|
+      if line =~ /^\/proc\/mpt\/ioc(\d+)\s+LSI Logic\s+(\S+)\s+/
+        controller = {
+          :id => devices[:controllers].count,
+          :model => Regexp.last_match(1),
+          :arrays => [],
+          :disks => []
+        }
+
+        controllers << controller
+        devices[:controllers] << controller
+      elsif line =~ /^\s+(\d+)\s+(\d+)\s+PhysDisk (\d+)\s+(\S+)\s+(\S+)\s+\d+\s+(\S+)\s+/
+        disks[Regexp.last_match(3).to_i] = {
+          :id => devices[:disks].count,
+          :controller => controller[:id],
+          :vendor => Regexp.last_match(4),
+          :model => Regexp.last_match(5),
+          :sas_address => Regexp.last_match(6),
+          :arrays => []
+        }
+
+        controller[:disks] << devices[:disks].count
+        devices[:disks] << disks[Regexp.last_match(3).to_i]
+      end
+    end
+
+    controllers.each_with_index do |controller, index|
+      port = index + 1
+      array = nil
+
+      IO.popen(["lsiutil", "-p", port.to_s, "-a", "69,0"]).each do |line|
+        if line =~ /^ (\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+RAID/
+          seg = Regexp.last_match(1).to_i
+          bus = Regexp.last_match(2).to_i
+          dev = Regexp.last_match(3).to_i
+          fun = Regexp.last_match(4).to_i
+
+          controller[:pci_slot] = sprintf("%04x:%02x:%02x.%01x", seg, bus, dev, fun)
+        end
+      end
+
+      IO.popen(["lsiutil", "-p", port.to_s, "-a", "21,1,0,0"]).each do |line|
+        if line =~ /^Volume (\d+) is/
+          array = {
+            :id => devices[:arrays].count,
+            :controller => controller[:id],
+            :number => Regexp.last_match(1),
+            :disks => []
+          }
+
+          devices[:arrays] << array
+          controller[:arrays] << array[:id]
+        elsif line =~ /^  Member \d+ is PhysDisk (\d+) /
+          array[:disks] << disks[Regexp.last_match(1).to_i][:id]
+          disks[Regexp.last_match(1).to_i][:arrays] << array[:id]
+        end
+      end
+    end
+
+    disks.each do |disk|
+      slot = controllers[disk[:controller]][:pci_slot]
+      sas_address = "0x#{disk[:sas_address]}"
+
+      Dir.glob("/sys/bus/pci/devices/#{slot}/host*/port-*:*/end_device-*:*/sas_device/end_device-*:*").each do |sas_device|
+        if read_sysctl_file("#{sas_device}/sas_address") == sas_address
+          if device = Dir.glob("#{sas_device}/device/target*:0:*/*:0:*:0/scsi_generic/sg*").first
+            disk[:device] = "/dev/#{File.basename(device)}"            
+          end
+        end
+      end
+    end
+  end
+
+  def find_mpt2_disks(devices)

     controllers = []
 
     IO.popen(%w(sas2ircu list)).each do |line|
     controllers = []
 
     IO.popen(%w(sas2ircu list)).each do |line|


@@ -586,7 +672,7 @@ Ohai.plugin(:Hardware) do
   end
 
   def find_adaptec_disks(devices)
   end
 
   def find_adaptec_disks(devices)

-    controller_count = IO.popen(%w(arcconf getconfig 0)).first.scan(/^Controllers found: (\d+)$/).first.first.to_i
+    controller_count = IO.popen(%w(arcconf getconfig 0)).first.scan(/^Controllers Found: (\d+)$/i).first.first.to_i

 
     1.upto(controller_count).each do |controller_number|
       controller = {
 
     1.upto(controller_count).each do |controller_number|
       controller = {


@@ -605,7 +691,7 @@ Ohai.plugin(:Hardware) do
       disk = nil
 
       IO.popen(["arcconf", "getconfig", controller_number.to_s]).each do |line|
       disk = nil
 
       IO.popen(["arcconf", "getconfig", controller_number.to_s]).each do |line|

-        if line =~ /^Logical device number (\d+)$/
+        if line =~ /^Logical Device Number (\d+)$/i

           array = {
             :id => devices[:arrays].count,
             :controller => controller[:id],
           array = {
             :id => devices[:arrays].count,
             :controller => controller[:id],


@@ -639,16 +725,19 @@ Ohai.plugin(:Hardware) do
           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 "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 "Serial number" then disk[:serial_number] = Regexp.last_match(2)
+          when "Serial Number" then disk[:serial_number] = Regexp.last_match(2)

           when "World-wide name" then disk[:wwn] = Regexp.last_match(2)
           when "World-wide name" then disk[:wwn] = 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
           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 =~ / Present \(.*((?:Connector|Enclosure):\d+,\s*(?:Device|Slot):\d+)\) /
+          array[:disks] << Regexp.last_match(1).tr(":", " ").gsub(/,\s*/, ", ")

         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)
         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 "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*$/
           when "Size" then array[:size] = memory_to_disk_size(Regexp.last_match(2))
           end
         elsif line =~ /^   (\S.*\S)\s*:\s+(\S.*\S)\s*$/


@@ -659,6 +748,8 @@ Ohai.plugin(:Hardware) do
           when "BIOS" then controller[:bios_version] = Regexp.last_match(2)
           when "Firmware" then controller[:firmware_version] = Regexp.last_match(2)
           end
           when "BIOS" then controller[:bios_version] = Regexp.last_match(2)
           when "Firmware" then controller[:firmware_version] = Regexp.last_match(2)
           end

+        elsif line =~ /^         Serial Number\s*:\s+(\S.*\S)\s*$/
+          controller[:serial_number] = Regexp.last_match(1)

         end
       end
 
         end
       end