From 6f05f788f11e98b18051f84fada2ca484caaf4e3 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 7 Jun 2018 16:55:12 -0400 Subject: [PATCH] Logstash Module - SSL updates --- salt/logstash/conf/conf.enabled.txt.so-master | 2 +- salt/logstash/files/dynamic/0006_input_beats.conf | 5 +++-- salt/logstash/init.sls | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/salt/logstash/conf/conf.enabled.txt.so-master b/salt/logstash/conf/conf.enabled.txt.so-master index a4da29cad..c33e46abe 100644 --- a/salt/logstash/conf/conf.enabled.txt.so-master +++ b/salt/logstash/conf/conf.enabled.txt.so-master @@ -12,6 +12,6 @@ /usr/share/logstash/pipeline.so/0002_input_windows_json.conf /usr/share/logstash/pipeline.so/0003_input_syslog.conf /usr/share/logstash/pipeline.so/0005_input_suricata.conf -/usr/share/logstash/pipeline.so/0006_input_beats.conf +/usr/share/logstash/pipeline.dynamic/0006_input_beats.conf /usr/share/logstash/pipeline.so/0007_input_import.conf /usr/share/logstash/pipeline.dynamic/9999_output_redis.conf diff --git a/salt/logstash/files/dynamic/0006_input_beats.conf b/salt/logstash/files/dynamic/0006_input_beats.conf index 79766785f..3f8a62973 100644 --- a/salt/logstash/files/dynamic/0006_input_beats.conf +++ b/salt/logstash/files/dynamic/0006_input_beats.conf @@ -7,8 +7,9 @@ input { beats { port => "5044" ssl => true - ssl_certificate => "" - ssl_key => "/some/location" + ssl_certificate_authorities => ["/usr/share/filebeat/ca.crt"] + ssl_certificate => "/usr/share/logstash/filebeat.crt" + ssl_key => "/usr/share/logstash/filebeat.key" tags => [ "beat" ] } } \ No newline at end of file diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls index 732ec7d15..a75a1ad7f 100644 --- a/salt/logstash/init.sls +++ b/salt/logstash/init.sls @@ -135,4 +135,5 @@ so-logstash: - /sys/fs/cgroup:/sys/fs/cgroup:ro - /etc/pki/filebeat.crt:/usr/share/logstash/filebeat.crt:ro - /etc/pki/filebeat.key:/usr/share/logstash/filebeat.key:ro + - /etc/pki/ca.crt:/usr/share/filebeat/ca.crt:ro - network_mode: so-elastic-net