Merge pull request #2310 from wazuh/merge-4.6.0-into-4.7.0

Merge 4.6.0 into 4.7.0
wazuh · Jul 24, 2023 · 7b67493 · 7b67493
2 parents 0ae5300 + 73e6f56
commit 7b67493
Show file tree

Hide file tree

Showing 15 changed files with 65 additions and 28 deletions.
diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml
@@ -52,7 +52,7 @@ jobs:
         run: |
           MAJOR=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)
           if [ "${{ steps.changes.outputs.deb_images }}" == "true" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$MAJOR" >> $GITHUB_ENV ; fi
-          if [ $MAJOR == "4.7" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi
+          if [ $MAJOR == "4.8" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi
           echo "CONTAINER_NAME=deb_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV
 
       - name: Download docker image for package building

diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml
@@ -53,7 +53,7 @@ jobs:
         run: |
           MAJOR=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)
           if [ "${{ steps.changes.outputs.rpm_images }}" == "true" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$MAJOR" >> $GITHUB_ENV ; fi
-          if [ $MAJOR == "4.7" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi
+          if [ $MAJOR == "4.8" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi
           if [ "${{ matrix.ARCHITECTURE }}" == "x86_64" ]; then echo "CONTAINER_NAME=rpm_builder_x86" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=rpm_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; fi
 
       - name: Download docker image for package building

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,5 @@
 # Change Log
 All notable changes to this project will be documented in this file.
-
 ## [v4.7.0]
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.7.0
@@ -9,6 +8,10 @@ All notable changes to this project will be documented in this file.
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.6.0
 
+## [4.5.2]
+
+- https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.2
+
 ## [v4.5.1]
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.1

diff --git a/README.md b/README.md
@@ -36,15 +36,15 @@ The following table shows the references for the versions of each component.
 |-----------------|-----------------------|
 | 4.3.x           | 1.2.0                 |
 | 4.4.0           | 2.4.1                 |
-| 4.4.1 - 4.6.0   | 2.6.0                 |
+| 4.4.1 - 4.7.0   | 2.6.0                 |
 
 ### Wazuh indexer
 
 | Wazuh indexer   | Opensearch            |
 |-----------------|-----------------------|
 | 4.3.x           | 1.2.4                 |
 | 4.4.0           | 2.4.1                 |
-| 4.4.1 - 4.6.0   | 2.6.0                 |
+| 4.4.1 - 4.7.0   | 2.6.0                 |
 
 ## Contribute
 

diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec
@@ -294,6 +294,8 @@ rm -fr %{buildroot}
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html
 * Mon Sep 04 2023 support <[email protected]> - 4.6.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
+* Fri Aug 04 2023 support <[email protected]> - 4.5.2
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
 * Tue Aug 01 2023 support <[email protected]> - 4.5.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html
 * Fri Jun 30 2023 support <[email protected]> - 4.5.0

diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog
@@ -10,6 +10,12 @@ wazuh-agent (4.6.0-RELEASE) stable; urgency=low
 
  -- Wazuh, Inc <[email protected]>  Mon, 04 Sep 2023 11:56:07 +0000
 
+wazuh-agent (4.5.2-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
+
+ -- Wazuh, Inc <[email protected]>  Fri, 04 Aug 2023 00:00:00 +0000
+
 wazuh-agent (4.5.1-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-1.html
@@ -180,13 +186,13 @@ wazuh-agent (4.2.0-RELEASE) stable; urgency=low
 
 wazuh-agent (4.1.5-RELEASE) stable; urgency=low
 
- * More info: https://documentation.wazuh.com/current/release-notes/release-4-1-5.html
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-1-5.html
 
  -- Wazuh, Inc <[email protected]>  Thu, 22 Apr 2021 16:50:05 +0000
 
 wazuh-agent (4.1.4-RELEASE) stable; urgency=low
 
- * More info: https://documentation.wazuh.com/current/release-notes/release-4-1-4.html
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-1-4.html
 
  -- Wazuh, Inc <[email protected]>  Mon, 29 Mar 2021 16:23:09 +0000
 
@@ -198,13 +204,13 @@ wazuh-agent (4.1.3-RELEASE) stable; urgency=low
 
 wazuh-agent (4.1.2-RELEASE) stable; urgency=low
 
- * More info: https://documentation.wazuh.com/current/release-notes/release-4-1-2.html
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-1-2.html
 
  -- Wazuh, Inc <[email protected]>  Mon, 08 Mar 2021 14:00:25 +0000
 
 wazuh-agent (4.1.1-RELEASE) stable; urgency=low
 
- * More info: https://documentation.wazuh.com/current/release-notes/release-4-1-1.html
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-1-1.html
 
  -- Wazuh, Inc <[email protected]>  Fri, 05 Mar 2021 13:24:41 +0000
 
@@ -264,7 +270,7 @@ wazuh-agent (4.0.0-RELEASE) stable; urgency=low
 
 wazuh-agent (3.13.3-RELEASE) stable; urgency=low
 
- * More info: https://documentation.wazuh.com/current/release-notes/release-3-13-3.html
+  * More info: https://documentation.wazuh.com/current/release-notes/release-3-13-3.html
 
  -- Wazuh, Inc <[email protected]>  Sat, 24 Apr 2021 07:01:55 +0000
 

diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog
@@ -8,7 +8,13 @@ wazuh-manager (4.6.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
 
- -- Wazuh, Inc <[email protected]>  Mon, 04 Sep 2023 11:56:07 +0000
+ -- Wazuh, Inc <[email protected]>  Fri, 08 Sep 2023 13:46:52 +0000
+
+wazuh-manager (4.5.2-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
+
+ -- Wazuh, Inc <[email protected]>  Fri, 04 Aug 2023 00:00:00 +0000
 
 wazuh-manager (4.5.1-RELEASE) stable; urgency=low
 
@@ -22,6 +28,12 @@ wazuh-manager (4.5.0-RELEASE) stable; urgency=low
 
  -- Wazuh, Inc <[email protected]>  Fri, 30 Jun 2023 11:56:07 +0000
 
+wazuh-manager (4.4.5-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html
+
+ -- Wazuh, Inc <[email protected]>  Wed, 19 Jul 2023 15:56:43 +0000
+
 wazuh-manager (4.4.4-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-4-4.html
@@ -174,13 +186,13 @@ wazuh-manager (4.2.0-RELEASE) stable; urgency=low
 
 wazuh-manager (4.1.5-RELEASE) stable; urgency=low
 
- * More info: https://documentation.wazuh.com/current/release-notes/release-4-1-5.html
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-1-5.html
 
  -- Wazuh, Inc <[email protected]>  Thu, 22 Apr 2021 16:50:05 +0000
 
 wazuh-manager (4.1.4-RELEASE) stable; urgency=low
 
- * More info: https://documentation.wazuh.com/current/release-notes/release-4-1-4.html
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-1-4.html
 
  -- Wazuh, Inc <[email protected]>  Mon, 29 Mar 2021 16:23:09 +0000
 
@@ -192,13 +204,13 @@ wazuh-manager (4.1.3-RELEASE) stable; urgency=low
 
 wazuh-manager (4.1.2-RELEASE) stable; urgency=low
 
- * More info: https://documentation.wazuh.com/current/release-notes/release-4-1-2.html
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-1-2.html
 
  -- Wazuh, Inc <[email protected]>  Mon, 08 Mar 2021 14:00:25 +0000
 
 wazuh-manager (4.1.1-RELEASE) stable; urgency=low
 
- * More info: https://documentation.wazuh.com/current/release-notes/release-4-1-1.html
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-1-1.html
 
  -- Wazuh, Inc <[email protected]>  Fri, 05 Mar 2021 13:24:41 +0000
 
@@ -258,7 +270,7 @@ wazuh-manager (4.0.0-RELEASE) stable; urgency=low
 
 wazuh-manager (3.13.3-RELEASE) stable; urgency=low
 
- * More info: https://documentation.wazuh.com/current/release-notes/release-3-13-3.html
+  * More info: https://documentation.wazuh.com/current/release-notes/release-3-13-3.html
 
  -- Wazuh, Inc <[email protected]>  Sat, 24 Apr 2021 07:01:55 +0000
 

diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec
@@ -603,6 +603,8 @@ rm -fr %{buildroot}
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html
 * Mon Sep 04 2023 support <[email protected]> - 4.6.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
+* Fri Aug 04 2023 support <[email protected]> - 4.5.2
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
 * Tue Aug 01 2023 support <[email protected]> - 4.5.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html
 * Fri Jun 30 2023 support <[email protected]> - 4.5.0

diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec
@@ -826,6 +826,8 @@ rm -fr %{buildroot}
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html
 * Mon Sep 04 2023 support <[email protected]> - 4.6.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
+* Fri Aug 04 2023 support <[email protected]> - 4.5.2
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
 * Tue Aug 01 2023 support <[email protected]> - 4.5.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html
 * Fri Jun 30 2023 support <[email protected]> - 4.5.0

diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog
@@ -10,11 +10,11 @@ wazuh-dashboard (4.6.0-RELEASE) stable; urgency=low
 
  -- Wazuh, Inc <[email protected]>  Mon, 04 Sep 2023 11:56:07 +0000
 
-wazuh-dashboard (4.5.0-RELEASE) stable; urgency=low
+wazuh-dashboard (4.5.2-RELEASE) stable; urgency=low
 
-  * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
 
- -- Wazuh, Inc <[email protected]>  Fri, 08 Sep 2023 13:46:52 +0000
+ -- Wazuh, Inc <[email protected]>  Fri, 04 Aug 2023 00:00:00 +0000
 
 wazuh-dashboard (4.5.1-RELEASE) stable; urgency=low
 
@@ -26,7 +26,7 @@ wazuh-dashboard (4.5.0-RELEASE) unstable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html
 
- -- Wazuh, Inc <[email protected]>  Fri, 30 Jun 2023 12:31:50 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 19 Jul 2023 13:45:36 +0000
 
 wazuh-dashboard (4.4.5-RELEASE) unstable; urgency=low
 

diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec
@@ -403,6 +403,8 @@ rm -fr %{buildroot}
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html
 * Sat Oct 28 2023 support <[email protected]> - 4.6.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
+* Fri Aug 04 2023 support <[email protected]> - 4.5.2
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
 * Tue Aug 01 2023 support <[email protected]> - 4.5.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html
 * Fri Jun 30 2023 support <[email protected]> - 4.5.0

diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog
@@ -10,6 +10,12 @@ wazuh-indexer (4.6.0-RELEASE) stable; urgency=low
 
  -- Wazuh, Inc <[email protected]>  Mon, 04 Sep 2023 11:56:07 +0000
 
+wazuh-indexer (4.5.2-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
+
+ -- Wazuh, Inc <[email protected]>  Fri, 04 Aug 2023 00:00:00 +0000
+
 wazuh-indexer (4.5.1-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-1.html

diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec
@@ -1398,6 +1398,8 @@ rm -fr %{buildroot}
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html
 * Mon Sep 04 2023 support <[email protected]> - 4.6.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
+* Fri Aug 04 2023 support <[email protected]> - 4.5.2
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
 * Tue Aug 01 2023 support <[email protected]> - 4.5.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html
 * Fri Jun 30 2023 support <[email protected]> - 4.5.0

diff --git a/tests/unattended/unit/suites/test-dashboard.sh b/tests/unattended/unit/suites/test-dashboard.sh
@@ -55,7 +55,7 @@ test-03-dashboard_install-yum() {
     load-dashboard_install
     sys_type="yum"
     sep="-"
-    wazuh_version="1.13.2"
+    wazuh_version="4.5.2"
     wazuh_revision="1"
     dashboard_install
 }
@@ -68,7 +68,7 @@ test-ASSERT-FAIL-04-dashboard_install-yum-error() {
     load-dashboard_install
     sys_type="yum"
     sep="-"
-    wazuh_version="1.13.2"
+    wazuh_version="4.5.2"
     wazuh_revision="1"
     @mockfalse yum install wazuh-dashboard-1.13.2-1 -y
     dashboard_install
@@ -78,7 +78,7 @@ test-05-dashboard_install-apt() {
     load-dashboard_install
     sys_type="apt-get"
     sep="="
-    wazuh_version="1.13.2"
+    wazuh_version="4.5.2"
     wazuh_revision="1"
     dashboard_install
 }
@@ -91,7 +91,7 @@ test-ASSERT-FAIL-06-dashboard_install-apt-error() {
     load-dashboard_install
     sys_type="apt-get"
     sep="="
-    wazuh_version="1.13.2"
+    wazuh_version="4.5.2"
     wazuh_revision="1"
     @mockfalse apt install wazuh-dashboard=1.13.2-1 -y
     dashboard_install

diff --git a/tests/unattended/unit/suites/test-indexer.sh b/tests/unattended/unit/suites/test-indexer.sh
@@ -49,7 +49,7 @@ test-03-indexer_install-yum() {
     load-indexer_install
     sys_type="yum"
     sep="-"
-    wazuh_version="1.13.2"
+    wazuh_version="4.6.0"
     wazuh_revision="1"
     indexer_install
 }
@@ -63,7 +63,7 @@ test-ASSERT-FAIL-04-indexer_install-yum-error() {
     load-indexer_install
     sys_type="yum"
     sep="-"
-    wazuh_version="1.13.2"
+    wazuh_version="4.6.0"
     wazuh_revision="1"
     @mockfalse yum install wazuh-indexer-1.13.2-1 -y 
     indexer_install
@@ -73,7 +73,7 @@ test-05-indexer_install-apt() {
     load-indexer_install
     sys_type="apt-get"
     sep="="
-    wazuh_version="1.13.2"
+    wazuh_version="4.6.0"
     wazuh_revision="1"
     indexer_install
 }
@@ -87,7 +87,7 @@ test-ASSERT-FAIL-06-indexer_install-apt-error() {
     load-indexer_install
     sys_type="apt-get"
     sep="="
-    wazuh_version="1.13.2"
+    wazuh_version="4.6.0"
     wazuh_revision="1"
     @mockfalse apt install wazuh-indexer=1.13.2-1 -y
     indexer_install