Drop support for lumberjack input to logstash

diff --git a/cookbooks/logstash/recipes/default.rb b/cookbooks/logstash/recipes/default.rb
index df54a728067c21eb1a77448c72ccfa11147bc4b1..620194df8973c596608c69d662cbfa697d6d292c 100644 (file)
--- a/cookbooks/logstash/recipes/default.rb
+++ b/cookbooks/logstash/recipes/default.rb
@@ -26,22 +26,6 @@ package %w[
   logstash
 ]
 
   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"
 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 87260524dc4991ccea2d1aa73c4a7e52760f912b..cbd61e937273adee69c36924c1e4efc2c75b92eb 100644 (file)
--- a/cookbooks/logstash/templates/default/logstash.conf.erb
+++ b/cookbooks/logstash/templates/default/logstash.conf.erb
@@ -1,10 +1,4 @@
 input {
 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"
   beats {
     port => 5044
     ssl_certificate => "/var/lib/logstash/beats.crt"