X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2e17bd4b4697423f9c124cfdb802424a58c16d80..241fcb72fc59ac141ed78e05f56b6b3f291da88e:/cookbooks/logstash/recipes/default.rb

diff --git a/cookbooks/logstash/recipes/default.rb b/cookbooks/logstash/recipes/default.rb
index 34f731af2..bbe845021 100644
--- a/cookbooks/logstash/recipes/default.rb
+++ b/cookbooks/logstash/recipes/default.rb
@@ -23,7 +23,7 @@ include_recipe "networking"
 keys = data_bag_item("logstash", "keys")
 
 package %w[
-  openjdk-8-jre-headless
+  openjdk-11-jre-headless
   logstash
 ]
 
@@ -77,15 +77,11 @@ end
 forwarders = []
 
 search(:node, "recipes:logstash\\:\\:forwarder").each do |forwarder|
-  forwarder.interfaces(:role => :external).map do |interface|
-    forwarders << interface[:address]
-  end
+  forwarders.append(forwarder.ipaddresses(:role => :external))
 end
 
 search(:node, "roles:gateway").each do |forwarder|
-  forwarder.interfaces(:role => :external).map do |interface|
-    forwarders << interface[:address]
-  end
+  forwarders.append(forwarder.ipaddresses(:role => :external))
 end
 
 firewall_rule "accept-logstash" do