From 1b4818c078fee14a8aad64f597cc6f82af9cb9bb Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez <1380243+xr09@users.noreply.github.com> Date: Thu, 19 Nov 2020 17:08:04 +0100 Subject: [PATCH 1/8] Clean old conf --- README.md | 2 -- elastic_conf/elasticsearch.yml | 3 --- 2 files changed, 5 deletions(-) delete mode 100644 elastic_conf/elasticsearch.yml diff --git a/README.md b/README.md index 77ce2d2a..2f28814c 100644 --- a/README.md +++ b/README.md @@ -89,8 +89,6 @@ ADMIN_PRIVILEGES=true # App privileges ├── CHANGELOG.md ├── docker-compose.yml - ├── elastic_conf - │   └── elasticsearch.yml ├── generate-opendistro-certs.yml ├── kibana-odfe │   ├── config diff --git a/elastic_conf/elasticsearch.yml b/elastic_conf/elasticsearch.yml deleted file mode 100644 index a7b1d6a5..00000000 --- a/elastic_conf/elasticsearch.yml +++ /dev/null @@ -1,3 +0,0 @@ -cluster.name: wazuh-elastic -network.host: 0.0.0.0 - From a680c955bca278dd251073159db5faee7d2d21a8 Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez <1380243+xr09@users.noreply.github.com> Date: Thu, 19 Nov 2020 17:08:42 +0100 Subject: [PATCH 2/8] Update matrix --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2f28814c..2deb9969 100644 --- a/README.md +++ b/README.md @@ -155,9 +155,10 @@ ADMIN_PRIVILEGES=true # App privileges | Wazuh version | ODFE | |---------------|---------| +| v4.0.1 | 1.11.0 | +|---------------|---------| | v4.0.0 | 1.10.1 | - ## Credits and Thank you These Docker containers are based on: From 353c64ba24b8f289cbdec63c7ea7b42914ffbbc0 Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez <1380243+xr09@users.noreply.github.com> Date: Thu, 19 Nov 2020 17:09:03 +0100 Subject: [PATCH 3/8] Bump kibana image --- kibana-odfe/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kibana-odfe/Dockerfile b/kibana-odfe/Dockerfile index c88b73b2..accd84ce 100644 --- a/kibana-odfe/Dockerfile +++ b/kibana-odfe/Dockerfile @@ -1,8 +1,8 @@ # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2) -FROM amazon/opendistro-for-elasticsearch-kibana:1.10.1 +FROM amazon/opendistro-for-elasticsearch-kibana:1.11.0 USER kibana ARG ELASTIC_VERSION=7.9.1 -ARG WAZUH_VERSION=4.0.0 +ARG WAZUH_VERSION=4.0.1 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}" WORKDIR /usr/share/kibana From f6c0432bc9b0ed83a4b3ba614897e5253288d367 Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez <1380243+xr09@users.noreply.github.com> Date: Thu, 19 Nov 2020 17:09:18 +0100 Subject: [PATCH 4/8] Bump wazuh image --- wazuh-odfe/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wazuh-odfe/Dockerfile b/wazuh-odfe/Dockerfile index 0148d8e0..a5f2aad7 100644 --- a/wazuh-odfe/Dockerfile +++ b/wazuh-odfe/Dockerfile @@ -2,7 +2,7 @@ FROM centos:7 ARG FILEBEAT_VERSION=7.9.1 -ARG WAZUH_VERSION=4.0.0-1 +ARG WAZUH_VERSION=4.0.1-1 ARG TEMPLATE_VERSION="master" ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.1.tar.gz" From 1d34d7db27cb080cc6318135b0c6581893ac249c Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez <1380243+xr09@users.noreply.github.com> Date: Thu, 19 Nov 2020 17:58:07 +0100 Subject: [PATCH 5/8] Dump ossec.log to stdout --- wazuh-odfe/config/etc/services.d/ossec-logs/run | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 wazuh-odfe/config/etc/services.d/ossec-logs/run diff --git a/wazuh-odfe/config/etc/services.d/ossec-logs/run b/wazuh-odfe/config/etc/services.d/ossec-logs/run new file mode 100644 index 00000000..edb4b87c --- /dev/null +++ b/wazuh-odfe/config/etc/services.d/ossec-logs/run @@ -0,0 +1,4 @@ +#!/usr/bin/with-contenv sh + +# dumping ossec.log to standard output +exec tail -f /var/ossec/logs/ossec.log From 47e69367e92d9e32d44885d2bd77aa38c13b1e25 Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez <1380243+xr09@users.noreply.github.com> Date: Thu, 19 Nov 2020 18:11:32 +0100 Subject: [PATCH 6/8] Update changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75169db2..a4bf2a18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Docker v4.0.1_1.11.0 + +### Added + +- Update to Wazuh version 4.0.1 +- Opendistro 1.11.0 compatiblity +- Re-enabled dumping ossec.log to stdout + ## Wazuh Docker v4.0.0_1.10.1 ### Added From 6e0b3703d6f1ad7430bb1a6d9da0faae584799f8 Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez <1380243+xr09@users.noreply.github.com> Date: Thu, 19 Nov 2020 18:12:13 +0100 Subject: [PATCH 7/8] Update version --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 1cdd9758..42e15842 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.0.0_1.10.1" -REVISION="40000" +WAZUH-DOCKER_VERSION="4.0.1_1.11.0" +REVISION="40100" From fa4815e51a521107bab41dec86fcf2ecf99b7d93 Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez <1380243+xr09@users.noreply.github.com> Date: Thu, 19 Nov 2020 18:13:41 +0100 Subject: [PATCH 8/8] Update images --- docker-compose.yml | 6 +++--- production-cluster.yml | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index cf47f224..43fa2f1b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh: - image: wazuh/wazuh-odfe:4.0.0_1.10.1 + image: wazuh/wazuh-odfe:4.0.1_1.11.0 hostname: wazuh-manager restart: always ports: @@ -30,7 +30,7 @@ services: - filebeat_var:/var/lib/filebeat elasticsearch: - image: amazon/opendistro-for-elasticsearch:1.10.1 + image: amazon/opendistro-for-elasticsearch:1.11.0 hostname: elasticsearch restart: always ports: @@ -50,7 +50,7 @@ services: hard: 65536 kibana: - image: wazuh/wazuh-kibana-odfe:4.0.0_1.10.1 + image: wazuh/wazuh-kibana-odfe:4.0.1_1.11.0 hostname: kibana restart: always ports: diff --git a/production-cluster.yml b/production-cluster.yml index f22516ef..8feef053 100644 --- a/production-cluster.yml +++ b/production-cluster.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh-master: - image: wazuh/wazuh-odfe:4.0.0_1.10.1 + image: wazuh/wazuh-odfe:4.0.1_1.11.0 hostname: wazuh-master restart: always ports: @@ -38,7 +38,7 @@ services: - ./production_cluster/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh-worker: - image: wazuh/wazuh-odfe:4.0.0_1.10.1 + image: wazuh/wazuh-odfe:4.0.1_1.11.0 hostname: wazuh-worker restart: always environment: @@ -67,7 +67,7 @@ services: - ./production_cluster/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf elasticsearch: - image: amazon/opendistro-for-elasticsearch:1.10.1 + image: amazon/opendistro-for-elasticsearch:1.11.0 hostname: elasticsearch restart: always ports: @@ -90,7 +90,7 @@ services: - ./production_cluster/elastic_opendistro/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml elasticsearch-2: - image: amazon/opendistro-for-elasticsearch:1.10.1 + image: amazon/opendistro-for-elasticsearch:1.11.0 hostname: elasticsearch-2 restart: always environment: @@ -111,7 +111,7 @@ services: - ./production_cluster/elastic_opendistro/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml elasticsearch-3: - image: amazon/opendistro-for-elasticsearch:1.10.1 + image: amazon/opendistro-for-elasticsearch:1.11.0 hostname: elasticsearch-3 restart: always environment: @@ -132,7 +132,7 @@ services: - ./production_cluster/elastic_opendistro/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml kibana: - image: wazuh/wazuh-kibana-odfe:4.0.0_1.10.1 + image: wazuh/wazuh-kibana-odfe:4.0.1_1.11.0 hostname: kibana restart: always ports: