From db93ca7b05bdeda1e670cd80ffd6e112f45fb0a3 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Mon, 11 Feb 2019 11:07:41 +0100 Subject: [PATCH 01/49] Update CHANGELOG.md --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3ad428e..cd900438 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. ## Wazuh Docker v3.8.2_6.5.4 +### Added + +- Add Wazuh-Elasticsearch. ([#106](https://github.com/wazuh/wazuh-docker/pull/106)) +- Store Filebeat _/var/lib/filebeat/registry._ ([#109](https://github.com/wazuh/wazuh-docker/pull/109)) +- 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)) + ### Changed - Update to Wazuh version 3.8.2. ([#105](https://github.com/wazuh/wazuh-docker/pull/105)) From fdd2c9d2bf68d5d9f1664fa00fbe704b99ed23df Mon Sep 17 00:00:00 2001 From: manuasir Date: Tue, 12 Feb 2019 17:38:49 +0100 Subject: [PATCH 02/49] Updating docker-compose file --- docker-compose.yml | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 97d06573..4db45ae2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,30 +11,16 @@ services: - "1515:1515" - "514:514/udp" - "55000:55000" -# - "1516:1516" - networks: - - docker_elk -# volumes: -# - my-path:/var/ossec/data:Z -# - my-path:/etc/postfix:Z -# - my-path:/etc/filebeat -# - my_path:/var/lib/filebeat -# - my-custom-config-path/ossec.conf:/wazuh-config-mount/etc/ossec.conf -# command: ["echo 'hello world'"] depends_on: - logstash logstash: image: wazuh/wazuh-logstash:3.8.2_6.5.4 hostname: logstash restart: always -# volumes: -# - my-path:/etc/logstash/conf.d:Z links: - elasticsearch:elasticsearch ports: - "5000:5000" - networks: - - docker_elk depends_on: - elasticsearch environment: @@ -45,7 +31,6 @@ services: restart: always ports: - "9200:9200" -# - "9300:9300" environment: - node.name=node-1 - cluster.name=wazuh @@ -57,20 +42,10 @@ services: soft: -1 hard: -1 mem_limit: 2g -# volumes: -# - my-path:/usr/share/elasticsearch/data:Z - networks: - - docker_elk kibana: image: wazuh/wazuh-kibana:3.8.2_6.5.4 hostname: kibana restart: always -# ports: -# - "5601:5601" -# environment: -# - ELASTICSEARCH_URL=http://elasticsearch:9200 - networks: - - docker_elk depends_on: - elasticsearch links: @@ -85,18 +60,7 @@ services: ports: - "80:80" - "443:443" -# volumes: -# - my-path:/etc/nginx/conf.d:Z - networks: - - docker_elk depends_on: - kibana links: - kibana:kibana - -networks: - docker_elk: - driver: bridge - ipam: - config: - - subnet: 172.25.0.0/24 From d1493272754ddd644f8fb89a0859cdc0c5b06908 Mon Sep 17 00:00:00 2001 From: migruiz4 Date: Wed, 6 Feb 2019 15:03:25 +0100 Subject: [PATCH 03/49] 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 04/49] 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 3ef08ccf6687c09d16b47f1a5e9471f27e7dd273 Mon Sep 17 00:00:00 2001 From: Mayte Ariza Date: Sun, 10 Mar 2019 16:38:51 +0100 Subject: [PATCH 05/49] Elasticsearch dockerfile: added repository-s3 plugin --- elasticsearch/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 1a41604b..b8b200f4 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -21,5 +21,7 @@ COPY --chown=elasticsearch:elasticsearch ./config/load_settings.sh ./ RUN chmod +x ./load_settings.sh +RUN elasticsearch-plugin install --batch repository-s3 + ENTRYPOINT ["/entrypoint.sh"] CMD ["elasticsearch"] From 90738fb148bfa0681ecd279f215813c9798895c0 Mon Sep 17 00:00:00 2001 From: l Date: Tue, 12 Mar 2019 12:38:11 +0100 Subject: [PATCH 06/49] Fixing docker run loop at the elasticsearch container --- elasticsearch/config/load_settings.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elasticsearch/config/load_settings.sh b/elasticsearch/config/load_settings.sh index bac61378..5ed1ac1a 100644 --- a/elasticsearch/config/load_settings.sh +++ b/elasticsearch/config/load_settings.sh @@ -4,7 +4,7 @@ set -e if [ "x${ELASTICSEARCH_URL}" = "x" ]; then - el_url="http://elasticsearch:9200" + el_url="http://localhost:9200" else el_url="${ELASTICSEARCH_URL}" fi From 3dce66e869d819b344863f4bf4973e9da4923d50 Mon Sep 17 00:00:00 2001 From: l Date: Wed, 13 Mar 2019 17:25:48 +0100 Subject: [PATCH 07/49] 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 08/49] 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 b06e4c4a5e07cd205c52ee945e88505767723bc1 Mon Sep 17 00:00:00 2001 From: l Date: Tue, 19 Mar 2019 10:48:07 +0100 Subject: [PATCH 09/49] Upgrade Elastic stack version to 6.6.1 --- elasticsearch/Dockerfile | 2 +- kibana/Dockerfile | 4 ++-- logstash/Dockerfile | 2 +- wazuh/Dockerfile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 1a41604b..19a605fd 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -1,5 +1,5 @@ # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/elasticsearch/elasticsearch:6.5.4 +FROM docker.elastic.co/elasticsearch/elasticsearch:6.6.1 ENV ALERTS_SHARDS="1" \ ALERTS_REPLICAS="0" diff --git a/kibana/Dockerfile b/kibana/Dockerfile index 8bb08523..80919392 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,6 +1,6 @@ # 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 +FROM docker.elastic.co/kibana/kibana:6.6.1 +ARG WAZUH_APP_VERSION=3.8.2_6.6.1 USER root ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp diff --git a/logstash/Dockerfile b/logstash/Dockerfile index 00322375..146050de 100644 --- a/logstash/Dockerfile +++ b/logstash/Dockerfile @@ -1,5 +1,5 @@ # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/logstash/logstash:6.5.4 +FROM docker.elastic.co/logstash/logstash:6.6.1 RUN rm -f /usr/share/logstash/pipeline/logstash.conf diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index 1031c1d0..268d2a3d 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -1,6 +1,6 @@ # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) FROM phusion/baseimage:latest -ARG FILEBEAT_VERSION=6.5.4 +ARG FILEBEAT_VERSION=6.6.1 ARG WAZUH_VERSION=3.8.2-1 ENV API_USER="foo" \ From c1a33b7185523bc8669234e8ff89c20f53be682f Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Tue, 19 Mar 2019 14:35:44 +0100 Subject: [PATCH 10/49] 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 11/49] 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 12/49] 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 13/49] 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 14/49] 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 15/49] 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 16/49] 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 17/49] 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 18/49] 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 19/49] 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 20/49] 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 21/49] 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 22/49] 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 23/49] 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 24/49] 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 25/49] 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 26/49] 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 27/49] 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 28/49] 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 From 715fb4fdec219c7c8c9826436be6b40292175e56 Mon Sep 17 00:00:00 2001 From: toniMR Date: Fri, 22 Mar 2019 09:52:37 +0100 Subject: [PATCH 29/49] Adding NGINX_CREDENTIALS in nginx/config/entrypoint.sh --- nginx/config/entrypoint.sh | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/nginx/config/entrypoint.sh b/nginx/config/entrypoint.sh index a6eeec9e..ca661412 100644 --- a/nginx/config/entrypoint.sh +++ b/nginx/config/entrypoint.sh @@ -1,5 +1,5 @@ -#!/bin/sh -# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) +#!/bin/bash +# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) set -e @@ -12,15 +12,27 @@ else echo "SSL certificates already present" fi -# Configuring default credentiales. +# Setting users credentials. if [ ! -f /etc/nginx/conf.d/kibana.htpasswd ]; then - echo "Setting Nginx credentials" - echo $NGINX_PWD|htpasswd -i -c /etc/nginx/conf.d/kibana.htpasswd $NGINX_NAME >/dev/null + echo "Setting users credentials" + if [ ! -z "$NGINX_CREDENTIALS" ]; then + IFS=';' read -r -a users <<< "$NGINX_CREDENTIALS" + for index in "${!users[@]}" + do + IFS=':' read -r -a credentials <<< "${users[index]}" + if [ $index -eq 0 ]; then + echo ${credentials[1]}|htpasswd -i -c /etc/nginx/conf.d/kibana.htpasswd ${credentials[0]} >/dev/null + else + echo ${credentials[1]}|htpasswd -i /etc/nginx/conf.d/kibana.htpasswd ${credentials[0]} >/dev/null + fi + done + else + echo $NGINX_PWD|htpasswd -i -c /etc/nginx/conf.d/kibana.htpasswd $NGINX_NAME >/dev/null + fi else echo "Kibana credentials already configured" fi - if [ "x${NGINX_PORT}" = "x" ]; then NGINX_PORT=443 fi From 12b40b48ee64d36046e73f7971d5b5c46268fe23 Mon Sep 17 00:00:00 2001 From: toniMR Date: Fri, 22 Mar 2019 09:54:32 +0100 Subject: [PATCH 30/49] Adding NGINX_CREDENTIALS in docker-compose.yml --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index c4cc56bd..91a0d9fc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -57,6 +57,7 @@ services: restart: always environment: - NGINX_PORT=443 + - NGINX_CREDENTIALS ports: - "80:80" - "443:443" From f3674ff9d9d1d0841d2f7aa8c0bf71c9abe198db Mon Sep 17 00:00:00 2001 From: toniMR Date: Fri, 22 Mar 2019 09:57:02 +0100 Subject: [PATCH 31/49] Changing comment --- nginx/config/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/config/entrypoint.sh b/nginx/config/entrypoint.sh index ca661412..1b395c5b 100644 --- a/nginx/config/entrypoint.sh +++ b/nginx/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 From 8823405dd93495c132b359ea65aa7d4ba98c75df Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Fri, 22 Mar 2019 14:47:22 +0100 Subject: [PATCH 32/49] remove alerts content --- wazuh/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index 1031c1d0..5c8fa136 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -60,6 +60,9 @@ RUN chmod +x /etc/service/wazuh-api/run && \ chmod +x /etc/service/postfix/run && \ chmod +x /etc/service/filebeat/run +RUN echo -n > /var/ossec/logs/alerts/alerts.json +RUN echo -n > /var/ossec/logs/alerts/alerts.log + # Run all services ENTRYPOINT ["/entrypoint.sh"] From 92d957730c86c82c72582248fc7fdfe73c213973 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Mon, 25 Mar 2019 17:36:27 +0100 Subject: [PATCH 33/49] remove alerts on build time --- wazuh/Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index 5c8fa136..ff9a940d 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -17,7 +17,8 @@ RUN set -x && echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee / 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/* + wazuh-api=${WAZUH_VERSION} && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -f \ + /var/ossec/logs/alerts/*/*/*.log && rm -f /var/ossec/logs/alerts/*/*/*.json # Adding first run script and entrypoint COPY config/data_dirs.env /data_dirs.env @@ -60,9 +61,6 @@ RUN chmod +x /etc/service/wazuh-api/run && \ chmod +x /etc/service/postfix/run && \ chmod +x /etc/service/filebeat/run -RUN echo -n > /var/ossec/logs/alerts/alerts.json -RUN echo -n > /var/ossec/logs/alerts/alerts.log - # Run all services ENTRYPOINT ["/entrypoint.sh"] From be9c278a186a1b6dc53b5016605db251447d29eb Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Mon, 25 Mar 2019 17:45:24 +0100 Subject: [PATCH 34/49] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a3aa5c1..7132e4b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file. - 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)) - Welcome screen management. ([#133](https://github.com/wazuh/wazuh-docker/pull/133)) +- Remove alerts created in build time. ([#137](https://github.com/wazuh/wazuh-docker/pull/137)) ### Changed From 62af977067498442e619cc35fee0dc3f17770baa Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Mon, 25 Mar 2019 17:46:12 +0100 Subject: [PATCH 35/49] Update CHANGELOG.md --- CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7132e4b9..61093b6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,13 +12,16 @@ All notable changes to this project will be documented in this file. - 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)) - Welcome screen management. ([#133](https://github.com/wazuh/wazuh-docker/pull/133)) -- Remove alerts created in build time. ([#137](https://github.com/wazuh/wazuh-docker/pull/137)) - ### Changed - Update to Wazuh version 3.8.2. ([#105](https://github.com/wazuh/wazuh-docker/pull/105)) +### Removed + +- Remove alerts created in build time. ([#137](https://github.com/wazuh/wazuh-docker/pull/137)) + + ## Wazuh Docker v3.8.1_6.5.4 ### Changed From 11108631c05bf888890195325c67ae65ad3b6693 Mon Sep 17 00:00:00 2001 From: toniMR Date: Tue, 26 Mar 2019 13:26:09 +0100 Subject: [PATCH 36/49] Adding comments --- nginx/config/entrypoint.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nginx/config/entrypoint.sh b/nginx/config/entrypoint.sh index 1b395c5b..385d7aa8 100644 --- a/nginx/config/entrypoint.sh +++ b/nginx/config/entrypoint.sh @@ -13,6 +13,15 @@ else fi # Setting users credentials. +# In order to set NGINX_CREDENTIALS, before "docker-compose up -d" run (a or b): +# +# a) export NGINX_CREDENTIALS="user1:pass1;user2:pass2;" or +# export NGINX_CREDENTIALS="user1:pass1;user2:pass2" +# +# b) Set NGINX_CREDENTIALS in docker-compose.yml: +# NGINX_CREDENTIALS=user1:pass1;user2:pass2; or +# NGINX_CREDENTIALS=user1:pass1;user2:pass2 +# if [ ! -f /etc/nginx/conf.d/kibana.htpasswd ]; then echo "Setting users credentials" if [ ! -z "$NGINX_CREDENTIALS" ]; then @@ -27,6 +36,7 @@ if [ ! -f /etc/nginx/conf.d/kibana.htpasswd ]; then fi done else + # NGINX_PWD and NGINX_NAME are declared in nginx/Dockerfile echo $NGINX_PWD|htpasswd -i -c /etc/nginx/conf.d/kibana.htpasswd $NGINX_NAME >/dev/null fi else From b15d61cda79735418852ac7c6ab1e3cb3a031313 Mon Sep 17 00:00:00 2001 From: Mayte Ariza Date: Tue, 26 Mar 2019 14:20:38 +0100 Subject: [PATCH 37/49] Added script configure_s3.sh to Elasticsearch Dockerfile --- elasticsearch/Dockerfile | 5 +++ elasticsearch/config/configure_s3.sh | 53 +++++++++++++++++++++++++++ elasticsearch/config/load_settings.sh | 19 ++++++++++ 3 files changed, 77 insertions(+) create mode 100644 elasticsearch/config/configure_s3.sh diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index b8b200f4..30a2cd0a 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -9,6 +9,8 @@ ENV API_USER="foo" \ ENV XPACK_ML="true" +ENV ENABLE_CONFIGURE_S3="false" + ENV TEMPLATE_VERSION=v3.8.2 ADD https://raw.githubusercontent.com/wazuh/wazuh/$TEMPLATE_VERSION/extensions/elasticsearch/wazuh-elastic6-template-alerts.json /usr/share/elasticsearch/config @@ -23,5 +25,8 @@ RUN chmod +x ./load_settings.sh RUN elasticsearch-plugin install --batch repository-s3 +COPY config/configure_s3.sh ./config/configure_s3.sh +RUN chmod 755 ./config/configure_s3.sh + ENTRYPOINT ["/entrypoint.sh"] CMD ["elasticsearch"] diff --git a/elasticsearch/config/configure_s3.sh b/elasticsearch/config/configure_s3.sh new file mode 100644 index 00000000..ca5db9a6 --- /dev/null +++ b/elasticsearch/config/configure_s3.sh @@ -0,0 +1,53 @@ +#!/bin/bash + +# Check arguments +function CheckArgs() +{ + if [ $1 != 4 ] && [ $1 != 5 ];then + echo "Use: configure_s3.sh (By default /elasticsearch/ is added to the path)" + echo "or use: configure_s3.sh " + exit 1 + + fi +} + +# Create repository from base_path /elasticsearch/ (this last one is automatically added by the script itself, no arg version needed) +# Repository name would be "s3-repository-" plus the current elasticsearch_major_version +function CreateRepo() +{ + + elastic_ip_port="$2" + bucket_name="$3" + path="$4" + repository_name="$5" + + if [ $1 == 5 ];then + version="$6" + else + version=`curl -s $elastic_ip_port | grep number | cut -d"\"" -f4 | cut -c1` + fi + + repository="$repository_name-$version" + s3_path="$path/elasticsearch/$version" + + curl -X PUT "$elastic_ip_port/_snapshot/$repository" -H 'Content-Type: application/json' -d' + { + "type": "s3", + "settings": { + "bucket": "'$bucket_name'", + "base_path": "'$s3_path'" + } + } + ' + +} + + +function Main() +{ + CheckArgs $1 + + CreateRepo $1 $2 $3 $4 $5 $6 +} + + Main $# $1 $2 $3 $4 $5 \ No newline at end of file diff --git a/elasticsearch/config/load_settings.sh b/elasticsearch/config/load_settings.sh index bac61378..bce7dd90 100644 --- a/elasticsearch/config/load_settings.sh +++ b/elasticsearch/config/load_settings.sh @@ -23,6 +23,25 @@ done >&2 echo "Elastic is up - executing command" +if [ $ENABLE_CONFIGURE_S3 ]; then + + sleep 10 + IP_PORT="${ELASTICSEARCH_IP}:${ELASTICSEARCH_PORT}" + + if [ "x$S3_PATH" != "x" ]; then + + if [ "x$S3_ELASTIC_MAJOR" != "x" ]; then + ./config/configure_s3.sh $IP_PORT $S3_BUCKET_NAME $S3_PATH $S3_REPOSITORY_NAME $S3_ELASTIC_MAJOR + + else + ./config/configure_s3.sh $IP_PORT $S3_BUCKET_NAME $S3_PATH $S3_REPOSITORY_NAME + + fi + + fi + +fi + #Insert default templates sed -i 's| "index.refresh_interval": "5s"| "index.refresh_interval": "5s", "number_of_shards" : '"${ALERTS_SHARDS}"', "number_of_replicas" : '"${ALERTS_REPLICAS}"'|' /usr/share/elasticsearch/config/wazuh-elastic6-template-alerts.json From ebca6b36967183202cfbf481f4c2e62135758e35 Mon Sep 17 00:00:00 2001 From: l Date: Tue, 26 Mar 2019 16:30:50 +0100 Subject: [PATCH 38/49] Fixing duplicate alerts with kubernetes --- wazuh/config/filebeat.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/wazuh/config/filebeat.yml b/wazuh/config/filebeat.yml index 1835863b..bb02a5d8 100644 --- a/wazuh/config/filebeat.yml +++ b/wazuh/config/filebeat.yml @@ -8,6 +8,7 @@ filebeat: json.message_key: log json.keys_under_root: true json.overwrite_keys: true + tail_files: true output: logstash: From 1bc6ecca67c31e52c8d9efd492e0a76f5c1c0205 Mon Sep 17 00:00:00 2001 From: Mayte Ariza Date: Wed, 27 Mar 2019 10:04:24 +0100 Subject: [PATCH 39/49] Elasticsearch major version checked and repository base path changed --- elasticsearch/config/configure_s3.sh | 17 ++++++++++++----- elasticsearch/config/load_settings.sh | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/elasticsearch/config/configure_s3.sh b/elasticsearch/config/configure_s3.sh index ca5db9a6..5ec80832 100644 --- a/elasticsearch/config/configure_s3.sh +++ b/elasticsearch/config/configure_s3.sh @@ -1,18 +1,20 @@ #!/bin/bash +set -e + # Check arguments function CheckArgs() { if [ $1 != 4 ] && [ $1 != 5 ];then - echo "Use: configure_s3.sh (By default /elasticsearch/ is added to the path)" + echo "Use: configure_s3.sh (By default is added to the path and the repository name)" echo "or use: configure_s3.sh " exit 1 fi } -# Create repository from base_path /elasticsearch/ (this last one is automatically added by the script itself, no arg version needed) -# Repository name would be "s3-repository-" plus the current elasticsearch_major_version +# Create repository from base_path / (if there is no argument, current version is added) +# Repository name would be - (if there is no argument, current version is added) function CreateRepo() { @@ -27,8 +29,13 @@ function CreateRepo() version=`curl -s $elastic_ip_port | grep number | cut -d"\"" -f4 | cut -c1` fi + if ! [[ "$version" =~ ^[0-9]+$ ]];then + echo "Elasticsearch major version must be an integer" + exit 1 + fi + repository="$repository_name-$version" - s3_path="$path/elasticsearch/$version" + s3_path="$path/$version" curl -X PUT "$elastic_ip_port/_snapshot/$repository" -H 'Content-Type: application/json' -d' { @@ -50,4 +57,4 @@ function Main() CreateRepo $1 $2 $3 $4 $5 $6 } - Main $# $1 $2 $3 $4 $5 \ No newline at end of file +Main $# $1 $2 $3 $4 $5 \ No newline at end of file diff --git a/elasticsearch/config/load_settings.sh b/elasticsearch/config/load_settings.sh index bce7dd90..17154c29 100644 --- a/elasticsearch/config/load_settings.sh +++ b/elasticsearch/config/load_settings.sh @@ -24,7 +24,7 @@ done >&2 echo "Elastic is up - executing command" if [ $ENABLE_CONFIGURE_S3 ]; then - + #Wait for Elasticsearch to be ready to create the repository sleep 10 IP_PORT="${ELASTICSEARCH_IP}:${ELASTICSEARCH_PORT}" From 91e70da2b8793a29e1cfdb7aec0550c344bf343b Mon Sep 17 00:00:00 2001 From: Mayte Ariza Date: Wed, 27 Mar 2019 12:48:12 +0100 Subject: [PATCH 40/49] Configure_s3.sh: comments added --- elasticsearch/config/configure_s3.sh | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/elasticsearch/config/configure_s3.sh b/elasticsearch/config/configure_s3.sh index 5ec80832..49c88a25 100644 --- a/elasticsearch/config/configure_s3.sh +++ b/elasticsearch/config/configure_s3.sh @@ -2,7 +2,9 @@ set -e -# Check arguments +# Check number of arguments passed to configure_s3.sh. If it is different from 4 or 5, the process will finish with error. +# param 1: number of arguments passed to configure_s3.sh + function CheckArgs() { if [ $1 != 4 ] && [ $1 != 5 ];then @@ -13,8 +15,15 @@ function CheckArgs() fi } -# Create repository from base_path / (if there is no argument, current version is added) +# Create S3 repository from base_path / (if there is no argument, current version is added) # Repository name would be - (if there is no argument, current version is added) +# param 1: +# param 2: +# param 3: +# param 4: +# param 5: Optional +# output: It will show "acknowledged" if the repository has been successfully created + function CreateRepo() { @@ -49,6 +58,13 @@ function CreateRepo() } +# Run functions CheckArgs and CreateRepo +# param 1: number of arguments passed to configure_s3.sh +# param 2: +# param 3: +# param 4: +# param 5: +# param 6: Optional function Main() { From 8e5ad87619fb93a95f9f7bfc42a020876d91ea6d Mon Sep 17 00:00:00 2001 From: manuasir Date: Fri, 29 Mar 2019 18:27:17 +0100 Subject: [PATCH 41/49] Added vm.max_map_count to README --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3760f61e..8e0d446a 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,9 @@ In this repository you will find the containers to run: * wazuh-logstash: It is used to receive alerts generated by the manager and feed Elasticsearch using an alerts template * wazuh-kibana: Provides a web user interface to browse through alerts data. It includes Wazuh plugin for Kibana, that allows you to visualize agents configuration and status. * wazuh-nginx: Proxies the Kibana container, adding HTTPS (via self-signed SSL certificate) and [Basic authentication](https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication#Basic_authentication_scheme). +* wazuh-elasticsearch: An Elasticsearch container (working as a single-node cluster) using Elastic Stack Docker images. **Be aware to increase the `vm.max_map_count` setting, as it's detailed in the [Wazuh documentation](https://documentation.wazuh.com/current/docker/wazuh-container.html#increase-max-map-count-on-your-host-linux).** -In addition, a docker-compose file is provided to launch the containers mentioned above. It also launches an Elasticsearch container (working as a single-node cluster) using Elastic Stack Docker images. +In addition, a docker-compose file is provided to launch the containers mentioned above. ## Documentation @@ -58,7 +59,7 @@ In addition, a docker-compose file is provided to launch the containers mentione ## Branches -* `stable` branch on correspond to the last Wazuh-Docker stable version. +* `stable` branch on correspond to the latest Wazuh-Docker stable version. * `master` branch contains the latest code, be aware of possible bugs on this branch. * `Wazuh.Version_ElasticStack.Version` (for example 3.7.0_6.4.3) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch. From 86bc43a4940f450ecf22449d4511d7cc3152bfb3 Mon Sep 17 00:00:00 2001 From: manuasir Date: Fri, 29 Mar 2019 18:44:36 +0100 Subject: [PATCH 42/49] Bump version --- CHANGELOG.md | 6 ++++++ README.md | 2 +- VERSION | 2 +- docker-compose.yml | 10 +++++----- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61093b6a..83f6cd42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Docker v3.8.2_6.6.1 + +### Changed + +- Update Elastic Stack version to 6.6.1. ([#143](https://github.com/wazuh/wazuh-docker/pull/143)) + ## Wazuh Docker v3.8.2_6.5.4 ### Added diff --git a/README.md b/README.md index 8e0d446a..7272cb19 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ In addition, a docker-compose file is provided to launch the containers mentione * `stable` branch on correspond to the latest Wazuh-Docker stable version. * `master` branch contains the latest code, be aware of possible bugs on this branch. -* `Wazuh.Version_ElasticStack.Version` (for example 3.7.0_6.4.3) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch. +* `Wazuh.Version_ElasticStack.Version` (for example 3.8.2_6.6.1) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch. ## Credits and Thank you diff --git a/VERSION b/VERSION index bb5f485c..cc705574 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="3.8.2_6.5.4" +WAZUH-DOCKER_VERSION="3.8.2_6.6.1" REVISION="3802" diff --git a/docker-compose.yml b/docker-compose.yml index 91a0d9fc..3bd76826 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: wazuh: - image: wazuh/wazuh:3.8.2_6.5.4 + image: wazuh/wazuh:3.8.2_6.6.1 hostname: wazuh-manager restart: always ports: @@ -14,7 +14,7 @@ services: depends_on: - logstash logstash: - image: wazuh/wazuh-logstash:3.8.2_6.5.4 + image: wazuh/wazuh-logstash:3.8.2_6.6.1 hostname: logstash restart: always links: @@ -26,7 +26,7 @@ services: environment: - LS_HEAP_SIZE=2048m elasticsearch: - image: wazuh/wazuh-elasticsearch:3.8.2_6.5.4 + image: wazuh/wazuh-elasticsearch:3.8.2_6.6.1 hostname: elasticsearch restart: always ports: @@ -43,7 +43,7 @@ services: hard: -1 mem_limit: 2g kibana: - image: wazuh/wazuh-kibana:3.8.2_6.5.4 + image: wazuh/wazuh-kibana:3.8.2_6.6.1 hostname: kibana restart: always depends_on: @@ -52,7 +52,7 @@ services: - elasticsearch:elasticsearch - wazuh:wazuh nginx: - image: wazuh/wazuh-nginx:3.8.2_6.5.4 + image: wazuh/wazuh-nginx:3.8.2_6.6.1 hostname: nginx restart: always environment: From 38644d380cb50021ae6e7e03ad60e4a81a173372 Mon Sep 17 00:00:00 2001 From: "Manuel J. Bernal" Date: Fri, 29 Mar 2019 18:51:52 +0100 Subject: [PATCH 43/49] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83f6cd42..39844ca5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Update Elastic Stack version to 6.6.1. ([#143](https://github.com/wazuh/wazuh-docker/pull/143)) +- Update Elastic Stack version to 6.6.1. ([#129](https://github.com/wazuh/wazuh-docker/pull/129)) ## Wazuh Docker v3.8.2_6.5.4 From b99d54eb259fa08bc8aa325d01b472412d401603 Mon Sep 17 00:00:00 2001 From: manuasir Date: Fri, 29 Mar 2019 19:03:28 +0100 Subject: [PATCH 44/49] Bump version --- CHANGELOG.md | 10 ++++++++-- README.md | 2 +- VERSION | 2 +- docker-compose.yml | 10 +++++----- elasticsearch/Dockerfile | 2 +- kibana/Dockerfile | 4 ++-- logstash/Dockerfile | 2 +- wazuh/Dockerfile | 2 +- 8 files changed, 20 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39844ca5..48c4e138 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,17 @@ # Change Log All notable changes to this project will be documented in this file. -## Wazuh Docker v3.8.2_6.6.1 +## Wazuh Docker v3.8.2_6.6.2 ### Changed -- Update Elastic Stack version to 6.6.1. ([#129](https://github.com/wazuh/wazuh-docker/pull/129)) +- Update Elastic Stack version to 6.6.2. ([#130](https://github.com/wazuh/wazuh-docker/pull/130)) + +## Wazuh Docker v3.8.2_6.6.2 + +### Changed + +- Update Elastic Stack version to 6.6.2. ([#129](https://github.com/wazuh/wazuh-docker/pull/129)) ## Wazuh Docker v3.8.2_6.5.4 diff --git a/README.md b/README.md index 7272cb19..28cdc27f 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ In addition, a docker-compose file is provided to launch the containers mentione * `stable` branch on correspond to the latest Wazuh-Docker stable version. * `master` branch contains the latest code, be aware of possible bugs on this branch. -* `Wazuh.Version_ElasticStack.Version` (for example 3.8.2_6.6.1) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch. +* `Wazuh.Version_ElasticStack.Version` (for example 3.8.2_6.6.2) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch. ## Credits and Thank you diff --git a/VERSION b/VERSION index cc705574..4b4e1a3b 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="3.8.2_6.6.1" +WAZUH-DOCKER_VERSION="3.8.2_6.6.2" REVISION="3802" diff --git a/docker-compose.yml b/docker-compose.yml index 3bd76826..a752310d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: wazuh: - image: wazuh/wazuh:3.8.2_6.6.1 + image: wazuh/wazuh:3.8.2_6.6.2 hostname: wazuh-manager restart: always ports: @@ -14,7 +14,7 @@ services: depends_on: - logstash logstash: - image: wazuh/wazuh-logstash:3.8.2_6.6.1 + image: wazuh/wazuh-logstash:3.8.2_6.6.2 hostname: logstash restart: always links: @@ -26,7 +26,7 @@ services: environment: - LS_HEAP_SIZE=2048m elasticsearch: - image: wazuh/wazuh-elasticsearch:3.8.2_6.6.1 + image: wazuh/wazuh-elasticsearch:3.8.2_6.6.2 hostname: elasticsearch restart: always ports: @@ -43,7 +43,7 @@ services: hard: -1 mem_limit: 2g kibana: - image: wazuh/wazuh-kibana:3.8.2_6.6.1 + image: wazuh/wazuh-kibana:3.8.2_6.6.2 hostname: kibana restart: always depends_on: @@ -52,7 +52,7 @@ services: - elasticsearch:elasticsearch - wazuh:wazuh nginx: - image: wazuh/wazuh-nginx:3.8.2_6.6.1 + image: wazuh/wazuh-nginx:3.8.2_6.6.2 hostname: nginx restart: always environment: diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index f5a8b6d8..c95c9e96 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -1,5 +1,5 @@ # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/elasticsearch/elasticsearch:6.6.1 +FROM docker.elastic.co/elasticsearch/elasticsearch:6.6.2 ENV ALERTS_SHARDS="1" \ ALERTS_REPLICAS="0" diff --git a/kibana/Dockerfile b/kibana/Dockerfile index abe4825b..3ecfcec2 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,6 +1,6 @@ # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/kibana/kibana:6.6.1 -ARG WAZUH_APP_VERSION=3.8.2_6.6.1 +FROM docker.elastic.co/kibana/kibana:6.6.2 +ARG WAZUH_APP_VERSION=3.8.2_6.6.2 USER root ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp diff --git a/logstash/Dockerfile b/logstash/Dockerfile index a89feed8..75c71a6a 100644 --- a/logstash/Dockerfile +++ b/logstash/Dockerfile @@ -1,5 +1,5 @@ # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/logstash/logstash:6.6.1 +FROM docker.elastic.co/logstash/logstash:6.6.2 COPY --chown=logstash:logstash config/entrypoint.sh /entrypoint.sh diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index b412a8e8..585a0227 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -1,6 +1,6 @@ # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) FROM phusion/baseimage:latest -ARG FILEBEAT_VERSION=6.6.1 +ARG FILEBEAT_VERSION=6.6.2 ARG WAZUH_VERSION=3.8.2-1 ENV API_USER="foo" \ From 274d6248d337abd95ecbd23bd68b60d50ced2879 Mon Sep 17 00:00:00 2001 From: manuasir Date: Tue, 2 Apr 2019 18:21:04 +0200 Subject: [PATCH 45/49] Bump version. --- CHANGELOG.md | 10 ++++++++-- README.md | 2 +- VERSION | 4 ++-- docker-compose.yml | 10 +++++----- elasticsearch/Dockerfile | 4 ++-- kibana/Dockerfile | 4 ++-- logstash/Dockerfile | 2 +- wazuh/Dockerfile | 2 +- 8 files changed, 22 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48c4e138..0a4035c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,23 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Docker v3.8.2_6.7.0 + +### Changed + +- Update Elastic Stack version to 6.7.0. ([#131](https://github.com/wazuh/wazuh-docker/pull/131)) + ## Wazuh Docker v3.8.2_6.6.2 ### Changed - Update Elastic Stack version to 6.6.2. ([#130](https://github.com/wazuh/wazuh-docker/pull/130)) -## Wazuh Docker v3.8.2_6.6.2 +## Wazuh Docker v3.8.2_6.6.1 ### Changed -- Update Elastic Stack version to 6.6.2. ([#129](https://github.com/wazuh/wazuh-docker/pull/129)) +- Update Elastic Stack version to 6.6.1. ([#129](https://github.com/wazuh/wazuh-docker/pull/129)) ## Wazuh Docker v3.8.2_6.5.4 diff --git a/README.md b/README.md index 28cdc27f..f3e82a5d 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ In addition, a docker-compose file is provided to launch the containers mentione * `stable` branch on correspond to the latest Wazuh-Docker stable version. * `master` branch contains the latest code, be aware of possible bugs on this branch. -* `Wazuh.Version_ElasticStack.Version` (for example 3.8.2_6.6.2) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch. +* `Wazuh.Version_ElasticStack.Version` (for example 3.8.2_6.7.0) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch. ## Credits and Thank you diff --git a/VERSION b/VERSION index 4b4e1a3b..2c9de155 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="3.8.2_6.6.2" -REVISION="3802" +WAZUH-DOCKER_VERSION="3.8.2_6.7.0" +REVISION="3803" diff --git a/docker-compose.yml b/docker-compose.yml index a752310d..03af6a96 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: wazuh: - image: wazuh/wazuh:3.8.2_6.6.2 + image: wazuh/wazuh:3.8.2_6.7.0 hostname: wazuh-manager restart: always ports: @@ -14,7 +14,7 @@ services: depends_on: - logstash logstash: - image: wazuh/wazuh-logstash:3.8.2_6.6.2 + image: wazuh/wazuh-logstash:3.8.2_6.7.0 hostname: logstash restart: always links: @@ -26,7 +26,7 @@ services: environment: - LS_HEAP_SIZE=2048m elasticsearch: - image: wazuh/wazuh-elasticsearch:3.8.2_6.6.2 + image: wazuh/wazuh-elasticsearch:3.8.2_6.7.0 hostname: elasticsearch restart: always ports: @@ -43,7 +43,7 @@ services: hard: -1 mem_limit: 2g kibana: - image: wazuh/wazuh-kibana:3.8.2_6.6.2 + image: wazuh/wazuh-kibana:3.8.2_6.7.0 hostname: kibana restart: always depends_on: @@ -52,7 +52,7 @@ services: - elasticsearch:elasticsearch - wazuh:wazuh nginx: - image: wazuh/wazuh-nginx:3.8.2_6.6.2 + image: wazuh/wazuh-nginx:3.8.2_6.7.0 hostname: nginx restart: always environment: diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index c95c9e96..2a5ff67c 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -1,5 +1,5 @@ # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/elasticsearch/elasticsearch:6.6.2 +FROM docker.elastic.co/elasticsearch/elasticsearch:6.7.0 ENV ALERTS_SHARDS="1" \ ALERTS_REPLICAS="0" @@ -23,7 +23,7 @@ COPY --chown=elasticsearch:elasticsearch ./config/load_settings.sh ./ RUN chmod +x ./load_settings.sh -RUN elasticsearch-plugin install --batch repository-s3 +RUN bin/elasticsearch-plugin install --batch https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-6.7.0.zip COPY config/configure_s3.sh ./config/configure_s3.sh RUN chmod 755 ./config/configure_s3.sh diff --git a/kibana/Dockerfile b/kibana/Dockerfile index 3ecfcec2..767c33d2 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,6 +1,6 @@ # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/kibana/kibana:6.6.2 -ARG WAZUH_APP_VERSION=3.8.2_6.6.2 +FROM docker.elastic.co/kibana/kibana:6.7.0 +ARG WAZUH_APP_VERSION=3.8.2_6.7.0 USER root ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp diff --git a/logstash/Dockerfile b/logstash/Dockerfile index 75c71a6a..2ad4fb93 100644 --- a/logstash/Dockerfile +++ b/logstash/Dockerfile @@ -1,5 +1,5 @@ # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/logstash/logstash:6.6.2 +FROM docker.elastic.co/logstash/logstash:6.7.0 COPY --chown=logstash:logstash config/entrypoint.sh /entrypoint.sh diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index 585a0227..e25f7936 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -1,6 +1,6 @@ # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) FROM phusion/baseimage:latest -ARG FILEBEAT_VERSION=6.6.2 +ARG FILEBEAT_VERSION=6.7.0 ARG WAZUH_VERSION=3.8.2-1 ENV API_USER="foo" \ From 61d3f460be33e26213e666afafda0e5b5fd1e4f3 Mon Sep 17 00:00:00 2001 From: manuasir Date: Wed, 3 Apr 2019 14:42:38 +0200 Subject: [PATCH 46/49] Updated CHANGELOG. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a4035c1..508393b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Update Elastic Stack version to 6.7.0. ([#131](https://github.com/wazuh/wazuh-docker/pull/131)) +- Update Elastic Stack version to 6.7.0. ([#144](https://github.com/wazuh/wazuh-docker/pull/144)) ## Wazuh Docker v3.8.2_6.6.2 From 5f2859d95e0f03486692db26f44754243461e492 Mon Sep 17 00:00:00 2001 From: Mayte Ariza Date: Wed, 17 Apr 2019 13:04:58 +0200 Subject: [PATCH 47/49] Entrypoint-scripts folder configured --- wazuh/Dockerfile | 5 +- wazuh/config/00-wazuh.sh | 151 +++++++++++++++++++++++++++++++++++++ wazuh/config/entrypoint.sh | 148 +----------------------------------- 3 files changed, 158 insertions(+), 146 deletions(-) create mode 100644 wazuh/config/00-wazuh.sh diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index ff9a940d..91c8e4fa 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -23,7 +23,9 @@ RUN add-apt-repository universe && apt-get update && apt-get upgrade -y -o Dpkg: # Adding first run script and entrypoint COPY config/data_dirs.env /data_dirs.env COPY config/init.bash /init.bash +RUN mkdir /entrypoint-scripts COPY config/entrypoint.sh /entrypoint.sh +COPY config/00-wazuh.sh /entrypoint-scripts/00-wazuh.sh # Sync calls are due to https://github.com/docker/docker/issues/9547 RUN chmod 755 /init.bash && \ @@ -31,7 +33,8 @@ 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 755 /entrypoint.sh + chmod 755 /entrypoint.sh && \ + chmod 755 /entrypoint-scripts/00-wazuh.sh COPY config/filebeat.yml /etc/filebeat/ RUN chmod go-w /etc/filebeat/filebeat.yml diff --git a/wazuh/config/00-wazuh.sh b/wazuh/config/00-wazuh.sh new file mode 100644 index 00000000..5935f8cb --- /dev/null +++ b/wazuh/config/00-wazuh.sh @@ -0,0 +1,151 @@ +#!/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. +# + +# + +# +# Startup the services +# + +source /data_dirs.env + +FIRST_TIME_INSTALLATION=false + +WAZUH_INSTALL_PATH=/var/ossec +DATA_PATH=${WAZUH_INSTALL_PATH}/data + +WAZUH_CONFIG_MOUNT=/wazuh-config-mount + +print() { + echo -e $1 +} + +error_and_exit() { + echo "Error executing command: '$1'." + echo 'Exiting.' + exit 1 +} + +exec_cmd() { + eval $1 > /dev/null 2>&1 || error_and_exit "$1" +} + +exec_cmd_stdout() { + eval $1 2>&1 || error_and_exit "$1" +} + +edit_configuration() { # $1 -> setting, $2 -> value + sed -i "s/^config.$1\s=.*/config.$1 = \"$2\";/g" "${DATA_PATH}/api/configuration/config.js" || error_and_exit "sed (editing configuration)" +} + +for ossecdir in "${DATA_DIRS[@]}"; do + if [ ! -e "${DATA_PATH}/${ossecdir}" ] + then + print "Installing ${ossecdir}" + exec_cmd "mkdir -p $(dirname ${DATA_PATH}/${ossecdir})" + exec_cmd "cp -pr /var/ossec/${ossecdir}-template ${DATA_PATH}/${ossecdir}" + FIRST_TIME_INSTALLATION=true + fi +done + +if [ -e ${WAZUH_INSTALL_PATH}/etc-template ] +then + cp -p /var/ossec/etc-template/internal_options.conf /var/ossec/etc/internal_options.conf +fi +rm /var/ossec/queue/db/.template.db + +touch ${DATA_PATH}/process_list +chgrp ossec ${DATA_PATH}/process_list +chmod g+rw ${DATA_PATH}/process_list + +AUTO_ENROLLMENT_ENABLED=${AUTO_ENROLLMENT_ENABLED:-true} +API_GENERATE_CERTS=${API_GENERATE_CERTS:-true} + +if [ $FIRST_TIME_INSTALLATION == true ] +then + if [ $AUTO_ENROLLMENT_ENABLED == true ] + then + if [ ! -e ${DATA_PATH}/etc/sslmanager.key ] + then + print "Creating ossec-authd key and cert" + exec_cmd "openssl genrsa -out ${DATA_PATH}/etc/sslmanager.key 4096" + exec_cmd "openssl req -new -x509 -key ${DATA_PATH}/etc/sslmanager.key -out ${DATA_PATH}/etc/sslmanager.cert -days 3650 -subj /CN=${HOSTNAME}/" + fi + fi + if [ $API_GENERATE_CERTS == true ] + then + if [ ! -e ${DATA_PATH}/api/configuration/ssl/server.crt ] + then + print "Enabling Wazuh API HTTPS" + edit_configuration "https" "yes" + print "Create Wazuh API key and cert" + exec_cmd "openssl genrsa -out ${DATA_PATH}/api/configuration/ssl/server.key 4096" + exec_cmd "openssl req -new -x509 -key ${DATA_PATH}/api/configuration/ssl/server.key -out ${DATA_PATH}/api/configuration/ssl/server.crt -days 3650 -subj /CN=${HOSTNAME}/" + fi + fi +fi + +############################################################################## +# Copy all files from $WAZUH_CONFIG_MOUNT to $DATA_PATH and respect +# destination files permissions +# +# For example, to mount the file /var/ossec/data/etc/ossec.conf, mount it at +# $WAZUH_CONFIG_MOUNT/etc/ossec.conf in your container and this code will +# replace the ossec.conf file in /var/ossec/data/etc with yours. +############################################################################## +if [ -e "$WAZUH_CONFIG_MOUNT" ] +then + print "Identified Wazuh configuration files to mount..." + + exec_cmd_stdout "cp --verbose -r $WAZUH_CONFIG_MOUNT/* $DATA_PATH" +else + print "No Wazuh configuration files to mount..." +fi + +function ossec_shutdown(){ + ${WAZUH_INSTALL_PATH}/bin/ossec-control stop; +} + +# Trap exit signals and do a proper shutdown +trap "ossec_shutdown; exit" SIGINT SIGTERM + +chmod -R g+rw ${DATA_PATH} + +############################################################################## +# Interpret any passed arguments (via docker command to this entrypoint) as +# paths or commands, and execute them. +# +# This can be useful for actions that need to be run before the services are +# started, such as "/var/ossec/bin/ossec-control enable agentless". +############################################################################## +for CUSTOM_COMMAND in "$@" +do + echo "Executing command \`${CUSTOM_COMMAND}\`" + exec_cmd_stdout "${CUSTOM_COMMAND}" +done + +############################################################################## +# Change Wazuh API user credentials. +############################################################################## + +pushd /var/ossec/api/configuration/auth/ + +echo "Change Wazuh API user credentials" +change_user="node htpasswd -b -c user $API_USER $API_PASS" +eval $change_user + +popd + + +############################################################################## +# Customize filebeat output ip +############################################################################## +if [ "$FILEBEAT_OUTPUT" != "" ]; then + sed -i "s/logstash:5000/$FILEBEAT_OUTPUT:5000/" /etc/filebeat/filebeat.yml +fi + diff --git a/wazuh/config/entrypoint.sh b/wazuh/config/entrypoint.sh index 67107f55..db6c6329 100644 --- a/wazuh/config/entrypoint.sh +++ b/wazuh/config/entrypoint.sh @@ -1,154 +1,12 @@ #!/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. -# +# It will run every .sh script located in entrypoint-scripts folder in lexicographical order +for script in `ls /entrypoint-scripts/*.sh | sort -n`; do + bash "$script" -H -# - -# -# Startup the services -# - -source /data_dirs.env - -FIRST_TIME_INSTALLATION=false - -WAZUH_INSTALL_PATH=/var/ossec -DATA_PATH=${WAZUH_INSTALL_PATH}/data - -WAZUH_CONFIG_MOUNT=/wazuh-config-mount - -print() { - echo -e $1 -} - -error_and_exit() { - echo "Error executing command: '$1'." - echo 'Exiting.' - exit 1 -} - -exec_cmd() { - eval $1 > /dev/null 2>&1 || error_and_exit "$1" -} - -exec_cmd_stdout() { - eval $1 2>&1 || error_and_exit "$1" -} - -edit_configuration() { # $1 -> setting, $2 -> value - sed -i "s/^config.$1\s=.*/config.$1 = \"$2\";/g" "${DATA_PATH}/api/configuration/config.js" || error_and_exit "sed (editing configuration)" -} - -for ossecdir in "${DATA_DIRS[@]}"; do - if [ ! -e "${DATA_PATH}/${ossecdir}" ] - then - print "Installing ${ossecdir}" - exec_cmd "mkdir -p $(dirname ${DATA_PATH}/${ossecdir})" - exec_cmd "cp -pr /var/ossec/${ossecdir}-template ${DATA_PATH}/${ossecdir}" - FIRST_TIME_INSTALLATION=true - fi done -if [ -e ${WAZUH_INSTALL_PATH}/etc-template ] -then - cp -p /var/ossec/etc-template/internal_options.conf /var/ossec/etc/internal_options.conf -fi -rm /var/ossec/queue/db/.template.db - -touch ${DATA_PATH}/process_list -chgrp ossec ${DATA_PATH}/process_list -chmod g+rw ${DATA_PATH}/process_list - -AUTO_ENROLLMENT_ENABLED=${AUTO_ENROLLMENT_ENABLED:-true} -API_GENERATE_CERTS=${API_GENERATE_CERTS:-true} - -if [ $FIRST_TIME_INSTALLATION == true ] -then - if [ $AUTO_ENROLLMENT_ENABLED == true ] - then - if [ ! -e ${DATA_PATH}/etc/sslmanager.key ] - then - print "Creating ossec-authd key and cert" - exec_cmd "openssl genrsa -out ${DATA_PATH}/etc/sslmanager.key 4096" - exec_cmd "openssl req -new -x509 -key ${DATA_PATH}/etc/sslmanager.key -out ${DATA_PATH}/etc/sslmanager.cert -days 3650 -subj /CN=${HOSTNAME}/" - fi - fi - if [ $API_GENERATE_CERTS == true ] - then - if [ ! -e ${DATA_PATH}/api/configuration/ssl/server.crt ] - then - print "Enabling Wazuh API HTTPS" - edit_configuration "https" "yes" - print "Create Wazuh API key and cert" - exec_cmd "openssl genrsa -out ${DATA_PATH}/api/configuration/ssl/server.key 4096" - exec_cmd "openssl req -new -x509 -key ${DATA_PATH}/api/configuration/ssl/server.key -out ${DATA_PATH}/api/configuration/ssl/server.crt -days 3650 -subj /CN=${HOSTNAME}/" - fi - fi -fi - -############################################################################## -# Copy all files from $WAZUH_CONFIG_MOUNT to $DATA_PATH and respect -# destination files permissions -# -# For example, to mount the file /var/ossec/data/etc/ossec.conf, mount it at -# $WAZUH_CONFIG_MOUNT/etc/ossec.conf in your container and this code will -# replace the ossec.conf file in /var/ossec/data/etc with yours. -############################################################################## -if [ -e "$WAZUH_CONFIG_MOUNT" ] -then - print "Identified Wazuh configuration files to mount..." - - exec_cmd_stdout "cp --verbose -r $WAZUH_CONFIG_MOUNT/* $DATA_PATH" -else - print "No Wazuh configuration files to mount..." -fi - -function ossec_shutdown(){ - ${WAZUH_INSTALL_PATH}/bin/ossec-control stop; -} - -# Trap exit signals and do a proper shutdown -trap "ossec_shutdown; exit" SIGINT SIGTERM - -chmod -R g+rw ${DATA_PATH} - -############################################################################## -# Interpret any passed arguments (via docker command to this entrypoint) as -# paths or commands, and execute them. -# -# This can be useful for actions that need to be run before the services are -# started, such as "/var/ossec/bin/ossec-control enable agentless". -############################################################################## -for CUSTOM_COMMAND in "$@" -do - echo "Executing command \`${CUSTOM_COMMAND}\`" - exec_cmd_stdout "${CUSTOM_COMMAND}" -done - -############################################################################## -# Change Wazuh API user credentials. -############################################################################## - -pushd /var/ossec/api/configuration/auth/ - -echo "Change Wazuh API user credentials" -change_user="node htpasswd -b -c user $API_USER $API_PASS" -eval $change_user - -popd - - -############################################################################## -# Customize filebeat output ip -############################################################################## -if [ "$FILEBEAT_OUTPUT" != "" ]; then - sed -i "s/logstash:5000/$FILEBEAT_OUTPUT:5000/" /etc/filebeat/filebeat.yml -fi - ############################################################################## # Start Wazuh Server. ############################################################################## From 49ace342a089c340a8d889a723b0a13eb31c2708 Mon Sep 17 00:00:00 2001 From: Mayte Ariza Date: Wed, 17 Apr 2019 15:54:38 +0200 Subject: [PATCH 48/49] Entrypoint.sh: ! style history substitution removed --- wazuh/config/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wazuh/config/entrypoint.sh b/wazuh/config/entrypoint.sh index db6c6329..bc07ae4a 100644 --- a/wazuh/config/entrypoint.sh +++ b/wazuh/config/entrypoint.sh @@ -3,7 +3,7 @@ # It will run every .sh script located in entrypoint-scripts folder in lexicographical order for script in `ls /entrypoint-scripts/*.sh | sort -n`; do - bash "$script" -H + bash "$script" done From 3f75dbdd39efa9f200f1405bfb6ac5dc56c3c572 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 25 Apr 2019 15:52:05 +0200 Subject: [PATCH 49/49] Add Elasticsearch cluster configuration (#146) --- CHANGELOG.md | 1 + README.md | 2 ++ elasticsearch/Dockerfile | 19 +++++++++++++++ elasticsearch/config/config_cluster.sh | 33 ++++++++++++++++++++++++++ elasticsearch/config/entrypoint.sh | 2 ++ elasticsearch/config/load_settings.sh | 15 ++++++++---- 6 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 elasticsearch/config/config_cluster.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index 61093b6a..db5a29eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file. - 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)) - Welcome screen management. ([#133](https://github.com/wazuh/wazuh-docker/pull/133)) +- Add Elasticsearch cluster configuration. ([#146](https://github.com/wazuh/wazuh-docker/pull/146)) ### Changed diff --git a/README.md b/README.md index 3760f61e..467d7fa1 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,8 @@ In this repository you will find the containers to run: In addition, a docker-compose file is provided to launch the containers mentioned above. It also launches an Elasticsearch container (working as a single-node cluster) using Elastic Stack Docker images. +* Elasticsearch cluster. In the Elasticsearch Dockerfile we can visualize variables to configure an Elasticsearch Cluster. These variables are used in the file *config_cluster.sh* to set them in the *elasticsearch.yml* configuration file. You can see the meaning of the node variables [here](https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-node.html) and other cluster settings [here](https://github.com/elastic/elasticsearch/blob/master/distribution/src/config/elasticsearch.yml). + ## Documentation * [Wazuh full documentation](http://documentation.wazuh.com) diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 30a2cd0a..56c44115 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -1,6 +1,8 @@ # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) FROM docker.elastic.co/elasticsearch/elasticsearch:6.5.4 +ENV ELASTICSEARCH_URL="http://elasticsearch:9200" + ENV ALERTS_SHARDS="1" \ ALERTS_REPLICAS="0" @@ -13,6 +15,20 @@ ENV ENABLE_CONFIGURE_S3="false" ENV TEMPLATE_VERSION=v3.8.2 +# Elasticearch cluster configuration environment variables +# If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration +ENV ELASTIC_CLUSTER="false" \ + CLUSTER_NAME="wazuh" \ + CLUSTER_NODE_MASTER="true" \ + CLUSTER_NODE_DATA="true" \ + CLUSTER_NODE_INGEST="true" \ + CLUSTER_NODE_NAME="wazuh-elasticsearch" \ + CLUSTER_MEMORY_LOCK="true" \ + CLUSTER_DISCOVERY_SERVICE="wazuh-elasticsearch" \ + CLUSTER_NUMBER_OF_MASTERS="2" \ + CLUSTER_MAX_NODES="1" \ + CLUSTER_DELAYED_TIMEOUT="1m" + ADD https://raw.githubusercontent.com/wazuh/wazuh/$TEMPLATE_VERSION/extensions/elasticsearch/wazuh-elastic6-template-alerts.json /usr/share/elasticsearch/config COPY config/entrypoint.sh /entrypoint.sh @@ -28,5 +44,8 @@ RUN elasticsearch-plugin install --batch repository-s3 COPY config/configure_s3.sh ./config/configure_s3.sh RUN chmod 755 ./config/configure_s3.sh +COPY --chown=elasticsearch:elasticsearch ./config/config_cluster.sh ./ +RUN chmod +x ./config_cluster.sh + ENTRYPOINT ["/entrypoint.sh"] CMD ["elasticsearch"] diff --git a/elasticsearch/config/config_cluster.sh b/elasticsearch/config/config_cluster.sh new file mode 100644 index 00000000..b4063825 --- /dev/null +++ b/elasticsearch/config/config_cluster.sh @@ -0,0 +1,33 @@ +#!/bin/bash +# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) + +elastic_config_file="/usr/share/elasticsearch/config/elasticsearch.yml" + + +# If Elasticsearch cluster is enable +if [[ $ELASTIC_CLUSTER == "true" ]] +then + + # Set the cluster.name and discovery.zen.minimun_master_nodes variables + sed -i 's:cluster.name\: "docker-cluster":cluster.name\: "'$CLUSTER_NAME'":g' $elastic_config_file + sed -i 's:discovery.zen.minimum_master_nodes\: 1:discovery.zen.minimum_master_nodes\: '$CLUSTER_NUMBER_OF_MASTERS':g' $elastic_config_file + + # Add the cluster configuration + echo " +#cluster node +node: + master: ${CLUSTER_NODE_MASTER} + data: ${CLUSTER_NODE_DATA} + ingest: ${CLUSTER_NODE_INGEST} + name: ${CLUSTER_NODE_NAME} + max_local_storage_nodes: ${CLUSTER_MAX_NODES} + +bootstrap: + memory_lock: ${CLUSTER_MEMORY_LOCK} + +discovery: + zen: + ping.unicast.hosts: ${CLUSTER_DISCOVERY_SERVICE} + +" >> $elastic_config_file +fi diff --git a/elasticsearch/config/entrypoint.sh b/elasticsearch/config/entrypoint.sh index 2c394cbd..c57703f1 100644 --- a/elasticsearch/config/entrypoint.sh +++ b/elasticsearch/config/entrypoint.sh @@ -43,6 +43,8 @@ fi # Run load settings script. +./config_cluster.sh + ./load_settings.sh & # Execute elasticsearch diff --git a/elasticsearch/config/load_settings.sh b/elasticsearch/config/load_settings.sh index 17154c29..cccc104d 100644 --- a/elasticsearch/config/load_settings.sh +++ b/elasticsearch/config/load_settings.sh @@ -3,11 +3,7 @@ set -e -if [ "x${ELASTICSEARCH_URL}" = "x" ]; then - el_url="http://elasticsearch:9200" -else - el_url="${ELASTICSEARCH_URL}" -fi +el_url=${ELASTICSEARCH_URL} if [ "x${WAZUH_API_URL}" = "x" ]; then wazuh_url="https://wazuh" @@ -94,5 +90,14 @@ curl -XPUT "$el_url/_cluster/settings" -H 'Content-Type: application/json' -d' } ' +# Set cluster delayed timeout when node falls +curl -X PUT "$el_url/_all/_settings" -H 'Content-Type: application/json' -d' +{ + "settings": { + "index.unassigned.node_left.delayed_timeout": "'"$CLUSTER_DELAYED_TIMEOUT"'" + } +} +' + echo "Elasticsearch is ready."