Merge 4.9.0 into 4.9.1 (#303)

Signed-off-by: JuanGarriuz <[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: Federico Rodriguez <[email protected]> Co-authored-by: Raul Del Pozo Moreno <[email protected]>
wazuh · Sep 10, 2024 · a2839f3 · a2839f3
1 parent 7202d7f
commit a2839f3
Show file tree

Hide file tree

Showing 31 changed files with 213 additions and 1,159 deletions.
diff --git a/.github/workflows/cypress_workflow.yml b/.github/workflows/cypress_workflow.yml
@@ -30,7 +30,7 @@ env:
   TEST_REPO: ${{ inputs.test_repo != '' && inputs.test_repo || 'opensearch-project/opensearch-dashboards-functional-test' }}
   TEST_BRANCH: "${{ inputs.test_branch != '' && inputs.test_branch || github.base_ref }}"
   FTR_PATH: 'ftr'
-  START_CMD: 'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch --savedObjects.maxImportPayloadBytes=10485760 --server.maxPayloadBytes=1759977 --logging.json=false --data.search.aggs.shardDelay.enabled=true'
+  START_CMD: 'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch --savedObjects.maxImportPayloadBytes=10485760 --server.maxPayloadBytes=1759977 --logging.json=false --data.search.aggs.shardDelay.enabled=true --opensearchDashboards.branding.useExpandedHeader=true'
   OPENSEARCH_SNAPSHOT_CMD: 'node ../scripts/opensearch snapshot -E cluster.routing.allocation.disk.threshold_enabled=false'
   CYPRESS_BROWSER: 'chromium'
   CYPRESS_VISBUILDER_ENABLED: true

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v4.9.0
+v4.9.1
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"]
@@ -10,6 +12,3 @@ server.ssl.key: "/etc/wazuh-dashboard/certs/dashboard-key.pem"
 server.ssl.certificate: "/etc/wazuh-dashboard/certs/dashboard.pem"
 opensearch.ssl.certificateAuthorities: ["/etc/wazuh-dashboard/certs/root-ca.pem"]
 uiSettings.overrides.defaultRoute: /app/wz-home
-
-opensearchDashboards.branding:
-  useExpandedHeader: false
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/docker/config/opensearch_dashboards.dev.security.yml b/docker/config/opensearch_dashboards.dev.security.yml
@@ -1,8 +1,5 @@
 server.host: "0.0.0.0"
 
-opensearchDashboards.branding:
-  useExpandedHeader: false
-
 opensearch.hosts: ["https://indexer:9200"]
 opensearch.ssl.verificationMode: none
 opensearch.username: "kibanaserver"

diff --git a/docker/config/opensearch_dashboards.dev.yml b/docker/config/opensearch_dashboards.dev.yml
@@ -1,4 +1 @@
 server.host: "0.0.0.0"
-
-opensearchDashboards.branding:
-  useExpandedHeader: false
diff --git a/packages/osd-plugin-helpers/src/integration_tests/build.test.ts b/packages/osd-plugin-helpers/src/integration_tests/build.test.ts
@@ -101,9 +101,15 @@ it('builds a generated plugin into a viable archive', async () => {
      info running @osd/optimizer
      │ info initialized, 0 bundles cached
      │ info starting worker [1 bundle]
+     │ warn worker stderr Browserslist: caniuse-lite is outdated. Please run:
+     │ warn worker stderr   npx update-browserslist-db@latest
+     │ warn worker stderr   Why you should do it regularly: https://github.com/browserslist/update-db#readme
      │ succ 1 bundles compiled successfully after <time>
      info copying assets from \`public/assets\` to build
      info copying server source into the build and converting with babel
+    Browserslist: caniuse-lite is outdated. Please run:
+      npx update-browserslist-db@latest
+      Why you should do it regularly: https://github.com/browserslist/update-db#readme
      info running yarn to install dependencies
      info compressing plugin into [fooTestPlugin-1.0.0.zip]
      info cleaning up compression temporary artifacts"
@@ -189,9 +195,15 @@ it('builds a non-semver generated plugin into a viable archive', async () => {
      info running @osd/optimizer
      │ info initialized, 0 bundles cached
      │ info starting worker [1 bundle]
+     │ warn worker stderr Browserslist: caniuse-lite is outdated. Please run:
+     │ warn worker stderr   npx update-browserslist-db@latest
+     │ warn worker stderr   Why you should do it regularly: https://github.com/browserslist/update-db#readme
      │ succ 1 bundles compiled successfully after <time>
      info copying assets from \`public/assets\` to build
      info copying server source into the build and converting with babel
+    Browserslist: caniuse-lite is outdated. Please run:
+      npx update-browserslist-db@latest
+      Why you should do it regularly: https://github.com/browserslist/update-db#readme
      info running yarn to install dependencies
      info compressing plugin into [fooTestPlugin-1.0.0.x.zip]
      info cleaning up compression temporary artifacts"

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"