X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2b39085d5ec6eb471f1d88ffb6d00822584bf7a0..ecb5d5beac1e41d30e47daa6a034c59b33027d12:/cookbooks/hardware/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 331fc8fe2..b4986e70e 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -80,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
@@ -201,10 +202,10 @@ 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"
@@ -451,18 +452,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
 
@@ -535,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"