Yet more rubucop cleanups

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

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index 03bcee613c92ca4202594a956e56b45b41890869..79c58df5800f5123ab21bd622e6a79405f371490 100644 (file)
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -25,7 +25,7 @@ service "munin-node" do
   if node[:lsb][:release].to_f >= 14.04
     provider Chef::Provider::Service::Upstart
   end
   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
 
   supports :status => true, :restart => true, :reload => true
 end
 


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


@@ -127,8 +127,8 @@ else
   end
 end
 
   end
 end
 

-disks = node[:block_device].select do |name,attributes|
-  [ "ATA", "FUJITSU", "SEAGATE", "DELL", "COMPAQ", "IBM-ESXS" ].include?(attributes[:vendor])
+disks = node[:block_device].select do |_, attributes|
+  ["ATA", "FUJITSU", "SEAGATE", "DELL", "COMPAQ", "IBM-ESXS"].include?(attributes[:vendor])

 end
 
 if disks.empty?
 end
 
 if disks.empty?


@@ -142,7 +142,7 @@ else
   end
 end
 
   end
 end
 

-if File.exists?("/sbin/hpasmcli")
+if File.exist?("/sbin/hpasmcli")

   munin_plugin "hpasmcli2_temp" do
     target "hpasmcli2_"
   end
   munin_plugin "hpasmcli2_temp" do
     target "hpasmcli2_"
   end


@@ -172,24 +172,22 @@ munin_plugin "http_loadtime" do
   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
+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
+      target "if_"
+    end
+  else
+    munin_plugin "if_err_#{ifname}" do
+      action :delete
+    end

 
 

-      munin_plugin "if_#{ifname}" do
-        action :delete
-      end
+    munin_plugin "if_#{ifname}" do
+      action :delete

     end
   end
 end
     end
   end
 end


@@ -279,7 +277,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?


@@ -321,10 +319,12 @@ else
   end
 end
 
   end
 end
 

-node[:block_device].each do |name,attributes|
+node[:block_device].each do |name, attributes|

   if attributes[:vendor] == "ATA"
     munin_plugin "smart_#{name}" do
       target "smart_"
   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
     end
   else
     munin_plugin "smart_#{name}" do