X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9609940accb4bc20bc380f2b35e850c0f5d0f66d..49e90bd4f3154ad5b3a542c7aad648b008dfe844:/cookbooks/logstash/recipes/default.rb

diff --git a/cookbooks/logstash/recipes/default.rb b/cookbooks/logstash/recipes/default.rb
index 73198d593..712b33cb8 100644
--- a/cookbooks/logstash/recipes/default.rb
+++ b/cookbooks/logstash/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: logstash
+# Cookbook:: logstash
 # Recipe:: default
 #
-# Copyright 2015, OpenStreetMap Foundation
+# Copyright:: 2015, 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,
@@ -17,26 +17,29 @@
 # limitations under the License.
 #
 
+include_recipe "elasticsearch"
 include_recipe "networking"
 
 keys = data_bag_item("logstash", "keys")
 
-package "default-jre-headless"
-package "logstash"
+package %w[
+  openjdk-8-jre-headless
+  logstash
+]
 
-cookbook_file "/var/lib/logstash/lumberjack.crt" do
-  source "lumberjack.crt"
+cookbook_file "/var/lib/logstash/beats.crt" do
+  source "beats.crt"
   user "root"
   group "logstash"
-  mode 0644
+  mode "644"
   notifies :restart, "service[logstash]"
 end
 
-file "/var/lib/logstash/lumberjack.key" do
-  content keys["lumberjack"].join("\n")
+file "/var/lib/logstash/beats.key" do
+  content keys["beats"].join("\n")
   user "root"
   group "logstash"
-  mode 0640
+  mode "640"
   notifies :restart, "service[logstash]"
 end
 
@@ -44,29 +47,36 @@ template "/etc/logstash/conf.d/chef.conf" do
   source "logstash.conf.erb"
   user "root"
   group "root"
-  mode 0644
-  notifies :restart, "service[logstash]"
+  mode "644"
+  notifies :start, "service[logstash]"
 end
 
 file "/etc/logrotate.d/logstash" do
-  mode 0644
+  mode "644"
+end
+
+template "/etc/default/logstash" do
+  source "logstash.default.erb"
+  user "root"
+  group "root"
+  mode "644"
+  notifies :restart, "service[logstash]"
 end
 
 service "logstash" do
   action [:enable, :start]
-  supports :status => true, :restart => true
 end
 
 template "/etc/cron.daily/expire-logstash" do
   source "expire.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode "755"
 end
 
-forwarders = search(:node, "recipes:logstash\\:\\:forwarder") # ~FC010
+forwarders = search(:node, "recipes:logstash\\:\\:forwarder")
 
-forwarders.each do |forwarder|
+forwarders.sort_by { |n| n[:fqdn] }.each do |forwarder|
   forwarder.interfaces(:role => :external) do |interface|
     firewall_rule "accept-lumberjack-#{forwarder}" do
       action :accept
@@ -77,12 +87,22 @@ forwarders.each do |forwarder|
       dest_ports "5043"
       source_ports "1024:"
     end
+
+    firewall_rule "accept-beats-#{forwarder}" do
+      action :accept
+      family interface[:family]
+      source "#{interface[:zone]}:#{interface[:address]}"
+      dest "fw"
+      proto "tcp:syn"
+      dest_ports "5044"
+      source_ports "1024:"
+    end
   end
 end
 
-gateways = search(:node, "roles:gateway") # ~FC010
+gateways = search(:node, "roles:gateway")
 
-gateways.each do |gateway|
+gateways.sort_by { |n| n[:fqdn] }.each do |gateway|
   gateway.interfaces(:role => :external) do |interface|
     firewall_rule "accept-lumberjack-#{gateway}" do
       action :accept
@@ -93,5 +113,15 @@ gateways.each do |gateway|
       dest_ports "5043"
       source_ports "1024:"
     end
+
+    firewall_rule "accept-beats-#{gateway}" do
+      action :accept
+      family interface[:family]
+      source "#{interface[:zone]}:#{interface[:address]}"
+      dest "fw"
+      proto "tcp:syn"
+      dest_ports "5044"
+      source_ports "1024:"
+    end
   end
 end