From 59731d7fdd4793d581c41c95b152748e8244806b Mon Sep 17 00:00:00 2001 From: Federico Rodriguez Date: Thu, 6 Feb 2025 15:02:10 +0100 Subject: [PATCH] Support Wazuh 4.11.1 rev 00 (#516) --- .../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 9381768e45ba..c8a9b23cc08e 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.11.0-alpha1 + uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@4.11.1 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.11.0-alpha1 + uses: wazuh/wazuh-dashboard-plugins/.github/workflows/manual-build.yml@4.11.1 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.11.0-alpha1 + uses: wazuh/wazuh-security-dashboards-plugin/.github/workflows/manual-build.yml@4.11.1 with: reference: ${{ inputs.reference_security_plugins }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 498b9338bf30..bfb8518d52f8 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.11.1 - OpenSearch Dashboards 2.16.0 - Revision 00 + +### Added + +- Support for Wazuh 4.11.1 + ## Wazuh dashboard v4.11.0 - OpenSearch Dashboards 2.16.0 - Revision 01 ### Added diff --git a/VERSION b/VERSION index bf721f579256..341d4629f942 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v4.11.0 +v4.11.1 diff --git a/dev-tools/build-packages/wazuh-dashboard.Dockerfile b/dev-tools/build-packages/wazuh-dashboard.Dockerfile index 68c425f412dc..9a6b17b8adb1 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.11.0 --build-arg WAZUH_DASHBOARDS_PLUGINS=4.11.0 --build-arg WAZUH_SECURITY_DASHBOARDS_PLUGIN_BRANCH=4.11.0 --build-arg OPENSEARCH_DASHBOARDS_VERSION=2.16.0 -t wzd:4.11.0 -f wazuh-dashboard.Dockerfile . +# Usage: docker build --build-arg NODE_VERSION=18.19.0 --build-arg WAZUH_DASHBOARDS_BRANCH=4.11.1 --build-arg WAZUH_DASHBOARDS_PLUGINS=4.11.1 --build-arg WAZUH_SECURITY_DASHBOARDS_PLUGIN_BRANCH=4.11.1 --build-arg OPENSEARCH_DASHBOARDS_VERSION=2.16.0 -t wzd:4.11.1 -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.11.0 -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.11.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 WORKDIR /home/node/wzd/dev-tools/build-packages/base/output RUN cp ./* /home/node/packages/ diff --git a/package.json b/package.json index 53eeee9e2aaa..6f9e1c38eb74 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,8 @@ "sha": "6cb7fec4e154faa0a4a3fee4b33dfef91b9870d9" }, "wazuh": { - "version": "4.11.0", - "revision": "01" + "version": "4.11.1", + "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 0defedf6f810..60bd69ae8cf2 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.11.0", + "wazuhVersion": "4.11.1", } `; @@ -106,7 +106,7 @@ Object { "uiPlugins": Array [], "vars": Object {}, "version": Any, - "wazuhVersion": "4.11.0", + "wazuhVersion": "4.11.1", } `; @@ -161,7 +161,7 @@ Object { "uiPlugins": Array [], "vars": Object {}, "version": Any, - "wazuhVersion": "4.11.0", + "wazuhVersion": "4.11.1", } `; @@ -220,7 +220,7 @@ Object { "uiPlugins": Array [], "vars": Object {}, "version": Any, - "wazuhVersion": "4.11.0", + "wazuhVersion": "4.11.1", } `; @@ -275,7 +275,7 @@ Object { "uiPlugins": Array [], "vars": Object {}, "version": Any, - "wazuhVersion": "4.11.0", + "wazuhVersion": "4.11.1", } `; @@ -330,7 +330,7 @@ Object { "uiPlugins": Array [], "vars": Object {}, "version": Any, - "wazuhVersion": "4.11.0", + "wazuhVersion": "4.11.1", } `; @@ -385,6 +385,6 @@ Object { "uiPlugins": Array [], "vars": Object {}, "version": Any, - "wazuhVersion": "4.11.0", + "wazuhVersion": "4.11.1", } `;