Fix munin alert thresholds for G9 machines

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

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index fdcdf6161cd2493e34e816e65fd170a4ebccde11..2fa629adfa09c5a674a07aeae25e6c8466add21e 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -65,7 +65,7 @@ when "HP"
     supports :status => true, :restart => true
   end
 
     supports :status => true, :restart => true
   end
 

-  if product.end_with?("Gen8") || product.end_with?("Gen9")
+  if product.end_with?("Gen8", "Gen9")

     package "hp-ams" do
       action :install
       notifies :restart, "service[hp-ams]"
     package "hp-ams" do
       action :install
       notifies :restart, "service[hp-ams]"


@@ -94,29 +94,8 @@ when "IBM"
 end
 
 units.sort.uniq.each do |unit|
 end
 
 units.sort.uniq.each do |unit|

-  if node[:lsb][:release].to_f >= 16.04
-    service "serial-getty@ttyS#{unit}" do
-      action [:enable, :start]
-    end
-  else
-    file "/etc/init/ttySttyS#{unit}.conf" do
-      action :delete
-    end
-
-    template "/etc/init/ttyS#{unit}.conf" do
-      source "tty.conf.erb"
-      owner "root"
-      group "root"
-      mode 0o644
-      variables :unit => unit
-    end
-
-    service "ttyS#{unit}" do
-      provider Chef::Provider::Service::Upstart
-      action [:enable, :start]
-      supports :status => true, :restart => true, :reload => false
-      subscribes :restart, "template[/etc/init/ttyS#{unit}.conf]"
-    end
+  service "serial-getty@ttyS#{unit}" do
+    action [:enable, :start]

   end
 end
 
   end
 end
 


@@ -130,6 +109,7 @@ if node[:hardware][:grub][:kernel]
   package "linux-image-#{kernel_version}-generic"
   package "linux-image-extra-#{kernel_version}-generic"
   package "linux-headers-#{kernel_version}-generic"
   package "linux-image-#{kernel_version}-generic"
   package "linux-image-extra-#{kernel_version}-generic"
   package "linux-headers-#{kernel_version}-generic"

+  package "linux-tools-#{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
 
   boot_device = IO.popen(["df", "/boot"]).readlines.last.split.first
   boot_uuid = IO.popen(["blkid", "-o", "value", "-s", "UUID", boot_device]).readlines.first.chomp


@@ -198,24 +178,6 @@ service "lldpd" do
   supports :status => true, :restart => true, :reload => true
 end
 
   supports :status => true, :restart => true, :reload => true
 end
 

-if node[:hardware][:mcelog][:enabled]
-  package "mcelog"
-
-  %w[bus cache dimm iomca page socket-memory unknown].each do |trigger|
-    template "/etc/mcelog/#{trigger}-error-trigger.local" do
-      source "mcelog-trigger.erb"
-      owner "root"
-      group "root"
-      mode 0o755
-    end
-  end
-
-  service "mcelog" do
-    action [:start, :enable]
-    supports :status => true, :restart => true, :reload => false
-  end
-end
-

 tools_packages = []
 status_packages = {}
 
 tools_packages = []
 status_packages = {}
 


@@ -332,26 +294,28 @@ intel_nvmes = nvmes.select { |pci| pci[:vendor_name] == "Intel Corporation" }
 if !intel_ssds.empty? || !intel_nvmes.empty?
   package "unzip"
 
 if !intel_ssds.empty? || !intel_nvmes.empty?
   package "unzip"
 

-  remote_file "#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_3.0.13_Linux.zip" do
-    source "https://downloadmirror.intel.com/27863/eng/Intel_SSD_Data_Center_Tool_3.0.13_Linux.zip"
+  intel_ssd_tool_version = "3.0.19"
+
+  remote_file "#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.zip" do
+    source "https://downloadmirror.intel.com/28639/eng/Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.zip"

   end
 
   end
 

-  execute "#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_3.0.13_Linux.zip" do
-    command "unzip Intel_SSD_Data_Center_Tool_3.0.13_Linux.zip isdct_3.0.13.400-17_amd64.deb"
+  execute "#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.zip" do
+    command "unzip Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.zip isdct_#{intel_ssd_tool_version}-1_amd64.deb"

     cwd Chef::Config[:file_cache_path]
     user "root"
     group "root"
     cwd Chef::Config[:file_cache_path]
     user "root"
     group "root"

-    not_if { File.exist?("#{Chef::Config[:file_cache_path]}/isdct_3.0.13.400-17_amd64.deb") }
+    not_if { File.exist?("#{Chef::Config[:file_cache_path]}/isdct_#{intel_ssd_tool_version}-1_amd64.deb") }

   end
 
   dpkg_package "isdct" do
   end
 
   dpkg_package "isdct" do

-    version "3.0.13.400-17"
-    source "#{Chef::Config[:file_cache_path]}/isdct_3.0.13.400-17_amd64.deb"
+    version "#{intel_ssd_tool_version}-1"
+    source "#{Chef::Config[:file_cache_path]}/isdct_#{intel_ssd_tool_version}-1_amd64.deb"

   end
 end
 
 disks = disks.map do |disk|
   end
 end
 
 disks = disks.map do |disk|

-  next if disk[:state] == "spun_down"
+  next if disk[:state] == "spun_down" || %w[unconfigured failed].any?(disk[:status])

 
   if disk[:smart_device]
     controller = node[:hardware][:disk][:controllers][disk[:controller]]
 
   if disk[:smart_device]
     controller = node[:hardware][:disk][:controllers][disk[:controller]]


@@ -384,12 +348,6 @@ disks = disks.map do |disk|
   ]
 end
 
   ]
 end
 

-smartd_service = if node[:lsb][:release].to_f >= 16.04
-                   "smartd"
-                 else
-                   "smartmontools"
-                 end
-

 disks = disks.compact
 
 if disks.count.positive?
 disks = disks.compact
 
 if disks.count.positive?


@@ -417,7 +375,7 @@ if disks.count.positive?
     mode 0o644
   end
 
     mode 0o644
   end
 

-  service smartd_service do
+  service "smartd" do

     action [:enable, :start]
     subscribes :reload, "template[/etc/smartd.conf]"
     subscribes :restart, "template[/etc/default/smartmontools]"
     action [:enable, :start]
     subscribes :reload, "template[/etc/smartd.conf]"
     subscribes :restart, "template[/etc/default/smartmontools]"


@@ -437,7 +395,7 @@ if disks.count.positive?
     end
   end
 else
     end
   end
 else

-  service smartd_service do
+  service "smartd" do

     action [:stop, :disable]
   end
 end
     action [:stop, :disable]
   end
 end


@@ -460,6 +418,7 @@ plugins = Dir.glob("/etc/munin/plugins/smart_*").map { |p| File.basename(p) } -
 plugins.each do |plugin|
   munin_plugin plugin do
     action :delete
 plugins.each do |plugin|
   munin_plugin plugin do
     action :delete

+    conf "munin.smart.erb"

   end
 end
 
   end
 end