From: Tom Hughes <tom@compton.nu>
Date: Thu, 5 Jul 2018 18:48:02 +0000 (+0100)
Subject: Drop support for lumberjack input to logstash
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/0ff99dc2859b8cc63d5c13b94ac6a0f5417bef2f?hp=45a4c210d219a5e2f4904517ca4c7eaecc072704

Drop support for lumberjack input to logstash
---

diff --git a/cookbooks/logstash/recipes/default.rb b/cookbooks/logstash/recipes/default.rb
index df54a7280..620194df8 100644
--- a/cookbooks/logstash/recipes/default.rb
+++ b/cookbooks/logstash/recipes/default.rb
@@ -26,22 +26,6 @@ package %w[
   logstash
 ]
 
-cookbook_file "/var/lib/logstash/lumberjack.crt" do
-  source "lumberjack.crt"
-  user "root"
-  group "logstash"
-  mode 0o644
-  notifies :restart, "service[logstash]"
-end
-
-file "/var/lib/logstash/lumberjack.key" do
-  content keys["lumberjack"].join("\n")
-  user "root"
-  group "logstash"
-  mode 0o640
-  notifies :restart, "service[logstash]"
-end
-
 cookbook_file "/var/lib/logstash/beats.crt" do
   source "beats.crt"
   user "root"
diff --git a/cookbooks/logstash/templates/default/logstash.conf.erb b/cookbooks/logstash/templates/default/logstash.conf.erb
index 87260524d..cbd61e937 100644
--- a/cookbooks/logstash/templates/default/logstash.conf.erb
+++ b/cookbooks/logstash/templates/default/logstash.conf.erb
@@ -1,10 +1,4 @@
 input {
-  lumberjack {
-    port => 5043
-    ssl_certificate => "/var/lib/logstash/lumberjack.crt"
-    ssl_key => "/var/lib/logstash/lumberjack.key"
-  }
-
   beats {
     port => 5044
     ssl_certificate => "/var/lib/logstash/beats.crt"