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

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index 0fddea5a9..cf2b767ab 100644
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# 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.
 # 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,
@@ -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|
@@ -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"
@@ -143,7 +147,7 @@ else
   end
 end
 
-munin_plugin "hpasmcli_temp" do # ~FC005
+munin_plugin "hpasmcli_temp" do
   action :delete
 end
 
@@ -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