X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/41140b569c7401130afc08c91554e57688ef9b91..f3885e7a9dacd61ae188d461d222ef0f052c1538:/cookbooks/munin/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb index ac6c4d843..cf2b767ab 100644 --- a/cookbooks/munin/recipes/default.rb +++ b/cookbooks/munin/recipes/default.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: munin +# Cookbook:: munin # Recipe:: default # -# Copyright 2010, OpenStreetMap Foundation +# Copyright:: 2010, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # 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,15 +17,10 @@ # limitations under the License. # -include_recipe "networking" - package "munin-node" service "munin-node" do - if node[:lsb][:release].to_f >= 14.04 - provider Chef::Provider::Service::Upstart - end - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true, :reload => true end @@ -33,16 +28,14 @@ servers = search(:node, "recipes:munin\\:\\:server") 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 @@ -51,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 @@ -60,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 @@ -71,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 @@ -90,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 @@ -98,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" @@ -127,22 +129,7 @@ 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 - end -else - munin_plugin "hddtemp_smartctl" do - conf "hddtemp.erb" - conf_variables :disks => disks - end -end - -if File.exists?("/sbin/hpasmcli") +if File.exist?("/sbin/hpasmcli") munin_plugin "hpasmcli2_temp" do target "hpasmcli2_" end @@ -172,8 +159,21 @@ munin_plugin "http_loadtime" do action :delete end -node[:network][:interfaces].each do |ifname,ifattr| - if ifattr[:encapsulation] == "Ethernet" and ifattr[:state] == "up" +node[:network][:interfaces].each do |ifname, ifattr| + if ifattr[:flags]&.include?("UP") && !ifattr[:flags].include?("LOOPBACK") + 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_conf "if_#{ifname}" do + action :delete + end + end + munin_plugin "if_err_#{ifname}" do target "if_err_" end @@ -197,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 @@ -207,9 +211,12 @@ if Dir.glob("/dev/ipmi*").empty? 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 @@ -220,7 +227,6 @@ else munin_plugin "ipmi_power" do target "ipmi_" - only_if { node[:lsb][:release].to_f >= 14.04 } end end @@ -277,16 +283,14 @@ 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? sensors_volt = true unless Dir.glob("#{hwmon}/in*_input").empty? end -if sensors_fan || sensors_temp || sensors_volt - package "lm-sensors" -end +package "lm-sensors" if sensors_fan || sensors_temp || sensors_volt if sensors_fan munin_plugin "sensors_fan" do @@ -319,20 +323,6 @@ else end end -node[:block_device].each do |name,attributes| - if attributes[:vendor] == "ATA" - munin_plugin "smart_#{name}" do - target "smart_" - conf "smart.erb" - conf_variables :disk => name - end - else - munin_plugin "smart_#{name}" do - action :delete - end - end -end - munin_plugin "swap" munin_plugin "tcp" munin_plugin "threads"