Don't try and run things that aren't installed yet

[chef.git] / cookbooks / hardware / recipes / default.rb

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 8655780367c2c5e332abfb6ce9c5f1513222851f..3a93a4ed95eed9cc0667968382a7c5cb2567576e 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+include_recipe "tools"
+
 case node[:cpu][:"0"][:vendor_id]
 when "GenuineIntel"
   package "intel-microcode"
@@ -277,7 +279,7 @@ node[:block_device].each do |name, attributes|
   disks << { :device => name } if attributes[:vendor] == "ATA"
 end
 
-if status_packages["cciss-vol-status"]
+if status_packages["cciss-vol-status"] && File.exist?("/usr/sbin/cciss_vol_status")
   status_packages["cciss-vol-status"].each do |device|
     IO.popen(["cciss_vol_status", "-V", "/dev/#{device}"]).each do |line|
       disks << { :device => device, :driver => "cciss", :id => Regexp.last_match[1].to_i - 1 } if line =~ / bay ([0-9]+) +HP /
@@ -306,6 +308,20 @@ if status_packages["megaclisas-status"]
   end
 end
 
+if tools_packages.include?("lsiutil")
+  Dir.glob("/sys/class/scsi_host/host*") do |host|
+    driver = File.new("#{host}/proc_name").read.chomp
+
+    next unless driver == "mptsas"
+
+    bus = host.sub("/sys/class/scsi_host/host", "")
+
+    Dir.glob("/sys/bus/scsi/devices/#{bus}:0:*/scsi_generic/*").each do |sg|
+      disks << { :device => File.basename(sg) }
+    end
+  end
+end
+
 if status_packages["sas2ircu-status"]
   Dir.glob("/sys/class/scsi_host/host*") do |host|
     driver = File.new("#{host}/proc_name").read.chomp
@@ -334,7 +350,7 @@ if status_packages["aacraid-status"]
   end
 end
 
-if tools_packages.include?("areca")
+if tools_packages.include?("areca") && File.exist?("/opt/areca/x86_64/cli64")
   device = IO.popen(["lsscsi", "-g"]).grep(%r{Areca +RAID controller .*/dev/(sg[0-9]+)}) do
     Regexp.last_match[1]
   end.first
@@ -353,6 +369,22 @@ if tools_packages.include?("areca")
   end
 end
 
+disks.each do |disk|
+  if disk[:device] =~ %r{^cciss/(.*)$}
+    id = File.read("/sys/bus/cciss/devices/#{Regexp.last_match[1]}/unique_id").chomp
+
+    disk[:munin] = "cciss-3#{id.downcase}"
+  else
+    disk[:munin] = disk[:device]
+  end
+
+  if disk[:id]
+    disk[:munin] = "#{disk[:munin]}-#{disk[:id].to_s.tr('/', ':')}"
+  end
+
+  disk[:hddtemp] = disk[:munin].tr("-:", "_")
+end
+
 if disks.count > 0
   package "smartmontools"
 
@@ -375,11 +407,38 @@ if disks.count > 0
 
   service "smartmontools" do
     action [:enable, :start]
+    supports :status => true, :restart => true, :reload => true
+  end
+
+  disks.each do |disk|
+    munin_plugin "smart_#{disk[:munin]}" do
+      target "smart_"
+      conf "munin.smart.erb"
+      conf_variables :disk => disk
+    end
+  end
+
+  munin_plugin "hddtemp_smartctl" do
+    conf "munin.hddtemp.erb"
+    conf_variables :disks => disks
   end
 else
   service "smartmontools" do
     action [:stop, :disable]
   end
+
+  munin_plugin "hddtemp_smartctl" do
+    action :delete
+  end
+end
+
+plugins = Dir.glob("/etc/munin/plugins/smart_*").map { |p| File.basename(p) } -
+          disks.map { |d| "smart_#{d[:munin]}" }
+
+plugins.each do |plugin|
+  munin_plugin plugin do
+    action :delete
+  end
 end
 
 if File.exist?("/etc/mdadm/mdadm.conf")