From 020047aa8fcd18b7f382a171a76b35118d03277f Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Fri, 21 Dec 2018 11:40:19 +0100 Subject: [PATCH 01/12] Update Elastic Stack version to 6.5.4 --- docker-compose.yml | 10 +++++----- kibana/Dockerfile | 4 ++-- logstash/Dockerfile | 2 +- wazuh/Dockerfile | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c3409ddd..083d698a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: wazuh: - image: wazuh/wazuh:3.7.2_6.5.3 + image: wazuh/wazuh:3.7.2_6.5.4 hostname: wazuh-manager restart: always ports: @@ -23,7 +23,7 @@ services: depends_on: - logstash logstash: - image: wazuh/wazuh-logstash:3.7.2_6.5.3 + image: wazuh/wazuh-logstash:3.7.2_6.5.4 hostname: logstash restart: always # volumes: @@ -39,7 +39,7 @@ services: environment: - LS_HEAP_SIZE=2048m elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:6.5.3 + image: docker.elastic.co/elasticsearch/elasticsearch:6.5.4 hostname: elasticsearch restart: always ports: @@ -61,7 +61,7 @@ services: networks: - docker_elk kibana: - image: wazuh/wazuh-kibana:3.7.2_6.5.3 + image: wazuh/wazuh-kibana:3.7.2_6.5.4 hostname: kibana restart: always # ports: @@ -76,7 +76,7 @@ services: - elasticsearch:elasticsearch - wazuh:wazuh nginx: - image: wazuh/wazuh-nginx:3.7.2_6.5.3 + image: wazuh/wazuh-nginx:3.7.2_6.5.4 hostname: nginx restart: always environment: diff --git a/kibana/Dockerfile b/kibana/Dockerfile index c1435ee7..b13e9f34 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,6 +1,6 @@ # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/kibana/kibana:6.5.3 -ARG WAZUH_APP_VERSION=3.7.2_6.5.3 +FROM docker.elastic.co/kibana/kibana:6.5.4 +ARG WAZUH_APP_VERSION=3.7.2_6.5.4 USER root ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp diff --git a/logstash/Dockerfile b/logstash/Dockerfile index 641214a5..853bcca6 100644 --- a/logstash/Dockerfile +++ b/logstash/Dockerfile @@ -1,5 +1,5 @@ # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/logstash/logstash:6.5.3 +FROM docker.elastic.co/logstash/logstash:6.5.4 RUN rm -f /usr/share/logstash/pipeline/logstash.conf diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index ccbbf5ba..7ff13e47 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -1,6 +1,6 @@ # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) FROM phusion/baseimage:latest -ARG FILEBEAT_VERSION=6.5.3 +ARG FILEBEAT_VERSION=6.5.4 ARG WAZUH_VERSION=3.7.2-1 # Updating image From 68b4703f7a197584079214c2bff1d1afd5927a27 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Fri, 21 Dec 2018 11:43:39 +0100 Subject: [PATCH 02/12] Update Elastic Stack to version 6.5.4 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cb579786..7900e49e 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ In addition, a docker-compose file is provided to launch the containers mentione ## Current release -Containers are currently tested on Wazuh version 3.7.2 and Elastic Stack version 6.5.3. We will do our best to keep this repository updated to latest versions of both Wazuh and Elastic Stack. +Containers are currently tested on Wazuh version 3.7.2 and Elastic Stack version 6.5.4. We will do our best to keep this repository updated to latest versions of both Wazuh and Elastic Stack. ## Directory structure From c7abb4239fc1943553e47a83f8af59233497b9f1 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Fri, 21 Dec 2018 11:45:12 +0100 Subject: [PATCH 03/12] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91f026ee..f43a171b 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.7.2_6.5.4 + +### Changed + +- Update Elastic Stack version to 6.5.4. ([#82](https://github.com/wazuh/wazuh-docker/pull/82)) + ## Wazuh Docker v3.7.2_6.5.3 ### Changed From a8e1661aa627d4ac2f56ac926fa024ca8d069045 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Fri, 21 Dec 2018 11:46:06 +0100 Subject: [PATCH 04/12] Bump version 3729 --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index f0bea7ad..11a72536 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="3.7.2_6.5.3" -REVISION="3728" +WAZUH-DOCKER_VERSION="3.7.2_6.5.4" +REVISION="3729" From ef5fbe15a5bf04a120024d825a3300fe32ee2d5e Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 27 Dec 2018 12:46:57 +0100 Subject: [PATCH 05/12] Temporary fix for Wazuh cluster master node in K8S --- wazuh/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index 7ff13e47..e59d5113 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -76,6 +76,8 @@ RUN mkdir /etc/service/filebeat COPY config/filebeat.runit.service /etc/service/filebeat/run RUN chmod +x /etc/service/filebeat/run +# Temporary fix for Wazuh cluster master node in Kubernetes +RUN sed -i '87d;88d' /var/ossec/framework/wazuh/cluster/cluster.py # Run all services ENTRYPOINT ["/entrypoint.sh"] From ab90a9a95b64bf9f6d0f7dc40d8a1d6219a5edb1 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Fri, 28 Dec 2018 11:43:31 +0100 Subject: [PATCH 06/12] add env credentials for nginx --- nginx/Dockerfile | 3 +++ nginx/config/entrypoint.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 29d4062f..0fb940e1 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -13,4 +13,7 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* VOLUME ["/etc/nginx/conf.d"] +ENV NGINX_NAME="foo" \ + NGINX_PWD="bar" + ENTRYPOINT /entrypoint.sh diff --git a/nginx/config/entrypoint.sh b/nginx/config/entrypoint.sh index 97dbf90c..c0cbc4d1 100644 --- a/nginx/config/entrypoint.sh +++ b/nginx/config/entrypoint.sh @@ -15,7 +15,7 @@ fi # Configuring default credentiales. if [ ! -f /etc/nginx/conf.d/kibana.htpasswd ]; then echo "Setting Nginx credentials" - echo bar|htpasswd -i -c /etc/nginx/conf.d/kibana.htpasswd foo >/dev/null + echo $NGINX_PWD|htpasswd -i -c /etc/nginx/conf.d/kibana.htpasswd $NGINX_NAME >/dev/null else echo "Kibana credentials already configured" fi From dff13dfc7a104cbc46e87cc0af3cf366cfba8900 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Fri, 28 Dec 2018 11:48:27 +0100 Subject: [PATCH 07/12] fix indent --- 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 c0cbc4d1..2332222b 100644 --- a/nginx/config/entrypoint.sh +++ b/nginx/config/entrypoint.sh @@ -15,7 +15,7 @@ fi # Configuring default credentiales. 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 $NGINX_PWD|htpasswd -i -c /etc/nginx/conf.d/kibana.htpasswd $NGINX_NAME >/dev/null else echo "Kibana credentials already configured" fi From f3655b1360256f95fdf3c32273b9d38cef9528d7 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Fri, 28 Dec 2018 12:23:38 +0100 Subject: [PATCH 08/12] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f43a171b..f71b5c23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ All notable changes to this project will be documented in this file. - Update Elastic Stack version to 6.5.4. ([#82](https://github.com/wazuh/wazuh-docker/pull/82)) +### Fixed + +- Temporary fix for Wazuh cluster master node in Kubernetes ([#84](https://github.com/wazuh/wazuh-docker/pull/84)) + ## Wazuh Docker v3.7.2_6.5.3 ### Changed From 7c9ee9b256caedecc9ef5adc42ec1160ee44a0ea Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Fri, 28 Dec 2018 12:24:00 +0100 Subject: [PATCH 09/12] Bump version 3730 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 11a72536..c053f481 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="3.7.2_6.5.4" -REVISION="3729" +REVISION="3730" From 57fd4d885989f0c8927522768f24212bbebb16dc Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Fri, 28 Dec 2018 12:24:41 +0100 Subject: [PATCH 10/12] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f71b5c23..65d2b1c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file. ### Changed - Update Elastic Stack version to 6.5.4. ([#82](https://github.com/wazuh/wazuh-docker/pull/82)) +- Add env credentials for nginx ([#86](https://github.com/wazuh/wazuh-docker/pull/86)) ### Fixed From 70e491fa6f7345c9cc8cf7be9475fe493d433fa6 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Fri, 28 Dec 2018 12:25:15 +0100 Subject: [PATCH 11/12] Bump version 3731 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c053f481..c848da98 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="3.7.2_6.5.4" -REVISION="3730" +REVISION="3731" From 81035c39db720a7d965468dc9b3765e8ff3b016a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Linares?= Date: Thu, 3 Jan 2019 15:37:48 +0100 Subject: [PATCH 12/12] Update Filebeat configuration (#88) --- wazuh/config/filebeat.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/wazuh/config/filebeat.yml b/wazuh/config/filebeat.yml index 0f2ea6ce..fcb32e1e 100644 --- a/wazuh/config/filebeat.yml +++ b/wazuh/config/filebeat.yml @@ -1,11 +1,10 @@ # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) filebeat: - inputs: + prospectors: - type: log paths: - - "/var/ossec/data/logs/alerts/alerts.json" - fields: - document_type: wazuh-alerts + - "/var/ossec/logs/alerts/alerts.json" + document_type: json json.message_key: log json.keys_under_root: true json.overwrite_keys: true