Merge pull request #1162 from wazuh/merge-4.8.1-into-master

Merge 4.8.1 into master
wazuh · Dec 20, 2023 · 27888e0 · 27888e0
2 parents e756c20 + 5791218
commit 27888e0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/.env b/.env
@@ -2,5 +2,5 @@ WAZUH_VERSION=4.9.0
 WAZUH_IMAGE_VERSION=4.9.0
 WAZUH_TAG_REVISION=1
 FILEBEAT_TEMPLATE_BRANCH=4.9.0
-WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.3.tar.gz
+WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz
 WAZUH_UI_REVISION=1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,11 @@ All notable changes to this project will be documented in this file.
 
 - Update Wazuh to version [4.8.0](https://github.com/wazuh/wazuh/blob/v4.8.0/CHANGELOG.md#v480)
 
+## Wazuh Docker v4.7.2
+### Added
+
+- Update Wazuh to version [4.7.2](https://github.com/wazuh/wazuh/blob/v4.7.2/CHANGELOG.md#v472)
+
 ## Wazuh Docker v4.7.1
 ### Added
 

diff --git a/README.md b/README.md
@@ -199,6 +199,7 @@ WAZUH_MONITORING_REPLICAS=0         ##
 | v4.9.0        |         |        |
 | v4.8.1        |         |        |
 | v4.8.0        |         |        |
+| v4.7.2        |         |        |
 | v4.7.1        |         |        |
 | v4.7.0        |         |        |
 | v4.6.0        |         |        |

diff --git a/build-docker-images/README.md b/build-docker-images/README.md
@@ -24,7 +24,7 @@ $ build-docker-images/build-images.sh -h
 Usage: build-docker-images/build-images.sh [OPTIONS]
 
     -d, --dev <ref>              [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default.
-    -f, --filebeat-module <ref>  [Optional] Set Filebeat module version. By default 0.3.
+    -f, --filebeat-module <ref>  [Optional] Set Filebeat module version. By default 0.4.
     -r, --revision <rev>         [Optional] Package revision. By default 1
     -v, --version <ver>          [Optional] Set the Wazuh version should be builded. By default, 4.9.0.
     -h, --help                   Show this help.

diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh
@@ -15,7 +15,7 @@ IMAGE_VERSION=${WAZUH_IMAGE_VERSION}
 WAZUH_IMAGE_VERSION="4.9.0"
 WAZUH_TAG_REVISION="1"
 WAZUH_DEV_STAGE=""
-FILEBEAT_MODULE_VERSION="0.3"
+FILEBEAT_MODULE_VERSION="0.4"
 
 # -----------------------------------------------------------------------------