From 0cef2a59748a618fbbdfc4d5105fa1120c222ebc Mon Sep 17 00:00:00 2001
From: "Manuel J. Bernal" <manuel.jimenez@wazuh.com>
Date: Fri, 10 May 2019 22:24:41 +0200
Subject: [PATCH] Include protocol and port in LOGSTASH_OUTPUT environment
 variable (#164)

* Including protocol and port in the LOGSTASH_OUTPUT env var.
---
 logstash/config/entrypoint.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/logstash/config/entrypoint.sh b/logstash/config/entrypoint.sh
index 88c3d169..4aaff056 100644
--- a/logstash/config/entrypoint.sh
+++ b/logstash/config/entrypoint.sh
@@ -17,6 +17,16 @@ else
   el_url="${ELASTICSEARCH_URL}"
 fi
 
+##############################################################################
+# Customize logstash output ip
+##############################################################################
+
+if [ "$LOGSTASH_OUTPUT" != "" ]; then
+  >&2 echo "Customize Logstash ouput ip."
+  sed -i 's|elasticsearch:9200|'$LOGSTASH_OUTPUT'|g' /usr/share/logstash/pipeline/01-wazuh.conf
+  sed -i 's|http://elasticsearch:9200|'$LOGSTASH_OUTPUT'|g' /usr/share/logstash/config/logstash.yml 
+fi
+
 until curl -XGET $el_url; do
   >&2 echo "Elastic is unavailable - sleeping."
   sleep 5
@@ -44,16 +54,6 @@ sleep 2
 
 >&2 echo "Wazuh alerts template is loaded."
 
-##############################################################################
-# Customize logstash output ip
-##############################################################################
-
-if [ "$LOGSTASH_OUTPUT" != "" ]; then
-  >&2 echo "Customize Logstash ouput ip."
-  sed -i "s/elasticsearch:9200/$LOGSTASH_OUTPUT:9200/" /usr/share/logstash/pipeline/01-wazuh.conf
-  sed -i "s/elasticsearch:9200/$LOGSTASH_OUTPUT:9200/" /usr/share/logstash/config/logstash.yml 
-fi
-
 ##############################################################################
 # Map environment variables to entries in logstash.yml.
 # Note that this will mutate logstash.yml in place if any such settings are found.