Merge 4.9.1 into 4.10.0 (#306)

Signed-off-by: JuanGarriuz <[email protected]> Co-authored-by: Federico Rodriguez <[email protected]> Co-authored-by: Antonio <[email protected]> Co-authored-by: Nicolas Agustin Guevara Pihen <[email protected]> Co-authored-by: JuanGarriuz <[email protected]> Co-authored-by: Raul Del Pozo Moreno <[email protected]>
wazuh · Oct 28, 2024 · 6b35cfb · 6b35cfb
1 parent d223035
commit 6b35cfb
Show file tree

Hide file tree

Showing 23 changed files with 196 additions and 159 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,7 @@ All notable changes to the Wazuh app project will be documented in this file.
 
 - Removed the setting home:useNewHomePage from the advanced settings because the views are not finished. [#282](https://github.com/wazuh/wazuh-dashboard/pull/282)
 
-## Wazuh dashboard v4.9.0 - OpenSearch Dashboards 2.13.0 - Revision 06
+## Wazuh dashboard v4.9.0 - OpenSearch Dashboards 2.13.0 - Revision 07
 
 ### Changed
 

diff --git a/config/opensearch_dashboards.prod.yml b/config/opensearch_dashboards.prod.yml
@@ -2,6 +2,8 @@ server.host: 0.0.0.0
 server.port: 443
 opensearch.hosts: https://localhost:9200
 opensearch.ssl.verificationMode: certificate
+#opensearch.username:
+#opensearch.password:
 opensearch.requestHeadersAllowlist: ["securitytenant","Authorization"]
 opensearch_security.multitenancy.enabled: false
 opensearch_security.readonly_mode.roles: ["kibana_read_only"]

diff --git a/dev-tools/build-packages/config/default b/dev-tools/build-packages/config/default
@@ -5,3 +5,4 @@ chdir="/"
 nice=""
 KILL_ON_STOP_TIMEOUT=0
 
+OSD_PATH_CONF="/etc/wazuh-dashboard"
diff --git a/dev-tools/build-packages/config/wazuh-dashboard.service b/dev-tools/build-packages/config/wazuh-dashboard.service
@@ -7,7 +7,7 @@ User=wazuh-dashboard
 Group=wazuh-dashboard
 EnvironmentFile=-/etc/default/wazuh-dashboard
 EnvironmentFile=-/etc/sysconfig/wazuh-dashboard
-ExecStart=/usr/share/wazuh-dashboard/bin/opensearch-dashboards -c "/etc/wazuh-dashboard/opensearch_dashboards.yml"
+ExecStart=/usr/share/wazuh-dashboard/bin/opensearch-dashboards
 WorkingDirectory=/usr/share/wazuh-dashboard
 
 [Install]

diff --git a/dev-tools/build-packages/deb/debian/rules b/dev-tools/build-packages/deb/debian/rules
@@ -58,6 +58,9 @@ override_dh_install:
 	useradd -g $(GROUP) $(USER)
 
 	tar -xf $(DASHBOARD_FILE)
+	sed -i 's/OSD_NODE_OPTS_PREFIX/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_NODE_OPTS_PREFIX/g' "wazuh-dashboard-base/bin/opensearch-dashboards"
+	sed -i 's/OSD_USE_NODE_JS_FILE_PATH/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_USE_NODE_JS_FILE_PATH/g' "wazuh-dashboard-base/bin/opensearch-dashboards-keystore"
+
 
 	mkdir -p $(TARGET_DIR)$(CONFIG_DIR)
 	mkdir -p $(TARGET_DIR)$(INSTALLATION_DIR)
@@ -95,6 +98,7 @@ override_dh_fixperms:
 	chmod 440 $(TARGET_DIR)$(INSTALLATION_DIR)/VERSION
 	chmod 750 $(TARGET_DIR)/etc/systemd/system/wazuh-dashboard
 	chmod 750 $(TARGET_DIR)/etc/default/wazuh-dashboard
+	chmod 640 "$(TARGET_DIR)$(CONFIG_DIR)"/opensearch_dashboards.yml
 	chmod 640 "$(TARGET_DIR)$(CONFIG_DIR)"/node.options
 	chmod 640 $(TARGET_DIR)/etc/systemd/system/wazuh-dashboard.service
 	find "$(TARGET_DIR)$(INSTALLATION_DIR)" -type d -exec chmod 750 {} \;

diff --git a/dev-tools/build-packages/rpm/wazuh-dashboard.spec b/dev-tools/build-packages/rpm/wazuh-dashboard.spec
@@ -54,6 +54,9 @@ useradd -g %{GROUP} %{USER}
 %build
 
 tar -xf %{DASHBOARD_FILE}
+sed -i 's/OSD_NODE_OPTS_PREFIX/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_NODE_OPTS_PREFIX/g' "wazuh-dashboard-base/bin/opensearch-dashboards"
+sed -i 's/OSD_USE_NODE_JS_FILE_PATH/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_USE_NODE_JS_FILE_PATH/g' "wazuh-dashboard-base/bin/opensearch-dashboards-keystore"
+
 
 # -----------------------------------------------------------------------------
 

diff --git a/src/core/common/logos/__snapshots__/get_logos.test.ts.snap b/src/core/common/logos/__snapshots__/get_logos.test.ts.snap
diff --git a/src/core/common/logos/get_logos.ts b/src/core/common/logos/get_logos.ts
@@ -22,8 +22,8 @@ export const CENTER_MARK_THEMED = 'ui/logos/wazuh_center_mark.svg';
 export const CENTER_MARK_ON_LIGHT = 'ui/logos/wazuh_center_mark_on_light.svg';
 export const CENTER_MARK_ON_DARK = 'ui/logos/wazuh_center_mark_on_dark.svg';
 export const ANIMATED_MARK_THEMED = 'ui/logos/spinner.svg';
-export const ANIMATED_MARK_ON_LIGHT = 'ui/logos/spinner_on_light.gif';
-export const ANIMATED_MARK_ON_DARK = 'ui/logos/spinner_on_dark.gif';
+export const ANIMATED_MARK_ON_LIGHT = 'ui/logos/spinner_on_light.svg';
+export const ANIMATED_MARK_ON_DARK = 'ui/logos/spinner_on_dark.svg';
 
 interface AssetOption {
   url?: string;

diff --git a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,4 @@ chdir="/"
		nice=""
		KILL_ON_STOP_TIMEOUT=0

		OSD_PATH_CONF="/etc/wazuh-dashboard"