From 5d5e4e37572e33d2c7a006625cef6b5bf2a3b04d Mon Sep 17 00:00:00 2001 From: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com> Date: Fri, 17 Jan 2025 16:01:02 -0300 Subject: [PATCH] Support Wazuh 4.10.2 rev 00 (#495) --- .../build_wazuh_dashboard_with_plugins.yml | 6 +++--- CHANGELOG.md | 6 ++++++ VERSION | 2 +- .../build-packages/wazuh-dashboard.Dockerfile | 4 ++-- package.json | 6 +++--- .../__snapshots__/rendering_service.test.ts.snap | 14 +++++++------- 6 files changed, 22 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build_wazuh_dashboard_with_plugins.yml b/.github/workflows/build_wazuh_dashboard_with_plugins.yml index b331fc92d2b0..3f6ecc76a14a 100644 --- a/.github/workflows/build_wazuh_dashboard_with_plugins.yml +++ b/.github/workflows/build_wazuh_dashboard_with_plugins.yml @@ -178,21 +178,21 @@ jobs: build-base: needs: [validate-job] name: Build dashboard - uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@v4.10.1-rc1 + uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@4.10.2 with: CHECKOUT_TO: ${{ github.head_ref || github.ref_name }} build-main-plugins: needs: [validate-job] name: Build plugins - uses: wazuh/wazuh-dashboard-plugins/.github/workflows/manual-build.yml@v4.10.1-rc1 + uses: wazuh/wazuh-dashboard-plugins/.github/workflows/manual-build.yml@4.10.2 with: reference: ${{ inputs.reference_wazuh_plugins }} build-security-plugin: needs: [validate-job] name: Build security plugin - uses: wazuh/wazuh-security-dashboards-plugin/.github/workflows/manual-build.yml@v4.10.1-rc1 + uses: wazuh/wazuh-security-dashboards-plugin/.github/workflows/manual-build.yml@4.10.2 with: reference: ${{ inputs.reference_security_plugins }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 7aa9b8529c14..f8e934762d42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to the Wazuh app project will be documented in this file. +## Wazuh dashboard v4.10.2 - OpenSearch Dashboards 2.16.0 - Revision 00 + +### Added + +- Support for Wazuh 4.10.2 + ## Wazuh dashboard v4.10.1 - OpenSearch Dashboards 2.16.0 - Revision 01 ### Added diff --git a/VERSION b/VERSION index 63c4177f6e55..95528b395f80 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v4.10.1 +v4.10.2 diff --git a/dev-tools/build-packages/wazuh-dashboard.Dockerfile b/dev-tools/build-packages/wazuh-dashboard.Dockerfile index d38dd9f79ac7..97ba8331decd 100644 --- a/dev-tools/build-packages/wazuh-dashboard.Dockerfile +++ b/dev-tools/build-packages/wazuh-dashboard.Dockerfile @@ -1,4 +1,4 @@ -# Usage: docker build --build-arg NODE_VERSION=18.19.0 --build-arg WAZUH_DASHBOARDS_BRANCH=4.10.1 --build-arg WAZUH_DASHBOARDS_PLUGINS=4.10.1 --build-arg WAZUH_SECURITY_DASHBOARDS_PLUGIN_BRANCH=4.10.1 --build-arg OPENSEARCH_DASHBOARDS_VERSION=2.16.0 -t wzd:4.10.1 -f wazuh-dashboard.Dockerfile . +# Usage: docker build --build-arg NODE_VERSION=18.19.0 --build-arg WAZUH_DASHBOARDS_BRANCH=4.10.2 --build-arg WAZUH_DASHBOARDS_PLUGINS=4.10.2 --build-arg WAZUH_SECURITY_DASHBOARDS_PLUGIN_BRANCH=4.10.2 --build-arg OPENSEARCH_DASHBOARDS_VERSION=2.16.0 -t wzd:4.10.2 -f wazuh-dashboard.Dockerfile . ARG NODE_VERSION FROM node:${NODE_VERSION} AS base @@ -44,7 +44,7 @@ RUN zip -r -j ./dashboard-package.zip ../wzd/target/opensearch-dashboards-${OPEN RUN zip -r -j ./security-package.zip ../wzd/plugins/wazuh-security-dashboards-plugin/build/security-dashboards-${OPENSEARCH_DASHBOARDS_VERSION}.0.zip RUN zip -r -j ./wazuh-package.zip ../wzd/plugins/wazuh-check-updates/build/wazuhCheckUpdates-${OPENSEARCH_DASHBOARDS_VERSION}.zip ../wzd/plugins/wazuh/build/wazuh-${OPENSEARCH_DASHBOARDS_VERSION}.zip ../wzd/plugins/wazuh-core/build/wazuhCore-${OPENSEARCH_DASHBOARDS_VERSION}.zip WORKDIR /home/node/wzd/dev-tools/build-packages/base -RUN ./generate_base.sh -v 4.10.1 -r 1 -a file:///home/node/packages/wazuh-package.zip -s file:///home/node/packages/security-package.zip -b file:///home/node/packages/dashboard-package.zip +RUN ./generate_base.sh -v 4.10.2 -r 1 -a file:///home/node/packages/wazuh-package.zip -s file:///home/node/packages/security-package.zip -b file:///home/node/packages/dashboard-package.zip WORKDIR /home/node/wzd/dev-tools/build-packages/base/output RUN cp ./* /home/node/packages/ diff --git a/package.json b/package.json index 506b6996b150..a1d538fdce04 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,8 @@ "sha": "6cb7fec4e154faa0a4a3fee4b33dfef91b9870d9" }, "wazuh": { - "version": "4.10.1", - "revision": "01" + "version": "4.10.2", + "revision": "00" }, "homepage": "https://opensearch.org", "bugs": { @@ -506,4 +506,4 @@ "node": ">=14.20.1 <19", "yarn": "^1.22.10" } -} +} \ No newline at end of file diff --git a/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap b/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap index 3fd809a88630..9d01fcd081f0 100644 --- a/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap +++ b/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap @@ -51,7 +51,7 @@ Object { "uiPlugins": Array [], "vars": Object {}, "version": Any, - "wazuhVersion": "4.10.1", + "wazuhVersion": "4.10.2", } `; @@ -106,7 +106,7 @@ Object { "uiPlugins": Array [], "vars": Object {}, "version": Any, - "wazuhVersion": "4.10.1", + "wazuhVersion": "4.10.2", } `; @@ -161,7 +161,7 @@ Object { "uiPlugins": Array [], "vars": Object {}, "version": Any, - "wazuhVersion": "4.10.1", + "wazuhVersion": "4.10.2", } `; @@ -220,7 +220,7 @@ Object { "uiPlugins": Array [], "vars": Object {}, "version": Any, - "wazuhVersion": "4.10.1", + "wazuhVersion": "4.10.2", } `; @@ -275,7 +275,7 @@ Object { "uiPlugins": Array [], "vars": Object {}, "version": Any, - "wazuhVersion": "4.10.1", + "wazuhVersion": "4.10.2", } `; @@ -330,7 +330,7 @@ Object { "uiPlugins": Array [], "vars": Object {}, "version": Any, - "wazuhVersion": "4.10.1", + "wazuhVersion": "4.10.2", } `; @@ -385,6 +385,6 @@ Object { "uiPlugins": Array [], "vars": Object {}, "version": Any, - "wazuhVersion": "4.10.1", + "wazuhVersion": "4.10.2", } `;