X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/18e12b0e123fc3e5f344682f884feabc12da0f5a..f3885e7a9dacd61ae188d461d222ef0f052c1538:/cookbooks/munin/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index 677a62b32..cf2b767ab 100644
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: munin
+# Cookbook:: munin
 # Recipe:: default
 #
-# Copyright 2010, OpenStreetMap Foundation
+# Copyright:: 2010, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ service "munin-node" do
   supports :status => true, :restart => true, :reload => true
 end
 
-servers = search(:node, "recipes:munin\\:\\:server") # ~FC010
+servers = search(:node, "recipes:munin\\:\\:server")
 
 servers.each do |server|
   server.interfaces(:role => :external) do |interface|
@@ -147,7 +147,7 @@ else
   end
 end
 
-munin_plugin "hpasmcli_temp" do # ~FC005
+munin_plugin "hpasmcli_temp" do
   action :delete
 end
 
@@ -160,7 +160,7 @@ 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/