X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/2ec62d46e6d050fe6384df90a2869036662d1b51..e5f294d3dc676675b2803915571c28337468c3b3:/cookbooks/munin/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb index c3e43cdd8..0fddea5a9 100644 --- a/cookbooks/munin/recipes/default.rb +++ b/cookbooks/munin/recipes/default.rb @@ -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,19 +44,19 @@ 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, resources(:service => "munin-node") + notifies :restart, "service[munin-node]" end 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,12 +64,12 @@ 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, resources(:service => "munin-node") + notifies :restart, "service[munin-node]" end if Dir.glob("/proc/acpi/thermal_zone/*/temperature").empty? @@ -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,13 +91,20 @@ else end end +munin_plugin_conf "df" do + template_source "df.erb" +end + munin_plugin "df" munin_plugin "df_inode" + 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 @@ -114,7 +117,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 @@ -122,43 +125,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 "http_loadtime" do + action :delete +end - munin_plugin "if_#{ifname}" do - target "if_" +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_source "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 @@ -168,6 +193,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 @@ -175,7 +204,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_source "ipmi.erb" + end + munin_plugin "ipmi_fans" do target "ipmi_" end @@ -183,31 +220,26 @@ else munin_plugin "ipmi_temp" do target "ipmi_" end -end - -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 - - munin_plugin "linux_diskstat_latency_#{device}" do - target "linux_diskstat_" - end - - munin_plugin "linux_diskstat_throughput_#{device}" do - target "linux_diskstat_" - end + munin_plugin "ipmi_power" do + target "ipmi_" end end +munin_plugin "irqstats" 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 @@ -215,7 +247,7 @@ else end end -if File.exists?("/proc/net/rpc/nfsd") +if node[:kernel][:modules].include?("nfsd") munin_plugin "nfsd" munin_plugin "nfsd4" else @@ -242,42 +274,53 @@ end munin_plugin "processes" munin_plugin "proc_pri" +sensors_fan = false +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") - if Dir.glob("#{hwmon}/fan*_input").empty? - munin_plugin "sensors_fan" do - action :delete - end - else - munin_plugin "sensors_fan" do - target "sensors_" - end + 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_" end +else + munin_plugin "sensors_fan" do + action :delete + end +end - if Dir.glob("#{hwmon}/temp*_input").empty? - munin_plugin "sensors_temp" do - action :delete - end - else - munin_plugin "sensors_temp" do - target "sensors_" - end +if sensors_temp + munin_plugin "sensors_temp" do + target "sensors_" end +else + munin_plugin "sensors_temp" do + action :delete + end +end - if Dir.glob("#{hwmon}/in*_input").empty? - munin_plugin "sensors_volt" do - action :delete - end - else - munin_plugin "sensors_volt" do - target "sensors_" - 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 -# smart_ munin_plugin "swap" +munin_plugin "tcp" munin_plugin "threads" munin_plugin "uptime" munin_plugin "users"