Merge branch '4.9.0' into merge-4.9.0-into-master

wazuh · Jun 12, 2024 · 284642d · 284642d
2 parents 3b248ba + e2b69f1
commit 284642d
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 46 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,10 +8,6 @@ All notable changes to this project will be documented in this file.
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.9.0
 
-## [4.8.2]
-
-- https://github.com/wazuh/wazuh-packages/releases/tag/v4.8.2
-
 ## [4.8.1]
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.8.1

diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec
@@ -295,7 +295,9 @@ rm -fr %{buildroot}
 - More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
 * Wed Jul 10 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Wed Jun 05 2024 support <[email protected]> - 4.8.0
+* Wed Jun 26 2024 support <[email protected]> - 4.8.1
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
+* Wed Jun 12 2024 support <[email protected]> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
 * Thu May 30 2024 support <[email protected]> - 4.7.5
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html

diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog
@@ -10,23 +10,17 @@ wazuh-agent (4.9.0-RELEASE) stable; urgency=low
 
  -- Wazuh, Inc <[email protected]>  Wed, 10 Jul 2024 00:00:00 +0000
 
-wazuh-agent (4.8.2-RELEASE) stable; urgency=low
-
-  * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html
-
- -- Wazuh, Inc <[email protected]>  Tue, 26 Mar 2024 00:00:00 +0000
-
 wazuh-agent (4.8.1-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
 
- -- Wazuh, Inc <[email protected]>  Wed, 28 Feb 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 26 Jun 2024 00:00:00 +0000
 
 wazuh-agent (4.8.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
 
- -- Wazuh, Inc <[email protected]>  Wed, 05 Jun 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 12 Jun 2024 00:00:00 +0000
 
 wazuh-agent (4.7.5-RELEASE) stable; urgency=low
 

diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog
@@ -10,23 +10,17 @@ wazuh-manager (4.9.0-RELEASE) stable; urgency=low
 
  -- Wazuh, Inc <[email protected]>  Wed, 10 Jul 2024 00:00:00 +0000
 
-wazuh-manager (4.8.2-RELEASE) stable; urgency=low
-
-  * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html
-
- -- Wazuh, Inc <[email protected]>  Tue, 26 Mar 2024 00:00:00 +0000
-
 wazuh-manager (4.8.1-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
 
- -- Wazuh, Inc <[email protected]>  Wed, 28 Feb 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 26 Jun 2024 00:00:00 +0000
 
 wazuh-manager (4.8.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
 
- -- Wazuh, Inc <[email protected]>  Wed, 05 Jun 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 12 Jun 2024 00:00:00 +0000
 
 wazuh-manager (4.7.5-RELEASE) stable; urgency=low
 

diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec
@@ -644,7 +644,9 @@ rm -fr %{buildroot}
 - More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
 * Wed Jul 10 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Wed Jun 05 2024 support <[email protected]> - 4.8.0
+* Wed Jun 26 2024 support <[email protected]> - 4.8.1
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
+* Wed Jun 12 2024 support <[email protected]> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
 * Thu May 30 2024 support <[email protected]> - 4.7.5
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html

diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec
@@ -891,7 +891,9 @@ rm -fr %{buildroot}
 - More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
 * Wed Jul 10 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Wed Jun 05 2024 support <[email protected]> - 4.8.0
+* Wed Jun 26 2024 support <[email protected]> - 4.8.1
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
+* Wed Jun 12 2024 support <[email protected]> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
 * Thu May 30 2024 support <[email protected]> - 4.7.5
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html

diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog
@@ -10,23 +10,17 @@ wazuh-dashboard (4.9.0-RELEASE) stable; urgency=low
 
  -- Wazuh, Inc <[email protected]>  Wed, 10 Jul 2024 00:00:00 +0000
 
-wazuh-dashboard (4.8.2-RELEASE) stable; urgency=low
-
-  * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html
-
- -- Wazuh, Inc <[email protected]>  Tue, 26 Mar 2024 00:00:00 +0000
-
 wazuh-dashboard (4.8.1-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
 
- -- Wazuh, Inc <[email protected]>  Wed, 28 Feb 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 26 Jun 2024 00:00:00 +0000
 
 wazuh-dashboard (4.8.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
 
- -- Wazuh, Inc <[email protected]>  Wed, 05 Jun 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 12 Jun 2024 00:00:00 +0000
 
 wazuh-dashboard (4.7.5-RELEASE) stable; urgency=low
 

diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec
@@ -350,7 +350,9 @@ rm -fr %{buildroot}
 - More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
 * Wed Jul 10 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Wed Jun 05 2024 support <[email protected]> - 4.8.0
+* Wed Jun 26 2024 support <[email protected]> - 4.8.1
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
+* Wed Jun 12 2024 support <[email protected]> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
 * Thu May 30 2024 support <[email protected]> - 4.7.5
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html

diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog
@@ -10,23 +10,17 @@ wazuh-indexer (4.9.0-RELEASE) stable; urgency=low
 
  -- Wazuh, Inc <[email protected]>  Wed, 10 Jul 2024 00:00:00 +0000
 
-wazuh-indexer (4.8.2-RELEASE) stable; urgency=low
-
-  * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html
-
- -- Wazuh, Inc <[email protected]>  Tue, 26 Mar 2024 00:00:00 +0000
-
 wazuh-indexer (4.8.1-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
 
- -- Wazuh, Inc <[email protected]>  Wed, 28 Feb 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 26 Jun 2024 00:00:00 +0000
 
 wazuh-indexer (4.8.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
 
- -- Wazuh, Inc <[email protected]>  Wed, 05 Jun 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 12 Jun 2024 00:00:00 +0000
 
 wazuh-indexer (4.7.5-RELEASE) stable; urgency=low
 

diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec
@@ -685,7 +685,9 @@ rm -fr %{buildroot}
 - More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
 * Wed Jul 10 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Wed Jun 05 2024 support <[email protected]> - 4.8.0
+* Wed Jun 26 2024 support <[email protected]> - 4.8.1
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
+* Wed Jun 12 2024 support <[email protected]> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
 * Thu May 30 2024 support <[email protected]> - 4.7.5
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html

diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh
@@ -240,9 +240,9 @@ function check_dist() {
         fi
     fi
 
-    if [ -n "${notsupported}" ] && [ -z "${ignore}" ]; then
-        common_logger -e "The recommended systems are: Red Hat Enterprise Linux 7, 8, 9; CentOS 7, 8; Amazon Linux 2; Ubuntu 16.04, 18.04, 20.04, 22.04. The current system does not match this list. Use -i|--ignore-check to skip this check."
-        exit 1
+    if [ -n "${notsupported}" ]; then
+        common_logger "The recommended systems are: Red Hat Enterprise Linux 7, 8, 9; CentOS 7, 8; Amazon Linux 2; Ubuntu 16.04, 18.04, 20.04, 22.04."
+        common_logger -w "The current system does not match with the list of recommended systems. The installation may not work properly."
     fi
     common_logger -d "Detected distribution name: ${DIST_NAME}"
     common_logger -d "Detected distribution version: ${DIST_VER}"

diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh
@@ -35,7 +35,7 @@ function getHelp() {
     echo -e "                Display this help and exit."
     echo -e ""
     echo -e "        -i,  --ignore-check"
-    echo -e "                Ignore the check for system compatibility and minimum hardware requirements."
+    echo -e "                Ignore the check for minimum hardware requirements."
     echo -e ""
     echo -e "        -o,  --overwrite"
     echo -e "                Overwrites previously installed components. This will erase all the existing configuration and data."
@@ -243,7 +243,7 @@ function main() {
 
     checks_arch
     if [ -n "${ignore}" ]; then
-        common_logger -w "Hardware and system checks ignored."
+        common_logger -w "Hardware checks ignored."
     else
         common_logger "Verifying that your system meets the recommended minimum hardware requirements."
         checks_health