From 697b7538cc265ac17abacd791316513ac6e6c82c Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 23 May 2022 09:57:31 -0300 Subject: [PATCH] bump release 4.5.0 --- .github/.goss.yaml | 2 +- .github/workflows/push.yml | 4 ++-- CHANGELOG.md | 4 ++-- README.md | 2 +- VERSION | 4 ++-- build-docker-images/build-images.yml | 24 +++++-------------- .../wazuh-dashboard/Dockerfile | 3 +-- .../wazuh-dashboard/config/config.sh | 4 ++-- .../wazuh-indexer/config/config.sh | 6 ++--- build-docker-images/wazuh-manager/Dockerfile | 7 ++---- indexer-certs-creator/config/entrypoint.sh | 4 ++-- .../config/wazuh_cluster/wazuh_worker.conf | 3 +++ multi-node/docker-compose.yml | 12 +++++----- .../config/wazuh_cluster/wazuh_manager.conf | 3 +++ single-node/docker-compose.yml | 6 ++--- 15 files changed, 39 insertions(+), 49 deletions(-) diff --git a/.github/.goss.yaml b/.github/.goss.yaml index a867bac9..76e84db8 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.4.1-1 + - 4.5.0 port: tcp:1514: listening: true diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 51077968..3c84f3f9 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -49,8 +49,8 @@ jobs: with: version: v0.3.16 - - name: Execute Goss tests (wazuh-manager) - run: dgoss run wazuh/wazuh-manager:${{env.WAZUH_IMAGE_VERSION}} + - name: Execute Goss tests (wazuh-odfe) + run: dgoss run wazuh/wazuh-manager:4.5.0 env: GOSS_SLEEP: 30 GOSS_FILE: .github/.goss.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ace25ab..277bb040 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,10 @@ # Change Log All notable changes to this project will be documented in this file. -## Wazuh Docker v4.4.1 +## Wazuh Docker v4.5.0 ### Added -- Update Wazuh to version [4.4.1](https://github.com/wazuh/wazuh/blob/v4.4.1/CHANGELOG.md#v441) +- Update Wazuh to version [4.5.0](https://github.com/wazuh/wazuh/blob/v4.5.0/CHANGELOG.md#v450) ## Wazuh Docker v4.4.0 ### Added diff --git a/README.md b/README.md index c2c19801..cb74e3cf 100644 --- a/README.md +++ b/README.md @@ -195,7 +195,7 @@ WAZUH_MONITORING_REPLICAS=0 ## | Wazuh version | ODFE | XPACK | |---------------|---------|--------| -| v4.4.1 | | | +| v4.5.0 | | | | v4.4.0 | | | | v4.3.10 | | | | v4.3.9 | | | diff --git a/VERSION b/VERSION index 6df24e26..5a1911b6 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.4.1" -REVISION="40406" +WAZUH-DOCKER_VERSION="4.5.0" +REVISION="40500" diff --git a/build-docker-images/build-images.yml b/build-docker-images/build-images.yml index 52984bf9..92be9b38 100644 --- a/build-docker-images/build-images.yml +++ b/build-docker-images/build-images.yml @@ -3,12 +3,8 @@ version: '3.7' services: wazuh.manager: - build: - context: wazuh-manager/ - args: - WAZUH_VERSION: ${WAZUH_VERSION} - WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION} - image: wazuh/wazuh-manager:${WAZUH_IMAGE_VERSION} + build: wazuh-manager/ + image: wazuh/wazuh-manager:4.5.0 hostname: wazuh.manager restart: always ports: @@ -35,12 +31,8 @@ services: - filebeat_var:/var/lib/filebeat wazuh.indexer: - build: - context: wazuh-indexer/ - args: - WAZUH_VERSION: ${WAZUH_VERSION} - WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION} - image: wazuh/wazuh-indexer:${WAZUH_IMAGE_VERSION} + build: wazuh-indexer/ + image: wazuh/wazuh-indexer:4.5.0 hostname: wazuh.indexer restart: always ports: @@ -56,12 +48,8 @@ services: hard: 65536 wazuh.dashboard: - build: - context: wazuh-dashboard/ - args: - WAZUH_VERSION: ${WAZUH_VERSION} - WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION} - image: wazuh/wazuh-dashboard:${WAZUH_IMAGE_VERSION} + build: wazuh-dashboard/ + image: wazuh/wazuh-dashboard:4.5.0 hostname: wazuh.dashboard restart: always ports: diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile index 1b95ca88..003d7d21 100644 --- a/build-docker-images/wazuh-dashboard/Dockerfile +++ b/build-docker-images/wazuh-dashboard/Dockerfile @@ -1,8 +1,7 @@ # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2) FROM ubuntu:focal AS builder -ARG WAZUH_VERSION -ARG WAZUH_TAG_REVISION +ARG WAZUH_VERSION=4.5.0 ARG INSTALL_DIR=/usr/share/wazuh-dashboard ARG WAZUH_UI_REVISION=1 diff --git a/build-docker-images/wazuh-dashboard/config/config.sh b/build-docker-images/wazuh-dashboard/config/config.sh index c33f8eb4..40e6ac67 100644 --- a/build-docker-images/wazuh-dashboard/config/config.sh +++ b/build-docker-images/wazuh-dashboard/config/config.sh @@ -9,8 +9,8 @@ export CONFIG_DIR=${INSTALLATION_DIR}/config ## Variables CERT_TOOL=wazuh-certs-tool.sh -PACKAGES_URL=https://packages.wazuh.com/4.3/ -PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.3/ +PACKAGES_URL=https://packages.wazuh.com/4.5/ +PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/ ## Check if the cert tool exists in S3 buckets CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}') diff --git a/build-docker-images/wazuh-indexer/config/config.sh b/build-docker-images/wazuh-indexer/config/config.sh index 728fc862..ea4ec95c 100644 --- a/build-docker-images/wazuh-indexer/config/config.sh +++ b/build-docker-images/wazuh-indexer/config/config.sh @@ -8,7 +8,7 @@ export TARGET_DIR=${CURDIR}/debian/${NAME} # Package build options export USER=${NAME} export GROUP=${NAME} -export VERSION=${WAZUH_VERSION}-${WAZUH_TAG_REVISION} +export VERSION=4.5.0 export LOG_DIR=/var/log/${NAME} export LIB_DIR=/var/lib/${NAME} export PID_DIR=/run/${NAME} @@ -53,8 +53,8 @@ tar -xf ${INDEXER_FILE} ## Variables CERT_TOOL=wazuh-certs-tool.sh PASSWORD_TOOL=wazuh-passwords-tool.sh -PACKAGES_URL=https://packages.wazuh.com/4.3/ -PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.3/ +PACKAGES_URL=https://packages.wazuh.com/4.5/ +PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/ ## Check if the cert tool exists in S3 buckets CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}') diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile index cee005e8..d4b1e344 100644 --- a/build-docker-images/wazuh-manager/Dockerfile +++ b/build-docker-images/wazuh-manager/Dockerfile @@ -1,11 +1,8 @@ # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2) FROM ubuntu:focal -RUN rm /bin/sh && ln -s /bin/bash /bin/sh - -ARG WAZUH_VERSION -ARG WAZUH_TAG_REVISION -ARG TEMPLATE_VERSION=4.3 +ARG WAZUH_VERSION=4.5.0 +ARG TEMPLATE_VERSION=4.5 ARG FILEBEAT_CHANNEL=filebeat-oss ARG FILEBEAT_VERSION=7.10.2 ARG WAZUH_VERSION=4.4.0-1 diff --git a/indexer-certs-creator/config/entrypoint.sh b/indexer-certs-creator/config/entrypoint.sh index ba7a3aa4..f5f19737 100644 --- a/indexer-certs-creator/config/entrypoint.sh +++ b/indexer-certs-creator/config/entrypoint.sh @@ -8,8 +8,8 @@ ## Variables CERT_TOOL=wazuh-certs-tool.sh PASSWORD_TOOL=wazuh-passwords-tool.sh -PACKAGES_URL=https://packages.wazuh.com/4.3/ -PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.3/ +PACKAGES_URL=https://packages.wazuh.com/4.5/ +PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/ ## Check if the cert tool exists in S3 buckets CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}') diff --git a/multi-node/config/wazuh_cluster/wazuh_worker.conf b/multi-node/config/wazuh_cluster/wazuh_worker.conf index 46fceb1e..6d5ffd93 100644 --- a/multi-node/config/wazuh_cluster/wazuh_worker.conf +++ b/multi-node/config/wazuh_cluster/wazuh_worker.conf @@ -222,6 +222,9 @@ 127.0.0.1 ^localhost.localdomain$ + 4.5.0.1 + 4.5.0.2 + 208.67.220.220 diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index c9667ede..3f5793a9 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.5.0 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.5.0 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.5.0 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.5.0 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.5.0 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.5.0 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/config/wazuh_cluster/wazuh_manager.conf b/single-node/config/wazuh_cluster/wazuh_manager.conf index 4db508d6..25dec785 100644 --- a/single-node/config/wazuh_cluster/wazuh_manager.conf +++ b/single-node/config/wazuh_cluster/wazuh_manager.conf @@ -222,6 +222,9 @@ 127.0.0.1 ^localhost.localdomain$ + 4.5.0.1 + 4.5.0.2 + 208.67.220.220 diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index f5e8e3f8..0ba63872 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.5.0 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.5.0 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.5.0 hostname: wazuh.dashboard restart: always ports: