From 20c8000fecdb5ff6a3bb5095c863b49035e33ead Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 10 Apr 2023 11:20:22 -0300 Subject: [PATCH 1/6] change revision --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index de800016..6df24e26 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.4.1" -REVISION="40405" +REVISION="40406" From cd9f211eb33ccccbc663c03912831f2e144c7985 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Wed, 19 Apr 2023 16:59:53 -0300 Subject: [PATCH 2/6] bump 4.3.11 version --- .env | 4 ++-- .github/.goss.yaml | 2 +- CHANGELOG.md | 9 ++------- README.md | 3 +-- VERSION | 4 ++-- build-docker-images/build-images.sh | 2 +- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 8 files changed, 18 insertions(+), 24 deletions(-) diff --git a/.env b/.env index 58ef3c4f..d70f87f2 100755 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -WAZUH_VERSION=4.4.1 -WAZUH_IMAGE_VERSION=4.4.1 +WAZUH_VERSION=4.3.11 +WAZUH_IMAGE_VERSION=4.3.11 WAZUH_TAG_REVISION=1 diff --git a/.github/.goss.yaml b/.github/.goss.yaml index a867bac9..5055f226 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.4.1-1 + - 4.3.11-1 port: tcp:1514: listening: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a641df4..8df5b560 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,10 @@ # Change Log All notable changes to this project will be documented in this file. -## Wazuh Docker v4.4.1 +## Wazuh Docker v4.3.11 ### Added -- Update Wazuh to version [4.4.1](https://github.com/wazuh/wazuh/blob/v4.4.1/CHANGELOG.md#v441) - -## Wazuh Docker v4.4.0 -### Added - -- Update Wazuh to version [4.4.0](https://github.com/wazuh/wazuh/blob/v4.4.0/CHANGELOG.md#v440) +- Update Wazuh to version [4.3.11](https://github.com/wazuh/wazuh/blob/v4.3.11/CHANGELOG.md#v4311) ## Wazuh Docker v4.3.10 ### Added diff --git a/README.md b/README.md index c2c19801..995a5575 100644 --- a/README.md +++ b/README.md @@ -195,8 +195,7 @@ WAZUH_MONITORING_REPLICAS=0 ## | Wazuh version | ODFE | XPACK | |---------------|---------|--------| -| v4.4.1 | | | -| v4.4.0 | | | +| v4.3.11 | | | | v4.3.10 | | | | v4.3.9 | | | | v4.3.8 | | | diff --git a/VERSION b/VERSION index 6df24e26..16e452b0 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.4.1" -REVISION="40406" +WAZUH-DOCKER_VERSION="4.3.11" +REVISION="40323" diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index b6c23532..57bd8497 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -1,4 +1,4 @@ -WAZUH_IMAGE_VERSION=4.4.1 +WAZUH_IMAGE_VERSION=4.3.11 WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g') WAZUH_TAG_REVISION=1 WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g') diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index c9667ede..6e7e2198 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh.master: - image: wazuh/wazuh-manager:4.4.1 + image: wazuh/wazuh-manager:4.3.11 hostname: wazuh.master restart: always ports: @@ -38,7 +38,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.worker: - image: wazuh/wazuh-manager:4.4.1 + image: wazuh/wazuh-manager:4.3.11 hostname: wazuh.worker restart: always environment: @@ -67,7 +67,7 @@ services: - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf wazuh1.indexer: - image: wazuh/wazuh-indexer:4.4.1 + image: wazuh/wazuh-indexer:4.3.11 hostname: wazuh1.indexer restart: always ports: @@ -93,7 +93,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh2.indexer: - image: wazuh/wazuh-indexer:4.4.1 + image: wazuh/wazuh-indexer:4.3.11 hostname: wazuh2.indexer restart: always environment: @@ -115,7 +115,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh3.indexer: - image: wazuh/wazuh-indexer:4.4.1 + image: wazuh/wazuh-indexer:4.3.11 hostname: wazuh3.indexer restart: always environment: @@ -137,7 +137,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.4.1 + image: wazuh/wazuh-dashboard:4.3.11 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index f5e8e3f8..b3f9fdad 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh.manager: - image: wazuh/wazuh-manager:4.4.1 + image: wazuh/wazuh-manager:4.3.11 hostname: wazuh.manager restart: always ports: @@ -39,7 +39,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.indexer: - image: wazuh/wazuh-indexer:4.4.1 + image: wazuh/wazuh-indexer:4.3.11 hostname: wazuh.indexer restart: always ports: @@ -64,7 +64,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.4.1 + image: wazuh/wazuh-dashboard:4.3.11 hostname: wazuh.dashboard restart: always ports: From 02aaf45e9df030302385ebae7439f6ae85f26caf Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 24 Apr 2023 09:17:02 -0300 Subject: [PATCH 3/6] change revision number --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 16e452b0..90a8562e 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.3.11" -REVISION="40323" +REVISION="40324" From 40faad148d817a86262d147906a5c7129eaa2d2b Mon Sep 17 00:00:00 2001 From: Jesse Roland Date: Tue, 18 Apr 2023 09:11:08 -0500 Subject: [PATCH 4/6] Add DASHBOARD_USERNAME and DASHBOARD_PASSWORD environment variables to the dashboard container. Resolves https://github.com/wazuh/wazuh-docker/issues/823 --- multi-node/docker-compose.yml | 2 ++ single-node/docker-compose.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 6e7e2198..05265252 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -147,6 +147,8 @@ services: - WAZUH_API_URL="https://wazuh.master" - API_USERNAME=wazuh-wui - API_PASSWORD=MyS3cr37P450r.*- + - DASHBOARD_USERNAME=kibanaserver + - DASHBOARD_PASSWORD=kibanaserver volumes: - ./config/wazuh_indexer_ssl_certs/wazuh.dashboard.pem:/usr/share/wazuh-dashboard/certs/wazuh-dashboard.pem - ./config/wazuh_indexer_ssl_certs/wazuh.dashboard-key.pem:/usr/share/wazuh-dashboard/certs/wazuh-dashboard-key.pem diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index b3f9fdad..0a2d5802 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -73,6 +73,8 @@ services: - INDEXER_USERNAME=admin - INDEXER_PASSWORD=SecretPassword - WAZUH_API_URL=https://wazuh.manager + - DASHBOARD_USERNAME=kibanaserver + - DASHBOARD_PASSWORD=kibanaserver - API_USERNAME=wazuh-wui - API_PASSWORD=MyS3cr37P450r.*- volumes: From cd7dc4c7cf30dc791082746dcb5c444bbe094702 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Fri, 28 Apr 2023 16:24:38 -0300 Subject: [PATCH 5/6] bump 4.4.2 version --- .env | 4 ++-- .github/.goss.yaml | 2 +- CHANGELOG.md | 15 +++++++++++++++ README.md | 3 +++ VERSION | 4 ++-- build-docker-images/build-images.sh | 2 +- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 8 files changed, 33 insertions(+), 15 deletions(-) diff --git a/.env b/.env index d70f87f2..d4169289 100755 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -WAZUH_VERSION=4.3.11 -WAZUH_IMAGE_VERSION=4.3.11 +WAZUH_VERSION=4.4.2 +WAZUH_IMAGE_VERSION=4.4.2 WAZUH_TAG_REVISION=1 diff --git a/.github/.goss.yaml b/.github/.goss.yaml index 5055f226..e87d8647 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.3.11-1 + - 4.4.2-1 port: tcp:1514: listening: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 8df5b560..d6b8d500 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,21 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Docker v4.4.2 +### Added + +- Update Wazuh to version [4.4.2](https://github.com/wazuh/wazuh/blob/v4.4.2/CHANGELOG.md#v442) + +## Wazuh Docker v4.4.1 +### Added + +- Update Wazuh to version [4.4.1](https://github.com/wazuh/wazuh/blob/v4.4.1/CHANGELOG.md#v441) + +## Wazuh Docker v4.4.0 +### Added + +- Update Wazuh to version [4.4.0](https://github.com/wazuh/wazuh/blob/v4.4.0/CHANGELOG.md#v440) + ## Wazuh Docker v4.3.11 ### Added diff --git a/README.md b/README.md index 995a5575..8619f3b7 100644 --- a/README.md +++ b/README.md @@ -195,6 +195,9 @@ WAZUH_MONITORING_REPLICAS=0 ## | Wazuh version | ODFE | XPACK | |---------------|---------|--------| +| v4.4.2 | | | +| v4.4.1 | | | +| v4.4.0 | | | | v4.3.11 | | | | v4.3.10 | | | | v4.3.9 | | | diff --git a/VERSION b/VERSION index 90a8562e..c56b258e 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.3.11" -REVISION="40324" +WAZUH-DOCKER_VERSION="4.4.2" +REVISION="40406" diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 57bd8497..11886cc2 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -1,4 +1,4 @@ -WAZUH_IMAGE_VERSION=4.3.11 +WAZUH_IMAGE_VERSION=4.4.2 WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g') WAZUH_TAG_REVISION=1 WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g') diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 05265252..8d6d3149 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh.master: - image: wazuh/wazuh-manager:4.3.11 + image: wazuh/wazuh-manager:4.4.2 hostname: wazuh.master restart: always ports: @@ -38,7 +38,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.worker: - image: wazuh/wazuh-manager:4.3.11 + image: wazuh/wazuh-manager:4.4.2 hostname: wazuh.worker restart: always environment: @@ -67,7 +67,7 @@ services: - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf wazuh1.indexer: - image: wazuh/wazuh-indexer:4.3.11 + image: wazuh/wazuh-indexer:4.4.2 hostname: wazuh1.indexer restart: always ports: @@ -93,7 +93,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh2.indexer: - image: wazuh/wazuh-indexer:4.3.11 + image: wazuh/wazuh-indexer:4.4.2 hostname: wazuh2.indexer restart: always environment: @@ -115,7 +115,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh3.indexer: - image: wazuh/wazuh-indexer:4.3.11 + image: wazuh/wazuh-indexer:4.4.2 hostname: wazuh3.indexer restart: always environment: @@ -137,7 +137,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.3.11 + image: wazuh/wazuh-dashboard:4.4.2 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 0a2d5802..ddaacc13 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh.manager: - image: wazuh/wazuh-manager:4.3.11 + image: wazuh/wazuh-manager:4.4.2 hostname: wazuh.manager restart: always ports: @@ -39,7 +39,7 @@ services: - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf wazuh.indexer: - image: wazuh/wazuh-indexer:4.3.11 + image: wazuh/wazuh-indexer:4.4.2 hostname: wazuh.indexer restart: always ports: @@ -64,7 +64,7 @@ services: - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml wazuh.dashboard: - image: wazuh/wazuh-dashboard:4.3.11 + image: wazuh/wazuh-dashboard:4.4.2 hostname: wazuh.dashboard restart: always ports: From 028b5f6034318e75da513da220027d575728e569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Wed, 17 May 2023 14:23:26 -0300 Subject: [PATCH 6/6] Revision update --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c56b258e..ae0f3cc1 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="4.4.2" -REVISION="40406" +REVISION="40408"