X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7b9ec4b60ee39614d1d083d7220e76b07d2b275f..aa02df0d2f61fb4d1839e1e9fca1ec95c249572a:/cookbooks/munin/recipes/default.rb diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb index 775acc095..fc457acdd 100644 --- a/cookbooks/munin/recipes/default.rb +++ b/cookbooks/munin/recipes/default.rb @@ -22,24 +22,27 @@ 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 @@ -50,7 +53,7 @@ template "/etc/munin/munin-node.conf" do group "root" mode 0644 variables :servers => servers - notifies :restart, resources(:service => "munin-node") + notifies :restart, "service[munin-node]" end remote_directory "/usr/local/share/munin/plugins" do @@ -73,7 +76,7 @@ remote_directory "/etc/munin/plugin-conf.d" do files_group "root" files_mode 0644 purge false - notifies :restart, resources(:service => "munin-node") + notifies :restart, "service[munin-node]" end if Dir.glob("/proc/acpi/thermal_zone/*/temperature").empty? @@ -85,10 +88,9 @@ else end # apcpdu_ -# api_ 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 @@ -102,7 +104,9 @@ munin_plugin "diskstats" munin_plugin "entropy" munin_plugin "forks" -if File.exists?("/proc/net/ip_conntrack") or File.exists?("/proc/net/nf_conntrack") +if node[:kernel][:modules].include?("nf_conntrack") + package "conntrack" + munin_plugin "fw_conntrack" munin_plugin "fw_forwarded_local" else @@ -115,7 +119,7 @@ else end end -if %x{sysctl -n net.ipv4.ip_forward}.chomp == "1" +if File.read("/proc/sys/net/ipv4/ip_forward").chomp == "1" munin_plugin "fw_packets" else munin_plugin "fw_packets" do @@ -123,43 +127,52 @@ else end end -# hddtemp_smartctl +if File.exist?("/sbin/hpasmcli") + munin_plugin "hpasmcli2_temp" do + target "hpasmcli2_" + 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 @@ -167,32 +180,57 @@ end munin_plugin "interrupts" munin_plugin "iostat" munin_plugin "iostat_ios" -# ipmi_ -munin_plugin "irqstats" -Dir.new("/sys/block").each do |device| - if device.match(/^sd/) - munin_plugin "linux_diskstat_iops_#{device}" do - target "linux_diskstat_" - end +if Dir.glob("/dev/ipmi*").empty? + munin_plugin_conf "ipmi" do + action :delete + end - munin_plugin "linux_diskstat_latency_#{device}" do - target "linux_diskstat_" - end + munin_plugin "ipmi_fans" do + action :delete + end - munin_plugin "linux_diskstat_throughput_#{device}" do - target "linux_diskstat_" - end + 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 + + 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" munin_plugin "load" munin_plugin "memory" -# mod_tile_ -# mysql_ munin_plugin "netstat" -if File.exists?("/proc/net/rpc/nfs") +if node[:kernel][:modules].include?("nfsv3") + munin_plugin "nfs_client" +else + munin_plugin "nfs_client" do + action :delete + end +end + +if node[:kernel][:modules].include?("nfsv4") munin_plugin "nfs4_client" else munin_plugin "nfs4_client" do @@ -200,7 +238,7 @@ else end end -if File.exists?("/proc/net/rpc/nfsd") +if node[:kernel][:modules].include?("nfsd") munin_plugin "nfsd" munin_plugin "nfsd4" else @@ -213,10 +251,8 @@ else end end -# nominatim_ munin_plugin "open_files" munin_plugin "open_inodes" -# passenger_ munin_plugin "postfix_mailqueue" do action :delete @@ -226,15 +262,58 @@ munin_plugin "postfix_mailvolume" do action :delete end -# postgres_ munin_plugin "processes" munin_plugin "proc_pri" -# renderd_ -# replication_delay -# sensors_ -# smart_ -# squid_ + +sensors_fan = false +sensors_temp = false +sensors_volt = false + +Dir.glob("/sys/class/hwmon/hwmon*").each do |hwmon| + 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? + sensors_volt = true unless Dir.glob("#{hwmon}/in*_input").empty? +end + +if sensors_fan || sensors_temp || sensors_volt + package "lm-sensors" +end + +if sensors_fan + munin_plugin "sensors_fan" do + target "sensors_" + end +else + munin_plugin "sensors_fan" do + action :delete + end +end + +if sensors_temp + munin_plugin "sensors_temp" do + target "sensors_" + end +else + munin_plugin "sensors_temp" do + action :delete + end +end + +if sensors_volt + munin_plugin "sensors_volt" do + target "sensors_" + conf "sensors_volt.erb" + end +else + munin_plugin "sensors_volt" do + action :delete + end +end + munin_plugin "swap" +munin_plugin "tcp" munin_plugin "threads" munin_plugin "uptime" munin_plugin "users"