From 0c79b5dbf9284104cb1ab66bd0673f9d41dd08bd Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 13 Mar 2023 20:57:10 +0000
Subject: [PATCH] Simplify generation of ACLs for munin and logstash

---
 cookbooks/logstash/recipes/default.rb | 16 ++++++----------
 cookbooks/munin/recipes/default.rb    | 10 +++-------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/cookbooks/logstash/recipes/default.rb b/cookbooks/logstash/recipes/default.rb
index 34f731af2..e3261d0d1 100644
--- a/cookbooks/logstash/recipes/default.rb
+++ b/cookbooks/logstash/recipes/default.rb
@@ -76,17 +76,13 @@ end
 
 forwarders = []
 
-search(:node, "recipes:logstash\\:\\:forwarder").each do |forwarder|
-  forwarder.interfaces(:role => :external).map do |interface|
-    forwarders << interface[:address]
-  end
-end
+forwarders << search(:node, "recipes:logstash\\:\\:forwarder").collect do |forwarder|
+  forwarder.ipaddresses(:role => :external)
+end.flatten
 
-search(:node, "roles:gateway").each do |forwarder|
-  forwarder.interfaces(:role => :external).map do |interface|
-    forwarders << interface[:address]
-  end
-end
+forwarders << search(:node, "roles:gateway").collect do |forwarder|
+  forwarder.ipaddresses(:role => :external)
+end.flatten
 
 firewall_rule "accept-logstash" do
   action :accept
diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index 0a2a34452..a54b38718 100644
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -24,13 +24,9 @@ service "munin-node" do
   supports :status => true, :restart => true, :reload => true
 end
 
-servers = []
-
-search(:node, "recipes:munin\\:\\:server").each do |server|
-  server.interfaces(:role => :external) do |interface|
-    servers << interface[:address]
-  end
-end
+servers = search(:node, "recipes:munin\\:\\:server").collect do |server|
+  server.ipaddresses(:role => :external)
+end.flatten
 
 firewall_rule "accept-munin" do
   action :accept
-- 
2.39.5