Merge pull request #2978 from wazuh/merge-4.8.0-into-4.9.0

Merge 4.8.0 into 4.9.0
wazuh · May 31, 2024 · 8bc24e1 · 8bc24e1
2 parents a12639a + 3ceb63a
commit 8bc24e1
Show file tree

Hide file tree

Showing 18 changed files with 89 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,10 @@ All notable changes to this project will be documented in this file.
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.8.0
 
+## [4.7.5]
+
+- https://github.com/wazuh/wazuh-packages/releases/tag/v4.7.5
+
 ## [4.7.4]
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.7.4

diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec
@@ -291,10 +291,12 @@ rm -fr %{buildroot}
 %attr(750, root, wazuh) %{_localstatedir}/wodles/*
 
 %changelog
-* Tue May 14 2024 support <[email protected]> - 4.9.0
+* Wed Jul 10 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Thu May 09 2024 support <[email protected]> - 4.8.0
+* Wed Jun 05 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
 * Thu Apr 25 2024 support <[email protected]> - 4.7.4
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
 * Tue Feb 27 2024 support <[email protected]> - 4.7.3

diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog
@@ -2,7 +2,7 @@ wazuh-agent (4.9.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
 
- -- Wazuh, Inc <[email protected]>  Tue, 14 May 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 10 Jul 2024 00:00:00 +0000
 
 wazuh-agent (4.8.2-RELEASE) stable; urgency=low
 
@@ -20,7 +20,13 @@ 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]>  Thu, 09 May 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 05 Jun 2024 00:00:00 +0000
+
+wazuh-agent (4.7.5-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
+
+ -- Wazuh, Inc <[email protected]>  Thu, 30 May 2024 00:00:00 +0000
 
 wazuh-agent (4.7.4-RELEASE) stable; urgency=low
 

diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright
@@ -1,6 +1,6 @@
 This work was packaged for Debian by:
 
-    Wazuh, Inc <[email protected]> on Tue, 14 May 2024 00:00:00 +0000
+    Wazuh, Inc <[email protected]> on Wed, 10 Jul 2024 00:00:00 +0000
 
 It was downloaded from:
 

diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog
@@ -2,7 +2,7 @@ wazuh-manager (4.9.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
 
- -- Wazuh, Inc <[email protected]>  Tue, 14 May 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 10 Jul 2024 00:00:00 +0000
 
 wazuh-manager (4.8.2-RELEASE) stable; urgency=low
 
@@ -20,7 +20,13 @@ 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]>  Thu, 09 May 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 05 Jun 2024 00:00:00 +0000
+
+wazuh-manager (4.7.5-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
+
+ -- Wazuh, Inc <[email protected]>  Thu, 30 May 2024 00:00:00 +0000
 
 wazuh-manager (4.7.4-RELEASE) stable; urgency=low
 

diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright
@@ -1,6 +1,6 @@
 This work was packaged for Debian by:
 
-    Wazuh, Inc <[email protected]> on Tue, 14 May 2024 00:00:00 +0000
+    Wazuh, Inc <[email protected]> on Wed, 10 Jul 2024 00:00:00 +0000
 
 It was downloaded from:
 

diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec
@@ -640,10 +640,12 @@ rm -fr %{buildroot}
 %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/*
 
 %changelog
-* Tue May 14 2024 support <[email protected]> - 4.9.0
+* Wed Jul 10 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Thu May 09 2024 support <[email protected]> - 4.8.0
+* Wed Jun 05 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
 * Thu Apr 25 2024 support <[email protected]> - 4.7.4
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
 * Tue Feb 27 2024 support <[email protected]> - 4.7.3

diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec
@@ -887,10 +887,12 @@ rm -fr %{buildroot}
 %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/*
 
 %changelog
-* Tue May 14 2024 support <[email protected]> - 4.9.0
+* Wed Jul 10 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Thu May 09 2024 support <[email protected]> - 4.8.0
+* Wed Jun 05 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
 * Thu Apr 25 2024 support <[email protected]> - 4.7.4
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
 * Tue Feb 27 2024 support <[email protected]> - 4.7.3

diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo
@@ -5,7 +5,7 @@ ARCH="i386"
 CLASSES="none"
 CATEGORY="system"
 VENDOR="Wazuh, Inc <[email protected]>"
-PSTAMP="14May2024"
+PSTAMP="10Jul2024"
 EMAIL="[email protected]"
 ISTATES="S s 1 2 3"
 RSTATES="S s 1 2 3"

diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh
@@ -110,6 +110,11 @@ cp ./etc/styles.js ./src/core/server/rendering/views/styles.js
 # Customize OpenSearch Dashboards with Wazuh
 # -----------------------------------------------------------------------------
 
+# Set v7 theme as default
+sed -i "s|value: 'Next (preview)',|value: 'v7',|g" ./src/core/server/ui_settings/settings/theme.js
+sed -i "s|defaultValue: 'v8'|defaultValue: 'v7'|g" ./src/core/server/ui_settings/ui_settings_config.js
+
+
 # Replace App Title
 sed -i "s|defaultValue: ''|defaultValue: \'Wazuh\'|g" ./src/core/server/opensearch_dashboards_config.js
 sed -i "90s|defaultValue: true|defaultValue: false|g" ./src/core/server/opensearch_dashboards_config.js

diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog
@@ -2,7 +2,7 @@ wazuh-dashboard (4.9.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
 
- -- Wazuh, Inc <[email protected]>  Tue, 14 May 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 10 Jul 2024 00:00:00 +0000
 
 wazuh-dashboard (4.8.2-RELEASE) stable; urgency=low
 
@@ -20,7 +20,13 @@ 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]>  Thu, 09 May 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 05 Jun 2024 00:00:00 +0000
+
+wazuh-dashboard (4.7.5-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
+
+ -- Wazuh, Inc <[email protected]>  Thu, 30 May 2024 00:00:00 +0000
 
 wazuh-dashboard (4.7.4-RELEASE) stable; urgency=low
 

diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright
@@ -1,6 +1,6 @@
 This work was packaged for Debian by:
 
-    Wazuh, Inc <[email protected]> on Tue, 14 May 2024 00:00:00 +0000
+    Wazuh, Inc <[email protected]> on Wed, 10 Jul 2024 00:00:00 +0000
 
 It was downloaded from:
 

diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec
@@ -108,6 +108,17 @@ find %{buildroot}%{INSTALL_DIR}/plugins/wazuh/ -type f -perm 755 -exec chmod 750
 find %{buildroot}%{INSTALL_DIR}/plugins/wazuh/ -type d -exec chmod 750 {} \;
 find %{buildroot}%{INSTALL_DIR}/plugins/wazuh/ -type f -perm 744 -exec chmod 740 {} \;
 
+find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -exec chown %{USER}:%{GROUP} {} \;
+find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -type f -perm 644 -exec chmod 640 {} \;
+find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -type f -perm 755 -exec chmod 750 {} \;
+find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -type d -exec chmod 750 {} \;
+find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -type f -perm 744 -exec chmod 740 {} \;
+
+find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -exec chown %{USER}:%{GROUP} {} \;
+find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -type f -perm 644 -exec chmod 640 {} \;
+find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -type f -perm 755 -exec chmod 750 {} \;
+find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -type d -exec chmod 750 {} \;
+find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -type f -perm 744 -exec chmod 740 {} \;
 # -----------------------------------------------------------------------------
 
 %pre
@@ -335,10 +346,12 @@ rm -fr %{buildroot}
 %config(noreplace) %attr(640, %{USER}, %{GROUP}) "%{CONFIG_DIR}/opensearch_dashboards.yml"
 
 %changelog
-* Tue May 14 2024 support <[email protected]> - 4.9.0
+* Wed Jul 10 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Thu May 09 2024 support <[email protected]> - 4.8.0
+* Wed Jun 05 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
 * Thu Apr 25 2024 support <[email protected]> - 4.7.4
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
 * Tue Feb 27 2024 support <[email protected]> - 4.7.3

diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog
@@ -2,7 +2,7 @@ wazuh-indexer (4.9.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
 
- -- Wazuh, Inc <[email protected]>  Tue, 14 May 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 10 Jul 2024 00:00:00 +0000
 
 wazuh-indexer (4.8.2-RELEASE) stable; urgency=low
 
@@ -20,7 +20,13 @@ 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]>  Thu, 09 May 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 05 Jun 2024 00:00:00 +0000
+
+wazuh-indexer (4.7.5-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
+
+ -- Wazuh, Inc <[email protected]>  Thu, 30 May 2024 00:00:00 +0000
 
 wazuh-indexer (4.7.4-RELEASE) stable; urgency=low
 

diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright
@@ -1,6 +1,6 @@
 This work was packaged for Debian by:
 
-    Wazuh, Inc <[email protected]> on Tue, 14 May 2024 00:00:00 +0000
+    Wazuh, Inc <[email protected]> on Wed, 10 Jul 2024 00:00:00 +0000
 
 It was downloaded from:
 

diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec
@@ -681,10 +681,12 @@ rm -fr %{buildroot}
 
 
 %changelog
-* Tue May 14 2024 support <[email protected]> - 4.9.0
+* Wed Jul 10 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Thu May 09 2024 support <[email protected]> - 4.8.0
+* Wed Jun 05 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
 * Thu Apr 25 2024 support <[email protected]> - 4.7.4
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
 * Tue Feb 27 2024 support <[email protected]> - 4.7.3

diff --git a/tests/unattended/install/test_unattended.py b/tests/unattended/install/test_unattended.py
@@ -208,10 +208,17 @@ def test_check_wazuh_api_status():
 @pytest.mark.wazuh
 def test_check_log_errors():
     found_error = False
+    exceptions = [
+        'WARNING: Cluster error detected',
+        'agent-upgrade: ERROR: (8123): There has been an error executing the request in the tasks manager.',
+        "ERROR: Could not send message through the cluster after '10' attempts"
+
+    ]
+
     with open('/var/ossec/logs/ossec.log', 'r') as f:
         for line in f.readlines():
             if 'ERROR' in line:
-                if 'ERROR: Cluster error detected' not in line and 'agent-upgrade: ERROR: (8123): There has been an error executing the request in the tasks manager.' not in line:
+                if not any(exception in line for exception in exceptions):
                     found_error = True
                     break
     assert found_error == False, line

diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh
@@ -224,7 +224,7 @@ function check_dist() {
 
     if [ "${DIST_NAME}" == "ubuntu" ]; then
         if  [ "${DIST_VER}" == "16" ] || [ "${DIST_VER}" == "18" ] ||
-            [ "${DIST_VER}" == "20" ] || [ "${DIST_VER}" == "22" ] || 
+            [ "${DIST_VER}" == "20" ] || [ "${DIST_VER}" == "22" ] ||
             [ "${DIST_VER}" == "24" ]; then
             if [ "${DIST_SUBVER}" != "04" ]; then
                 notsupported=1
@@ -246,7 +246,7 @@ function check_dist() {
     fi
     common_logger -d "Detected distribution name: ${DIST_NAME}"
     common_logger -d "Detected distribution version: ${DIST_VER}"
-    
+
 }
 
 function checks_health() {
@@ -384,11 +384,11 @@ function checks_ports() {
     elif [ "${sys_type}" == "apt-get" ]; then
         installCommon_aptInstallList "${dep}"
     fi
-    
+
     if [ "${#not_installed[@]}" -gt 0 ]; then
             wia_dependencies_installed+=("${dep}")
     fi
-    
+
     common_logger -d "Checking ports availability."
     used_port=0
     ports=("$@")