Merge remote-tracking branch 'github/pull/102'

[chef.git] / cookbooks / munin / recipes / default.rb

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index ce771e8c8cc29e8318715e29c5254e7560932214..39085f0e2f8efc32a400440a05457fad4662ef7f 100644 (file)
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -17,29 +17,30 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "networking"
-

 package "munin-node"
 
 service "munin-node" do
 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
 
   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|
 
 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
     end
   end
 end


@@ -48,7 +49,7 @@ template "/etc/munin/munin-node.conf" do
   source "munin-node.conf.erb"
   owner "root"
   group "root"
   source "munin-node.conf.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   variables :servers => servers
   notifies :restart, "service[munin-node]"
 end
   variables :servers => servers
   notifies :restart, "service[munin-node]"
 end


@@ -57,10 +58,10 @@ remote_directory "/usr/local/share/munin/plugins" do
   source "plugins"
   owner "root"
   group "root"
   source "plugins"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

   files_owner "root"
   files_group "root"
   files_owner "root"
   files_group "root"

-  files_mode 0755
+  files_mode 0o755

   purge true
 end
 
   purge true
 end
 


@@ -68,10 +69,10 @@ remote_directory "/etc/munin/plugin-conf.d" do
   source "plugin-conf.d"
   owner "root"
   group "munin"
   source "plugin-conf.d"
   owner "root"
   group "munin"

-  mode 0750
+  mode 0o750

   files_owner "root"
   files_group "root"
   files_owner "root"
   files_group "root"

-  files_mode 0644
+  files_mode 0o644

   purge false
   notifies :restart, "service[munin-node]"
 end
   purge false
   notifies :restart, "service[munin-node]"
 end


@@ -87,7 +88,7 @@ end
 # apcpdu_
 munin_plugin "cpu"
 
 # 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
   munin_plugin "cpuspeed"
 else
   munin_plugin "cpuspeed" do


@@ -95,8 +96,13 @@ else
   end
 end
 
   end
 end
 

+munin_plugin_conf "df" do
+  template "df.erb"
+end
+

 munin_plugin "df"
 munin_plugin "df_inode"
 munin_plugin "df"
 munin_plugin "df_inode"

+

 munin_plugin "diskstats"
 munin_plugin "entropy"
 munin_plugin "forks"
 munin_plugin "diskstats"
 munin_plugin "entropy"
 munin_plugin "forks"


@@ -124,43 +130,65 @@ else
   end
 end
 
   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
 else

-  munin_plugin "hpasmcli_temp" do
+  munin_plugin "hpasmcli2_temp" do

     action :delete
   end
 
     action :delete
   end
 

-  munin_plugin "hpasmcli_fans" do
+  munin_plugin "hpasmcli2_fans" do

     action :delete
   end
 end
 
     action :delete
   end
 end
 

-munin_plugin "http_loadtime" do
+munin_plugin "hpasmcli_temp" do # ~FC005

   action :delete
 end
 
   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 "if.erb"
+        variables :ifname => ifname

       end
     else
       end
     else

-      munin_plugin "if_err_#{ifname}" do
+      munin_plugin_conf "if_#{ifname}" do

         action :delete
       end
         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
     end
   end
 end


@@ -170,6 +198,10 @@ munin_plugin "iostat"
 munin_plugin "iostat_ios"
 
 if Dir.glob("/dev/ipmi*").empty?
 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
   munin_plugin "ipmi_fans" do
     action :delete
   end


@@ -177,7 +209,16 @@ if Dir.glob("/dev/ipmi*").empty?
   munin_plugin "ipmi_temp" do
     action :delete
   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
 else

+  munin_plugin_conf "ipmi" do
+    template "ipmi.erb"
+  end
+

   munin_plugin "ipmi_fans" do
     target "ipmi_"
   end
   munin_plugin "ipmi_fans" do
     target "ipmi_"
   end


@@ -185,31 +226,27 @@ else
   munin_plugin "ipmi_temp" do
     target "ipmi_"
   end
   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_"
+    only_if { node[:lsb][:release].to_f >= 14.04 }

   end
 end
 
   end
 end
 

+munin_plugin "irqstats"

 munin_plugin "load"
 munin_plugin "memory"
 munin_plugin "netstat"
 
 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
   munin_plugin "nfs4_client"
 else
   munin_plugin "nfs4_client" do


@@ -217,7 +254,7 @@ else
   end
 end
 
   end
 end
 

-if File.exists?("/proc/net/rpc/nfsd")
+if node[:kernel][:modules].include?("nfsd")

   munin_plugin "nfsd"
   munin_plugin "nfsd4"
 else
   munin_plugin "nfsd"
   munin_plugin "nfsd4"
 else


@@ -249,15 +286,15 @@ sensors_temp = false
 sensors_volt = false
 
 Dir.glob("/sys/class/hwmon/hwmon*").each do |hwmon|
 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
 
 
   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_"
 if sensors_fan
   munin_plugin "sensors_fan" do
     target "sensors_"


@@ -281,6 +318,7 @@ end
 if sensors_volt
   munin_plugin "sensors_volt" do
     target "sensors_"
 if sensors_volt
   munin_plugin "sensors_volt" do
     target "sensors_"

+    conf "sensors_volt.erb"

   end
 else
   munin_plugin "sensors_volt" do
   end
 else
   munin_plugin "sensors_volt" do


@@ -288,19 +326,8 @@ else
   end
 end
 
   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 "swap"

+munin_plugin "tcp"

 munin_plugin "threads"
 munin_plugin "uptime"
 munin_plugin "users"
 munin_plugin "threads"
 munin_plugin "uptime"
 munin_plugin "users"