X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1613ad2ccaf85558a7fdcc3021992ad4d1734fc2..1d23c59f10b2636d9c20b3da441aa22373f88af4:/cookbooks/munin/recipes/default.rb?ds=inline diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb index f02730ebc..677d79d5e 100644 --- a/cookbooks/munin/recipes/default.rb +++ b/cookbooks/munin/recipes/default.rb @@ -17,29 +17,30 @@ # limitations under the License. # -include_recipe "networking" - package "munin-node" service "munin-node" do - action [ :enable, :start ] + if node[:lsb][:release].to_f >= 15.10 + provider Chef::Provider::Service::Systemd + elsif node[:lsb][:release].to_f >= 14.04 + provider Chef::Provider::Service::Upstart + end + action [:enable, :start] supports :status => true, :restart => true, :reload => true end -servers = search(:node, "recipes:munin\\:\\:server") +servers = search(:node, "recipes:munin\\:\\:server") # ~FC010 servers.each do |server| server.interfaces(:role => :external) do |interface| - if interface[:zone] - firewall_rule "accept-munin-#{server}" do - action :accept - family interface[:family] - source "#{interface[:zone]}:#{interface[:address]}" - dest "fw" - proto "tcp:syn" - dest_ports "munin" - source_ports "1024:" - end + firewall_rule "accept-munin-#{server}" do + action :accept + family interface[:family] + source "#{interface[:zone]}:#{interface[:address]}" + dest "fw" + proto "tcp:syn" + dest_ports "munin" + source_ports "1024:" end end end @@ -48,7 +49,7 @@ template "/etc/munin/munin-node.conf" do source "munin-node.conf.erb" owner "root" group "root" - mode 0644 + mode 0o644 variables :servers => servers notifies :restart, "service[munin-node]" end @@ -57,10 +58,10 @@ remote_directory "/usr/local/share/munin/plugins" do source "plugins" owner "root" group "root" - mode 0755 + mode 0o755 files_owner "root" files_group "root" - files_mode 0755 + files_mode 0o755 purge true end @@ -68,26 +69,14 @@ remote_directory "/etc/munin/plugin-conf.d" do source "plugin-conf.d" owner "root" group "munin" - mode 0750 + mode 0o750 files_owner "root" files_group "root" - files_mode 0644 + files_mode 0o644 purge false notifies :restart, "service[munin-node]" end -if node[:dmi] and node[:dmi][:system] and node[:dmi][:system][:manufacturer] == "HP" - case node[:dmi][:system][:product_name] - when "ProLiant DL360 G6", "ProLiant DL360 G7" - template "/etc/sensors.d/disable-bad-acpi-sensor.conf" do - source "disable-bad-acpi-sensor.conf.erb" - owner "root" - group "root" - mode 0644 - end - end -end - if Dir.glob("/proc/acpi/thermal_zone/*/temperature").empty? munin_plugin "acpi" do action :delete @@ -99,7 +88,7 @@ end # apcpdu_ munin_plugin "cpu" -if File.exists?("/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state") +if File.exist?("/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state") munin_plugin "cpuspeed" else munin_plugin "cpuspeed" do @@ -107,8 +96,13 @@ else end end +munin_plugin_conf "df" do + template "df.erb" +end + munin_plugin "df" munin_plugin "df_inode" + munin_plugin "diskstats" munin_plugin "entropy" munin_plugin "forks" @@ -136,56 +130,52 @@ else end end -disks = node[:block_device].select do |name,attributes| - [ "ATA", "FUJITSU", "SEAGATE", "DELL", "COMPAQ", "IBM-ESXS" ].include?(attributes[:vendor]) -end - -if disks.empty? - munin_plugin "hddtemp_smartctl" do - action :delete +if File.exist?("/sbin/hpasmcli") + munin_plugin "hpasmcli2_temp" do + target "hpasmcli2_" end -else - munin_plugin "hddtemp_smartctl" do - conf "hddtemp.erb" - conf_variables :disks => disks - end -end -if File.exists?("/sbin/hpasmcli") - munin_plugin "hpasmcli_temp" - munin_plugin "hpasmcli_fans" + munin_plugin "hpasmcli2_fans" do + target "hpasmcli2_" + end else - munin_plugin "hpasmcli_temp" do + munin_plugin "hpasmcli2_temp" do action :delete end - munin_plugin "hpasmcli_fans" do + munin_plugin "hpasmcli2_fans" do action :delete end end +munin_plugin "hpasmcli_temp" do # ~FC005 + action :delete +end + +munin_plugin "hpasmcli_fans" do + action :delete +end + munin_plugin "http_loadtime" do action :delete end -node[:network][:interfaces].each do |ifname,ifattr| - if ifname =~ /^eth\d+$/ - if ifattr[:flags] and ifattr[:flags].include?("UP") - munin_plugin "if_err_#{ifname}" do - target "if_err_" - end - - munin_plugin "if_#{ifname}" do - target "if_" - end - else - munin_plugin "if_err_#{ifname}" do - action :delete - end - - munin_plugin "if_#{ifname}" do - action :delete - end +node[:network][:interfaces].each do |ifname, ifattr| + if ifattr[:encapsulation] == "Ethernet" && ifattr[:state] == "up" + munin_plugin "if_err_#{ifname}" do + target "if_err_" + end + + munin_plugin "if_#{ifname}" do + target "if_" + end + else + munin_plugin "if_err_#{ifname}" do + action :delete + end + + munin_plugin "if_#{ifname}" do + action :delete end end end @@ -195,6 +185,10 @@ munin_plugin "iostat" munin_plugin "iostat_ios" if Dir.glob("/dev/ipmi*").empty? + munin_plugin_conf "ipmi" do + action :delete + end + munin_plugin "ipmi_fans" do action :delete end @@ -202,7 +196,16 @@ if Dir.glob("/dev/ipmi*").empty? munin_plugin "ipmi_temp" do action :delete end + + munin_plugin "ipmi_power" do + action :delete + only_if { node[:lsb][:release].to_f >= 14.04 } + end else + munin_plugin_conf "ipmi" do + template "ipmi.erb" + end + munin_plugin "ipmi_fans" do target "ipmi_" end @@ -210,6 +213,11 @@ else munin_plugin "ipmi_temp" do target "ipmi_" end + + munin_plugin "ipmi_power" do + target "ipmi_" + only_if { node[:lsb][:release].to_f >= 14.04 } + end end munin_plugin "irqstats" @@ -265,7 +273,7 @@ sensors_temp = false sensors_volt = false Dir.glob("/sys/class/hwmon/hwmon*").each do |hwmon| - hwmon = "#{hwmon}/device" unless File.exists?("#{hwmon}/name") + hwmon = "#{hwmon}/device" unless File.exist?("#{hwmon}/name") sensors_fan = true unless Dir.glob("#{hwmon}/fan*_input").empty? sensors_temp = true unless Dir.glob("#{hwmon}/temp*_input").empty? @@ -299,6 +307,7 @@ end if sensors_volt munin_plugin "sensors_volt" do target "sensors_" + conf "sensors_volt.erb" end else munin_plugin "sensors_volt" do @@ -306,18 +315,6 @@ else end end -node[:block_device].each do |name,attributes| - if attributes[:vendor] == "ATA" - munin_plugin "smart_#{name}" do - target "smart_" - end - else - munin_plugin "smart_#{name}" do - action :delete - end - end -end - munin_plugin "swap" munin_plugin "tcp" munin_plugin "threads"