Update carto stylesheet to v2.33.0

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

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 8655780367c2c5e332abfb6ce9c5f1513222851f..3c2f84a681472fdcf64b34ff85ffd959482e989a 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -17,6 +17,9 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "tools"
+include_recipe "munin"
+

 case node[:cpu][:"0"][:vendor_id]
 when "GenuineIntel"
   package "intel-microcode"
 case node[:cpu][:"0"][:vendor_id]
 when "GenuineIntel"
   package "intel-microcode"


@@ -188,7 +191,7 @@ node[:kernel][:modules].each_key do |modname|
   when "mptsas"
     tools_packages << "lsiutil"
     # status_packages["mpt-status"] ||= []
   when "mptsas"
     tools_packages << "lsiutil"
     # status_packages["mpt-status"] ||= []

-  when "mpt2sas"
+  when "mpt2sas", "mpt3sas"

     tools_packages << "sas2ircu"
     status_packages["sas2ircu-status"] ||= []
   when "megaraid_mm"
     tools_packages << "sas2ircu"
     status_packages["sas2ircu-status"] ||= []
   when "megaraid_mm"


@@ -277,7 +280,7 @@ node[:block_device].each do |name, attributes|
   disks << { :device => name } if attributes[:vendor] == "ATA"
 end
 
   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 /
   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,15 +309,31 @@ if status_packages["megaclisas-status"]
   end
 end
 
   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
 
 if status_packages["sas2ircu-status"]
   Dir.glob("/sys/class/scsi_host/host*") do |host|
     driver = File.new("#{host}/proc_name").read.chomp
 

-    next unless driver == "mpt2sas"
+    next unless driver == "mpt2sas" || driver == "mpt3sas"

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

+      next if File.directory?("#{sg}/../../block")
+

       disks << { :device => File.basename(sg) }
     end
   end
       disks << { :device => File.basename(sg) }
     end
   end


@@ -334,7 +353,7 @@ if status_packages["aacraid-status"]
   end
 end
 
   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
   device = IO.popen(["lsscsi", "-g"]).grep(%r{Areca +RAID controller .*/dev/(sg[0-9]+)}) do
     Regexp.last_match[1]
   end.first


@@ -353,6 +372,22 @@ if tools_packages.include?("areca")
   end
 end
 
   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"
 
 if disks.count > 0
   package "smartmontools"
 


@@ -375,11 +410,44 @@ if disks.count > 0
 
   service "smartmontools" do
     action [:enable, :start]
 
   service "smartmontools" do
     action [:enable, :start]

+    supports :status => true, :restart => true, :reload => true
+  end
+
+  # Don't try and do munin monitoring of disks behind
+  # an Areca controller as they only allow one thing to
+  # talk to the controller at a time and smartd will
+  # throw errors if it clashes with munin
+  disks = disks.reject { |disk| disk[:driver] == "areca" }
+
+  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
   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")
 end
 
 if File.exist?("/etc/mdadm/mdadm.conf")