Merge pull request #2679 from wazuh/Merge-4.8.0-into-4.8.1

Merge 4.8.0 into 4.8.1
wazuh · Dec 12, 2023 · ff63cc3 · ff63cc3
2 parents 08f6704 + e975666
commit ff63cc3
Show file tree

Hide file tree

Showing 44 changed files with 360 additions and 190 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,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.2]
+
+- https://github.com/wazuh/wazuh-packages/releases/tag/v4.7.2
+
 ## [4.7.1]
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.7.1

diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec
@@ -290,10 +290,12 @@ rm -fr %{buildroot}
 %attr(750, root, wazuh) %{_localstatedir}/wodles/*
 
 %changelog
-* Tue Jan 30 2024 support <[email protected]> - 4.8.1
+* Tue Feb 13 2024 support <[email protected]> - 4.8.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
-* Fri Dec 15 2023 support <[email protected]> - 4.8.0
+* Wed Jan 31 2024 support <[email protected]> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
+* Sun Dec 17 2023 support <[email protected]> - 4.7.2
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
 * Tue Dec 05 2023 support <[email protected]> - 4.7.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html
 * Tue Nov 21 2023 support <[email protected]> - 4.7.0

diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog
@@ -2,13 +2,20 @@ 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]>  Tue, 30 Jan 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Tue, 13 Feb 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]>  Fri, 15 Dec 2023 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 31 Jan 2024 00:00:00 +0000
+
+wazuh-agent (4.7.2-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
+
+ -- Wazuh, Inc <[email protected]>  Sun, 17 Dec 2023 00:00:00 +0000
+
 wazuh-agent (4.7.1-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html

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, 30 Jan 2024 00:00:00 +0000
+    Wazuh, Inc <[email protected]> on Tue, 13 Feb 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,20 @@ 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]>  Tue, 30 Jan 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Tue, 13 Feb 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]>  Fri, 15 Dec 2023 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 31 Jan 2024 00:00:00 +0000
+
+wazuh-manager (4.7.2-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
+
+ -- Wazuh, Inc <[email protected]>  Sun, 17 Dec 2023 00:00:00 +0000
+
 wazuh-manager (4.7.1-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html

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, 30 Jan 2024 00:00:00 +0000
+    Wazuh, Inc <[email protected]> on Tue, 13 Feb 2024 00:00:00 +0000
 
 It was downloaded from:
 

diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec
@@ -625,10 +625,12 @@ rm -fr %{buildroot}
 %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/*
 
 %changelog
-* Tue Jan 30 2024 support <[email protected]> - 4.8.1
+* Tue Feb 13 2024 support <[email protected]> - 4.8.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
-* Fri Dec 15 2023 support <[email protected]> - 4.8.0
+* Wed Jan 31 2024 support <[email protected]> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
+* Sun Dec 17 2023 support <[email protected]> - 4.7.2
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
 * Tue Dec 05 2023 support <[email protected]> - 4.7.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html
 * Tue Nov 21 2023 support <[email protected]> - 4.7.0

diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec
@@ -853,10 +853,12 @@ rm -fr %{buildroot}
 %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/*
 
 %changelog
-* Tue Jan 30 2024 support <[email protected]> - 4.8.1
+* Tue Feb 13 2024 support <[email protected]> - 4.8.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
-* Fri Dec 15 2023 support <[email protected]> - 4.8.0
+* Wed Jan 31 2024 support <[email protected]> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
+* Sun Dec 17 2023 support <[email protected]> - 4.7.2
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
 * Tue Dec 05 2023 support <[email protected]> - 4.7.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html
 * Tue Nov 21 2023 support <[email protected]> - 4.7.0

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="30Jan2024"
+PSTAMP="13Feb2024"
 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
@@ -96,10 +96,8 @@ sed -i 's/exec "${NODE}"/NODE_ENV=production exec "${NODE}" ${NODE_OPTIONS} /g'
 cp ./etc/custom_welcome/template.js.hbs ./src/legacy/ui/ui_render/bootstrap/template.js.hbs
 cp ./etc/custom_welcome/light_theme.style.css ./src/core/server/core_app/assets/legacy_light_theme.css
 # SVG
-cp ./etc/custom_welcome/*svg ./src/core/server/core_app/assets/logos/
+cp ./etc/custom_welcome/Assets/default_branding/*svg ./src/core/server/core_app/assets/logos/
 # Copy Home button
-cp ./etc/custom_welcome/Assets/default_branding/home.svg ./src/core/server/core_app/assets/logos/
-cp ./etc/custom_welcome/Assets/default_branding/home_dark_mode.svg ./src/core/server/core_app/assets/logos/
 # Copy favicons
 cp ./etc/custom_welcome/Assets/Favicons/* ./src/core/server/core_app/assets/favicons/
 cp ./etc/custom_welcome/Assets/Favicons/favicon.ico ./src/core/server/core_app/assets/favicons/favicon.ico
@@ -116,11 +114,6 @@ cp ./etc/styles.js ./src/core/server/rendering/views/styles.js
 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
 
-## Remove OpenSearch from the upper bar with empty svg
-cp ./etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg ./src/core/server/core_app/assets/logos/opensearch_dashboards.svg
-cp ./etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg ./src/core/server/core_app/assets/logos/opensearch_dashboards_on_light.svg
-cp ./etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg ./src/core/server/core_app/assets/logos/opensearch_dashboards_on_dark.svg
-
 # Remove the `home` button from the sidebar menu
 sed -i 's|\["EuiHorizontalRule"\],{margin:"none"})),external_osdSharedDeps_React_default.a.createElement(external_osdSharedDeps_ElasticEui_\["EuiFlexItem"\],{grow:false,style:{flexShrink:0}},external_osdSharedDeps_React_default.a.createElement(external_osdSharedDeps_ElasticEui_\["EuiCollapsibleNavGroup"\]|["EuiHorizontalRule"],{margin:"none"})),false\&\&external_osdSharedDeps_React_default.a.createElem(external_osdSharedDeps_ElasticEui_["EuiFlexItem"],{grow:false,style:{flexShrink:0}},external_osdSharedDeps_React_default.a.createElement(external_osdSharedDeps_ElasticEui_["EuiCollapsibleNavGroup"]|' ./src/core/target/public/core.entry.js
 
@@ -158,24 +151,11 @@ sed -i 's|https://survey.opensearch.org|https://wazuh.com/community/join-us-on-s
 sed -i 's|GITHUB_CREATE_ISSUE_LINK="https://github.com/opensearch-project/OpenSearch-Dashboards/issues/new/choose"|GITHUB_CREATE_ISSUE_LINK="https://github.com/wazuh/wazuh/issues/new/choose"|' ./src/core/target/public/core.entry.js
 
 # Custom logos
-## Custom logos - Home button logo
-sed -i 's|MARK_THEMED="ui/logos/opensearch_mark.svg"|MARK_THEMED="ui/logos/home.svg"|g' ./src/core/target/public/core.entry.js
-sed -i 's|MARK_ON_LIGHT="ui/logos/opensearch_mark_on_light.svg"|MARK_ON_LIGHT="ui/logos/home.svg"|g' ./src/core/target/public/core.entry.js
-sed -i 's|MARK_ON_DARK="ui/logos/opensearch_mark_on_dark.svg"|MARK_ON_DARK="ui/logos/home_dark_mode.svg"|g' ./src/core/target/public/core.entry.js
-sed -i 's|MARK_THEMED="ui/logos/opensearch_mark.svg"|MARK_THEMED="ui/logos/home.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js
-sed -i 's|MARK_ON_LIGHT="ui/logos/opensearch_mark_on_light.svg"|MARK_ON_LIGHT="ui/logos/home.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js
-sed -i 's|MARK_ON_DARK="ui/logos/opensearch_mark_on_dark.svg"|MARK_ON_DARK="ui/logos/home_dark_mode.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js
 ## Custom logos - Login logo
-sed -i 's|OPENSEARCH_ON_LIGHT="ui/logos/opensearch_on_light.svg"|OPENSEARCH_ON_LIGHT="ui/logos/Wazuh-Logo.svg"|g' ./plugins/alertingDashboards/target/public/alertingDashboards.plugin.js
-sed -i 's|OPENSEARCH_ON_DARK="ui/logos/opensearch_on_dark.svg"|OPENSEARCH_ON_DARK="ui/logos/Wazuh-Logo.svg"|g' ./plugins/alertingDashboards/target/public/alertingDashboards.plugin.js
-sed -i 's|OPENSEARCH_ON_LIGHT="ui/logos/opensearch_on_light.svg"|OPENSEARCH_ON_LIGHT="ui/logos/Wazuh-Logo.svg"|g' ./plugins/indexManagementDashboards/target/public/indexManagementDashboards.plugin.js
-sed -i 's|OPENSEARCH_ON_DARK="ui/logos/opensearch_on_dark.svg"|OPENSEARCH_ON_DARK="ui/logos/Wazuh-Logo.svg"|g' ./plugins/indexManagementDashboards/target/public/indexManagementDashboards.plugin.js
-sed -i 's|OPENSEARCH_ON_LIGHT="ui/logos/opensearch_on_light.svg"|OPENSEARCH_ON_LIGHT="ui/logos/Wazuh-Logo.svg"|g' ./plugins/notificationsDashboards/target/public/notificationsDashboards.plugin.js
-sed -i 's|OPENSEARCH_ON_DARK="ui/logos/opensearch_on_dark.svg"|OPENSEARCH_ON_DARK="ui/logos/Wazuh-Logo.svg"|g' ./plugins/notificationsDashboards/target/public/notificationsDashboards.plugin.js
-sed -i 's|OPENSEARCH_ON_LIGHT="ui/logos/opensearch_on_light.svg"|OPENSEARCH_ON_LIGHT="ui/logos/Wazuh-Logo.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js
-sed -i 's|OPENSEARCH_ON_DARK="ui/logos/opensearch_on_dark.svg"|OPENSEARCH_ON_DARK="ui/logos/Wazuh-Logo.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js
-sed -i 's|OPENSEARCH_ON_LIGHT="ui/logos/opensearch_on_light.svg"|OPENSEARCH_ON_LIGHT="ui/logos/Wazuh-Logo.svg"|g' ./src/core/target/public/core.entry.js
-sed -i 's|OPENSEARCH_ON_DARK="ui/logos/opensearch_on_dark.svg"|OPENSEARCH_ON_DARK="ui/logos/Wazuh-Logo.svg"|g' ./src/core/target/public/core.entry.js
+sed -i 's|props.chrome.logos.OpenSearch.url|props.http.basePath.prepend("/ui/logos/wazuh_dashboard_login_mark.svg")|g' ./plugins/securityDashboards/target/public/securityDashboards.chunk.5.js
+
+# Collapse initially the application categories in the side menu
+sed -i 's|_storage\$getItem!==void 0?_storage\$getItem:"true"|_storage\$getItem!==void 0?_storage\$getItem:"false"|' ./src/core/target/public/core.entry.js
 
 # Redirections
 ## Redirections - Replace the redirections to the home app

diff --git a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/home.svg b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/home.svg
diff --git a/...hboard/base/files/etc/custom_welcome/Assets/default_branding/home_dark_mode.svg b/...hboard/base/files/etc/custom_welcome/Assets/default_branding/home_dark_mode.svg
diff --git a/...board/base/files/etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg b/...board/base/files/etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg
diff --git a/...ault_branding/wazuh_mark_default_mode.svg → ...me/Assets/default_branding/opensearch.svg b/...ault_branding/wazuh_mark_default_mode.svg → ...me/Assets/default_branding/opensearch.svg
diff --git a/...ase/files/etc/custom_welcome/Assets/default_branding/opensearch_center_mark.svg b/...ase/files/etc/custom_welcome/Assets/default_branding/opensearch_center_mark.svg
diff --git a/...default_branding/wazuh_mark_dark_mode.svg → ..._branding/opensearch_center_mark_dark.svg b/...default_branding/wazuh_mark_dark_mode.svg → ..._branding/opensearch_center_mark_dark.svg
diff --git a/...es/etc/custom_welcome/Assets/default_branding/opensearch_dashboards_on_dark.svg b/...es/etc/custom_welcome/Assets/default_branding/opensearch_dashboards_on_dark.svg
diff --git a/...s/etc/custom_welcome/Assets/default_branding/opensearch_dashboards_on_light.svg b/...s/etc/custom_welcome/Assets/default_branding/opensearch_dashboards_on_light.svg
diff --git a/...board/base/files/etc/custom_welcome/Assets/default_branding/opensearch_mark.svg b/...board/base/files/etc/custom_welcome/Assets/default_branding/opensearch_mark.svg
diff --git a/...se/files/etc/custom_welcome/Assets/default_branding/opensearch_mark_on_dark.svg b/...se/files/etc/custom_welcome/Assets/default_branding/opensearch_mark_on_dark.svg
diff --git a/...e/files/etc/custom_welcome/Assets/default_branding/opensearch_mark_on_light.svg b/...e/files/etc/custom_welcome/Assets/default_branding/opensearch_mark_on_light.svg
diff --git a/...rd/base/files/etc/custom_welcome/Assets/default_branding/opensearch_on_dark.svg b/...rd/base/files/etc/custom_welcome/Assets/default_branding/opensearch_on_dark.svg