From 2647cadeca84da923c33ff35190e23641782a8bd Mon Sep 17 00:00:00 2001
From: Schnitzel <michael@amazee.com>
Date: Wed, 20 Feb 2019 18:00:37 -0500
Subject: [PATCH] newest versions of logstash need some additional configs

---
 lagoon-remote/logs-forwarder-logstash/logstash.conf |  1 +
 services/logs-db/Dockerfile                         |  1 +
 services/logs-forwarder/.lagoon.multi.yml           | 11 +++++++++--
 services/logs-forwarder/.lagoon.single.yml          | 11 +++++++++--
 services/logs-forwarder/Dockerfile                  |  2 +-
 services/logs-forwarder/entrypoint.sh               |  2 +-
 6 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/lagoon-remote/logs-forwarder-logstash/logstash.conf b/lagoon-remote/logs-forwarder-logstash/logstash.conf
index 683744ae8f..e4a6a72e8e 100644
--- a/lagoon-remote/logs-forwarder-logstash/logstash.conf
+++ b/lagoon-remote/logs-forwarder-logstash/logstash.conf
@@ -8,6 +8,7 @@ input {
 }
 
 output {
+  # stdout { codec => rubydebug }
   lumberjack {
     codec => json
     hosts => "${LOGS_FORWARDER_LOGSTASH_TARGET_HOST}"
diff --git a/services/logs-db/Dockerfile b/services/logs-db/Dockerfile
index 0b6866f07a..2343d0b1bf 100644
--- a/services/logs-db/Dockerfile
+++ b/services/logs-db/Dockerfile
@@ -8,6 +8,7 @@ RUN bin/elasticsearch-plugin install -b com.floragunn:search-guard-6:6.5.4-24.0
     && sed -i 's/searchguard.audit.type: internal_elasticsearch//' config/elasticsearch.yml \
     && echo "searchguard.roles_mapping_resolution: BOTH" >> config/elasticsearch.yml \
     && echo "xpack.monitoring.collection.enabled: true" >> config/elasticsearch.yml \
+    && echo "xpack.monitoring.history.duration: 1d" >> config/elasticsearch.yml \
     && echo "node.attr.box_type: \${BOX_TYPE}" >> config/elasticsearch.yml \
     && chmod +x plugins/search-guard-6/tools/hash.sh
 
diff --git a/services/logs-forwarder/.lagoon.multi.yml b/services/logs-forwarder/.lagoon.multi.yml
index e25bc31b23..5489479765 100644
--- a/services/logs-forwarder/.lagoon.multi.yml
+++ b/services/logs-forwarder/.lagoon.multi.yml
@@ -219,20 +219,27 @@ objects:
       <label @LAGOON_ELASTICSEARCH>
         <match **>
           @type elasticsearch
+          #with_transporter_log true
+          #@log_level debug
           host logs-db
           port 9200
           templates { "container-logs": "/fluentd/etc/container-logs.json"}
           template_overwrite true
           target_index_key index_name
           index_name container-logs-noproject-%Y.%m
+          reconnect_on_error true
+          reload_on_failure true
+          ssl_version TLSv1_2
+          request_timeout 60s
+          slow_flush_log_threshold 90s
           <buffer tag,time>
             @type file
             path /fluentd/buffer/elasticsarch
             timekey 3600
             timekey_wait 0s
             flush_mode interval
-            flush_interval 1s
-            chunk_limit_size 256MB
+            flush_interval 10s
+            chunk_limit_size 16MB
             total_limit_size 15GB
             flush_thread_count 8
             overflow_action block
diff --git a/services/logs-forwarder/.lagoon.single.yml b/services/logs-forwarder/.lagoon.single.yml
index f17a28cc40..b5dc20542c 100644
--- a/services/logs-forwarder/.lagoon.single.yml
+++ b/services/logs-forwarder/.lagoon.single.yml
@@ -202,20 +202,27 @@ objects:
       <label @LAGOON_ELASTICSEARCH>
         <match **>
           @type elasticsearch
+          #with_transporter_log true
+          #@log_level debug
           host logs-db
           port 9200
           templates { "container-logs": "/fluentd/etc/container-logs.json"}
           template_overwrite true
           target_index_key index_name
           index_name container-logs-noproject-%Y.%m
+          reconnect_on_error true
+          reload_on_failure true
+          ssl_version TLSv1_2
+          request_timeout 60s
+          slow_flush_log_threshold 90s
           <buffer tag,time>
             @type file
             path /fluentd/buffer/elasticsarch
             timekey 3600
             timekey_wait 0s
             flush_mode interval
-            flush_interval 1s
-            chunk_limit_size 256MB
+            flush_interval 10s
+            chunk_limit_size 16MB
             total_limit_size 15GB
             flush_thread_count 8
             overflow_action block
diff --git a/services/logs-forwarder/Dockerfile b/services/logs-forwarder/Dockerfile
index 834554d94f..25c3f2d4df 100644
--- a/services/logs-forwarder/Dockerfile
+++ b/services/logs-forwarder/Dockerfile
@@ -26,4 +26,4 @@ ENV LOGS_FORWARDER_SHARED_KEY=secret \
     LOGS_FORWARDER_PRIVATE_KEY_PASSPHRASE=amazing1
 
 ENTRYPOINT ["/sbin/tini", "--", "/bin/entrypoint.sh"]
-CMD ["sh", "-c", "exec fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins $FLUENTD_OPT"]
+CMD ["sh", "-c", "exec fluentd -c /fluentd/etc/fluent.conf -p /fluentd/plugins $FLUENTD_OPT"]
diff --git a/services/logs-forwarder/entrypoint.sh b/services/logs-forwarder/entrypoint.sh
index 3dee69ccd1..6f36a2410c 100755
--- a/services/logs-forwarder/entrypoint.sh
+++ b/services/logs-forwarder/entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # If $FLUENT_FORWARD_EXTERNAL_ENABLED is set, we enable the forward external config
-if [ "$LOGS_FORWARDER_EXTERNAL_FLUENTD_ENABLED" ] && [ -f /fluentd/etc/logs-copy-forward-external-fluentd.conf.disabled ]; then
+if [ "$LOGS_FORWARDER_EXTERNAL_FLUENTD_ENABLED" == "true" ] && [ -f /fluentd/etc/logs-copy-forward-external-fluentd.conf.disabled ]; then
 
   # check that all env variables are set that we will need.
   if [ -z $LOGS_FORWARDER_EXTERNAL_FLUENTD_SHARED_KEY ]; then echo "LOGS_FORWARDER_EXTERNAL_FLUENTD_SHARED_KEY is not set, but needed for FLUENT_FORWARD_EXTERNAL_ENABLED"; exit 1; fi