Merge pull request #50 from Firefishy/add-imagery

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

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index 4bf1f8703602bcdad985ed266f321b306be8a79b..fc457acdd5ff27f21ccb669134c0b1f89a218eef 100644 (file)
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -22,24 +22,27 @@ 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


@@ -87,7 +90,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


@@ -124,56 +127,52 @@ else
   end
 end
 
   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
+if File.exist?("/sbin/hpasmcli")
+  munin_plugin "hpasmcli2_temp" do
+    target "hpasmcli2_"

   end
   end

-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


@@ -183,6 +182,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


@@ -190,7 +193,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


@@ -198,6 +210,11 @@ else
   munin_plugin "ipmi_temp" do
     target "ipmi_"
   end
   munin_plugin "ipmi_temp" do
     target "ipmi_"
   end

+
+  munin_plugin "ipmi_power" do
+    target "ipmi_"
+    only_if { node[:lsb][:release].to_f >= 14.04 }
+  end

 end
 
 munin_plugin "irqstats"
 end
 
 munin_plugin "irqstats"


@@ -253,7 +270,7 @@ 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|

-  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_fan = true unless Dir.glob("#{hwmon}/fan*_input").empty?
   sensors_temp = true unless Dir.glob("#{hwmon}/temp*_input").empty?


@@ -287,6 +304,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


@@ -294,18 +312,6 @@ 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 "tcp"
 munin_plugin "threads"
 munin_plugin "swap"
 munin_plugin "tcp"
 munin_plugin "threads"