X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3a4d52bd4c0f8e6ae7679145846b7bc7845d8ace..6922bbdb6fbb5c8af223c1117d6d7e0b2d41f0ad:/cookbooks/munin/recipes/default.rb

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index 59dc6e456..677d79d5e 100644
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -17,32 +17,30 @@
 # limitations under the License.
 #
 
-include_recipe "networking"
-
 package "munin-node"
 
 service "munin-node" do
-  if node[:lsb][:release].to_f >= 14.04
+  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 ]
+  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
@@ -51,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
@@ -60,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
 
@@ -71,10 +69,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
@@ -98,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"
@@ -127,21 +130,6 @@ else
   end
 end
 
-disks = node[:block_device].select do |_, 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.exist?("/sbin/hpasmcli")
   munin_plugin "hpasmcli2_temp" do
     target "hpasmcli2_"
@@ -160,7 +148,7 @@ else
   end
 end
 
-munin_plugin "hpasmcli_temp" do
+munin_plugin "hpasmcli_temp" do # ~FC005
   action :delete
 end
 
@@ -197,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
@@ -210,6 +202,10 @@ if Dir.glob("/dev/ipmi*").empty?
     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
@@ -319,20 +315,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"