X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2bce87624a95eeebc027ee8f3eed5fda8c47bba9..cf894718de9117eb4189e78f27e966c3a9b8dc93:/cookbooks/munin/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb index e83cac6f6..677a62b32 100644 --- a/cookbooks/munin/recipes/default.rb +++ b/cookbooks/munin/recipes/default.rb @@ -8,7 +8,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -17,29 +17,25 @@ # limitations under the License. # -include_recipe "networking" - package "munin-node" service "munin-node" do - action [ :enable, :start ] + 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 +44,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 +53,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,10 +64,10 @@ 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 @@ -87,7 +83,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 @@ -95,8 +91,17 @@ else end end +munin_plugin_conf "df" do + template "df.erb" +end + munin_plugin "df" munin_plugin "df_inode" + +munin_plugin_conf "diskstats" do + template "diskstats.erb" +end + munin_plugin "diskstats" munin_plugin "entropy" munin_plugin "forks" @@ -124,43 +129,65 @@ 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 "http_loadtime" do +munin_plugin "hpasmcli_temp" do # ~FC005 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 "hpasmcli_fans" do + action :delete +end - munin_plugin "if_#{ifname}" do - target "if_" +munin_plugin "http_loadtime" do + action :delete +end + +node[:network][:interfaces].each do |ifname, ifattr| + if ifattr[:encapsulation] == "Ethernet" && ifattr[:state] == "up" + if node[:hardware] && + node[:hardware][:network] && + node[:hardware][:network][ifname][:device] =~ /^virtio/ + munin_plugin_conf "if_#{ifname}" do + template "if.erb" + variables :ifname => ifname end else - munin_plugin "if_err_#{ifname}" do + munin_plugin_conf "if_#{ifname}" do action :delete end + end - munin_plugin "if_#{ifname}" do - action :delete - end + 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 @@ -170,6 +197,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 @@ -177,7 +208,15 @@ if Dir.glob("/dev/ipmi*").empty? munin_plugin "ipmi_temp" do action :delete end + + munin_plugin "ipmi_power" do + action :delete + end else + munin_plugin_conf "ipmi" do + template "ipmi.erb" + end + munin_plugin "ipmi_fans" do target "ipmi_" end @@ -185,6 +224,10 @@ else munin_plugin "ipmi_temp" do target "ipmi_" end + + munin_plugin "ipmi_power" do + target "ipmi_" + end end munin_plugin "irqstats" @@ -192,7 +235,15 @@ munin_plugin "load" munin_plugin "memory" 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 +251,7 @@ else end end -if File.exists?("/proc/net/rpc/nfsd") +if node[:kernel][:modules].include?("nfsd") munin_plugin "nfsd" munin_plugin "nfsd4" else @@ -232,15 +283,15 @@ sensors_temp = false sensors_volt = false Dir.glob("/sys/class/hwmon/hwmon*").each do |hwmon| - package "lm-sensors" - - 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? sensors_volt = true unless Dir.glob("#{hwmon}/in*_input").empty? end +package "lm-sensors" if sensors_fan || sensors_temp || sensors_volt + if sensors_fan munin_plugin "sensors_fan" do target "sensors_" @@ -264,6 +315,7 @@ end if sensors_volt munin_plugin "sensors_volt" do target "sensors_" + conf "sensors_volt.erb" end else munin_plugin "sensors_volt" do @@ -271,19 +323,8 @@ 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" munin_plugin "uptime" munin_plugin "users"