X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6a91072ee77724069f37eefdde66fd50bfa9da00..ecb5d5beac1e41d30e47daa6a034c59b33027d12:/cookbooks/hardware/recipes/default.rb

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index d4c8d0470..b4986e70e 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -17,6 +17,9 @@
 # limitations under the License.
 #
 
+include_recipe "tools"
+include_recipe "munin"
+
 case node[:cpu][:"0"][:vendor_id]
 when "GenuineIntel"
   package "intel-microcode"
@@ -77,6 +80,7 @@ if manufacturer == "HP" && node[:lsb][:release].to_f > 11.10
     repository "git://chef.openstreetmap.org/hp-legacy.git"
     user "root"
     group "root"
+    ignore_failure true
   end
 
   link "/opt/hp/hp-health/bin/hpasmd" do
@@ -117,6 +121,24 @@ unless unit.nil?
   end
 end
 
+# if we need a different / special kernel version to make the hardware
+# work (e.g: https://github.com/openstreetmap/operations/issues/45) then
+# ensure that we have the package installed. the grub template will
+# make sure that this is the default on boot.
+if node[:hardware][:grub][:kernel]
+  kernel_version = node[:hardware][:grub][:kernel]
+
+  package "linux-image-#{kernel_version}-generic"
+  package "linux-image-extra-#{kernel_version}-generic"
+  package "linux-headers-#{kernel_version}-generic"
+
+  boot_device = IO.popen(["df", "/boot"]).readlines.last.split.first
+  boot_uuid = IO.popen(["blkid", "-o", "value", "-s", "UUID", boot_device]).readlines.first.chomp
+  grub_entry = "gnulinux-advanced-#{boot_uuid}>gnulinux-#{kernel_version}-advanced-#{boot_uuid}"
+else
+  grub_entry = "0"
+end
+
 if File.exist?("/etc/default/grub")
   execute "update-grub" do
     action :nothing
@@ -128,7 +150,7 @@ if File.exist?("/etc/default/grub")
     owner "root"
     group "root"
     mode 0644
-    variables :unit => unit, :speed => speed
+    variables :unit => unit, :speed => speed, :entry => grub_entry
     notifies :run, "execute[update-grub]"
   end
 end
@@ -180,15 +202,15 @@ status_packages = {}
 node[:kernel][:modules].each_key do |modname|
   case modname
   when "cciss"
-    tools_packages << "hpacucli"
+    tools_packages << "hpssacli"
     status_packages["cciss-vol-status"] ||= []
   when "hpsa"
-    tools_packages << "hpacucli"
+    tools_packages << "hpssacli"
     status_packages["cciss-vol-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"
@@ -277,7 +299,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 /
@@ -324,11 +346,13 @@ 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|
+      next if File.directory?("#{sg}/../../block")
+
       disks << { :device => File.basename(sg) }
     end
   end
@@ -348,7 +372,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
@@ -368,7 +392,7 @@ if tools_packages.include?("areca")
 end
 
 disks.each do |disk|
-  if disk[:device] =~ /^cciss\/(.*)$/
+  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}"
@@ -386,6 +410,13 @@ end
 if disks.count > 0
   package "smartmontools"
 
+  template "/usr/local/bin/smartd-mailer" do
+    source "smartd-mailer.erb"
+    owner "root"
+    group "root"
+    mode 0755
+  end
+
   template "/etc/smartd.conf" do
     source "smartd.conf.erb"
     owner "root"
@@ -405,8 +436,15 @@ if disks.count > 0
 
   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_"
@@ -414,23 +452,26 @@ if disks.count > 0
       conf_variables :disk => disk
     end
   end
+else
+  service "smartmontools" do
+    action [:stop, :disable]
+  end
+end
 
+if disks.count > 0
   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
+    conf "munin.hddtemp.erb"
   end
 end
 
 plugins = Dir.glob("/etc/munin/plugins/smart_*").map { |p| File.basename(p) } -
-          disks.map { |d| "smart_#{d[:munin_name]}" }
+          disks.map { |d| "smart_#{d[:munin]}" }
 
 plugins.each do |plugin|
   munin_plugin plugin do
@@ -498,6 +539,30 @@ end
 unless Dir.glob("/sys/class/hwmon/hwmon*").empty?
   package "lm-sensors"
 
+  Dir.glob("/sys/devices/platform/coretemp.*").each do |coretemp|
+    cpu = File.basename(coretemp).sub("coretemp.", "").to_i
+    chip = format("coretemp-isa-%04d", cpu)
+
+    if File.exist?("#{coretemp}/name")
+      temps = Dir.glob("#{coretemp}/temp*_input").map do |temp|
+        File.basename(temp).sub("temp", "").sub("_input", "").to_i
+      end.sort
+    else
+      temps = Dir.glob("#{coretemp}/hwmon/hwmon*/temp*_input").map do |temp|
+        File.basename(temp).sub("temp", "").sub("_input", "").to_i
+      end.sort
+    end
+
+    if temps.first == 1
+      node.default[:hardware][:sensors][chip][:temps][:temp1][:label] = "CPU #{cpu}"
+      temps.shift
+    end
+
+    temps.each_with_index do |temp, index|
+      node.default[:hardware][:sensors][chip][:temps]["temp#{temp}"][:label] = "CPU #{cpu} Core #{index}"
+    end
+  end
+
   execute "/etc/sensors.d/chef.conf" do
     action :nothing
     command "/usr/bin/sensors -s"