Merge pull request #2979 from wazuh/merge-4.9.0-into-master

Merge 4.9.0 into master
wazuh · May 31, 2024 · 6f5758e · 6f5758e
2 parents e33bba5 + e6e6ff9
commit 6f5758e
Show file tree

Hide file tree

Showing 19 changed files with 186 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,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,12 +291,14 @@ rm -fr %{buildroot}
 %attr(750, root, wazuh) %{_localstatedir}/wodles/*
 
 %changelog
-* Tue Oct 01 2024 support <[email protected]> - 5.0.0
+* Thu Dec 12 2024 support <[email protected]> - 5.0.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
-* 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,13 +2,13 @@ wazuh-agent (5.0.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
 
- -- Wazuh, Inc <[email protected]>  Tue, 01 Oct 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Thu, 12 Dec 2024 00:00:00 +0000
 
 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
 
@@ -26,7 +26,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, 01 Oct 2024 00:00:00 +0000
+    Wazuh, Inc <[email protected]> on Thu, 12 Dec 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,13 +2,13 @@ wazuh-manager (5.0.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
 
- -- Wazuh, Inc <[email protected]>  Tue, 01 Oct 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Thu, 12 Dec 2024 00:00:00 +0000
 
 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
 
@@ -26,7 +26,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, 01 Oct 2024 00:00:00 +0000
+    Wazuh, Inc <[email protected]> on Thu, 12 Dec 2024 00:00:00 +0000
 
 It was downloaded from:
 

diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec
@@ -640,12 +640,14 @@ rm -fr %{buildroot}
 %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/*
 
 %changelog
-* Tue Oct 01 2024 support <[email protected]> - 5.0.0
+* Thu Dec 12 2024 support <[email protected]> - 5.0.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
-* 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
@@ -625,7 +625,7 @@ rm -fr %{buildroot}
 %dir %attr(770, root, wazuh) %{_localstatedir}/api/configuration/security
 %dir %attr(770, root, wazuh) %{_localstatedir}/api/configuration/ssl
 %dir %attr(750, root, wazuh) %{_localstatedir}/api/scripts
-%attr(640, root, wazuh) %{_localstatedir}/api/scripts/wazuh-apid.py
+%attr(640, root, wazuh) %{_localstatedir}/api/scripts/*.py
 %dir %attr(750, root, wazuh) %{_localstatedir}/backup
 %dir %attr(750, wazuh, wazuh) %{_localstatedir}/backup/db
 %dir %attr(750, wazuh, wazuh) %{_localstatedir}/backup/agents
@@ -887,12 +887,14 @@ rm -fr %{buildroot}
 %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/*
 
 %changelog
-* Tue Oct 01 2024 support <[email protected]> - 5.0.0
+* Thu Dec 12 2024 support <[email protected]> - 5.0.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
-* 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="01Oct2024"
+PSTAMP="12Dec2024"
 EMAIL="[email protected]"
 ISTATES="S s 1 2 3"
 RSTATES="S s 1 2 3"

diff --git a/solaris/solaris11/SPECS/template_agent.json b/solaris/solaris11/SPECS/template_agent.json
@@ -2047,7 +2047,79 @@
         "type": "file",
         "user": "root"
     },
-    "/var/ossec/wodles/azure/orm.py": {
+    "/var/ossec/wodles/azure/azure_utils.py": {
+        "class": "static",
+        "group": "wazuh",
+        "mode": "0750",
+        "prot": "-rwxr-x---",
+        "type": "file",
+        "user": "root"
+    },
+    "/var/ossec/wodles/azure/azure_services": {
+        "class": "static",
+        "group": "wazuh",
+        "mode": "0750",
+        "prot": "drwxr-x---",
+        "type": "directory",
+        "user": "root"
+    },
+    "/var/ossec/wodles/azure/azure_services/__init__.py": {
+        "class": "static",
+        "group": "wazuh",
+        "mode": "0750",
+        "prot": "-rwxr-x---",
+        "type": "file",
+        "user": "root"
+    },
+    "/var/ossec/wodles/azure/azure_services/analytics.py": {
+        "class": "static",
+        "group": "wazuh",
+        "mode": "0750",
+        "prot": "-rwxr-x---",
+        "type": "file",
+        "user": "root"
+    },
+    "/var/ossec/wodles/azure/azure_services/graph.py": {
+        "class": "static",
+        "group": "wazuh",
+        "mode": "0750",
+        "prot": "-rwxr-x---",
+        "type": "file",
+        "user": "root"
+    },
+    "/var/ossec/wodles/azure/azure_services/storage.py": {
+        "class": "static",
+        "group": "wazuh",
+        "mode": "0750",
+        "prot": "-rwxr-x---",
+        "type": "file",
+        "user": "root"
+    },
+    "/var/ossec/wodles/azure/db": {
+        "class": "static",
+        "group": "wazuh",
+        "mode": "0750",
+        "prot": "drwxr-x---",
+        "type": "directory",
+        "user": "root"
+    },
+    "/var/ossec/wodles/azure/db/__init__.py": {
+        "class": "static",
+        "group": "wazuh",
+        "mode": "0750",
+        "prot": "-rwxr-x---",
+        "type": "file",
+        "user": "root"
+    },
+    "/var/ossec/wodles/azure/db/orm.py": {
+        "class": "static",
+        "group": "wazuh",
+        "mode": "0750",
+        "prot": "-rwxr-x---",
+        "type": "file",
+        "user": "root"
+    },
+    "/var/ossec/wodles/azure/db/utils.py": {
         "class": "static",
         "group": "wazuh",
         "mode": "0750",

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,13 +2,13 @@ wazuh-dashboard (5.0.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
 
- -- Wazuh, Inc <[email protected]>  Tue, 01 Oct 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Thu, 12 Dec 2024 00:00:00 +0000
 
 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
 
@@ -26,7 +26,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, 01 Oct 2024 00:00:00 +0000
+    Wazuh, Inc <[email protected]> on Thu, 12 Dec 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,12 +346,14 @@ rm -fr %{buildroot}
 %config(noreplace) %attr(640, %{USER}, %{GROUP}) "%{CONFIG_DIR}/opensearch_dashboards.yml"
 
 %changelog
-* Tue Oct 01 2024 support <[email protected]> - 5.0.0
+* Thu Dec 12 2024 support <[email protected]> - 5.0.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
-* 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,13 +2,13 @@ wazuh-indexer (5.0.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
 
- -- Wazuh, Inc <[email protected]>  Tue, 01 Oct 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Thu, 12 Dec 2024 00:00:00 +0000
 
 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
 
@@ -26,7 +26,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, 01 Oct 2024 00:00:00 +0000
+    Wazuh, Inc <[email protected]> on Thu, 12 Dec 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,12 +681,14 @@ rm -fr %{buildroot}
 
 
 %changelog
-* Tue Oct 01 2024 support <[email protected]> - 5.0.0
+* Thu Dec 12 2024 support <[email protected]> - 5.0.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
-* 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