Merge 4.3 into master

2025-11-03 13:33:15 +00:00 · 2022-05-20 15:57:34 -03:00
parent 04389ad2ae 9cd399c2df
commit b21c3769d3
15 changed files with 46 additions and 30 deletions
--- a/.github/.goss.yaml
+++ b/.github/.goss.yaml
@@ -56,7 +56,7 @@ package:
  wazuh-manager:
    installed: true
    versions:
-    - 4.3.1
+    - 4.4.0
 port:
  tcp:1514:
    listening: true
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -25,7 +25,7 @@ jobs:
        version: v0.3.16

    - name: Execute Goss tests (wazuh-odfe)
-      run: dgoss run wazuh/wazuh-manager:4.3.1
+      run: dgoss run wazuh/wazuh-manager:4.4.0
      env:
        GOSS_SLEEP: 30
        GOSS_FILE: .github/.goss.yaml
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log
 All notable changes to this project will be documented in this file.

+## 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.1
 ### Added

@@ -11,6 +16,11 @@ All notable changes to this project will be documented in this file.

 - Update Wazuh to version [4.3.0](https://github.com/wazuh/wazuh/blob/v4.3.0/CHANGELOG.md#v430)

+## Wazuh Docker v4.2.6
+### Added
+
+- Update Wazuh to version [4.2.6](https://github.com/wazuh/wazuh/blob/v4.2.6/CHANGELOG.md#v426)
+
 ## Wazuh Docker v4.2.5
 ### Added

--- a/README.md
+++ b/README.md
@@ -193,8 +193,10 @@ WAZUH_MONITORING_REPLICAS=0         #

 | Wazuh version | ODFE    | XPACK  |
 |---------------|---------|--------|
+| v4.4.0        |         |        |
 | v4.3.1        |         |        |
 | v4.3.0        |         |        |
+| v4.2.6        | 1.13.2  | 7.11.2 |
 | v4.2.5        | 1.13.2  | 7.11.2 |
 | v4.2.4        | 1.13.2  | 7.11.2 |
 | v4.2.3        | 1.13.2  | 7.11.2 |
--- a/4
+++ b/4
@@ -1,2 +1,2 @@
-WAZUH-DOCKER_VERSION="4.3.1"
-REVISION="40311"
+WAZUH-DOCKER_VERSION="4.4.0"
+REVISION="40400"
--- a/build-docker-images/docker-compose.yml
+++ b/build-docker-images/docker-compose.yml
@@ -4,7 +4,7 @@ version: '3.7'
 services:
  wazuh.manager:
    build:  wazuh-manager/
-    image: wazuh/wazuh-manager:4.3.1
+    image: wazuh/wazuh-manager:4.4.0
    hostname: wazuh.manager
    restart: always
    ports:
@@ -32,7 +32,7 @@ services:

  wazuh.indexer:
    build: wazuh-indexer/
-    image: wazuh/wazuh-indexer:4.3.1
+    image: wazuh/wazuh-indexer:4.4.0
    hostname: wazuh.indexer
    restart: always
    ports:
@@ -49,7 +49,7 @@ services:

  wazuh.dashboard:
    build: wazuh-dashboard/
-    image: wazuh/wazuh-dashboard:4.3.1
+    image: wazuh/wazuh-dashboard:4.4.0
    hostname: wazuh.dashboard
    restart: always
    ports:
--- a/build-docker-images/wazuh-dashboard/Dockerfile
+++ b/build-docker-images/wazuh-dashboard/Dockerfile
@@ -1,7 +1,7 @@
 # Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
 FROM ubuntu:focal AS builder

-ARG WAZUH_VERSION=4.3.1
+ARG WAZUH_VERSION=4.4.0
 ARG INSTALL_DIR=/usr/share/wazuh-dashboard

 # Update and install dependencies
--- 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.4/
+PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.4/

 ## 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}')
--- 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=4.3.1
+export VERSION=4.4.0
 export LOG_DIR=/var/log/${NAME}
 export LIB_DIR=/var/lib/${NAME}
 export PID_DIR=/run/${NAME}
@@ -30,8 +30,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.4/
+PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.4/

 ## 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}')
--- a/build-docker-images/wazuh-manager/Dockerfile
+++ b/build-docker-images/wazuh-manager/Dockerfile
@@ -1,8 +1,8 @@
 # Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
 FROM ubuntu:focal

-ARG WAZUH_VERSION=4.3.1
-ARG TEMPLATE_VERSION=4.3
+ARG WAZUH_VERSION=4.4.0
+ARG TEMPLATE_VERSION=4.4
 ARG FILEBEAT_CHANNEL=filebeat-oss
 ARG FILEBEAT_VERSION=7.10.2
 ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.1.tar.gz"
--- 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.4/
+PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.4/

 ## 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}')
@@ -54,8 +54,8 @@ cp /certificates/root-ca.key /certificates/root-ca-manager.key
 chown 999:997 /certificates/root-ca-manager.pem
 chown 999:997 /certificates/root-ca-manager.key

-for i in ${node_names[@]}; 
-do 
+for i in ${node_names[@]};
+do
  chown 999:997 "/certificates/${i}.pem"
  chown 999:997 "/certificates/${i}-key.pem"
 done
--- a/multi-node/config/wazuh_cluster/wazuh_worker.conf
+++ b/multi-node/config/wazuh_cluster/wazuh_worker.conf
@@ -222,7 +222,9 @@
  <global>
    <white_list>127.0.0.1</white_list>
    <white_list>^localhost.localdomain$</white_list>
-    <white_list>127.0.0.53</white_list>
+    <white_list>4.4.0.1</white_list>
+    <white_list>4.4.0.2</white_list>
+    <white_list>208.67.220.220</white_list>
  </global>

  <command>
--- 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.1
+    image: wazuh/wazuh-manager:4.4.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.3.1
+    image: wazuh/wazuh-manager:4.4.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.3.1
+    image: wazuh/wazuh-indexer:4.4.0
    hostname: wazuh1.indexer
    restart: always
    ports:
@@ -93,7 +93,7 @@ services:
      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml

  wazuh2.indexer:
-    image: wazuh/wazuh-indexer:4.3.1
+    image: wazuh/wazuh-indexer:4.4.0
    hostname: wazuh2.indexer
    restart: always
    environment:
@@ -115,7 +115,7 @@ services:
      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml

  wazuh3.indexer:
-    image: wazuh/wazuh-indexer:4.3.1
+    image: wazuh/wazuh-indexer:4.4.0
    hostname: wazuh3.indexer
    restart: always
    environment:
@@ -137,7 +137,7 @@ services:
      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml

  wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:4.3.1
+    image: wazuh/wazuh-dashboard:4.4.0
    hostname: wazuh.dashboard
    restart: always
    ports:
--- a/single-node/config/wazuh_cluster/wazuh_manager.conf
+++ b/single-node/config/wazuh_cluster/wazuh_manager.conf
@@ -222,7 +222,9 @@
  <global>
    <white_list>127.0.0.1</white_list>
    <white_list>^localhost.localdomain$</white_list>
-    <white_list>10.0.0.106</white_list>
+    <white_list>4.4.0.1</white_list>
+    <white_list>4.4.0.2</white_list>
+    <white_list>208.67.220.220</white_list>
  </global>

  <command>
--- 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.1
+    image: wazuh/wazuh-manager:4.4.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.3.1
+    image: wazuh/wazuh-indexer:4.4.0
    hostname: wazuh.indexer
    restart: always
    ports:
@@ -64,7 +64,7 @@ services:
      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml

  wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:4.3.1
+    image: wazuh/wazuh-dashboard:4.4.0
    hostname: wazuh.dashboard
    restart: always
    ports: