From 92956887b5ed66b051e7efdd3d755a84a8b28938 Mon Sep 17 00:00:00 2001
From: cruizba <charlesrb94@outlook.com>
Date: Mon, 28 Sep 2020 10:06:16 +0200
Subject: [PATCH] Deployment: ELK Updates - Filebeat can be used externally
 with and without de security - Minor fix in Label ELK label description in CF
 template

---
 ...fn-openvidu-server-pro-no-market.yaml.template |  2 +-
 .../openvidu-server-pro/beats/filebeat.yml        |  2 --
 .../openvidu-server-pro/docker-compose.yml        | 15 ++++++++-------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/openvidu-server/deployments/pro/aws/cfn-openvidu-server-pro-no-market.yaml.template b/openvidu-server/deployments/pro/aws/cfn-openvidu-server-pro-no-market.yaml.template
index be09fbd3..25489e9d 100644
--- a/openvidu-server/deployments/pro/aws/cfn-openvidu-server-pro-no-market.yaml.template
+++ b/openvidu-server/deployments/pro/aws/cfn-openvidu-server-pro-no-market.yaml.template
@@ -213,7 +213,7 @@ Metadata:
           - OpenViduSecret
           - MediaNodesStartNumber
       - Label:
-          default: Kibana configuration
+          default: Elasticsearch and Kibana configuration
         Parameters:
           - ElasticsearchUser
           - ElasticsearchPassword
diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/beats/filebeat.yml b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/beats/filebeat.yml
index 3581884d..1cbe8027 100644
--- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/beats/filebeat.yml
+++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/beats/filebeat.yml
@@ -17,8 +17,6 @@ processors:
 output:
   elasticsearch:
     hosts: ["${OPENVIDU_PRO_ELASTICSEARCH_HOST}"]
-    username: ${ELASTICSEARCH_USERNAME}
-    password: ${ELASTICSEARCH_PASSWORD}
     indices:
       - index: "filebeat-redis-%{+yyyy.MM.dd}"
         when.or:
diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml
index 0eeafe55..12b28d04 100644
--- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml
+++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml
@@ -88,10 +88,6 @@ services:
     elasticsearch:
         image: docker.elastic.co/elasticsearch/elasticsearch:7.8.0
         restart: always
-        command: 
-            - '/bin/bash'
-            - '-c'
-            - '/usr/share/elasticsearch/bin/elasticsearch-users useradd ${ELASTICSEARCH_USERNAME} -p ${ELASTICSEARCH_PASSWORD} -r superuser; /tini -- /usr/local/bin/docker-entrypoint.sh'
         environment:
             - discovery.type=single-node
             - xpack.security.enabled=true
@@ -99,6 +95,10 @@ services:
             - 9200:9200
         volumes:
             - ./elasticsearch:/usr/share/elasticsearch/data
+        command: > 
+            /bin/bash -c "elasticsearch-users useradd ${ELASTICSEARCH_USERNAME} 
+            -p ${ELASTICSEARCH_PASSWORD} -r superuser;
+            docker-entrypoint.sh"
 
     kibana:
         image: docker.elastic.co/kibana/kibana:7.8.0
@@ -116,11 +116,12 @@ services:
         restart: always
         user: root
         environment:
-            - ELASTICSEARCH_USERNAME=${ELASTICSEARCH_USERNAME}
-            - ELASTICSEARCH_PASSWORD=${ELASTICSEARCH_PASSWORD}
             - OPENVIDU_PRO_ELASTICSEARCH_HOST=${OPENVIDU_PRO_ELASTICSEARCH_HOST:-http://127.0.0.1:9200}
         volumes:
             - ./beats/filebeat.yml:/usr/share/filebeat/filebeat.yml:ro
             - /var/lib/docker:/var/lib/docker:ro
             - /var/run/docker.sock:/var/run/docker.sock
-        command: filebeat -e -strict.perms=false
+        command: >
+            /bin/bash -c "filebeat -e -strict.perms=false
+            `if [ ! -z $ELASTICSEARCH_USERNAME ]; then echo '-E output.elasticsearch.username=$ELASTICSEARCH_USERNAME'; fi`
+            `if [ ! -z $ELASTICSEARCH_PASSWORD ]; then echo '-E output.elasticsearch.password=$ELASTICSEARCH_PASSWORD'; fi`"