Merge pull request #1013 from wazuh/bump-4.6.0-revision

Revision Bump
2025-10-23 04:51:57 +00:00 · 2023-09-22 14:49:59 -03:00 · 2023-09-22 14:37:02 -03:00 · 2023-09-22 06:36:48 -03:00 · 2023-09-22 11:11:45 +02:00 · 2023-09-18 14:37:34 -03:00
18 changed files with 64 additions and 27 deletions
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
-WAZUH_VERSION=4.5.3
-WAZUH_IMAGE_VERSION=4.5.3
+WAZUH_VERSION=4.6.0
+WAZUH_IMAGE_VERSION=4.6.0
 WAZUH_TAG_REVISION=1
--- a/.github/.goss.yaml
+++ b/.github/.goss.yaml
@@ -56,7 +56,7 @@ package:
  wazuh-manager:
    installed: true
    versions:
-    - 4.5.3-1
+    - 4.6.0-1
 port:
  tcp:1514:
    listening: true
--- 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.6.0
+### Added
+
+- Update Wazuh to version [4.6.0](https://github.com/wazuh/wazuh/blob/v4.6.0/CHANGELOG.md#v460)
+
 ## Wazuh Docker v4.5.3
 ### Added

--- a/README.md
+++ b/README.md
@@ -195,6 +195,7 @@ WAZUH_MONITORING_REPLICAS=0         ##

 | Wazuh version | ODFE    | XPACK  |
 |---------------|---------|--------|
+| v4.6.0        |         |        |
 | v4.5.3        |         |        |
 | v4.5.2        |         |        |
 | v4.5.1        |         |        |
--- a/4
+++ b/4
@@ -1,2 +1,2 @@
-WAZUH-DOCKER_VERSION="4.5.3"
-REVISION="40505"
+WAZUH-DOCKER_VERSION="4.6.0"
+REVISION="40601"
--- a/build-docker-images/build-images.sh
+++ b/build-docker-images/build-images.sh
@@ -1,4 +1,4 @@
-WAZUH_IMAGE_VERSION=4.5.3
+WAZUH_IMAGE_VERSION=4.6.0
 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')
--- a/build-docker-images/wazuh-dashboard/Dockerfile
+++ b/build-docker-images/wazuh-dashboard/Dockerfile
@@ -66,6 +66,8 @@ ENV PATTERN="" \
    EXTENSIONS_CISCAT="" \
    EXTENSIONS_AWS="" \
    EXTENSIONS_GCP="" \
+    EXTENSIONS_GITHUB=""\
+    EXTENSIONS_OFFICE=""\
    EXTENSIONS_VIRUSTOTAL="" \
    EXTENSIONS_OSQUERY="" \
    EXTENSIONS_DOCKER="" \
--- 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.5/
-PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/
+PACKAGES_URL=https://packages.wazuh.com/4.6/
+PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.6/

 ## 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-dashboard/config/wazuh_app_config.sh
+++ b/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh
@@ -25,6 +25,8 @@ declare -A CONFIG_MAP=(
  [extensions.ciscat]=$EXTENSIONS_CISCAT
  [extensions.aws]=$EXTENSIONS_AWS
  [extensions.gcp]=$EXTENSIONS_GCP
+  [extensions.github]=$EXTENSIONS_GITHUB
+  [extensions.office]=$EXTENSIONS_OFFICE
  [extensions.virustotal]=$EXTENSIONS_VIRUSTOTAL
  [extensions.osquery]=$EXTENSIONS_OSQUERY
  [extensions.docker]=$EXTENSIONS_DOCKER
--- a/build-docker-images/wazuh-indexer/config/config.sh
+++ b/build-docker-images/wazuh-indexer/config/config.sh
@@ -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.5/
-PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/
+PACKAGES_URL=https://packages.wazuh.com/4.6/
+PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.6/

 ## 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
@@ -5,7 +5,7 @@ RUN rm /bin/sh && ln -s /bin/bash /bin/sh

 ARG WAZUH_VERSION
 ARG WAZUH_TAG_REVISION
-ARG TEMPLATE_VERSION=4.5
+ARG TEMPLATE_VERSION=v4.6.0
 ARG FILEBEAT_CHANNEL=filebeat-oss
 ARG FILEBEAT_VERSION=7.10.2
 ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.2.tar.gz"
@@ -52,4 +52,4 @@ RUN chmod 755 /permanent_data.sh && \
 # Services ports
 EXPOSE 55000/tcp 1514/tcp 1515/tcp 514/udp 1516/tcp

-ENTRYPOINT [ "/init" ]
+ENTRYPOINT [ "/init" ]
--- a/build-docker-images/wazuh-manager/config/create_user.py
+++ b/build-docker-images/wazuh-manager/config/create_user.py
@@ -13,7 +13,7 @@ SPECIAL_CHARS = "@$!%*?&-_"


 try:
-    from wazuh.rbac.orm import create_rbac_db
+    from wazuh.rbac.orm import check_database_integrity
    from wazuh.security import (
        create_user,
        get_users,
@@ -69,7 +69,7 @@ if __name__ == "__main__":
    username, password = read_user_file()

    # create RBAC database
-    create_rbac_db()
+    check_database_integrity()

    initial_users = db_users()
    if username not in initial_users:
--- 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.5/
-PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/
+PACKAGES_URL=https://packages.wazuh.com/4.6/
+PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.6/

 ## 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/multi-node/config/wazuh_cluster/wazuh_manager.conf
+++ b/multi-node/config/wazuh_cluster/wazuh_manager.conf
@@ -117,6 +117,7 @@
      <enabled>no</enabled>
      <os>buster</os>
      <os>bullseye</os>
+      <os>bookworm</os>
      <update_interval>1h</update_interval>
    </provider>

@@ -163,6 +164,14 @@
      <update_interval>1h</update_interval>
    </provider>

+    <!-- Alma Linux OS vulnerabilities -->
+    <provider name="almalinux">
+      <enabled>no</enabled>
+      <os>8</os>
+      <os>9</os>
+      <update_interval>1h</update_interval>
+    </provider>
+
    <!-- Aggregate vulnerabilities -->
    <provider name="nvd">
      <enabled>yes</enabled>
@@ -366,4 +375,4 @@
    <location>/var/log/dpkg.log</location>
  </localfile>

-</ossec_config>
+</ossec_config>
--- a/multi-node/config/wazuh_cluster/wazuh_worker.conf
+++ b/multi-node/config/wazuh_cluster/wazuh_worker.conf
@@ -117,6 +117,7 @@
      <enabled>no</enabled>
      <os>buster</os>
      <os>bullseye</os>
+      <os>bookworm</os>
      <update_interval>1h</update_interval>
    </provider>

@@ -157,6 +158,14 @@
      <update_interval>1h</update_interval>
    </provider>

+    <!-- Alma Linux OS vulnerabilities -->
+    <provider name="almalinux">
+      <enabled>no</enabled>
+      <os>8</os>
+      <os>9</os>
+      <update_interval>1h</update_interval>
+    </provider>
+
    <!-- Windows OS vulnerabilities -->
    <provider name="msu">
      <enabled>yes</enabled>
@@ -366,4 +375,4 @@
    <location>/var/log/dpkg.log</location>
  </localfile>

-</ossec_config>
+</ossec_config>
--- 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.5.3
+    image: wazuh/wazuh-manager:4.6.0
    hostname: wazuh.master
    restart: always
    ulimits:
@@ -45,7 +45,7 @@ services:
      - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf

  wazuh.worker:
-    image: wazuh/wazuh-manager:4.5.3
+    image: wazuh/wazuh-manager:4.6.0
    hostname: wazuh.worker
    restart: always
    ulimits:
@@ -81,7 +81,7 @@ services:
      - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf

  wazuh1.indexer:
-    image: wazuh/wazuh-indexer:4.5.3
+    image: wazuh/wazuh-indexer:4.6.0
    hostname: wazuh1.indexer
    restart: always
    ports:
@@ -107,7 +107,7 @@ services:
      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml

  wazuh2.indexer:
-    image: wazuh/wazuh-indexer:4.5.3
+    image: wazuh/wazuh-indexer:4.6.0
    hostname: wazuh2.indexer
    restart: always
    environment:
@@ -129,7 +129,7 @@ services:
      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml

  wazuh3.indexer:
-    image: wazuh/wazuh-indexer:4.5.3
+    image: wazuh/wazuh-indexer:4.6.0
    hostname: wazuh3.indexer
    restart: always
    environment:
@@ -151,7 +151,7 @@ services:
      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml

  wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:4.5.3
+    image: wazuh/wazuh-dashboard:4.6.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
@@ -117,6 +117,7 @@
      <enabled>no</enabled>
      <os>buster</os>
      <os>bullseye</os>
+      <os>bookworm</os>
      <update_interval>1h</update_interval>
    </provider>

@@ -157,6 +158,14 @@
      <update_interval>1h</update_interval>
    </provider>

+    <!-- Alma Linux OS vulnerabilities -->
+    <provider name="almalinux">
+      <enabled>no</enabled>
+      <os>8</os>
+      <os>9</os>
+      <update_interval>1h</update_interval>
+    </provider>
+
    <!-- Windows OS vulnerabilities -->
    <provider name="msu">
      <enabled>yes</enabled>
--- 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.5.3
+    image: wazuh/wazuh-manager:4.6.0
    hostname: wazuh.manager
    restart: always
    ulimits:
@@ -46,7 +46,7 @@ services:
      - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf

  wazuh.indexer:
-    image: wazuh/wazuh-indexer:4.5.3
+    image: wazuh/wazuh-indexer:4.6.0
    hostname: wazuh.indexer
    restart: always
    ports:
@@ -71,7 +71,7 @@ services:
      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml

  wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:4.5.3
+    image: wazuh/wazuh-dashboard:4.6.0
    hostname: wazuh.dashboard
    restart: always
    ports:
Author	SHA1	Message	Date
Gonzalo Acuña	958e466682	Merge pull request #1013 from wazuh/bump-4.6.0-revision Revision Bump	2023-09-22 14:49:59 -03:00
Gonzalo Acuña	7d5b1c4f85	Revision Bump	2023-09-22 14:37:02 -03:00
Gonzalo Acuña	d6b73cb3dc	Merge pull request #1008 from wazuh/merge-4.5.3-into-4.6.0 Merge 4.5.3 into 4.6.0	2023-09-22 06:36:48 -03:00
David Correa Rodríguez	62627e32fd	Merge remote-tracking branch 'origin/4.5.3' into merge-4.5.3-into-4.6.0	2023-09-22 11:11:45 +02:00
Gonzalo Acuña	536dd51aa7	Merge pull request #1000 from wazuh/18966-error-in-wazuh-docker-startup Error in Wazuh Docker startup	2023-09-18 14:37:34 -03:00
vcerenu	5769159cf9	change RBAC database procedure	2023-09-18 12:05:29 -03:00
Gonzalo Acuña	0c6077c3e0	Merge pull request #992 from wazuh/984-build-imagessh-script-is-not-capable-of-using-repos-majorminorpatch-branches Change wazuh template origin	2023-09-13 11:09:44 -03:00
vcerenu	de7754364d	change wazuh template origin	2023-09-12 15:49:31 -03:00
Gonzalo Acuña	73ada94ed6	Merge pull request #988 from wazuh/987-add-support-to-define-the-default-value-of-extensionsgithub-and-extensionsoffice-in-the-wazuh-dashboard-docker-image Add extensions into wazuh.yml	2023-09-08 14:13:00 -03:00
vcerenu	63817dfd55	add extensions for wazuh.yml	2023-09-07 12:15:25 -03:00
Gonzalo Acuña	637110c278	Merge pull request #983 from wazuh/merge-4.5.3-into-4.6.0 Merge `4.5.3` into `4.6.0`	2023-09-07 09:01:40 -03:00
David Correa Rodríguez	b18c068650	Added empty line to changelog	2023-09-07 13:58:32 +02:00
David Correa Rodríguez	9a871dbbcb	Merge branch '4.5.3' into merge-4.5.3-into-4.6.0	2023-09-07 13:39:58 +02:00
Gonzalo Acuña	b377a0f6eb	Merge pull request #966 from wazuh/18542-vdt-bookworm-support Add Debian Bookworm to VDT default configuration	2023-08-25 13:17:17 -03:00
Mateo Cervilla	44e9bebed0	Add Debian Bookworm VDT support	2023-08-25 12:24:01 -03:00
Gonzalo Acuña	760fc8ccbf	Merge pull request #961 from wazuh/merge-4.5.2-into-4.6.0 Merge 4.5.2 into 4.6.0	2023-08-24 13:10:01 -03:00
vcerenu	44303d3701	resolving conflicts	2023-08-24 12:45:02 -03:00
David Correa Rodríguez	6c91bac96d	Merge pull request #936 from wazuh/merge-4.5.2-into-4.6.0 Merge `4.5.2` into `4.6.0`	2023-08-11 12:39:39 +02:00
Gonzalo Acuña	1dec665a97	Merge pull request #925 from wazuh/10774-alma-support Updating vulnerability detector default configuration with AlmaLinux support	2023-08-09 09:46:28 -03:00
pereyra-m	757e5dbf05	Updating ossec.conf file with the AlmaLinux support in the vulnerability detector section	2023-08-07 17:32:03 -03:00
Gonzalo Acuña	3953986652	Merge pull request #898 from wazuh/merge-4.5.2-into-4.6.0 Merge `4.5.2` into `4.6.0`	2023-07-21 08:27:24 -03:00
Gonzalo Acuña	f2dab81387	Merge branch '4.6.0' into merge-4.5.2-into-4.6.0	2023-07-21 08:15:57 -03:00
Carlos Bordon	b27d991f0c	Merge pull request #886 from wazuh/merge-4.5.1-into-4.6.0 Merge 4.5.1 into 4.6.0	2023-07-11 12:04:34 -03:00
vcerenu	4d0aa57ed2	resolving merge conflicts	2023-07-11 11:49:32 -03:00
Victor Ereñú	f4f99f17b7	Merge pull request #872 from wazuh/bump-4-6 Bump 4.6 version	2023-06-23 12:36:30 -03:00
vcerenu	8e3b8aada8	bump 4.6 version	2023-06-23 10:33:35 -03:00
Gonzalo Acuña	7abaea9b4c	Merge pull request #866 from wazuh/merge-4.4.5-into-4.5 Merge `4.4.5` into `4.5`	2023-06-14 15:48:43 -03:00
Gonzalo Acuña	303b64c7ae	Merge branch '4.5' into merge-4.4.5-into-4.5	2023-06-14 15:16:14 -03:00
Raul Del Pozo Moreno	2058734154	Merge pull request #853 from wazuh/4.5-merge-4.4 Merge `4.4` into `4.5`	2023-05-29 16:34:48 +02:00
Raul Del Pozo Moreno	4e34f1f7b7	Merge remote-tracking branch 'origin/4.4' into 4.5-merge-4.4	2023-05-26 18:51:03 +02:00
Raul Del Pozo Moreno	9a9fac6243	Merge pull request #847 from wazuh/merge-4.4-4.5 Merge `4.4` into `4.5`	2023-05-18 22:38:07 +02:00
Raul Del Pozo Moreno	11d15670f4	Merge remote-tracking branch 'origin/4.4' into merge-4.4-4.5	2023-05-18 22:27:31 +02:00
Raul Del Pozo Moreno	e826236a28	Added missing config	2023-05-18 21:30:38 +02:00
vcerenu	137989ddd1	bump 4.3 into master	2023-05-18 21:26:28 +02:00
vcerenu	0d76a85ded	bump 4.3 into master	2023-05-18 21:26:08 +02:00
fcaffieri	e95455a12b	Add fix to avoid GLIBC crash, fix identation	2023-05-18 21:25:37 +02:00
fcaffieri	887293d474	Add fix to avoid GLIBC crash	2023-05-18 21:25:36 +02:00
fcaffieri	ae20f302c0	disable filebeat metrics	2023-05-18 21:25:36 +02:00
vcerenu	08314f9e2e	bump release 4.5.0	2023-05-18 21:25:07 +02:00
vcerenu	c6f1f31d57	bump release 4.5.0	2023-05-18 21:25:00 +02:00
vcerenu	312466704d	bump release 4.5.0	2023-05-18 21:25:00 +02:00
Gonzalo Acuña	d00fc0ccf6	Revision update	2023-05-18 21:24:16 +02:00
vcerenu	42ea26b3bd	bump 4.4.2 version	2023-05-18 21:24:15 +02:00
Jesse Roland	fe75f8fb4e	Add DASHBOARD_USERNAME and DASHBOARD_PASSWORD environment variables to the dashboard container. Resolves https://github.com/wazuh/wazuh-docker/issues/823	2023-05-18 21:23:36 +02:00
vcerenu	8b1ed497ab	change revision number	2023-05-18 21:23:35 +02:00
vcerenu	195b34c259	bump 4.3.11 version	2023-05-18 21:23:34 +02:00
vcerenu	08c9b95455	change revision	2023-05-18 21:22:46 +02:00