Gather information on directly connected disks

[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 20a2f7786bf1b4dd7669d69deb4ffcbc518d941e..6c83be31e7bffe8f88032fff2f32ef695f61a185 100644 (file)
--- a/cookbooks/hardware/templates/default/ohai.rb.erb
+++ b/cookbooks/hardware/templates/default/ohai.rb.erb
@@ -11,6 +11,14 @@ Ohai.plugin(:Hardware) do
   rescue Errno::ENOENT, Errno::EINVAL
   end
 
+  def parse_disk_size(size)
+    if size =~ /^(\d+(?:\.\d+))?\s*TB/i
+      sprintf "%dTB", Regexp.last_match(1).to_f * 2**40 / 1_000_000_000_000
+    elsif size =~ /^(\d+(?:\.\d+))?\s*GB/i
+      sprintf "%dGB", Regexp.last_match(1).to_f * 2**30 / 1000000000
+    end
+  end
+
   def pci_devices
     device = nil
 
@@ -77,12 +85,55 @@ Ohai.plugin(:Hardware) do
     disk[:arrays] = []
     disk[:disks] = []
 
+    find_direct_disks(disk)
     find_hp_disks(disk) if File.exist?("/usr/sbin/hpssacli")
     find_megaraid_disks(disk) if File.exist?("/usr/sbin/megacli")
+    # aacraid
+    # areca (/opt/areca/x86_64/cli64)
 
     disk
   end
 
+  def find_direct_disks(devices)
+    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"
+        bus = host.sub("/sys/class/scsi_host/host", "")
+
+        Dir.glob("/sys/bus/scsi/devices/#{bus}:0:*").each do |device|
+          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
+
+          if size > 1_000_000_000_000
+            size = sprintf "%d TB", size / 1_000_000_000_000
+          elsif size > 1000000000
+            size = sprintf "%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
+          }
+        end
+      end
+    end
+  end
+
   def find_hp_disks(devices)
     controllers = []
     disks = []
@@ -240,7 +291,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] = Regexp.last_match(2).sub(/\s*\[.*\]$/, "")
+        when "Raw Size" then disk[:size] = parse_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.*)$/
@@ -270,7 +321,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] = Regexp.last_match(2).sub(/\s*\[.*\]$/, "")
+        when "Raw Size" then disk[:size] = parse_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