From d1493272754ddd644f8fb89a0859cdc0c5b06908 Mon Sep 17 00:00:00 2001 From: migruiz4 Date: Wed, 6 Feb 2019 15:03:25 +0100 Subject: [PATCH 01/23] Resolved conflicts refactoring Dockerfile --- wazuh/Dockerfile | 88 +++++++++++++++++------------------------------- 1 file changed, 31 insertions(+), 57 deletions(-) diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index 56b0b982..c56bf6cb 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -3,53 +3,31 @@ FROM phusion/baseimage:latest ARG FILEBEAT_VERSION=6.5.4 ARG WAZUH_VERSION=3.8.2-1 -ENV API_USER="foo" \ - API_PASS="bar" +# Set repositories. +RUN set -x && echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list && \ + curl -s https://packages.wazuh.com/key/GPG-KEY-WAZUH | apt-key add - && \ + curl --silent --location https://deb.nodesource.com/setup_8.x | bash - && \ + echo "postfix postfix/mailname string wazuh-manager" | debconf-set-selections && \ + echo "postfix postfix/main_mailer_type string 'Internet Site'" | debconf-set-selections && \ + groupadd -g 1000 ossec && useradd -u 1000 -g 1000 ossec -# Updating image -RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" +RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" && apt-get --no-install-recommends --no-install-suggests -y install openssl postfix bsd-mailx python-boto python-pip \ + apt-transport-https vim expect nodejs python-cryptography wazuh-manager=${WAZUH_VERSION} \ + wazuh-api=${WAZUH_VERSION} && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -# Set Wazuh repository. -RUN echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list -RUN curl -s https://packages.wazuh.com/key/GPG-KEY-WAZUH | apt-key add - - -# Set nodejs repository. -RUN curl --silent --location https://deb.nodesource.com/setup_8.x | bash - - -# Creating ossec user as uid:gid 1000:1000 -RUN groupadd -g 1000 ossec -RUN useradd -u 1000 -g 1000 -d /var/ossec ossec - -# Configure postfix -RUN echo "postfix postfix/mailname string wazuh-manager" | debconf-set-selections -RUN echo "postfix postfix/main_mailer_type string 'Internet Site'" | debconf-set-selections - -# Add universe repository -RUN add-apt-repository universe - -# Install packages -RUN apt-get update && apt-get -y install openssl postfix bsd-mailx python-boto python-pip \ - apt-transport-https vim expect nodejs python-cryptography wazuh-manager=${WAZUH_VERSION} \ - wazuh-api=${WAZUH_VERSION} mailutils libsasl2-modules - -# Adding first run script. -ADD config/data_dirs.env /data_dirs.env -ADD config/init.bash /init.bash +# Adding first run script and entrypoint +COPY config/data_dirs.env /data_dirs.env +COPY config/init.bash /init.bash +COPY config/entrypoint.sh /entrypoint.sh # Sync calls are due to https://github.com/docker/docker/issues/9547 -RUN chmod 755 /init.bash &&\ - sync && /init.bash &&\ - sync && rm /init.bash - -# Installing and configuring fiebeat -RUN curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-${FILEBEAT_VERSION}-amd64.deb &&\ - dpkg -i filebeat-${FILEBEAT_VERSION}-amd64.deb && rm -f filebeat-${FILEBEAT_VERSION}-amd64.deb -COPY config/filebeat.yml /etc/filebeat/ -RUN chmod go-w /etc/filebeat/filebeat.yml - -# Adding entrypoint -ADD config/entrypoint.sh /entrypoint.sh -RUN chmod 755 /entrypoint.sh +RUN chmod 755 /init.bash && \ + sync && /init.bash && \ + sync && rm /init.bash && \ + curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-${FILEBEAT_VERSION}-amd64.deb &&\ + dpkg -i filebeat-${FILEBEAT_VERSION}-amd64.deb && rm -f filebeat-${FILEBEAT_VERSION}-amd64.deb && \ + chmod go-w /etc/filebeat/filebeat.yml && \ + chmod 755 /entrypoint.sh # Setting volumes VOLUME ["/var/ossec/data"] @@ -60,25 +38,21 @@ VOLUME ["/var/lib/filebeat"] # Services ports EXPOSE 55000/tcp 1514/udp 1515/tcp 514/udp 1516/tcp -# Clean up -RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - # Adding services -RUN mkdir /etc/service/wazuh +RUN mkdir /etc/service/wazuh && \ + mkdir /etc/service/wazuh-api && \ + mkdir /etc/service/postfix && \ + mkdir /etc/service/filebeat + COPY config/wazuh.runit.service /etc/service/wazuh/run -RUN chmod +x /etc/service/wazuh/run - -RUN mkdir /etc/service/wazuh-api COPY config/wazuh-api.runit.service /etc/service/wazuh-api/run -RUN chmod +x /etc/service/wazuh-api/run - -RUN mkdir /etc/service/postfix COPY config/postfix.runit.service /etc/service/postfix/run -RUN chmod +x /etc/service/postfix/run - -RUN mkdir /etc/service/filebeat COPY config/filebeat.runit.service /etc/service/filebeat/run -RUN chmod +x /etc/service/filebeat/run + +RUN chmod +x /etc/service/wazuh-api/run && \ + chmod +x /etc/service/wazuh/run && \ + chmod +x /etc/service/postfix/run && \ + chmod +x /etc/service/filebeat/run # Run all services ENTRYPOINT ["/entrypoint.sh"] From bc18ef46e6a0dd4a7ce4c99f679a60fa34b3efb4 Mon Sep 17 00:00:00 2001 From: manuasir Date: Tue, 12 Feb 2019 18:06:23 +0100 Subject: [PATCH 02/23] Deleted unused file --- kibana/config/kibana.yml | 92 ---------------------------------------- 1 file changed, 92 deletions(-) delete mode 100644 kibana/config/kibana.yml diff --git a/kibana/config/kibana.yml b/kibana/config/kibana.yml deleted file mode 100644 index 993ad7da..00000000 --- a/kibana/config/kibana.yml +++ /dev/null @@ -1,92 +0,0 @@ -# Kibana is served by a back end server. This setting specifies the port to use. -server.port: 5601 - -# This setting specifies the IP address of the back end server. -server.host: "0.0.0.0" - -# Enables you to specify a path to mount Kibana at if you are running behind a proxy. This setting -# cannot end in a slash. -# server.basePath: "" - -# The maximum payload size in bytes for incoming server requests. -# server.maxPayloadBytes: 1048576 - -# The Kibana server's name. This is used for display purposes. -# server.name: "your-hostname" - -# The URL of the Elasticsearch instance to use for all your queries. -elasticsearch.url: "http://elasticsearch:9200" - -# When this setting’s value is true Kibana uses the hostname specified in the server.host -# setting. When the value of this setting is false, Kibana uses the hostname of the host -# that connects to this Kibana instance. -# elasticsearch.preserveHost: true - -# Kibana uses an index in Elasticsearch to store saved searches, visualizations and -# dashboards. Kibana creates a new index if the index doesn’t already exist. -# kibana.index: ".kibana" - -# The default application to load. -# kibana.defaultAppId: "discover" - -# If your Elasticsearch is protected with basic authentication, these settings provide -# the username and password that the Kibana server uses to perform maintenance on the Kibana -# index at startup. Your Kibana users still need to authenticate with Elasticsearch, which -# is proxied through the Kibana server. -# elasticsearch.username: "user" -# elasticsearch.password: "pass" - -# Paths to the PEM-format SSL certificate and SSL key files, respectively. These -# files enable SSL for outgoing requests from the Kibana server to the browser. -# server.ssl.cert: /path/to/your/server.crt -# server.ssl.key: /path/to/your/server.key - -# Optional settings that provide the paths to the PEM-format SSL certificate and key files. -# These files validate that your Elasticsearch backend uses the same key files. -# elasticsearch.ssl.cert: /path/to/your/client.crt -# elasticsearch.ssl.key: /path/to/your/client.key - -# Optional setting that enables you to specify a path to the PEM file for the certificate -# authority for your Elasticsearch instance. -# elasticsearch.ssl.ca: /path/to/your/CA.pem - -# To disregard the validity of SSL certificates, change this setting’s value to false. -# elasticsearch.ssl.verify: true - -# Time in milliseconds to wait for Elasticsearch to respond to pings. Defaults to the value of -# the elasticsearch.requestTimeout setting. -# elasticsearch.pingTimeout: 1500 - -# Time in milliseconds to wait for responses from the back end or Elasticsearch. This value -# must be a positive integer. -# elasticsearch.requestTimeout: 30000 - -# List of Kibana client-side headers to send to Elasticsearch. To send *no* client-side -# headers, set this value to [] (an empty list). -# elasticsearch.requestHeadersWhitelist: [ authorization ] - -# Time in milliseconds for Elasticsearch to wait for responses from shards. Set to 0 to disable. -# elasticsearch.shardTimeout: 0 - -# Time in milliseconds to wait for Elasticsearch at Kibana startup before retrying. -# elasticsearch.startupTimeout: 5000 - -# Specifies the path where Kibana creates the process ID file. -# pid.file: /var/run/kibana.pid - -# Enables you specify a file where Kibana stores log output. -# logging.dest: stdout - -# Set the value of this setting to true to suppress all logging output. -# logging.silent: false - -# Set the value of this setting to true to suppress all logging output other than error messages. -logging.quiet: true - -# Set the value of this setting to true to log all events, including system usage information -# and all requests. -# logging.verbose: false - -# Set the interval in milliseconds to sample system and process performance -# metrics. Minimum is 100ms. Defaults to 10000. -# ops.interval: 10000 From 3dce66e869d819b344863f4bf4973e9da4923d50 Mon Sep 17 00:00:00 2001 From: l Date: Wed, 13 Mar 2019 17:25:48 +0100 Subject: [PATCH 03/23] Fixing missing packets, env vars and config file of filebeat --- wazuh/Dockerfile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index c56bf6cb..ee109be8 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -3,16 +3,20 @@ FROM phusion/baseimage:latest ARG FILEBEAT_VERSION=6.5.4 ARG WAZUH_VERSION=3.8.2-1 +ENV API_USER="foo" \ + API_PASS="bar" + # Set repositories. RUN set -x && echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list && \ curl -s https://packages.wazuh.com/key/GPG-KEY-WAZUH | apt-key add - && \ curl --silent --location https://deb.nodesource.com/setup_8.x | bash - && \ echo "postfix postfix/mailname string wazuh-manager" | debconf-set-selections && \ echo "postfix postfix/main_mailer_type string 'Internet Site'" | debconf-set-selections && \ - groupadd -g 1000 ossec && useradd -u 1000 -g 1000 ossec + groupadd -g 1000 ossec && useradd -u 1000 -g 1000 -d /var/ossec ossec -RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" && apt-get --no-install-recommends --no-install-suggests -y install openssl postfix bsd-mailx python-boto python-pip \ - apt-transport-https vim expect nodejs python-cryptography wazuh-manager=${WAZUH_VERSION} \ +RUN add-apt-repository universe && apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" && \ + apt-get --no-install-recommends --no-install-suggests -y install openssl postfix bsd-mailx python-boto python-pip \ + apt-transport-https vim expect nodejs python-cryptography mailutils libsasl2-modules wazuh-manager=${WAZUH_VERSION} \ wazuh-api=${WAZUH_VERSION} && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Adding first run script and entrypoint @@ -26,9 +30,11 @@ RUN chmod 755 /init.bash && \ sync && rm /init.bash && \ curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-${FILEBEAT_VERSION}-amd64.deb &&\ dpkg -i filebeat-${FILEBEAT_VERSION}-amd64.deb && rm -f filebeat-${FILEBEAT_VERSION}-amd64.deb && \ - chmod go-w /etc/filebeat/filebeat.yml && \ chmod 755 /entrypoint.sh +COPY config/filebeat.yml /etc/filebeat/ +RUN chmod go-w /etc/filebeat/filebeat.yml + # Setting volumes VOLUME ["/var/ossec/data"] VOLUME ["/etc/filebeat"] @@ -56,3 +62,4 @@ RUN chmod +x /etc/service/wazuh-api/run && \ # Run all services ENTRYPOINT ["/entrypoint.sh"] + From 532b6911728dfa91b9158c98ae54b7bfc7c5fd57 Mon Sep 17 00:00:00 2001 From: l Date: Fri, 15 Mar 2019 15:11:49 +0100 Subject: [PATCH 04/23] Changing copyright year to 2019 --- LICENSE | 2 +- README.md | 2 +- docker-compose.yml | 2 +- kibana/Dockerfile | 2 +- kibana/config/entrypoint.sh | 2 +- kibana/config/wazuh_app_config.sh | 2 +- logstash/Dockerfile | 2 +- logstash/config/01-wazuh.conf | 2 +- logstash/config/run.sh | 2 +- nginx/Dockerfile | 2 +- nginx/config/entrypoint.sh | 2 +- wazuh/Dockerfile | 2 +- wazuh/config/entrypoint.sh | 2 +- wazuh/config/filebeat.yml | 2 +- wazuh/config/init.bash | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/LICENSE b/LICENSE index b63808b6..04fb7afc 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ - Portions Copyright (C) 2018 Wazuh, Inc. + Portions Copyright (C) 2019 Wazuh, Inc. Based on work Copyright (C) 2003 - 2013 Trend Micro, Inc. This program is a free software; you can redistribute it and/or modify diff --git a/README.md b/README.md index d1ea97b6..3760f61e 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ We thank you them and everyone else who has contributed to this project. ## License and copyright -Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) +Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) ## Web references diff --git a/docker-compose.yml b/docker-compose.yml index 97d06573..7c309f3a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) +# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) version: '2' services: diff --git a/kibana/Dockerfile b/kibana/Dockerfile index 6816c5ba..8bb08523 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,4 +1,4 @@ -# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) +# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) FROM docker.elastic.co/kibana/kibana:6.5.4 ARG WAZUH_APP_VERSION=3.8.2_6.5.4 USER root diff --git a/kibana/config/entrypoint.sh b/kibana/config/entrypoint.sh index e34029b7..c38bb1d7 100644 --- a/kibana/config/entrypoint.sh +++ b/kibana/config/entrypoint.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) +# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) set -e diff --git a/kibana/config/wazuh_app_config.sh b/kibana/config/wazuh_app_config.sh index a545cba7..6fffd005 100644 --- a/kibana/config/wazuh_app_config.sh +++ b/kibana/config/wazuh_app_config.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) +# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) kibana_config_file="/usr/share/kibana/plugins/wazuh/config.yml" diff --git a/logstash/Dockerfile b/logstash/Dockerfile index e0beeb68..00322375 100644 --- a/logstash/Dockerfile +++ b/logstash/Dockerfile @@ -1,4 +1,4 @@ -# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) +# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) FROM docker.elastic.co/logstash/logstash:6.5.4 RUN rm -f /usr/share/logstash/pipeline/logstash.conf diff --git a/logstash/config/01-wazuh.conf b/logstash/config/01-wazuh.conf index a8dddca4..791cfd3f 100644 --- a/logstash/config/01-wazuh.conf +++ b/logstash/config/01-wazuh.conf @@ -1,4 +1,4 @@ -# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) +# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh - Logstash configuration file ## Remote Wazuh Manager - Filebeat input input { diff --git a/logstash/config/run.sh b/logstash/config/run.sh index a10d3e3c..0ccb2eee 100644 --- a/logstash/config/run.sh +++ b/logstash/config/run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) +# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) # # OSSEC container bootstrap. See the README for information of the environment # variables expected by this script. diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 0fb940e1..9ed0950e 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -1,4 +1,4 @@ -# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) +# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) FROM nginx:latest ENV DEBIAN_FRONTEND noninteractive diff --git a/nginx/config/entrypoint.sh b/nginx/config/entrypoint.sh index 2332222b..a6eeec9e 100644 --- a/nginx/config/entrypoint.sh +++ b/nginx/config/entrypoint.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) +# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) set -e diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index ee109be8..1031c1d0 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -1,4 +1,4 @@ -# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) +# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) FROM phusion/baseimage:latest ARG FILEBEAT_VERSION=6.5.4 ARG WAZUH_VERSION=3.8.2-1 diff --git a/wazuh/config/entrypoint.sh b/wazuh/config/entrypoint.sh index 37b37be2..67107f55 100644 --- a/wazuh/config/entrypoint.sh +++ b/wazuh/config/entrypoint.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) +# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) # # OSSEC container bootstrap. See the README for information of the environment diff --git a/wazuh/config/filebeat.yml b/wazuh/config/filebeat.yml index fcb32e1e..1835863b 100644 --- a/wazuh/config/filebeat.yml +++ b/wazuh/config/filebeat.yml @@ -1,4 +1,4 @@ -# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) +# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) filebeat: prospectors: - type: log diff --git a/wazuh/config/init.bash b/wazuh/config/init.bash index 21306499..cfff523d 100644 --- a/wazuh/config/init.bash +++ b/wazuh/config/init.bash @@ -1,5 +1,5 @@ #!/bin/bash -# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) +# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) # # Initialize the custom data directory layout From c1a33b7185523bc8669234e8ff89c20f53be682f Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Tue, 19 Mar 2019 14:35:44 +0100 Subject: [PATCH 05/23] kibana welcome --- kibana/Dockerfile | 7 +++++++ kibana/config/welcome_wazuh.sh | 15 +++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 kibana/config/welcome_wazuh.sh diff --git a/kibana/Dockerfile b/kibana/Dockerfile index 8bb08523..b8a29ea8 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -49,6 +49,7 @@ ARG XPACK_DEVTOOLS="true" ARG XPACK_MONITORING="true" ARG XPACK_APM="true" +ARG CHANGE_WELLCOME="false" COPY --chown=kibana:kibana ./config/wazuh_app_config.sh ./ @@ -66,4 +67,10 @@ RUN ./xpack_config.sh RUN /usr/local/bin/kibana-docker --optimize +COPY --chown=kibana:kibana ./config/welcome_wazuh.sh ./ + +RUN chmod +x ./welcome_wazuh.sh + +RUN ./welcome_wazuh.sh + ENTRYPOINT /entrypoint.sh diff --git a/kibana/config/welcome_wazuh.sh b/kibana/config/welcome_wazuh.sh new file mode 100644 index 00000000..1c94c41c --- /dev/null +++ b/kibana/config/welcome_wazuh.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +if [[ $CHANGE_WELLCOME == "true" ]] +then + + kibana_path="/usr/share/kibana" + # Set Wazuh app as the default landing page + echo "Set Wazuh app as the default landing page" + echo "server.defaultRoute: /app/wazuh" >> /etc/kibana/kibana.yml + + # Redirect Kibana welcome screen to Discover + echo "Redirect Kibana welcome screen to Discover" + sed -i "s:'/app/kibana#/home':'/app/kibana#/discover':g" $kibana_path/src/ui/public/chrome/directives/global_nav/global_nav.html + sed -i "s:'/app/kibana#/home':'/app/kibana#/discover':g" $kibana_path/src/ui/public/chrome/directives/header_global_nav/header_global_nav.js +fi From d0df9a06e1c8b62dacea8a081b9c1a7b8f23bf09 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Tue, 19 Mar 2019 14:50:12 +0100 Subject: [PATCH 06/23] fix typo --- kibana/Dockerfile | 2 +- kibana/config/welcome_wazuh.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kibana/Dockerfile b/kibana/Dockerfile index b8a29ea8..1b4c3b92 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -49,7 +49,7 @@ ARG XPACK_DEVTOOLS="true" ARG XPACK_MONITORING="true" ARG XPACK_APM="true" -ARG CHANGE_WELLCOME="false" +ARG CHANGE_WELCOME="false" COPY --chown=kibana:kibana ./config/wazuh_app_config.sh ./ diff --git a/kibana/config/welcome_wazuh.sh b/kibana/config/welcome_wazuh.sh index 1c94c41c..ceb72ed3 100644 --- a/kibana/config/welcome_wazuh.sh +++ b/kibana/config/welcome_wazuh.sh @@ -1,6 +1,6 @@ #!/bin/bash -if [[ $CHANGE_WELLCOME == "true" ]] +if [[ $CHANGE_WELCOME == "true" ]] then kibana_path="/usr/share/kibana" From 666708c47f7145ad6c66a070b585afa7aaa597f3 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Tue, 19 Mar 2019 16:26:14 +0100 Subject: [PATCH 07/23] kibana yml is in other path --- kibana/config/welcome_wazuh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kibana/config/welcome_wazuh.sh b/kibana/config/welcome_wazuh.sh index ceb72ed3..3ed3586e 100644 --- a/kibana/config/welcome_wazuh.sh +++ b/kibana/config/welcome_wazuh.sh @@ -6,7 +6,7 @@ then kibana_path="/usr/share/kibana" # Set Wazuh app as the default landing page echo "Set Wazuh app as the default landing page" - echo "server.defaultRoute: /app/wazuh" >> /etc/kibana/kibana.yml + echo "server.defaultRoute: /app/wazuh" >> /usr/share/kibana/config/kibana.yml # Redirect Kibana welcome screen to Discover echo "Redirect Kibana welcome screen to Discover" From e182e0d4f8a5e3255a66866579fb72a26d572ac5 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Tue, 19 Mar 2019 16:51:51 +0100 Subject: [PATCH 08/23] change redirect to wazuh app --- kibana/config/welcome_wazuh.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kibana/config/welcome_wazuh.sh b/kibana/config/welcome_wazuh.sh index 3ed3586e..a42f38f2 100644 --- a/kibana/config/welcome_wazuh.sh +++ b/kibana/config/welcome_wazuh.sh @@ -10,6 +10,6 @@ then # Redirect Kibana welcome screen to Discover echo "Redirect Kibana welcome screen to Discover" - sed -i "s:'/app/kibana#/home':'/app/kibana#/discover':g" $kibana_path/src/ui/public/chrome/directives/global_nav/global_nav.html - sed -i "s:'/app/kibana#/home':'/app/kibana#/discover':g" $kibana_path/src/ui/public/chrome/directives/header_global_nav/header_global_nav.js + sed -i "s:'/app/kibana#/home':'/app/wazuh:g" $kibana_path/src/ui/public/chrome/directives/global_nav/global_nav.html + sed -i "s:'/app/kibana#/home':'/app/wazuh:g" $kibana_path/src/ui/public/chrome/directives/header_global_nav/header_global_nav.js fi From e6062f28f3b42912940b0f8af2ef6ff5448984e1 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Tue, 19 Mar 2019 17:07:01 +0100 Subject: [PATCH 09/23] removing optimize bundles --- kibana/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kibana/Dockerfile b/kibana/Dockerfile index 1b4c3b92..a7c44edf 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -65,7 +65,7 @@ RUN chmod +x ./xpack_config.sh RUN ./xpack_config.sh -RUN /usr/local/bin/kibana-docker --optimize +RUN rm -rf ./optimize/bundles COPY --chown=kibana:kibana ./config/welcome_wazuh.sh ./ @@ -73,4 +73,6 @@ RUN chmod +x ./welcome_wazuh.sh RUN ./welcome_wazuh.sh +RUN /usr/local/bin/kibana-docker --optimize + ENTRYPOINT /entrypoint.sh From 9b0602766fcfde244ff744db9dab39462355897f Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Tue, 19 Mar 2019 17:43:14 +0100 Subject: [PATCH 10/23] fix typo --- kibana/config/welcome_wazuh.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kibana/config/welcome_wazuh.sh b/kibana/config/welcome_wazuh.sh index a42f38f2..0bb9a77d 100644 --- a/kibana/config/welcome_wazuh.sh +++ b/kibana/config/welcome_wazuh.sh @@ -10,6 +10,6 @@ then # Redirect Kibana welcome screen to Discover echo "Redirect Kibana welcome screen to Discover" - sed -i "s:'/app/kibana#/home':'/app/wazuh:g" $kibana_path/src/ui/public/chrome/directives/global_nav/global_nav.html - sed -i "s:'/app/kibana#/home':'/app/wazuh:g" $kibana_path/src/ui/public/chrome/directives/header_global_nav/header_global_nav.js + sed -i "s:'/app/kibana#/home':'/app/wazuh':g" $kibana_path/src/ui/public/chrome/directives/global_nav/global_nav.html + sed -i "s:'/app/kibana#/home':'/app/wazuh':g" $kibana_path/src/ui/public/chrome/directives/header_global_nav/header_global_nav.js fi From b7537453e31af6c8a5a911bb1c246f4a08faeda0 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Wed, 20 Mar 2019 15:47:14 +0100 Subject: [PATCH 11/23] Hide undesired links --- kibana/Dockerfile | 2 -- kibana/config/welcome_wazuh.sh | 8 ++++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/kibana/Dockerfile b/kibana/Dockerfile index a7c44edf..92beac63 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -65,8 +65,6 @@ RUN chmod +x ./xpack_config.sh RUN ./xpack_config.sh -RUN rm -rf ./optimize/bundles - COPY --chown=kibana:kibana ./config/welcome_wazuh.sh ./ RUN chmod +x ./welcome_wazuh.sh diff --git a/kibana/config/welcome_wazuh.sh b/kibana/config/welcome_wazuh.sh index 0bb9a77d..3deb1e82 100644 --- a/kibana/config/welcome_wazuh.sh +++ b/kibana/config/welcome_wazuh.sh @@ -3,6 +3,8 @@ if [[ $CHANGE_WELCOME == "true" ]] then + rm -rf ./optimize/bundles + kibana_path="/usr/share/kibana" # Set Wazuh app as the default landing page echo "Set Wazuh app as the default landing page" @@ -12,4 +14,10 @@ then echo "Redirect Kibana welcome screen to Discover" sed -i "s:'/app/kibana#/home':'/app/wazuh':g" $kibana_path/src/ui/public/chrome/directives/global_nav/global_nav.html sed -i "s:'/app/kibana#/home':'/app/wazuh':g" $kibana_path/src/ui/public/chrome/directives/header_global_nav/header_global_nav.js + + # Redirect Kibana welcome screen to Discover + echo "Hide undesired links" + sed -i 's#visible: true#visible: false#g' $kibana_path/x-pack/plugins/rollup/public/crud_app/index.js + sed -i 's#visible: true#visible: false#g' $kibana_path/x-pack/plugins/license_management/public/management_section.js fi + From 699f2bb82e32b37714024b21c48eb80f60c62d0f Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Wed, 20 Mar 2019 16:30:44 +0100 Subject: [PATCH 12/23] fix visible path --- kibana/config/welcome_wazuh.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kibana/config/welcome_wazuh.sh b/kibana/config/welcome_wazuh.sh index 3deb1e82..0925d57a 100644 --- a/kibana/config/welcome_wazuh.sh +++ b/kibana/config/welcome_wazuh.sh @@ -17,7 +17,7 @@ then # Redirect Kibana welcome screen to Discover echo "Hide undesired links" - sed -i 's#visible: true#visible: false#g' $kibana_path/x-pack/plugins/rollup/public/crud_app/index.js - sed -i 's#visible: true#visible: false#g' $kibana_path/x-pack/plugins/license_management/public/management_section.js + sed -i 's#visible: true#visible: false#g' $kibana_path/node_modules/x-pack/plugins/rollup/public/crud_app/index.js + sed -i 's#visible: true#visible: false#g' $kibana_path/node_modules/x-pack/plugins/license_management/public/management_section.js fi From 6ce25e00c9598ffbc9cc6a8d9fd943797856cd20 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 21 Mar 2019 16:13:53 +0100 Subject: [PATCH 13/23] merge run.sh in new entrypoint.sh --- logstash/config/{run.sh => entrypoint.sh} | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) rename logstash/config/{run.sh => entrypoint.sh} (55%) diff --git a/logstash/config/run.sh b/logstash/config/entrypoint.sh similarity index 55% rename from logstash/config/run.sh rename to logstash/config/entrypoint.sh index 0ccb2eee..a523ec8f 100644 --- a/logstash/config/run.sh +++ b/logstash/config/entrypoint.sh @@ -1,10 +1,12 @@ -#!/bin/bash +#!/bin/bash -e # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) # # OSSEC container bootstrap. See the README for information of the environment # variables expected by this script. # + + ############################################################################## # Customize logstash output ip ############################################################################## @@ -13,4 +15,17 @@ if [ "$LOGSTASH_OUTPUT" != "" ]; then sed -i "s/elasticsearch:9200/$LOGSTASH_OUTPUT:9200/" /usr/share/logstash/config/logstash.yml fi -/usr/local/bin/docker-entrypoint +# Map environment variables to entries in logstash.yml. +# Note that this will mutate logstash.yml in place if any such settings are found. +# This may be undesirable, especially if logstash.yml is bind-mounted from the +# host system. + +env2yaml /usr/share/logstash/config/logstash.yml + +export LS_JAVA_OPTS="-Dls.cgroup.cpuacct.path.override=/ -Dls.cgroup.cpu.path.override=/ $LS_JAVA_OPTS" + +if [[ -z $1 ]] || [[ ${1:0:1} == '-' ]] ; then + exec logstash "$@" +else + exec "$@" +fi From 3fdba44bfad4c64e24dfb927fb1c78f8e938ded0 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 21 Mar 2019 16:29:48 +0100 Subject: [PATCH 14/23] cond. race for logstash and improve it for kibana --- kibana/config/entrypoint.sh | 6 ++++-- logstash/Dockerfile | 2 +- logstash/config/entrypoint.sh | 24 +++++++++++++++++++++++- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/kibana/config/entrypoint.sh b/kibana/config/entrypoint.sh index c38bb1d7..1ba0a44d 100644 --- a/kibana/config/entrypoint.sh +++ b/kibana/config/entrypoint.sh @@ -10,11 +10,13 @@ else fi until curl -XGET $el_url; do - >&2 echo "Elastic is unavailable - sleeping" + >&2 echo "Elastic is unavailable - sleeping." sleep 5 done ->&2 echo "Elastic is up - executing command" +sleep 10 + +>&2 echo "Elasticsearch is up." ./wazuh_app_config.sh diff --git a/logstash/Dockerfile b/logstash/Dockerfile index 00322375..b53d0806 100644 --- a/logstash/Dockerfile +++ b/logstash/Dockerfile @@ -9,4 +9,4 @@ USER root COPY config/run.sh /run.sh RUN chmod +x /run.sh -ENTRYPOINT ["/run.sh"] +ENTRYPOINT /entrypoint.sh diff --git a/logstash/config/entrypoint.sh b/logstash/config/entrypoint.sh index a523ec8f..4eef7fa7 100644 --- a/logstash/config/entrypoint.sh +++ b/logstash/config/entrypoint.sh @@ -1,24 +1,46 @@ -#!/bin/bash -e +#!/bin/bash # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) # # OSSEC container bootstrap. See the README for information of the environment # variables expected by this script. # +set -e +############################################################################## +# Waiting for elasticsearch +############################################################################## + +if [ "x${ELASTICSEARCH_URL}" = "x" ]; then + el_url="http://elasticsearch:9200" +else + el_url="${ELASTICSEARCH_URL}" +fi + +until curl -XGET $el_url; do + >&2 echo "Elastic is unavailable - sleeping." + sleep 5 +done + +sleep 10 + +>&2 echo "Elasticsearch is up." ############################################################################## # Customize logstash output ip ############################################################################## if [ "$LOGSTASH_OUTPUT" != "" ]; then + 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. # This may be undesirable, especially if logstash.yml is bind-mounted from the # host system. +############################################################################## env2yaml /usr/share/logstash/config/logstash.yml From 580251104c231e9a65716cc635700c0aad52d14c Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 21 Mar 2019 16:34:24 +0100 Subject: [PATCH 15/23] add entrypoint to Dockerfile --- logstash/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/logstash/Dockerfile b/logstash/Dockerfile index b53d0806..3ad72068 100644 --- a/logstash/Dockerfile +++ b/logstash/Dockerfile @@ -1,6 +1,10 @@ # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) FROM docker.elastic.co/logstash/logstash:6.5.4 +COPY config/entrypoint.sh /entrypoint.sh + +RUN chmod 755 /entrypoint.sh + RUN rm -f /usr/share/logstash/pipeline/logstash.conf COPY config/01-wazuh.conf /usr/share/logstash/pipeline/01-wazuh.conf From 48e0c75a26794937d6f752d64a3e5cb6f8572e0e Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 21 Mar 2019 16:56:22 +0100 Subject: [PATCH 16/23] remove run.sh execution --- logstash/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logstash/Dockerfile b/logstash/Dockerfile index 3ad72068..fea745a3 100644 --- a/logstash/Dockerfile +++ b/logstash/Dockerfile @@ -1,7 +1,7 @@ # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) FROM docker.elastic.co/logstash/logstash:6.5.4 -COPY config/entrypoint.sh /entrypoint.sh +COPY --chown=logstash:logstash config/entrypoint.sh /entrypoint.sh RUN chmod 755 /entrypoint.sh From 727858f74c4308579bd63f89711669941ecc5e56 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 21 Mar 2019 16:56:52 +0100 Subject: [PATCH 17/23] remove run.sh exe --- logstash/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/logstash/Dockerfile b/logstash/Dockerfile index fea745a3..205937c9 100644 --- a/logstash/Dockerfile +++ b/logstash/Dockerfile @@ -9,8 +9,4 @@ RUN rm -f /usr/share/logstash/pipeline/logstash.conf COPY config/01-wazuh.conf /usr/share/logstash/pipeline/01-wazuh.conf -USER root -COPY config/run.sh /run.sh -RUN chmod +x /run.sh - ENTRYPOINT /entrypoint.sh From b3114e72935a07d2ee03b08a174e698dab7db08e Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 21 Mar 2019 18:25:56 +0100 Subject: [PATCH 18/23] add race condition for wazuh alerts template --- kibana/config/entrypoint.sh | 21 +++++++++++++++++++++ logstash/config/entrypoint.sh | 19 ++++++++++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/kibana/config/entrypoint.sh b/kibana/config/entrypoint.sh index 1ba0a44d..fc4baf56 100644 --- a/kibana/config/entrypoint.sh +++ b/kibana/config/entrypoint.sh @@ -3,6 +3,10 @@ set -e +############################################################################## +# Waiting for elasticsearch +############################################################################## + if [ "x${ELASTICSEARCH_URL}" = "x" ]; then el_url="http://elasticsearch:9200" else @@ -19,6 +23,23 @@ sleep 10 >&2 echo "Elasticsearch is up." +############################################################################## +# Waiting for wazuh alerts template +############################################################################## + +strlen=0 + +while [[ $strlen -eq 0 ]] +do + template=$(curl $el_url:9200/_cat/templates/wazuh -s) + strlen=${#template} +done + +sleep 10 + +>&2 echo "Wazuh alerts template is load." + + ./wazuh_app_config.sh sleep 5 diff --git a/logstash/config/entrypoint.sh b/logstash/config/entrypoint.sh index 4eef7fa7..32c347ec 100644 --- a/logstash/config/entrypoint.sh +++ b/logstash/config/entrypoint.sh @@ -26,11 +26,28 @@ sleep 10 >&2 echo "Elasticsearch is up." +############################################################################## +# Waiting for wazuh alerts template +############################################################################## + +strlen=0 + +while [[ $strlen -eq 0 ]] +do + template=$(curl $el_url:9200/_cat/templates/wazuh -s) + strlen=${#template} +done + +sleep 10 + +>&2 echo "Wazuh alerts template is load." + ############################################################################## # Customize logstash output ip ############################################################################## + if [ "$LOGSTASH_OUTPUT" != "" ]; then - echo "Customize Logstash ouput ip." + >&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 From c6793657e71c08efd42af75c1bbf817bc1fd022e Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 21 Mar 2019 18:38:28 +0100 Subject: [PATCH 19/23] improve template check --- kibana/config/entrypoint.sh | 3 ++- logstash/config/entrypoint.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kibana/config/entrypoint.sh b/kibana/config/entrypoint.sh index fc4baf56..e2d87ace 100644 --- a/kibana/config/entrypoint.sh +++ b/kibana/config/entrypoint.sh @@ -33,11 +33,12 @@ while [[ $strlen -eq 0 ]] do template=$(curl $el_url:9200/_cat/templates/wazuh -s) strlen=${#template} + >&2 echo "Wazuh alerts template not loaded - sleeping." done sleep 10 ->&2 echo "Wazuh alerts template is load." +>&2 echo "Wazuh alerts template is loaded." ./wazuh_app_config.sh diff --git a/logstash/config/entrypoint.sh b/logstash/config/entrypoint.sh index 32c347ec..e394a784 100644 --- a/logstash/config/entrypoint.sh +++ b/logstash/config/entrypoint.sh @@ -36,11 +36,12 @@ while [[ $strlen -eq 0 ]] do template=$(curl $el_url:9200/_cat/templates/wazuh -s) strlen=${#template} + >&2 echo "Wazuh alerts template not loaded - sleeping." done sleep 10 ->&2 echo "Wazuh alerts template is load." +>&2 echo "Wazuh alerts template is loaded." ############################################################################## # Customize logstash output ip From 283ca42d57a84df2b3d43a6bdd0b10fd59d0d6c9 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 21 Mar 2019 19:13:22 +0100 Subject: [PATCH 20/23] reduce sleep times after pass check --- kibana/config/entrypoint.sh | 5 +++-- logstash/config/entrypoint.sh | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/kibana/config/entrypoint.sh b/kibana/config/entrypoint.sh index e2d87ace..a87e0bfc 100644 --- a/kibana/config/entrypoint.sh +++ b/kibana/config/entrypoint.sh @@ -18,7 +18,7 @@ until curl -XGET $el_url; do sleep 5 done -sleep 10 +sleep 2 >&2 echo "Elasticsearch is up." @@ -34,9 +34,10 @@ do template=$(curl $el_url:9200/_cat/templates/wazuh -s) strlen=${#template} >&2 echo "Wazuh alerts template not loaded - sleeping." + sleep 2 done -sleep 10 +sleep 2 >&2 echo "Wazuh alerts template is loaded." diff --git a/logstash/config/entrypoint.sh b/logstash/config/entrypoint.sh index e394a784..f8b88116 100644 --- a/logstash/config/entrypoint.sh +++ b/logstash/config/entrypoint.sh @@ -22,7 +22,7 @@ until curl -XGET $el_url; do sleep 5 done -sleep 10 +sleep 2 >&2 echo "Elasticsearch is up." @@ -37,9 +37,10 @@ do template=$(curl $el_url:9200/_cat/templates/wazuh -s) strlen=${#template} >&2 echo "Wazuh alerts template not loaded - sleeping." + sleep 2 done -sleep 10 +sleep 2 >&2 echo "Wazuh alerts template is loaded." From fc97c3623be46320c4d1d6044279a53752f7b37b Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 21 Mar 2019 19:18:17 +0100 Subject: [PATCH 21/23] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd900438..55d51374 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file. - Adding the option to disable some xpack features. ([#111](https://github.com/wazuh/wazuh-docker/pull/111)) - Wazuh-Kibana customizable at plugin level. ([#117](https://github.com/wazuh/wazuh-docker/pull/117)) - Adding env variables for alerts data flow. ([#118](https://github.com/wazuh/wazuh-docker/pull/118)) +- Welcome screen management. ([#133](https://github.com/wazuh/wazuh-docker/pull/133)) ### Changed From 6a82a367119783d4c79b988076292d9c5c2f99cf Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 21 Mar 2019 19:27:42 +0100 Subject: [PATCH 22/23] fix typo in elasticsearch url --- kibana/config/entrypoint.sh | 2 +- logstash/config/entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kibana/config/entrypoint.sh b/kibana/config/entrypoint.sh index a87e0bfc..f7788d29 100644 --- a/kibana/config/entrypoint.sh +++ b/kibana/config/entrypoint.sh @@ -31,7 +31,7 @@ strlen=0 while [[ $strlen -eq 0 ]] do - template=$(curl $el_url:9200/_cat/templates/wazuh -s) + template=$(curl $el_url/_cat/templates/wazuh -s) strlen=${#template} >&2 echo "Wazuh alerts template not loaded - sleeping." sleep 2 diff --git a/logstash/config/entrypoint.sh b/logstash/config/entrypoint.sh index f8b88116..88c3d169 100644 --- a/logstash/config/entrypoint.sh +++ b/logstash/config/entrypoint.sh @@ -34,7 +34,7 @@ strlen=0 while [[ $strlen -eq 0 ]] do - template=$(curl $el_url:9200/_cat/templates/wazuh -s) + template=$(curl $el_url/_cat/templates/wazuh -s) strlen=${#template} >&2 echo "Wazuh alerts template not loaded - sleeping." sleep 2 From fdca63f5922c094fdeab918fa53f2e465b88637a Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 21 Mar 2019 19:38:54 +0100 Subject: [PATCH 23/23] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd900438..9df3c64b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file. - Adding the option to disable some xpack features. ([#111](https://github.com/wazuh/wazuh-docker/pull/111)) - Wazuh-Kibana customizable at plugin level. ([#117](https://github.com/wazuh/wazuh-docker/pull/117)) - Adding env variables for alerts data flow. ([#118](https://github.com/wazuh/wazuh-docker/pull/118)) +- New Logstash entrypoint added. ([#135](https://github.com/wazuh/wazuh-docker/pull/135/files)) ### Changed