X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9360c6961050e2730b750afc41ec3e240dda3f30..b3054cb3d8f3cfae3b1c045e7715e6c127386459:/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 09a9bced0..b2d56c7d8 100644
--- a/cookbooks/hardware/templates/default/ohai.rb.erb
+++ b/cookbooks/hardware/templates/default/ohai.rb.erb
@@ -356,7 +356,7 @@ Ohai.plugin(:Hardware) do
     controllers.each do |controller|
       if device = Dir.glob("/sys/bus/pci/devices/#{controller[:pci_slot]}/cciss*").first
         controller[:device] = File.basename(device).sub(/^cciss(\d+)$/, "/dev/cciss/c\\1d0")
-      elsif device = Dir.glob("/sys/bus/pci/devices/#{controller[:pci_slot]}/host*/target0:0:0/0:0:0:0/scsi_generic/sg*").first
+      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)}"
       end
     end
@@ -434,9 +434,18 @@ Ohai.plugin(:Hardware) do
         devices[:disks] << disk
         controller[:disks] << disk[:id]
         array[:disks] << disk[:id]
+      elsif disk && line =~ /^Firmware state:\s+(.*\S)\s*$/
+        Regexp.last_match(1).split(/,\s*/).each do |state|
+          case state
+          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
+          end
+        end
       elsif disk && line =~ /^(\S.*\S)\s*:\s+(\S.*)$/
         case Regexp.last_match(1)
-        when "Device Id" then disk[:smart_devlce] = "megaraid,#{Regexp.last_match(2)}"
+        when "Device Id" then disk[:smart_device] = "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] = memory_to_disk_size(Regexp.last_match(2).sub(/\s*\[.*\]$/, ""))
@@ -464,10 +473,18 @@ Ohai.plugin(:Hardware) do
 
           devices[:disks] << disk
         end
+      elsif disk && line =~ /^Firmware state:\s+(.*\S)\s*$/
+        Regexp.last_match(1).split(/,\s*/).each do |state|
+          case state
+          when "Online" then disk[:status] = "online"
+          when "Hotspare" then disk[:status] = "hotspare"
+          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.*)$/
         case Regexp.last_match(1)
-        when "Device Id" then disk[:smart_devlce] = "megaraid,#{Regexp.last_match(2)}"
-        when "WWN" then disk[:wwn] = Regexp.last_match(2)
+        when "Device Id" then disk[:smart_device] = "megaraid,#{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_number] = Regexp.last_match(2).split
@@ -777,6 +794,71 @@ Ohai.plugin(:Hardware) do
     end
   end
 
+  def lvm_devices
+    {
+      :pvs => find_lvm_pvs,
+      :vgs => find_lvm_vgs,
+      :lvs => find_lvm_lvs
+    }
+  end
+
+  def find_lvm_pvs
+    IO.popen(["pvdisplay", "-c"]).each_with_object({}) do |line, pvs|
+      fields = line.strip.split(":")
+
+      pvs[fields[0]] = {
+        :vg => fields[1],
+        :pv_size => fields[2],
+        :pv_status => fields[4],
+        :pe_size => fields[7],
+        :pe_total => fields[8],
+        :pe_free => fields[9],
+        :pe_allocated => fields[10],
+        :pv_uuid => fields[11]
+      }
+    end
+  end
+
+  def find_lvm_vgs
+    IO.popen(["vgdisplay", "-c"]).each_with_object({}) do |line, vgs|
+      fields = line.strip.split(":")
+
+      vgs[fields[0]] = {
+        :vg_access => fields[1],
+        :vg_status => fields[2],
+        :lv_maximum => fields[4],
+        :lv_count => fields[5],
+        :lv_open => fields[6],
+        :pv_maximum => fields[8],
+        :pv_current => fields[9],
+        :pv_actual => fields[10],
+        :vg_size => fields[11],
+        :pe_size => fields[12],
+        :pe_total => fields[13],
+        :pe_allocated => fields[14],
+        :pe_free => fields[15],
+        :vg_uuid => fields[16]
+      }
+    end
+  end
+
+  def find_lvm_lvs
+    IO.popen(["lvdisplay", "-c"]).each_with_object({}) do |line, lvs|
+      fields = line.strip.split(":")
+
+      lvs[fields[0]] = {
+        :vg => fields[1],
+        :lv_access => fields[2],
+        :lv_status => fields[3],
+        :lv_open => fields[5],
+        :lv_size => fields[6],
+        :le_count => fields[7],
+        :lv_minor => fields[11],
+        :lv_major => fields[12]
+      }
+    end
+  end
+
   def psu_devices
     device = nil
 
@@ -821,6 +903,7 @@ Ohai.plugin(:Hardware) do
     hardware[:network] = network_devices
     hardware[:memory] = memory_devices
     hardware[:disk] = disk_devices
+    hardware[:lvm] = lvm_devices
     hardware[:psu] = psu_devices
     hardware[:mc] = mc_device
   end