X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9e6069ae06e994e399ac0952ff2a712dc968e7af..29e2c1a969f226660eac316bd713c0c8c31e9133:/cookbooks/hardware/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 3a93a4ed9..8342a9ac3 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -18,6 +18,11 @@
 #
 
 include_recipe "tools"
+include_recipe "munin"
+
+ohai_plugin "hardware" do
+  template "ohai.rb.erb"
+end
 
 case node[:cpu][:"0"][:vendor_id]
 when "GenuineIntel"
@@ -79,6 +84,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
@@ -119,6 +125,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
@@ -130,7 +154,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
@@ -182,15 +206,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"
@@ -219,7 +243,7 @@ node[:block_device].each do |name, attributes|
   end
 end
 
-%w(hpacucli lsiutil sas2ircu megactl megacli arcconf).each do |tools_package|
+%w(hpssacli lsiutil sas2ircu megactl megacli arcconf).each do |tools_package|
   if tools_packages.include?(tools_package)
     package tools_package
   else
@@ -273,121 +297,55 @@ end
   end
 end
 
-disks = []
-
-node[:block_device].each do |name, attributes|
-  disks << { :device => name } if attributes[:vendor] == "ATA"
-end
-
-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 /
-    end
-  end
-end
-
-if status_packages["megaclisas-status"]
-  controller = 0
-
-  Dir.glob("/sys/class/scsi_host/host*") do |host|
-    driver = File.new("#{host}/proc_name").read.chomp
-
-    next unless driver == "megaraid_sas"
-
-    bus = host.sub("/sys/class/scsi_host/host", "")
-    device = File.basename(Dir.glob("/sys/bus/scsi/devices/#{bus}:*/scsi_generic/*").first)
-
-    IO.popen(["megacli", "-PDList", "-a#{controller}", "-NoLog"]).each do |line|
-      disks << { :device => device, :driver => "megaraid",  :id => Regexp.last_match[1] } if line =~ /^Device Id: ([0-9]+)$/
-
-      disks.pop if line =~ /^Firmware state: Hotspare, Spun down$/
-    end
-
-    controller += 1
-  end
-end
-
-if tools_packages.include?("lsiutil")
-  Dir.glob("/sys/class/scsi_host/host*") do |host|
-    driver = File.new("#{host}/proc_name").read.chomp
+disks = if node[:hardware][:disk]
+          node[:hardware][:disk][:disks]
+        else
+          []
+        end
 
-    next unless driver == "mptsas"
+disks = disks.map do |disk|
+  next if disk[:state] == "spun_down"
 
-    bus = host.sub("/sys/class/scsi_host/host", "")
+  if disk[:smart_device]
+    controller = node[:hardware][:disk][:controllers][disk[:controller]]
+    device = controller[:device].sub("/dev/", "")
+    smart = disk[:smart_device]
 
-    Dir.glob("/sys/bus/scsi/devices/#{bus}:0:*/scsi_generic/*").each do |sg|
-      disks << { :device => File.basename(sg) }
+    if device.start_with?("cciss/") && smart =~ /^cciss,(\d+)$/
+      array = node[:hardware][:disk][:arrays][disk[:arrays].first]
+      munin = "cciss-3#{array[:wwn]}-#{Regexp.last_match(1)}"
+    elsif smart =~ /^.*,(\d+)$/
+      munin = "#{device}-#{Regexp.last_match(1)}"
+    elsif smart =~ %r{^.*,(\d+)/(\d+)$}
+      munin = "#{device}-#{Regexp.last_match(1)}:#{Regexp.last_match(2)}"
     end
+  elsif disk[:device]
+    device = disk[:device].sub("/dev/", "")
+    munin = device
   end
-end
-
-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"
 
-    bus = host.sub("/sys/class/scsi_host/host", "")
+  next if device.nil?
 
-    Dir.glob("/sys/bus/scsi/devices/#{bus}:0:*/scsi_generic/*").each do |sg|
-      disks << { :device => File.basename(sg) }
-    end
-  end
-end
-
-if status_packages["aacraid-status"]
-  Dir.glob("/sys/class/scsi_host/host*") do |host|
-    driver = File.new("#{host}/proc_name").read.chomp
-
-    next unless driver == "aacraid"
-
-    bus = host.sub("/sys/class/scsi_host/host", "")
-
-    Dir.glob("/sys/bus/scsi/devices/#{bus}:1:*/scsi_generic/*").each do |sg|
-      disks << { :device => File.basename(sg) }
-    end
-  end
+  Hash[
+    :device => device,
+    :smart => smart,
+    :munin => munin,
+    :hddtemp => munin.tr("-:", "_")
+  ]
 end
 
-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
-
-  IO.popen(["/opt/areca/x86_64/cli64", "disk", "info"]).each do |line|
-    next if line =~ /N\.A\./
-
-    if line =~ /^ +[0-9]+ +0*([0-9]+) +(?:Slot#|SLOT )0*([0-9]+) +/
-      enc = Regexp.last_match[1]
-      slot = Regexp.last_match[2]
-
-      disks << { :device => device, :driver => "areca", :id => "#{slot}/#{enc}" }
-    elsif line =~ /^ +([0-9]+) +[0-9]+ +/
-      disks << { :device => device, :driver => "areca", :id => Regexp.last_match[1] }
-    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
+disks = disks.compact
 
 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"
@@ -410,6 +368,12 @@ if disks.count > 0
     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[:smart] && disk[:smart].start_with?("areca,") }
+
   disks.each do |disk|
     munin_plugin "smart_#{disk[:munin]}" do
       target "smart_"
@@ -417,18 +381,21 @@ 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
 
@@ -476,7 +443,11 @@ if node[:lsb][:release].to_f <= 12.10
   end
 else
   service "kmod" do
-    provider Chef::Provider::Service::Upstart
+    if node[:lsb][:release].to_f >= 15.10
+      provider Chef::Provider::Service::Systemd
+    else
+      provider Chef::Provider::Service::Upstart
+    end
     action :nothing
     subscribes :start, "template[/etc/modules]"
   end
@@ -501,6 +472,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)
+
+    temps = if File.exist?("#{coretemp}/name")
+              Dir.glob("#{coretemp}/temp*_input").map do |temp|
+                File.basename(temp).sub("temp", "").sub("_input", "").to_i
+              end.sort
+            else
+              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"