Fixed sed command in kibana_settings

Changed entrypoint copy location
Merge pull request #178 from wazuh/kibana-elastic-port
2025-10-23 04:51:57 +00:00 · 2019-05-21 23:18:51 +02:00 · 2019-05-21 23:18:35 +02:00 · 2019-05-18 11:52:08 +02:00 · 2019-05-17 12:56:45 -07:00 · 2019-05-10 22:26:49 +02:00
3 changed files with 15 additions and 14 deletions
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -9,8 +9,8 @@ RUN NODE_OPTIONS="--max-old-space-size=3072" /usr/share/kibana/bin/kibana-plugin
    chown -R kibana:kibana /usr/share/kibana &&\
    rm -rf /tmp/*

-COPY config/entrypoint.sh /entrypoint.sh
-RUN chmod 755 /entrypoint.sh
+COPY config/entrypoint.sh ./entrypoint.sh
+RUN chmod 755 ./entrypoint.sh

 USER kibana

@@ -73,4 +73,4 @@ RUN ./welcome_wazuh.sh

 RUN /usr/local/bin/kibana-docker --optimize

-ENTRYPOINT /entrypoint.sh
+ENTRYPOINT ./entrypoint.sh
--- a/kibana/config/kibana_settings.sh
+++ b/kibana/config/kibana_settings.sh
@@ -19,7 +19,8 @@ WAZUH_MAJOR=3
 # Customize elasticsearch ip
 ##############################################################################
 if [ "$ELASTICSEARCH_KIBANA_IP" != "" ]; then
-  sed -i "s/elasticsearch:9200/$ELASTICSEARCH_KIBANA_IP:9200/" /usr/share/kibana/config/kibana.yml
+  sed -i 's|http://elasticsearch:9200|'$ELASTICSEARCH_KIBANA_IP'|g' /usr/share/kibana/config/kibana.yml
+
 fi

 if [ "$KIBANA_IP" != "" ]; then
--- 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.
Author	SHA1	Message	Date
Manuel J. Bernal	f66f986abb	Fixed sed command in kibana_settings	2019-05-21 23:18:51 +02:00
Manuel J. Bernal	569d3ee931	Changed entrypoint copy location	2019-05-21 23:18:35 +02:00
Manuel J. Bernal	01e8e18f61	Merge pull request #178 from wazuh/kibana-elastic-port Allow port change for elasticsearch url in kibana	2019-05-18 11:52:08 +02:00
Javier Castro	447c15c823	Allow port change for elasticsearch url in kibana	2019-05-17 12:56:45 -07:00
Manuel J. Bernal	f63d9fa387	Include protocol and port in LOGSTASH_OUTPUT environment variable (#164 ) * Including protocol and port in the LOGSTASH_OUTPUT env var.	2019-05-10 22:26:49 +02:00