X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e5f294d3dc676675b2803915571c28337468c3b3..bb8fbb886ef77d0e23f675966342c10d1d603e00:/cookbooks/munin/recipes/default.rb

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index 0fddea5a9..df7bfbe08 100644
--- 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
 #
-#     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,
@@ -92,12 +92,16 @@ else
 end
 
 munin_plugin_conf "df" do
-  template_source "df.erb"
+  template "df.erb"
 end
 
 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"
@@ -156,12 +160,12 @@ munin_plugin "http_loadtime" do
 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_source "if.erb"
+        template "if.erb"
         variables :ifname => ifname
       end
     else
@@ -210,7 +214,7 @@ if Dir.glob("/dev/ipmi*").empty?
   end
 else
   munin_plugin_conf "ipmi" do
-    template_source "ipmi.erb"
+    template "ipmi.erb"
   end
 
   munin_plugin "ipmi_fans" do