Upgrade ridley and ouroboros to chef 12

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

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index c3e43cdd8eed5f4ed6b9a573dafc5c6cebe7ea7e..36ddd96b44e0997439d5dd7b6ff77d5a0c22b4ad 100644 (file)
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -22,7 +22,10 @@ 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 >= 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
 


@@ -30,16 +33,14 @@ servers = search(:node, "recipes:munin\\:\\:server")
 
 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


@@ -50,7 +51,7 @@ template "/etc/munin/munin-node.conf" do
   group "root"
   mode 0644
   variables :servers => servers
   group "root"
   mode 0644
   variables :servers => servers

-  notifies :restart, resources(:service => "munin-node")
+  notifies :restart, "service[munin-node]"

 end
 
 remote_directory "/usr/local/share/munin/plugins" do
 end
 
 remote_directory "/usr/local/share/munin/plugins" do


@@ -73,7 +74,7 @@ remote_directory "/etc/munin/plugin-conf.d" do
   files_group "root"
   files_mode 0644
   purge false
   files_group "root"
   files_mode 0644
   purge false

-  notifies :restart, resources(:service => "munin-node")
+  notifies :restart, "service[munin-node]"

 end
 
 if Dir.glob("/proc/acpi/thermal_zone/*/temperature").empty?
 end
 
 if Dir.glob("/proc/acpi/thermal_zone/*/temperature").empty?


@@ -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


@@ -101,7 +102,9 @@ munin_plugin "diskstats"
 munin_plugin "entropy"
 munin_plugin "forks"
 
 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
   munin_plugin "fw_conntrack"
   munin_plugin "fw_forwarded_local"
 else


@@ -114,7 +117,7 @@ else
   end
 end
 
   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
   munin_plugin "fw_packets"
 else
   munin_plugin "fw_packets" do


@@ -122,43 +125,52 @@ 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 "hpasmcli_temp" do # ~FC005
+  action :delete
+end
+
+munin_plugin "hpasmcli_fans" do
+  action :delete
+end
+

 munin_plugin "http_loadtime" do
   action :delete
 end
 
 munin_plugin "http_loadtime" do
   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 "if_#{ifname}" do
-        target "if_"
-      end
-    else
-      munin_plugin "if_err_#{ifname}" do
-        action :delete
-      end
-
-      munin_plugin "if_#{ifname}" do
-        action :delete
-      end
+node[:network][:interfaces].each do |ifname, ifattr|
+  if ifattr[:encapsulation] == "Ethernet" && ifattr[:state] == "up"
+    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


@@ -175,6 +187,11 @@ 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
   munin_plugin "ipmi_fans" do
     target "ipmi_"
 else
   munin_plugin "ipmi_fans" do
     target "ipmi_"


@@ -183,31 +200,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


@@ -215,7 +228,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


@@ -242,42 +255,55 @@ end
 munin_plugin "processes"
 munin_plugin "proc_pri"
 
 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|
 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
+
+if sensors_fan || sensors_temp || sensors_volt
+  package "lm-sensors"
+end
+
+if sensors_fan
+  munin_plugin "sensors_fan" do
+    target "sensors_"
+  end
+else
+  munin_plugin "sensors_fan" do
+    action :delete

   end
   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

+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
 
   end
 end
 

-# smart_

 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"