Monitor all HP RAID volumes

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index 6b12827ca64a4cd0ec3941943c2f3fddcbac67ba..904b51e3653726ce2c04a7543a7679889b11282f 100644 (file)
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -10,7 +10,7 @@ if node[:dmi] and node[:dmi][:system]
 end
 
 if node[:kernel] and node[:kernel][:modules]
-  raidmods = node[:kernel][:modules].keys & ["cciss", "mptsas", "mpt2sas", "megaraid_mm", "megaraid_sas", "aacraid"]
+  raidmods = node[:kernel][:modules].keys & ["cciss", "hpsa", "mptsas", "mpt2sas", "megaraid_mm", "megaraid_sas", "aacraid"]
 
   unless raidmods.empty?
     default[:apt][:sources] |= [ "hwraid" ]

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index ad64ae56ba143de40a39e709415b213d231a888e..837e1e9b06d9a8d5aad4ef0ad8c65b3d410b73af 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -142,30 +142,43 @@ template "/etc/initramfs-tools/conf.d/mdadm" do
 end
 
 tools_packages = []
-status_packages = []
+status_packages = {}
 
 node[:kernel][:modules].each_key do |modname|
   case modname
   when "cciss"
     tools_packages << "hpacucli"
-    status_packages << "cciss-vol-status"
+    status_packages["cciss-vol-status"] ||= []
   when "hpsa"
     tools_packages << "hpacucli"
+    status_packages["cciss-vol-status"] ||= []
   when "mptsas"
     tools_packages << "lsiutil"
-    status_packages << "mpt-status"
+    status_packages["mpt-status"] ||= []
   when "mpt2sas"
     tools_packages << "sas2ircu"
-    status_packages << "sas2ircu-status"
+    status_packages["sas2ircu-status"] ||= []
   when "megaraid_mm"
     tools_packages << "megactl"
-    status_packages << "megaraid-status"
+    status_packages["megaraid-status"] ||= []
   when "megaraid_sas"
     tools_packages << "megacli"
-    status_packages << "megaclisas-status"
+    status_packages["megaclisas-status"] ||= []
   when "aacraid"
     tools_packages << "arcconf"
-    status_packages << "aacraid-status"
+    status_packages["aacraid-status"] ||= []
+  end
+end
+
+node[:block_device].each do |name,attributes|
+  if attributes[:vendor] == "HP" and attributes[:model] == "LOGICAL VOLUME"
+    if name =~ /^cciss!(.*)$/
+      status_packages["cciss-vol-status"] |= [ "cciss/#{$1}" ]
+    else
+      Dir.glob("/sys/block/#{name}/device/scsi_generic/*").each do |sg|
+        status_packages["cciss-vol-status"] |= [ File.basename(sg) ]
+      end
+    end
   end
 end
 
@@ -188,6 +201,7 @@ end
       owner "root"
       group "root"
       mode 0644
+      variables :devices => status_packages[status_package]
     end
 
     service "#{status_package}d" do

diff --git a/cookbooks/hardware/templates/default/raid.default.erb b/cookbooks/hardware/templates/default/raid.default.erb
index e72dc9c8043464d8726e318d63db3c298f99eec8..c54af812e71e22a673a7a6a4a862528736571e01 100644 (file)
--- a/cookbooks/hardware/templates/default/raid.default.erb
+++ b/cookbooks/hardware/templates/default/raid.default.erb
@@ -1 +1,4 @@
-MAILTO=admins@openstreetmap.org
+MAILTO="admins@openstreetmap.org"
+<% unless @devices.empty? -%>
+ID="<%= @devices.sort.uniq.map { |d| "/dev/#{d}" }.join(" ") %>"
+<% end -%>