[skip ci] Small corrections

Author: Chris Wiechmann

filebeat/docker-compose.filebeat.yml

@@ -10,6 +10,7 @@ services:
     command: --strict.perms=false
     environment:
       - LOGSTASH_HOSTS=${LOGSTASH_HOSTS}
+      - LOGSTASH=${LOGSTASH:""} # Deprecated, will be removed in a future release
       - ELASTICSEARCH_HOSTS=${ELASTICSEARCH_HOSTS}
       - ELASTICSEARCH_CLUSTER_UUID=${ELASTICSEARCH_CLUSTER_UUID}
       - ELASTICSEARCH_CRT=${ELASTICSEARCH_CRT}

filebeat/scripts/custom-entrypoint.sh

@@ -4,13 +4,13 @@
 # as is it required by Filebeat. 
 
 if [ -z "${LOGSTASH_HOSTS}" ];then
-        if [ -z "${LOGSTASH}" ]; then
-		echo "Parameter: LOGSTASH_HOSTS is missing";
-		exit 99;
-	else 
-                echo "Parameter LOGSTASH is deprecated. Please migrate your configuration to parameter: LOGSTASH_HOSTS";
-                LOGSTASH_HOSTS=${LOGSTASH}
-        fi
+    if [ -z "${LOGSTASH}" ]; then
+        echo "Parameter: LOGSTASH_HOSTS is missing";
+        exit 99;
+    else 
+        echo "Parameter LOGSTASH is deprecated. Please migrate your configuration (.env file) to parameter: LOGSTASH_HOSTS";
+        LOGSTASH_HOSTS=${LOGSTASH}
+    fi
 fi
 
 hostsForFilebeat=`echo ${LOGSTASH_HOSTS} | awk '{split($0, va, /,/); vl=""; for (v in va) { if (vl =="" ) vl = sprintf("\"%s\"", va[v]); else vl = vl sprintf(",\"%s\"", va[v]); } printf("'[%s]'", vl) }'`