Avoid exception when an interface has no flags

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

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index fc457acdd5ff27f21ccb669134c0b1f89a218eef..3418d3e83b1843255ca6f44eed9d6096d099840f 100644 (file)
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,16 +17,9 @@
 # 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

-  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
   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end


@@ -51,7 +44,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


@@ -60,10 +53,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
 


@@ -71,10 +64,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


@@ -98,8 +91,17 @@ 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_conf "diskstats" do
+  template "diskstats.erb"
+end
+

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


@@ -158,7 +160,20 @@ munin_plugin "http_loadtime" do
 end
 
 node[:network][:interfaces].each do |ifname, ifattr|
 end
 
 node[:network][:interfaces].each do |ifname, ifattr|

-  if ifattr[:encapsulation] == "Ethernet" && ifattr[:state] == "up"
+  if ifattr[:flags]&.include?("UP") && !ifattr[:flags].include?("LOOPBACK")
+    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
+      munin_plugin_conf "if_#{ifname}" do
+        action :delete
+      end
+    end
+

     munin_plugin "if_err_#{ifname}" do
       target "if_err_"
     end
     munin_plugin "if_err_#{ifname}" do
       target "if_err_"
     end


@@ -196,7 +211,6 @@ if Dir.glob("/dev/ipmi*").empty?
 
   munin_plugin "ipmi_power" do
     action :delete
 
   munin_plugin "ipmi_power" do
     action :delete

-    only_if { node[:lsb][:release].to_f >= 14.04 }

   end
 else
   munin_plugin_conf "ipmi" do
   end
 else
   munin_plugin_conf "ipmi" do


@@ -213,7 +227,6 @@ else
 
   munin_plugin "ipmi_power" do
     target "ipmi_"
 
   munin_plugin "ipmi_power" do
     target "ipmi_"

-    only_if { node[:lsb][:release].to_f >= 14.04 }

   end
 end
 
   end
 end
 


@@ -277,9 +290,7 @@ Dir.glob("/sys/class/hwmon/hwmon*").each do |hwmon|
   sensors_volt = true unless Dir.glob("#{hwmon}/in*_input").empty?
 end
 
   sensors_volt = true unless Dir.glob("#{hwmon}/in*_input").empty?
 end
 

-if sensors_fan || sensors_temp || sensors_volt
-  package "lm-sensors"
-end
+package "lm-sensors" if sensors_fan || sensors_temp || sensors_volt

 
 if sensors_fan
   munin_plugin "sensors_fan" do
 
 if sensors_fan
   munin_plugin "sensors_fan" do