From e5d43150e5f3e877251da0b142aa9e93b41ff06d Mon Sep 17 00:00:00 2001 From: Antonio <34042064+Desvelao@users.noreply.github.com> Date: Tue, 24 Sep 2024 17:13:25 +0200 Subject: [PATCH 01/26] Fix error RPM package checking files (#326) --- dev-tools/build-packages/rpm/wazuh-dashboard.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-tools/build-packages/rpm/wazuh-dashboard.spec b/dev-tools/build-packages/rpm/wazuh-dashboard.spec index b6ca32c3c761..758e6ef7aa62 100644 --- a/dev-tools/build-packages/rpm/wazuh-dashboard.spec +++ b/dev-tools/build-packages/rpm/wazuh-dashboard.spec @@ -381,6 +381,7 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/ui_render/bootstrap/osd_bundles_loader_source.js" %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/ui_render/bootstrap/index.js" %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/ui_render/bootstrap/template.js.hbs" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/ui_render/bootstrap/startup.js.hbs" %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/ui_render/bootstrap/app_bootstrap.js" %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/index.js" %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/apm/index.js" From a5e01995e43348b3a10a1815c9df17c085b70a60 Mon Sep 17 00:00:00 2001 From: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com> Date: Thu, 10 Oct 2024 10:19:51 -0300 Subject: [PATCH 02/26] Merge 4.9.1 into 4.10.0 (#350) Co-authored-by: Federico Rodriguez --- CHANGELOG.md | 3 ++- dev-tools/build-packages/base/generate_base.sh | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf17eaa21694..4b61e7545be6 100644 --- 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.1 - OpenSearch Dashboards 2.13.0 - Revision 01 +## Wazuh dashboard v4.9.1 - OpenSearch Dashboards 2.13.0 - Revision 03 ### Added @@ -21,6 +21,7 @@ All notable changes to the Wazuh app project will be documented in this file. ### Fixed - Fixed bug that caused the terminal to freeze on deb upgrades [#301](https://github.com/wazuh/wazuh-dashboard/pull/301) +- Fixed the name of the "Index management" category to "Indexer management" [#330](https://github.com/wazuh/wazuh-dashboard/pull/330) ## Wazuh dashboard v4.9.0 - OpenSearch Dashboards 2.13.0 - Revision 07 diff --git a/dev-tools/build-packages/base/generate_base.sh b/dev-tools/build-packages/base/generate_base.sh index ad59dc776bbb..6b45e7d35cff 100755 --- a/dev-tools/build-packages/base/generate_base.sh +++ b/dev-tools/build-packages/base/generate_base.sh @@ -148,7 +148,7 @@ build() { # Move installed plugins from categories after generating the package category_explore='{id:"explore",label:"Explore",order:100,euiIconType:"search"}' - category_dashboard_management='{id:"management",label:"Index management",order:5e3,euiIconType:"managementApp"}' + category_dashboard_management='{id:"management",label:"Indexer management",order:5e3,euiIconType:"managementApp"}' # Replace app category to Reporting app sed -i -e "s|category:{id:\"opensearch\",label:_i18n.i18n.translate(\"opensearch.reports.categoryName\",{defaultMessage:\"OpenSearch Plugins\"}),order:2e3}|category:${category_explore}|" ./plugins/reportsDashboards/target/public/reportsDashboards.plugin.js @@ -162,7 +162,7 @@ build() { # Replace app category to Notifications app sed -i -e "s|category:DEFAULT_APP_CATEGORIES.management|category:${category_explore}|" ./plugins/notificationsDashboards/target/public/notificationsDashboards.plugin.js - # Replace app category to Index Management app + # Replace app category to Indexer Management app sed -i -e "s|category:DEFAULT_APP_CATEGORIES.management|category:${category_dashboard_management}|g" ./plugins/indexManagementDashboards/target/public/indexManagementDashboards.plugin.js # Generate compressed files diff --git a/package.json b/package.json index 74ad2f37bd92..2a6af2a6fccc 100644 --- a/package.json +++ b/package.json @@ -506,4 +506,4 @@ "node": ">=14.20.1 <19", "yarn": "^1.22.10" } -} +} \ No newline at end of file From 01c2ad11f62c6157c0b43263d89676760b74effc Mon Sep 17 00:00:00 2001 From: Federico Rodriguez Date: Thu, 10 Oct 2024 17:20:43 +0200 Subject: [PATCH 03/26] Bump 4.10.0 revision 02 (#352) --- .github/workflows/build_wazuh_dashboard_with_plugins.yml | 6 +++--- CHANGELOG.md | 2 +- package.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_wazuh_dashboard_with_plugins.yml b/.github/workflows/build_wazuh_dashboard_with_plugins.yml index 3a1056ae0eaf..d80a1a01adea 100644 --- a/.github/workflows/build_wazuh_dashboard_with_plugins.yml +++ b/.github/workflows/build_wazuh_dashboard_with_plugins.yml @@ -103,21 +103,21 @@ jobs: build-base: needs: [validate-inputs] name: Build dashboard - uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@v4.10.0-alpha1 + uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@v4.10.0-alpha2 with: CHECKOUT_TO: ${{ github.head_ref || github.ref_name }} build-main-plugins: needs: [validate-inputs] name: Build plugins - uses: wazuh/wazuh-dashboard-plugins/.github/workflows/manual-build.yml@v4.10.0-alpha1 + uses: wazuh/wazuh-dashboard-plugins/.github/workflows/manual-build.yml@v4.10.0-alpha2 with: reference: ${{ inputs.reference_wazuh_plugins }} build-security-plugin: needs: [validate-inputs] name: Build security plugin - uses: wazuh/wazuh-security-dashboards-plugin/.github/workflows/manual-build.yml@v4.10.0-alpha1 + uses: wazuh/wazuh-security-dashboards-plugin/.github/workflows/manual-build.yml@v4.10.0-alpha2 with: reference: ${{ inputs.reference_security_plugins }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b61e7545be6..b8eff3bf7658 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Wazuh app project will be documented in this file. -## Wazuh dashboard v4.10.0 - OpenSearch Dashboards 2.16.0 - Revision 01 +## Wazuh dashboard v4.10.0 - OpenSearch Dashboards 2.16.0 - Revision 02 ### Removed diff --git a/package.json b/package.json index 2a6af2a6fccc..30aaea6f00b7 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ }, "wazuh": { "version": "4.10.0", - "revision": "01" + "revision": "02" }, "homepage": "https://opensearch.org", "bugs": { @@ -506,4 +506,4 @@ "node": ">=14.20.1 <19", "yarn": "^1.22.10" } -} \ No newline at end of file +} From c9d51a82452eedf2cee3ad8933f4bcea5318f930 Mon Sep 17 00:00:00 2001 From: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com> Date: Thu, 17 Oct 2024 13:36:14 -0300 Subject: [PATCH 04/26] Bump revision to 04 (#356) (#364) Co-authored-by: Federico Rodriguez --- CHANGELOG.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8eff3bf7658..039745b13024 100644 --- 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.1 - OpenSearch Dashboards 2.13.0 - Revision 03 +## Wazuh dashboard v4.9.1 - OpenSearch Dashboards 2.13.0 - Revision 04 ### Added diff --git a/package.json b/package.json index 30aaea6f00b7..45c7a5b61f36 100644 --- a/package.json +++ b/package.json @@ -506,4 +506,4 @@ "node": ">=14.20.1 <19", "yarn": "^1.22.10" } -} +} \ No newline at end of file From 316703fc93cd6f79d6c683fa1b80f674461e82fd Mon Sep 17 00:00:00 2001 From: Antonio <34042064+Desvelao@users.noreply.github.com> Date: Fri, 18 Oct 2024 10:46:43 +0200 Subject: [PATCH 05/26] Bump 4.10.0 rev 03 (#369) --- CHANGELOG.md | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 039745b13024..1ba8d6208f45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Wazuh app project will be documented in this file. -## Wazuh dashboard v4.10.0 - OpenSearch Dashboards 2.16.0 - Revision 02 +## Wazuh dashboard v4.10.0 - OpenSearch Dashboards 2.16.0 - Revision 03 ### Removed diff --git a/package.json b/package.json index 45c7a5b61f36..16ae5221b21c 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ }, "wazuh": { "version": "4.10.0", - "revision": "02" + "revision": "03" }, "homepage": "https://opensearch.org", "bugs": { @@ -506,4 +506,4 @@ "node": ">=14.20.1 <19", "yarn": "^1.22.10" } -} \ No newline at end of file +} From 77002e4dffee09848aef5699759414e381c84655 Mon Sep 17 00:00:00 2001 From: Antonio <34042064+Desvelao@users.noreply.github.com> Date: Thu, 24 Oct 2024 09:30:57 +0200 Subject: [PATCH 06/26] Reduced the loading logo size (#373) --- CHANGELOG.md | 4 ++++ src/core/server/rendering/views/styles.tsx | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ba8d6208f45..98f7dbb828c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to the Wazuh app project will be documented in this file. ## Wazuh dashboard v4.10.0 - OpenSearch Dashboards 2.16.0 - Revision 03 +### Changed + +- Reduced the size of the loading logo [#373](https://github.com/wazuh/wazuh-dashboard/pull/373) + ### Removed - Removed the setting home:useNewHomePage from the advanced settings because the views are not finished. [#282](https://github.com/wazuh/wazuh-dashboard/pull/282) diff --git a/src/core/server/rendering/views/styles.tsx b/src/core/server/rendering/views/styles.tsx index f9fa4bbb1e9a..82c22eda9960 100644 --- a/src/core/server/rendering/views/styles.tsx +++ b/src/core/server/rendering/views/styles.tsx @@ -169,7 +169,7 @@ export const Styles: FunctionComponent = ({ theme, darkMode }) => { } .loadingLogoContainer { - height: 150px; /* Wazuh */ + height: 100px; /* Wazuh */ padding: 10px 10px 10px 10px; } From 1c3e1e2981098d78471403595f93a2f3a06ae56b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chantal=20Bel=C3=A9n=20kelm?= <99441266+chantal-kelm@users.noreply.github.com> Date: Fri, 25 Oct 2024 04:00:36 -0300 Subject: [PATCH 07/26] Change order of menu sections (#372) Co-authored-by: Federico Rodriguez --- CHANGELOG.md | 4 ++++ dev-tools/build-packages/base/generate_base.sh | 2 +- .../ui/header/__snapshots__/collapsible_nav.test.tsx.snap | 2 +- src/core/utils/default_app_categories.ts | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98f7dbb828c9..b3ab8bed0b79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ 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) +### Changed + +- Changed the order of the “Dashboard management” and “Indexer management” sections. + ## Wazuh dashboard v4.9.1 - OpenSearch Dashboards 2.13.0 - Revision 04 ### Added diff --git a/dev-tools/build-packages/base/generate_base.sh b/dev-tools/build-packages/base/generate_base.sh index 6b45e7d35cff..cda6aac36071 100755 --- a/dev-tools/build-packages/base/generate_base.sh +++ b/dev-tools/build-packages/base/generate_base.sh @@ -148,7 +148,7 @@ build() { # Move installed plugins from categories after generating the package category_explore='{id:"explore",label:"Explore",order:100,euiIconType:"search"}' - category_dashboard_management='{id:"management",label:"Indexer management",order:5e3,euiIconType:"managementApp"}' + category_dashboard_management='{id:"management",label:"Indexer management",order:6e3,euiIconType:"managementApp"}' # Replace app category to Reporting app sed -i -e "s|category:{id:\"opensearch\",label:_i18n.i18n.translate(\"opensearch.reports.categoryName\",{defaultMessage:\"OpenSearch Plugins\"}),order:2e3}|category:${category_explore}|" ./plugins/reportsDashboards/target/public/reportsDashboards.plugin.js 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 index 122a66fdc214..0d11a8e4a6f7 100644 --- 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 @@ -242,7 +242,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = ` "euiIconType": "managementApp", "id": "management", "label": "Indexer management", - "order": 5000, + "order": 6000, }, "data-test-subj": "monitoring", "href": "monitoring", diff --git a/src/core/utils/default_app_categories.ts b/src/core/utils/default_app_categories.ts index ceb7e13b9469..6d112473fc58 100644 --- a/src/core/utils/default_app_categories.ts +++ b/src/core/utils/default_app_categories.ts @@ -78,7 +78,7 @@ export const DEFAULT_APP_CATEGORIES: Record = Object.freeze label: i18n.translate('core.ui.dashboardManagementNavList.label', { defaultMessage: 'Dashboard management', }), - order: 6000, + order: 5000, euiIconType: 'dashboardApp', }, management: { @@ -86,7 +86,7 @@ export const DEFAULT_APP_CATEGORIES: Record = Object.freeze label: i18n.translate('core.ui.managementNavList.label', { defaultMessage: 'Indexer management', }), - order: 5000, + order: 6000, euiIconType: 'managementApp', }, investigate: { From 9a50aa3889d846bd218ad48d1c9297bc9dd66209 Mon Sep 17 00:00:00 2001 From: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com> Date: Tue, 29 Oct 2024 15:25:12 -0300 Subject: [PATCH 08/26] Avoid duplicate package creation (#385) --- .../build_wazuh_dashboard_with_plugins.yml | 168 +++++++++++------- 1 file changed, 107 insertions(+), 61 deletions(-) diff --git a/.github/workflows/build_wazuh_dashboard_with_plugins.yml b/.github/workflows/build_wazuh_dashboard_with_plugins.yml index d80a1a01adea..8e81e7242441 100644 --- a/.github/workflows/build_wazuh_dashboard_with_plugins.yml +++ b/.github/workflows/build_wazuh_dashboard_with_plugins.yml @@ -1,4 +1,4 @@ -run-name: Build ${{ inputs.system }} wazuh-dashboard on ${{ inputs.architecture }} ${{ inputs.is_stage && '- is stage' || '' }} ${{ inputs.checksum && '- checksum' || '' }} ${{ inputs.debug && '- debug' || '' }} ${{ inputs.id }} +run-name: Build ${{ inputs.system }} wazuh-dashboard on ${{ inputs.architecture }} ${{ inputs.is_stage && '- is stage' || '' }} ${{ inputs.checksum && '- checksum' || '' }} ${{ inputs.id }} name: Build Wazuh dashboard with plugins on: @@ -85,8 +85,64 @@ on: required: false jobs: - validate-inputs: + setup-variables: runs-on: ubuntu-latest + name: Setup variables + outputs: + CURRENT_DIR: ${{ steps.setup-variables.outputs.CURRENT_DIR }} + VERSION: ${{ steps.setup-variables.outputs.VERSION }} + REVISION: ${{ steps.setup-variables.outputs.REVISION }} + COMMIT_SHA: ${{ steps.setup-variables.outputs.COMMIT_SHA }} + PRODUCTION: ${{ steps.setup-variables.outputs.PRODUCTION }} + WAZUH_DASHBOARD_SLIM: ${{ steps.setup-variables.outputs.WAZUH_DASHBOARD_SLIM }} + WAZUH_SECURITY_PLUGIN: ${{ steps.setup-variables.outputs.WAZUH_SECURITY_PLUGIN }} + WAZUH_PLUGINS: ${{ steps.setup-variables.outputs.WAZUH_PLUGINS }} + PACKAGE_NAME: ${{ steps.setup-variables.outputs.PACKAGE_NAME }} + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup variables + id: setup-variables + run: | + CURRENT_DIR=$(pwd -P) + VERSION=$(tail -c +2 VERSION) + REVISION=$(yarn --silent wzd-revision) + COMMIT_SHA=$(git rev-parse --short HEAD) + if [ "${{ inputs.is_stage }}" = "true" ]; then + PRODUCTION=--production + else + PRODUCTION="" + fi + WAZUH_DASHBOARD_SLIM=wazuh-dashboard_${VERSION}-${REVISION}_x64.tar.gz + WAZUH_SECURITY_PLUGIN=wazuh-security-dashboards-plugin_${VERSION}-${REVISION}_${{ inputs.reference_security_plugins }}.zip + WAZUH_PLUGINS=wazuh-dashboard-plugins_${VERSION}-${REVISION}_${{ inputs.reference_wazuh_plugins }}.zip + if [ "${{ inputs.system }}" = "deb" ]; then + if [ "${{ inputs.is_stage }}" = "true" ]; then + PACKAGE_NAME=wazuh-dashboard_${VERSION}-${{ inputs.revision }}_${{ inputs.architecture }}.deb + else + PACKAGE_NAME=wazuh-dashboard_${VERSION}-${{ inputs.revision }}_${{ inputs.architecture }}_${COMMIT_SHA}.deb + fi + else + if [ "${{ inputs.is_stage }}" = "true" ]; then + PACKAGE_NAME=wazuh-dashboard-${VERSION}-${{ inputs.revision }}.${{ inputs.architecture }}.rpm + else + PACKAGE_NAME=wazuh-dashboard_${VERSION}-${{ inputs.revision }}_${{ inputs.architecture }}_${COMMIT_SHA}.rpm + fi + fi + echo "CURRENT_DIR=$CURRENT_DIR" >> $GITHUB_OUTPUT + echo "VERSION=$VERSION" >> $GITHUB_OUTPUT + echo "REVISION=$REVISION" >> $GITHUB_OUTPUT + echo "COMMIT_SHA=$COMMIT_SHA" >> $GITHUB_OUTPUT + echo "PRODUCTION=$PRODUCTION" >> $GITHUB_OUTPUT + echo "WAZUH_DASHBOARD_SLIM=$WAZUH_DASHBOARD_SLIM" >> $GITHUB_OUTPUT + echo "WAZUH_SECURITY_PLUGIN=$WAZUH_SECURITY_PLUGIN" >> $GITHUB_OUTPUT + echo "WAZUH_PLUGINS=$WAZUH_PLUGINS" >> $GITHUB_OUTPUT + echo "PACKAGE_NAME=$PACKAGE_NAME" >> $GITHUB_OUTPUT + + validate-job: + runs-on: ubuntu-latest + needs: setup-variables name: Validate inputs steps: - name: Validate inputs @@ -100,29 +156,48 @@ jobs: exit 1 fi + - name: Set up AWS CLI + uses: aws-actions/configure-aws-credentials@v4 + with: + aws-access-key-id: ${{ secrets.CI_INTERNAL_DEVELOPMENT_BUCKET_USER_ACCESS_KEY }} + aws-secret-access-key: ${{ secrets.CI_INTERNAL_DEVELOPMENT_BUCKET_USER_SECRET_KEY }} + aws-region: ${{ secrets.CI_AWS_REGION }} + + - name: Verify if package is already built + run: | + set +e + echo "Verifying package" + PACKAGE_NAME=${{ needs.setup-variables.outputs.PACKAGE_NAME }} + exists=$(aws s3 ls s3://packages-dev.internal.wazuh.com/development/wazuh/4.x/main/packages/$PACKAGE_NAME) + if [ -n "$exists" ]; then + echo "Package already exists" + exit 1 + fi + set -e + build-base: - needs: [validate-inputs] + needs: [validate-job] name: Build dashboard - uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@v4.10.0-alpha2 + uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@4.10.0 with: CHECKOUT_TO: ${{ github.head_ref || github.ref_name }} build-main-plugins: - needs: [validate-inputs] + needs: [validate-job] name: Build plugins - uses: wazuh/wazuh-dashboard-plugins/.github/workflows/manual-build.yml@v4.10.0-alpha2 + uses: wazuh/wazuh-dashboard-plugins/.github/workflows/manual-build.yml@4.10.0 with: reference: ${{ inputs.reference_wazuh_plugins }} build-security-plugin: - needs: [validate-inputs] + needs: [validate-job] name: Build security plugin - uses: wazuh/wazuh-security-dashboards-plugin/.github/workflows/manual-build.yml@v4.10.0-alpha2 + uses: wazuh/wazuh-security-dashboards-plugin/.github/workflows/manual-build.yml@4.10.0 with: reference: ${{ inputs.reference_security_plugins }} build-and-test-package: - needs: [build-main-plugins, build-base, build-security-plugin] + needs: [setup-variables, build-main-plugins, build-base, build-security-plugin] runs-on: ubuntu-latest name: Generate packages steps: @@ -135,77 +210,48 @@ jobs: node-version-file: '.nvmrc' registry-url: 'https://registry.npmjs.org' - - name: Setup variables - run: | - echo "CURRENT_DIR=$(pwd -P)" >> $GITHUB_ENV - echo "VERSION=$(tail -c +2 VERSION)" >> $GITHUB_ENV - echo "REVISION=$(yarn --silent wzd-revision)" >> $GITHUB_ENV - echo "COMMIT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV - if [ "${{ inputs.is_stage }}" = "true" ]; then - echo "PRODUCTION=--production" >> $GITHUB_ENV - fi - - - name: Setup packages names - run: | - echo "WAZUH_DASHBOARD_SLIM=wazuh-dashboard_${{ env.VERSION }}-${{ env.REVISION }}_x64.tar.gz" >> $GITHUB_ENV - echo "WAZUH_SECURITY_PLUGIN=wazuh-security-dashboards-plugin_${{ env.VERSION }}-${{ env.REVISION }}_${{ inputs.reference_security_plugins }}.zip" >> $GITHUB_ENV - echo "WAZUH_PLUGINS=wazuh-dashboard-plugins_${{ env.VERSION }}-${{ env.REVISION }}_${{ inputs.reference_wazuh_plugins }}.zip" >> $GITHUB_ENV - if [ "${{ inputs.system }}" = "deb" ]; then - if [ "${{ inputs.is_stage }}" = "true" ]; then - echo "PACKAGE_NAME=wazuh-dashboard_${{ env.VERSION }}-${{ inputs.revision }}_${{ inputs.architecture }}.deb" >> $GITHUB_ENV - else - echo "PACKAGE_NAME=wazuh-dashboard_${{ env.VERSION }}-${{ inputs.revision }}_${{ inputs.architecture }}_${{ env.COMMIT_SHA}}.deb" >> $GITHUB_ENV - fi - else - if [ "${{ inputs.is_stage }}" = "true" ]; then - echo "PACKAGE_NAME=wazuh-dashboard-${{ env.VERSION }}-${{ inputs.revision }}.${{ inputs.architecture }}.rpm" >> $GITHUB_ENV - else - echo "PACKAGE_NAME=wazuh-dashboard_${{ env.VERSION }}-${{ inputs.revision }}_${{ inputs.architecture }}_${{ env.COMMIT_SHA}}.rpm" >> $GITHUB_ENV - fi - fi - - name: Download dashboard artifact uses: actions/download-artifact@v3 with: - name: ${{ env.WAZUH_DASHBOARD_SLIM }} - path: ${{ env.CURRENT_DIR }}/artifacts/dashboard + name: ${{ needs.setup-variables.outputs.WAZUH_DASHBOARD_SLIM }} + path: ${{ needs.setup-variables.outputs.CURRENT_DIR }}/artifacts/dashboard - name: Download security plugin artifact uses: actions/download-artifact@v3 with: - name: ${{ env.WAZUH_SECURITY_PLUGIN }} - path: ${{ env.CURRENT_DIR }}/artifacts/security-plugin + name: ${{ needs.setup-variables.outputs.WAZUH_SECURITY_PLUGIN }} + path: ${{ needs.setup-variables.outputs.CURRENT_DIR }}/artifacts/security-plugin - name: Download plugins artifacts uses: actions/download-artifact@v3 with: - name: ${{ env.WAZUH_PLUGINS }} - path: ${{ env.CURRENT_DIR }}/artifacts/plugins + name: ${{ needs.setup-variables.outputs.WAZUH_PLUGINS }} + path: ${{ needs.setup-variables.outputs.CURRENT_DIR }}/artifacts/plugins - name: Zip plugins run: | - zip -r -j ${{ env.CURRENT_DIR }}/artifacts/wazuh-package.zip ${{ env.CURRENT_DIR }}/artifacts/plugins - zip -r -j ${{ env.CURRENT_DIR }}/artifacts/security-package.zip ${{ env.CURRENT_DIR }}/artifacts/security-plugin - zip -r -j ${{ env.CURRENT_DIR }}/artifacts/dashboard-package.zip ${{ env.CURRENT_DIR }}/artifacts/dashboard/${{ env.WAZUH_DASHBOARD_SLIM }} + zip -r -j ${{ needs.setup-variables.outputs.CURRENT_DIR }}/artifacts/wazuh-package.zip ${{ needs.setup-variables.outputs.CURRENT_DIR }}/artifacts/plugins + zip -r -j ${{ needs.setup-variables.outputs.CURRENT_DIR }}/artifacts/security-package.zip ${{ needs.setup-variables.outputs.CURRENT_DIR }}/artifacts/security-plugin + zip -r -j ${{ needs.setup-variables.outputs.CURRENT_DIR }}/artifacts/dashboard-package.zip ${{ needs.setup-variables.outputs.CURRENT_DIR }}/artifacts/dashboard/${{ needs.setup-variables.outputs.WAZUH_DASHBOARD_SLIM }} - name: Build package run: | - cd ${{ env.CURRENT_DIR }}/dev-tools/build-packages + cd ${{ needs.setup-variables.outputs.CURRENT_DIR }}/dev-tools/build-packages bash ./build-packages.sh \ - -v ${{ env.VERSION }} \ + -v ${{ needs.setup-variables.outputs.VERSION }} \ -r ${{ inputs.revision }} \ - -a file://${{env.CURRENT_DIR}}/artifacts/wazuh-package.zip \ - -s file://${{env.CURRENT_DIR}}/artifacts/security-package.zip \ - -b file://${{env.CURRENT_DIR}}/artifacts/dashboard-package.zip \ - --${{ inputs.system }} ${{ env.PRODUCTION }} + -a file://${{needs.setup-variables.outputs.CURRENT_DIR}}/artifacts/wazuh-package.zip \ + -s file://${{needs.setup-variables.outputs.CURRENT_DIR}}/artifacts/security-package.zip \ + -b file://${{needs.setup-variables.outputs.CURRENT_DIR}}/artifacts/dashboard-package.zip \ + --${{ inputs.system }} ${{ needs.setup-variables.outputs.PRODUCTION }} - name: Test package run: | - cd ${{ env.CURRENT_DIR }}/dev-tools/test-packages - ls -la ${{ env.CURRENT_DIR }}/dev-tools/build-packages/output/${{ inputs.system }} - cp ${{ env.CURRENT_DIR }}/dev-tools/build-packages/output/${{ inputs.system }}/${{env.PACKAGE_NAME}} ${{ env.CURRENT_DIR }}/dev-tools/test-packages/${{ inputs.system }} + cd ${{ needs.setup-variables.outputs.CURRENT_DIR }}/dev-tools/test-packages + ls -la ${{ needs.setup-variables.outputs.CURRENT_DIR }}/dev-tools/build-packages/output/${{ inputs.system }} + cp ${{ needs.setup-variables.outputs.CURRENT_DIR }}/dev-tools/build-packages/output/${{ inputs.system }}/${{needs.setup-variables.outputs.PACKAGE_NAME}} ${{ needs.setup-variables.outputs.CURRENT_DIR }}/dev-tools/test-packages/${{ inputs.system }} bash ./test-packages.sh \ - -p ${{env.PACKAGE_NAME}} + -p ${{needs.setup-variables.outputs.PACKAGE_NAME}} - name: Set up AWS CLI uses: aws-actions/configure-aws-credentials@v4 @@ -217,14 +263,14 @@ jobs: - name: Upload package run: | echo "Uploading package" - aws s3 cp ${{ env.CURRENT_DIR }}/dev-tools/build-packages/output/${{ inputs.system }}/${{env.PACKAGE_NAME}} s3://packages-dev.internal.wazuh.com/development/wazuh/4.x/main/packages/ - s3uri="s3://packages-dev.internal.wazuh.com/development/wazuh/4.x/main/packages/${{env.PACKAGE_NAME}}" + aws s3 cp ${{ needs.setup-variables.outputs.CURRENT_DIR }}/dev-tools/build-packages/output/${{ inputs.system }}/${{needs.setup-variables.outputs.PACKAGE_NAME}} s3://packages-dev.internal.wazuh.com/development/wazuh/4.x/main/packages/ + s3uri="s3://packages-dev.internal.wazuh.com/development/wazuh/4.x/main/packages/${{needs.setup-variables.outputs.PACKAGE_NAME}}" echo "S3 URI: ${s3uri}" - name: Upload SHA512 if: ${{ inputs.checksum }} run: | echo "Uploading checksum" - aws s3 cp ${{ env.CURRENT_DIR }}/dev-tools/build-packages/output/${{ inputs.system }}/${{env.PACKAGE_NAME}}.sha512 s3://packages-dev.internal.wazuh.com/development/wazuh/4.x/main/packages/ - s3uri="s3://packages-dev.internal.wazuh.com/development/wazuh/4.x/main/packages/${{env.PACKAGE_NAME}}.sha512" + aws s3 cp ${{ needs.setup-variables.outputs.CURRENT_DIR }}/dev-tools/build-packages/output/${{ inputs.system }}/${{needs.setup-variables.outputs.PACKAGE_NAME}}.sha512 s3://packages-dev.internal.wazuh.com/development/wazuh/4.x/main/packages/ + s3uri="s3://packages-dev.internal.wazuh.com/development/wazuh/4.x/main/packages/${{needs.setup-variables.outputs.PACKAGE_NAME}}.sha512" echo "S3 sha512 URI: ${s3uri}" From e6e36cf05acd747e992549b0bb110a53d83d3d9b Mon Sep 17 00:00:00 2001 From: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com> Date: Tue, 5 Nov 2024 06:45:00 -0300 Subject: [PATCH 09/26] Merge 4.9.2 into 4.10.0 (#395) Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com> --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3ab8bed0b79..47ab68322e09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,12 @@ All notable changes to the Wazuh app project will be documented in this file. - Changed the order of the “Dashboard management” and “Indexer management” sections. +## Wazuh dashboard v4.9.2 - OpenSearch Dashboards 2.13.0 - Revision 01 + +### Added + +- Support for Wazuh 4.9.2 + ## Wazuh dashboard v4.9.1 - OpenSearch Dashboards 2.13.0 - Revision 04 ### Added diff --git a/package.json b/package.json index 16ae5221b21c..05af8764cee6 100644 --- a/package.json +++ b/package.json @@ -506,4 +506,4 @@ "node": ">=14.20.1 <19", "yarn": "^1.22.10" } -} +} \ No newline at end of file From c456b95f909d0bb5a4f98687fd43b31a31c74b80 Mon Sep 17 00:00:00 2001 From: Federico Rodriguez Date: Fri, 8 Nov 2024 12:58:47 +0100 Subject: [PATCH 10/26] Bump revision to 4.10.0-04 (#404) --- .github/workflows/build_wazuh_dashboard_with_plugins.yml | 6 +++--- CHANGELOG.md | 2 +- package.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_wazuh_dashboard_with_plugins.yml b/.github/workflows/build_wazuh_dashboard_with_plugins.yml index 8e81e7242441..c2ea0c6ca496 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@4.10.0 + uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@v4.10.0-alpha3 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@4.10.0 + uses: wazuh/wazuh-dashboard-plugins/.github/workflows/manual-build.yml@v4.10.0-alpha3 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@4.10.0 + uses: wazuh/wazuh-security-dashboards-plugin/.github/workflows/manual-build.yml@v4.10.0-alpha3 with: reference: ${{ inputs.reference_security_plugins }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 47ab68322e09..47162a115161 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Wazuh app project will be documented in this file. -## Wazuh dashboard v4.10.0 - OpenSearch Dashboards 2.16.0 - Revision 03 +## Wazuh dashboard v4.10.0 - OpenSearch Dashboards 2.16.0 - Revision 04 ### Changed diff --git a/package.json b/package.json index 05af8764cee6..f06f7d409ec3 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ }, "wazuh": { "version": "4.10.0", - "revision": "03" + "revision": "04" }, "homepage": "https://opensearch.org", "bugs": { @@ -506,4 +506,4 @@ "node": ">=14.20.1 <19", "yarn": "^1.22.10" } -} \ No newline at end of file +} From d52514112a4323200db84b86e30e2634d982acab Mon Sep 17 00:00:00 2001 From: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:20:18 -0300 Subject: [PATCH 11/26] Remove validation for duplicate packages (#406) --- .../workflows/build_wazuh_dashboard_with_plugins.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/build_wazuh_dashboard_with_plugins.yml b/.github/workflows/build_wazuh_dashboard_with_plugins.yml index c2ea0c6ca496..a5abad7d05fa 100644 --- a/.github/workflows/build_wazuh_dashboard_with_plugins.yml +++ b/.github/workflows/build_wazuh_dashboard_with_plugins.yml @@ -163,18 +163,6 @@ jobs: aws-secret-access-key: ${{ secrets.CI_INTERNAL_DEVELOPMENT_BUCKET_USER_SECRET_KEY }} aws-region: ${{ secrets.CI_AWS_REGION }} - - name: Verify if package is already built - run: | - set +e - echo "Verifying package" - PACKAGE_NAME=${{ needs.setup-variables.outputs.PACKAGE_NAME }} - exists=$(aws s3 ls s3://packages-dev.internal.wazuh.com/development/wazuh/4.x/main/packages/$PACKAGE_NAME) - if [ -n "$exists" ]; then - echo "Package already exists" - exit 1 - fi - set -e - build-base: needs: [validate-job] name: Build dashboard From eaa6b78f6844d6c3e7b3147d6f43e92f21d47fb5 Mon Sep 17 00:00:00 2001 From: Guido Modarelli <38738725+guidomodarelli@users.noreply.github.com> Date: Wed, 13 Nov 2024 11:03:21 -0300 Subject: [PATCH 12/26] Update the actions' version (#394) Co-authored-by: Federico Rodriguez --- .github/workflows/build_and_test_workflow.yml | 42 ++++++++++--------- .github/workflows/build_base.yml | 7 ++-- .../build_wazuh_dashboard_with_plugins.yml | 8 ++-- .github/workflows/codeql.yml | 2 +- .github/workflows/cypress_workflow.yml | 21 ++++++---- CHANGELOG.md | 7 +--- 6 files changed, 46 insertions(+), 41 deletions(-) diff --git a/.github/workflows/build_and_test_workflow.yml b/.github/workflows/build_and_test_workflow.yml index 01f0cdaeb49a..0ed5da176a6e 100644 --- a/.github/workflows/build_and_test_workflow.yml +++ b/.github/workflows/build_and_test_workflow.yml @@ -62,7 +62,7 @@ jobs: disk-root: 'C:' - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup JDK (Windows only) if: matrix.os == 'windows-latest' @@ -72,7 +72,7 @@ jobs: distribution: 'adopt' - name: Setup Node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' registry-url: 'https://registry.npmjs.org' @@ -88,7 +88,7 @@ jobs: run: echo "YARN_CACHE_LOCATION=$(yarn cache dir)" >> $GITHUB_ENV - name: Initialize Yarn Cache - uses: actions/cache@v3 + uses: actions/cache@v4 if: matrix.os != 'windows-latest' with: path: ${{ env.YARN_CACHE_LOCATION }} @@ -170,7 +170,7 @@ jobs: disk-root: 'C:' - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup JDK (Windows only) if: matrix.os == 'windows-latest' @@ -180,7 +180,7 @@ jobs: distribution: 'adopt' - name: Setup Node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' registry-url: 'https://registry.npmjs.org' @@ -196,7 +196,7 @@ jobs: run: echo "YARN_CACHE_LOCATION=$(yarn cache dir)" >> $GITHUB_ENV - name: Initialize Yarn Cache - uses: actions/cache@v3 + uses: actions/cache@v4 if: matrix.os != 'windows-latest' with: path: ${{ env.YARN_CACHE_LOCATION }} @@ -249,13 +249,14 @@ jobs: JOB: ci${{ matrix.group }} CACHE_DIR: ciGroup${{ matrix.group }} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: failure() with: name: failure-artifacts-ci${{ matrix.group }} path: | test/*/failure_debug/ test/*/screenshots/ + overwrite: true plugin-functional-tests: name: Run plugin functional tests on ${{ matrix.name }} @@ -286,7 +287,7 @@ jobs: disk-root: 'C:' - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup JDK (Windows only) if: matrix.os == 'windows-latest' @@ -296,7 +297,7 @@ jobs: distribution: 'adopt' - name: Setup Node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' registry-url: 'https://registry.npmjs.org' @@ -312,7 +313,7 @@ jobs: run: echo "YARN_CACHE_LOCATION=$(yarn cache dir)" >> $GITHUB_ENV - name: Initialize Yarn Cache - uses: actions/cache@v3 + uses: actions/cache@v4 if: matrix.os != 'windows-latest' with: path: ${{ env.YARN_CACHE_LOCATION }} @@ -360,13 +361,14 @@ jobs: id: plugin-ftr-tests run: node scripts/functional_tests.js --config test/plugin_functional/config.ts - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: failure() with: name: failure-artifacts-plugin-functional-${{ matrix.os }} path: | test/*/failure_debug/ test/*/screenshots/ + overwrite: true build-min-artifact-tests: name: Build min release artifacts on ${{ matrix.name }} @@ -418,12 +420,12 @@ jobs: disk-root: 'C:' - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ./artifacts - name: Setup Node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: './artifacts/.nvmrc' registry-url: 'https://registry.npmjs.org' @@ -439,7 +441,7 @@ jobs: run: echo "YARN_CACHE_LOCATION=$(yarn cache dir)" >> $GITHUB_ENV - name: Initialize Yarn Cache - uses: actions/cache@v3 + uses: actions/cache@v4 if: matrix.os != 'windows-latest' with: path: ${{ env.YARN_CACHE_LOCATION }} @@ -473,12 +475,13 @@ jobs: - name: Build `${{ matrix.name }}` run: yarn ${{ matrix.script }} --release - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: success() with: name: ${{ matrix.suffix }}-${{ env.VERSION }} path: ./artifacts/target/${{ env.ARTIFACT_BUILD_NAME }} retention-days: 1 + overwrite: true bwc-tests: needs: [build-min-artifact-tests] @@ -507,7 +510,7 @@ jobs: ] steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ./artifacts @@ -515,7 +518,7 @@ jobs: - run: echo [NOTE] These tests will be ran using Linux x64 release builds without security - name: Setup Node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: './artifacts/.nvmrc' registry-url: 'https://registry.npmjs.org' @@ -550,7 +553,7 @@ jobs: run: echo "BWC_VERSIONS=${{ matrix.version }}" >> $GITHUB_ENV - name: Download OpenSearch Dashboards - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 id: download with: name: linux-x64-${{ env.VERSION }} @@ -562,7 +565,7 @@ jobs: run: | yarn test:bwc -s false -o ${{ env.OPENSEARCH_URL }} -d ${{ steps.download.outputs.download-path }}/opensearch-dashboards-${{ env.VERSION }}-linux-x64.tar.gz -v ${{ matrix.version }} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: ${{ failure() && steps.verify-opensearch-exists.outputs.version-exists == 'true' }} with: name: ${{ matrix.version }}-test-failures @@ -571,3 +574,4 @@ jobs: ./artifacts/bwc_tmp/test/cypress/screenshots/* ./artifacts/bwc_tmp/test/cypress/results/* retention-days: 1 + overwrite: true diff --git a/.github/workflows/build_base.yml b/.github/workflows/build_base.yml index 0fac06eaa850..8e0179f74dc8 100644 --- a/.github/workflows/build_base.yml +++ b/.github/workflows/build_base.yml @@ -39,7 +39,7 @@ jobs: ref: ${{ inputs.CHECKOUT_TO }} - name: Setup Node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: './artifacts/.nvmrc' registry-url: 'https://registry.npmjs.org' @@ -54,7 +54,7 @@ jobs: run: echo "YARN_CACHE_LOCATION=$(yarn cache dir)" >> $GITHUB_ENV - name: Initialize Yarn Cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ env.YARN_CACHE_LOCATION }} key: yarn-${{ hashFiles('**/yarn.lock') }} @@ -85,9 +85,10 @@ jobs: - name: Rename artifact run: mv /home/runner/work/wazuh-dashboard/wazuh-dashboard/artifacts/target/opensearch-dashboards-${{ env.VERSION }}-linux-${{ matrix.ARCHITECTURE }}.${{ matrix.DISTRIBUTION }} /home/runner/work/wazuh-dashboard/wazuh-dashboard/artifacts/target/${{ env.ARTIFACT_BUILD_NAME }} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: success() with: name: ${{ env.ARTIFACT_BUILD_NAME }} path: ./artifacts/target/${{ env.ARTIFACT_BUILD_NAME }} retention-days: 30 + overwrite: true diff --git a/.github/workflows/build_wazuh_dashboard_with_plugins.yml b/.github/workflows/build_wazuh_dashboard_with_plugins.yml index a5abad7d05fa..8d5a7b220128 100644 --- a/.github/workflows/build_wazuh_dashboard_with_plugins.yml +++ b/.github/workflows/build_wazuh_dashboard_with_plugins.yml @@ -193,25 +193,25 @@ jobs: uses: actions/checkout@v4 - name: Setup Node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' registry-url: 'https://registry.npmjs.org' - name: Download dashboard artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ needs.setup-variables.outputs.WAZUH_DASHBOARD_SLIM }} path: ${{ needs.setup-variables.outputs.CURRENT_DIR }}/artifacts/dashboard - name: Download security plugin artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ needs.setup-variables.outputs.WAZUH_SECURITY_PLUGIN }} path: ${{ needs.setup-variables.outputs.CURRENT_DIR }}/artifacts/security-plugin - name: Download plugins artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ needs.setup-variables.outputs.WAZUH_PLUGINS }} path: ${{ needs.setup-variables.outputs.CURRENT_DIR }}/artifacts/plugins diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 092c298a32e4..8c7e91460365 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -41,7 +41,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/cypress_workflow.yml b/.github/workflows/cypress_workflow.yml index 03547e89fcf8..6820c727a876 100644 --- a/.github/workflows/cypress_workflow.yml +++ b/.github/workflows/cypress_workflow.yml @@ -64,7 +64,7 @@ jobs: - name: Get source information from PR number if: ${{ github.event_name == 'workflow_dispatch' && inputs.pr_number != '' }} id: get_pr_info - uses: actions/github-script@v6 + uses: actions/github-script@v7 with: script: | const { data: result } = await github.rest.pulls.get({ @@ -82,13 +82,13 @@ jobs: echo "SOURCE_BRANCH=${{ steps.get_pr_info.outputs.head_ref }}" >> $GITHUB_ENV - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: ${{ env.SOURCE_REPO }} ref: '${{ env.SOURCE_BRANCH }}' - name: Setup Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' registry-url: 'https://registry.npmjs.org' @@ -105,7 +105,7 @@ jobs: run: node scripts/build_opensearch_dashboards_platform_plugins --no-examples --workers 12 - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: ${{ env.FTR_PATH }} repository: ${{ env.TEST_REPO }} @@ -135,7 +135,7 @@ jobs: - name: Cache Cypress id: cache-cypress - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ~/.cache/Cypress key: cypress-cache-v2-${{ runner.os }}-${{ hashFiles('**/package.json') }} @@ -145,7 +145,7 @@ jobs: - run: npx cypress cache path - name: Run tests - uses: cypress-io/github-action@v2 + uses: cypress-io/github-action@v6 with: working-directory: ${{ env.FTR_PATH }} start: ${{ env.OPENSEARCH_SNAPSHOT_CMD }}, ${{ env.START_CMD }} @@ -153,26 +153,29 @@ jobs: command: yarn cypress:run-without-security --browser ${{ env.CYPRESS_BROWSER }} --config ignoreTestFiles="dashboard_sanity_test_spec.js" --spec ${{ env.SPEC }} # Screenshots are only captured on failure, will change this once we do visual regression tests - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: failure() with: name: ftr-cypress-screenshots path: ${{ env.FTR_PATH }}/cypress/screenshots retention-days: 1 + overwrite: true - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: always() with: name: ftr-cypress-videos path: ${{ env.FTR_PATH }}/cypress/videos retention-days: 1 + overwrite: true - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: always() with: name: ftr-cypress-results path: ${{ env.FTR_PATH }}/cypress/results retention-days: 1 + overwrite: true add-comment: needs: [cypress-tests] if: ${{ always() && github.event_name == 'workflow_dispatch' && inputs.pr_number != '' }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 47162a115161..f04e42ad5d82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,14 +7,11 @@ All notable changes to the Wazuh app project will be documented in this file. ### Changed - Reduced the size of the loading logo [#373](https://github.com/wazuh/wazuh-dashboard/pull/373) +- Changed the order of the "Dashboard management" and "Indexer management" sections [#372](https://github.com/wazuh/wazuh-dashboard/pull/372) ### Removed -- Removed the setting home:useNewHomePage from the advanced settings because the views are not finished. [#282](https://github.com/wazuh/wazuh-dashboard/pull/282) - -### Changed - -- Changed the order of the “Dashboard management” and “Indexer management” sections. +- 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.2 - OpenSearch Dashboards 2.13.0 - Revision 01 From 6d205d339810dcc7de55d521468c446a4e02ed71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chantal=20Bel=C3=A9n=20kelm?= <99441266+chantal-kelm@users.noreply.github.com> Date: Thu, 14 Nov 2024 15:55:55 -0300 Subject: [PATCH 13/26] Reorder sections (#413) --- CHANGELOG.md | 1 - dev-tools/build-packages/base/generate_base.sh | 2 +- .../collapsible_nav.test.tsx.snap | 2 +- src/core/utils/default_app_categories.ts | 18 +++++++++--------- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f04e42ad5d82..31a9254759b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,6 @@ All notable changes to the Wazuh app project will be documented in this file. ### Changed - Reduced the size of the loading logo [#373](https://github.com/wazuh/wazuh-dashboard/pull/373) -- Changed the order of the "Dashboard management" and "Indexer management" sections [#372](https://github.com/wazuh/wazuh-dashboard/pull/372) ### Removed diff --git a/dev-tools/build-packages/base/generate_base.sh b/dev-tools/build-packages/base/generate_base.sh index cda6aac36071..6b45e7d35cff 100755 --- a/dev-tools/build-packages/base/generate_base.sh +++ b/dev-tools/build-packages/base/generate_base.sh @@ -148,7 +148,7 @@ build() { # Move installed plugins from categories after generating the package category_explore='{id:"explore",label:"Explore",order:100,euiIconType:"search"}' - category_dashboard_management='{id:"management",label:"Indexer management",order:6e3,euiIconType:"managementApp"}' + category_dashboard_management='{id:"management",label:"Indexer management",order:5e3,euiIconType:"managementApp"}' # Replace app category to Reporting app sed -i -e "s|category:{id:\"opensearch\",label:_i18n.i18n.translate(\"opensearch.reports.categoryName\",{defaultMessage:\"OpenSearch Plugins\"}),order:2e3}|category:${category_explore}|" ./plugins/reportsDashboards/target/public/reportsDashboards.plugin.js 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 index 0d11a8e4a6f7..122a66fdc214 100644 --- 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 @@ -242,7 +242,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = ` "euiIconType": "managementApp", "id": "management", "label": "Indexer management", - "order": 6000, + "order": 5000, }, "data-test-subj": "monitoring", "href": "monitoring", diff --git a/src/core/utils/default_app_categories.ts b/src/core/utils/default_app_categories.ts index 6d112473fc58..57ecaeb4bbe2 100644 --- a/src/core/utils/default_app_categories.ts +++ b/src/core/utils/default_app_categories.ts @@ -73,22 +73,22 @@ export const DEFAULT_APP_CATEGORIES: Record = Object.freeze order: 4000, euiIconType: 'logoSecurity', }, - dashboardManagement: { - id: 'wz-category-dashboard-management', - label: i18n.translate('core.ui.dashboardManagementNavList.label', { - defaultMessage: 'Dashboard management', - }), - order: 5000, - euiIconType: 'dashboardApp', - }, management: { id: 'management', label: i18n.translate('core.ui.managementNavList.label', { defaultMessage: 'Indexer management', }), - order: 6000, + order: 5000, euiIconType: 'managementApp', }, + dashboardManagement: { + id: 'wz-category-dashboard-management', + label: i18n.translate('core.ui.dashboardManagementNavList.label', { + defaultMessage: 'Dashboard management', + }), + order: 6000, + euiIconType: 'dashboardApp', + }, investigate: { id: 'investigate', label: i18n.translate('core.ui.investigate.label', { From 21d94de9a5c59b5e104cf92314f17cb809c0871e Mon Sep 17 00:00:00 2001 From: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com> Date: Wed, 20 Nov 2024 16:08:51 +0100 Subject: [PATCH 14/26] Notification plugin registered in the Explore category (#422) --- dev-tools/build-packages/base/generate_base.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/build-packages/base/generate_base.sh b/dev-tools/build-packages/base/generate_base.sh index 6b45e7d35cff..99662a8df072 100755 --- a/dev-tools/build-packages/base/generate_base.sh +++ b/dev-tools/build-packages/base/generate_base.sh @@ -160,7 +160,7 @@ build() { sed -i -e "s|category:{id:\"opensearch\",label:\"OpenSearch Plugins\",order:2e3}|category:${category_explore}|" ./plugins/customImportMapDashboards/target/public/customImportMapDashboards.plugin.js # Replace app category to Notifications app - sed -i -e "s|category:DEFAULT_APP_CATEGORIES.management|category:${category_explore}|" ./plugins/notificationsDashboards/target/public/notificationsDashboards.plugin.js + sed -i -e "s|category:(_core\$chrome=core.chrome)!==null&&_core\$chrome!==void 0&&(_core\$chrome=_core\$chrome.navGroup)!==null&&_core\$chrome!==void 0&&_core\$chrome.getNavGroupEnabled()?undefined:DEFAULT_APP_CATEGORIES.management|category:${category_explore}|" ./plugins/notificationsDashboards/target/public/notificationsDashboards.plugin.js # Replace app category to Indexer Management app sed -i -e "s|category:DEFAULT_APP_CATEGORIES.management|category:${category_dashboard_management}|g" ./plugins/indexManagementDashboards/target/public/indexManagementDashboards.plugin.js From 566acd80e955ba677312e308516a1f151e404a57 Mon Sep 17 00:00:00 2001 From: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com> Date: Wed, 20 Nov 2024 18:40:24 +0100 Subject: [PATCH 15/26] Fix help menu links (#424) --- src/core/public/chrome/chrome_service.tsx | 1 + src/core/public/chrome/constants.ts | 5 + .../header/__snapshots__/header.test.tsx.snap | 9 + .../header_help_menu.test.tsx.snap | 234 +++++++++++++----- .../public/chrome/ui/header/header.test.tsx | 1 + src/core/public/chrome/ui/header/header.tsx | 2 + .../ui/header/header_help_menu.test.tsx | 1 + .../chrome/ui/header/header_help_menu.tsx | 43 +++- .../core_app/assets/logos/google_groups.svg | 29 +++ .../core_app/assets/logos/icon_dark.svg | 17 ++ .../core_app/assets/logos/icon_light.svg | 13 + src/core/tsconfig.json | 10 +- 12 files changed, 286 insertions(+), 79 deletions(-) create mode 100644 src/core/server/core_app/assets/logos/google_groups.svg create mode 100644 src/core/server/core_app/assets/logos/icon_dark.svg create mode 100644 src/core/server/core_app/assets/logos/icon_light.svg diff --git a/src/core/public/chrome/chrome_service.tsx b/src/core/public/chrome/chrome_service.tsx index d52f6694ee06..04d9c3e51b6d 100644 --- a/src/core/public/chrome/chrome_service.tsx +++ b/src/core/public/chrome/chrome_service.tsx @@ -320,6 +320,7 @@ export class ChromeService { navGroupsMap$={navGroup.getNavGroupsMap$()} setCurrentNavGroup={navGroup.setCurrentNavGroup} workspaceList$={workspaces.workspaceList$} + darkmode={uiSettings.get('theme:darkMode')} /> ), diff --git a/src/core/public/chrome/constants.ts b/src/core/public/chrome/constants.ts index d16393088a16..27fe2c2db3e3 100644 --- a/src/core/public/chrome/constants.ts +++ b/src/core/public/chrome/constants.ts @@ -27,6 +27,10 @@ * specific language governing permissions and limitations * under the License. */ +import wazuh from '../../../../package.json'; + +export const WAZUH_MAJOR = wazuh.wazuh.version.split('.')[0]; +export const WAZUH_MINOR = wazuh.wazuh.version.split('.')[1]; export const OPENSEARCH_DASHBOARDS_FEEDBACK_LINK = 'https://wazuh.com/community/join-us-on-slack'; export const OPENSEARCH_DASHBOARDS_ASK_OPENSEARCH_LINK = OPENSEARCH_DASHBOARDS_FEEDBACK_LINK; @@ -37,3 +41,4 @@ export enum RightNavigationOrder { Settings = 10, DevTool = 20, } +export const WAZUH_DOCUMENTATION_URL = `https://documentation.wazuh.com/${WAZUH_MAJOR}.${WAZUH_MINOR}/`; diff --git a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap index 98cb378e46ee..0866ba0010e4 100644 --- a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap +++ b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap @@ -455,6 +455,7 @@ exports[`Header handles visibility and lock changes 1`] = ` "thrownError": null, } } + darkmode={false} forceAppSwitcherNavigation$={ BehaviorSubject { "_isScalar": false, @@ -4445,6 +4446,7 @@ exports[`Header handles visibility and lock changes 1`] = ` className="euiHeaderSectionItem euiHeaderSectionItem--borderLeft" > + - Wazuh documentation + Documentation
- +
@@ -1849,7 +1863,7 @@ exports[`Header help menu hides survey link 1`] = ` /> @@ -1859,12 +1873,12 @@ exports[`Header help menu hides survey link 1`] = ` - Open an issue in GitHub + Google Group @@ -2013,13 +2027,14 @@ exports[`Header help menu hides survey link 1`] = ` > @@ -2027,6 +2042,7 @@ exports[`Header help menu hides survey link 1`] = ` className="euiButtonEmpty__content" iconSide="left" iconSize="s" + iconType="/ui/logos/icon_light.svg" textProps={ Object { "className": "euiButtonEmpty__text", @@ -2036,15 +2052,28 @@ exports[`Header help menu hides survey link 1`] = ` + + + - Wazuh documentation + Documentation @@ -2060,19 +2089,22 @@ exports[`Header help menu hides survey link 1`] = ` - + @@ -2128,7 +2173,7 @@ exports[`Header help menu hides survey link 1`] = ` className="euiButtonEmpty__content" iconSide="left" iconSize="s" - iconType="logoGithub" + iconType="/ui/logos/google_groups.svg" textProps={ Object { "className": "euiButtonEmpty__text", @@ -2142,12 +2187,12 @@ exports[`Header help menu hides survey link 1`] = ` className="euiButtonContent__icon" color="inherit" size="s" - type="logoGithub" + type="/ui/logos/google_groups.svg" > @@ -2155,11 +2200,11 @@ exports[`Header help menu hides survey link 1`] = ` className="euiButtonEmpty__text" > - Open an issue in GitHub + Google Group @@ -2183,6 +2228,7 @@ exports[`Header help menu hides survey link 1`] = ` exports[`Header help menu renders survey link 1`] = ` + - Wazuh documentation + Documentation
- +
+ - Give feedback + Projects on Github @@ -4050,7 +4114,7 @@ exports[`Header help menu renders survey link 1`] = ` /> @@ -4060,12 +4124,12 @@ exports[`Header help menu renders survey link 1`] = ` - Open an issue in GitHub + Google Group @@ -4214,13 +4278,14 @@ exports[`Header help menu renders survey link 1`] = ` > @@ -4228,6 +4293,7 @@ exports[`Header help menu renders survey link 1`] = ` className="euiButtonEmpty__content" iconSide="left" iconSize="s" + iconType="/ui/logos/icon_light.svg" textProps={ Object { "className": "euiButtonEmpty__text", @@ -4237,15 +4303,28 @@ exports[`Header help menu renders survey link 1`] = ` + + + - Wazuh documentation + Documentation @@ -4261,19 +4340,22 @@ exports[`Header help menu renders survey link 1`] = ` - + @@ -4322,6 +4418,7 @@ exports[`Header help menu renders survey link 1`] = ` className="euiButtonEmpty__content" iconSide="left" iconSize="s" + iconType="logoGithub" textProps={ Object { "className": "euiButtonEmpty__text", @@ -4331,15 +4428,28 @@ exports[`Header help menu renders survey link 1`] = ` + + + - Give feedback + Projects on Github @@ -4363,14 +4473,14 @@ exports[`Header help menu renders survey link 1`] = ` @@ -4378,7 +4488,7 @@ exports[`Header help menu renders survey link 1`] = ` className="euiButtonEmpty__content" iconSide="left" iconSize="s" - iconType="logoGithub" + iconType="/ui/logos/google_groups.svg" textProps={ Object { "className": "euiButtonEmpty__text", @@ -4392,12 +4502,12 @@ exports[`Header help menu renders survey link 1`] = ` className="euiButtonContent__icon" color="inherit" size="s" - type="logoGithub" + type="/ui/logos/google_groups.svg" > @@ -4405,11 +4515,11 @@ exports[`Header help menu renders survey link 1`] = ` className="euiButtonEmpty__text" > - Open an issue in GitHub + Google Group diff --git a/src/core/public/chrome/ui/header/header.test.tsx b/src/core/public/chrome/ui/header/header.test.tsx index 1cfcc84acee5..1956b4e41a6c 100644 --- a/src/core/public/chrome/ui/header/header.test.tsx +++ b/src/core/public/chrome/ui/header/header.test.tsx @@ -85,6 +85,7 @@ function mockProps() { navControlsLeftBottom$: new BehaviorSubject([]), setCurrentNavGroup: jest.fn(() => {}), workspaceList$: new BehaviorSubject([]), + darkmode: false, }; } diff --git a/src/core/public/chrome/ui/header/header.tsx b/src/core/public/chrome/ui/header/header.tsx index 9c4ae18d4a39..e536433a1742 100644 --- a/src/core/public/chrome/ui/header/header.tsx +++ b/src/core/public/chrome/ui/header/header.tsx @@ -111,6 +111,7 @@ export interface HeaderProps { navGroupsMap$: Observable>; setCurrentNavGroup: ChromeNavGroupServiceStartContract['setCurrentNavGroup']; workspaceList$: Observable; + darkmode: boolean; } export function Header({ @@ -288,6 +289,7 @@ export function Header({ opensearchDashboardsDocLink={opensearchDashboardsDocLink} opensearchDashboardsVersion={opensearchDashboardsVersion} surveyLink={survey} + darkmode={observables.darkmode} /> diff --git a/src/core/public/chrome/ui/header/header_help_menu.test.tsx b/src/core/public/chrome/ui/header/header_help_menu.test.tsx index fbcd47367120..2099b9a2a471 100644 --- a/src/core/public/chrome/ui/header/header_help_menu.test.tsx +++ b/src/core/public/chrome/ui/header/header_help_menu.test.tsx @@ -15,6 +15,7 @@ function mockProps() { opensearchDashboardsDocLink: '/doclink', opensearchDashboardsVersion: '1.0', useDefaultContent: true, + darkmode: false, }; } diff --git a/src/core/public/chrome/ui/header/header_help_menu.tsx b/src/core/public/chrome/ui/header/header_help_menu.tsx index feec39386c4e..678e5cdb382f 100644 --- a/src/core/public/chrome/ui/header/header_help_menu.tsx +++ b/src/core/public/chrome/ui/header/header_help_menu.tsx @@ -51,7 +51,7 @@ import { ExclusiveUnion } from '@elastic/eui'; import { combineLatest } from 'rxjs'; import { HeaderExtension } from './header_extension'; import { ChromeHelpExtension } from '../../chrome_service'; -import { GITHUB_CREATE_ISSUE_LINK } from '../../constants'; +import { WAZUH_DOCUMENTATION_URL } from '../../constants'; /** @public */ export type ChromeHelpExtensionMenuGitHubLink = EuiButtonEmptyProps & { @@ -124,6 +124,7 @@ interface Props { useDefaultContent?: boolean; opensearchDashboardsDocLink: string; surveyLink?: string; + darkmode: boolean; } interface State { @@ -199,26 +200,38 @@ class HeaderHelpMenuUI extends Component { intl, opensearchDashboardsVersion, useDefaultContent, - opensearchDashboardsDocLink, surveyLink, + darkmode, } = this.props; - const { helpExtension, helpSupportUrl } = this.state; + const { helpExtension } = this.state; const defaultContent = useDefaultContent ? ( - + - + @@ -226,10 +239,16 @@ class HeaderHelpMenuUI extends Component { {surveyLink && (
- + @@ -239,15 +258,15 @@ class HeaderHelpMenuUI extends Component { diff --git a/src/core/server/core_app/assets/logos/google_groups.svg b/src/core/server/core_app/assets/logos/google_groups.svg new file mode 100644 index 000000000000..934cf1d86d56 --- /dev/null +++ b/src/core/server/core_app/assets/logos/google_groups.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + diff --git a/src/core/server/core_app/assets/logos/icon_dark.svg b/src/core/server/core_app/assets/logos/icon_dark.svg new file mode 100644 index 000000000000..966e74def86c --- /dev/null +++ b/src/core/server/core_app/assets/logos/icon_dark.svg @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/src/core/server/core_app/assets/logos/icon_light.svg b/src/core/server/core_app/assets/logos/icon_light.svg new file mode 100644 index 000000000000..cc9df8577f88 --- /dev/null +++ b/src/core/server/core_app/assets/logos/icon_light.svg @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/src/core/tsconfig.json b/src/core/tsconfig.json index 3281d2f19cfe..fedd701d7e3c 100644 --- a/src/core/tsconfig.json +++ b/src/core/tsconfig.json @@ -5,7 +5,8 @@ "outDir": "./target/types", "emitDeclarationOnly": true, "declaration": true, - "declarationMap": true + "declarationMap": true, + "rootDir": "../../" }, "include": [ "public/**/*", @@ -15,9 +16,8 @@ "test_helpers/**/*", "utils/**/*", "index.ts", - "typings.ts" + "typings.ts", + "../../package.json" ], - "references": [ - { "path": "../test_utils/" } - ] + "references": [{ "path": "../test_utils/" }] } From 78d7a3511382b0f45c28acdc7c7a8a92705a8bf5 Mon Sep 17 00:00:00 2001 From: Antonio <34042064+Desvelao@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:30:04 +0100 Subject: [PATCH 16/26] Bump 4.10.0 rev 05 (#426) --- .github/workflows/build_wazuh_dashboard_with_plugins.yml | 6 +++--- CHANGELOG.md | 2 +- dev-tools/build-packages/wazuh-dashboard.Dockerfile | 2 +- package.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_wazuh_dashboard_with_plugins.yml b/.github/workflows/build_wazuh_dashboard_with_plugins.yml index 8d5a7b220128..03222130c603 100644 --- a/.github/workflows/build_wazuh_dashboard_with_plugins.yml +++ b/.github/workflows/build_wazuh_dashboard_with_plugins.yml @@ -166,21 +166,21 @@ jobs: build-base: needs: [validate-job] name: Build dashboard - uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@v4.10.0-alpha3 + uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@v4.10.0-beta1 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.0-alpha3 + uses: wazuh/wazuh-dashboard-plugins/.github/workflows/manual-build.yml@v4.10.0-beta1 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.0-alpha3 + uses: wazuh/wazuh-security-dashboards-plugin/.github/workflows/manual-build.yml@v4.10.0-beta1 with: reference: ${{ inputs.reference_security_plugins }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 31a9254759b0..fab307447f65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Wazuh app project will be documented in this file. -## Wazuh dashboard v4.10.0 - OpenSearch Dashboards 2.16.0 - Revision 04 +## Wazuh dashboard v4.10.0 - OpenSearch Dashboards 2.16.0 - Revision 05 ### Changed diff --git a/dev-tools/build-packages/wazuh-dashboard.Dockerfile b/dev-tools/build-packages/wazuh-dashboard.Dockerfile index 38406e41ad62..5ce488909cca 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.0 --build-arg WAZUH_DASHBOARDS_PLUGINS=4.10.0 --build-arg WAZUH_SECURITY_DASHBOARDS_PLUGIN_BRANCH=4.10.0 --build-arg OPENSEARCH_DASHBOARDS_VERSION=2.13.0 -t wzd:4.10.0 -f wazuh-dashboard.Dockerfile . +# Usage: docker build --build-arg NODE_VERSION=18.19.0 --build-arg WAZUH_DASHBOARDS_BRANCH=4.10.0 --build-arg WAZUH_DASHBOARDS_PLUGINS=4.10.0 --build-arg WAZUH_SECURITY_DASHBOARDS_PLUGIN_BRANCH=4.10.0 --build-arg OPENSEARCH_DASHBOARDS_VERSION=2.16.0 -t wzd:4.10.0 -f wazuh-dashboard.Dockerfile . ARG NODE_VERSION FROM node:${NODE_VERSION} AS base diff --git a/package.json b/package.json index f06f7d409ec3..65d183b4e1be 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ }, "wazuh": { "version": "4.10.0", - "revision": "04" + "revision": "05" }, "homepage": "https://opensearch.org", "bugs": { From bb92de8d2ee531e73a870dfb3ec609c42aadaeb8 Mon Sep 17 00:00:00 2001 From: Federico Rodriguez Date: Mon, 25 Nov 2024 15:31:51 +0100 Subject: [PATCH 17/26] Fix actions artifact plugins name (#428) --- .../build_wazuh_dashboard_with_plugins.yml | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_wazuh_dashboard_with_plugins.yml b/.github/workflows/build_wazuh_dashboard_with_plugins.yml index 03222130c603..4992944ade24 100644 --- a/.github/workflows/build_wazuh_dashboard_with_plugins.yml +++ b/.github/workflows/build_wazuh_dashboard_with_plugins.yml @@ -96,7 +96,9 @@ jobs: PRODUCTION: ${{ steps.setup-variables.outputs.PRODUCTION }} WAZUH_DASHBOARD_SLIM: ${{ steps.setup-variables.outputs.WAZUH_DASHBOARD_SLIM }} WAZUH_SECURITY_PLUGIN: ${{ steps.setup-variables.outputs.WAZUH_SECURITY_PLUGIN }} - WAZUH_PLUGINS: ${{ steps.setup-variables.outputs.WAZUH_PLUGINS }} + WAZUH_PLUGINS_WAZUH: ${{ steps.setup-variables.outputs.WAZUH_PLUGINS_WAZUH }} + WAZUH_PLUGINS_CORE: ${{ steps.setup-variables.outputs.WAZUH_PLUGINS_CORE }} + WAZUH_PLUGINS_CHECK_UPDATES: ${{ steps.setup-variables.outputs.WAZUH_PLUGINS_CHECK_UPDATES }} PACKAGE_NAME: ${{ steps.setup-variables.outputs.PACKAGE_NAME }} steps: - name: Checkout code @@ -116,7 +118,9 @@ jobs: fi WAZUH_DASHBOARD_SLIM=wazuh-dashboard_${VERSION}-${REVISION}_x64.tar.gz WAZUH_SECURITY_PLUGIN=wazuh-security-dashboards-plugin_${VERSION}-${REVISION}_${{ inputs.reference_security_plugins }}.zip - WAZUH_PLUGINS=wazuh-dashboard-plugins_${VERSION}-${REVISION}_${{ inputs.reference_wazuh_plugins }}.zip + WAZUH_PLUGINS_WAZUH=wazuh-dashboard-plugins_wazuh_${VERSION}-${REVISION}_${{ inputs.reference_wazuh_plugins }}.zip + WAZUH_PLUGINS_CORE=wazuh-dashboard-plugins_wazuh-core_${VERSION}-${REVISION}_${{ inputs.reference_wazuh_plugins }}.zip + WAZUH_PLUGINS_CHECK_UPDATES=wazuh-dashboard-plugins_wazuh-check-updates_${VERSION}-${REVISION}_${{ inputs.reference_wazuh_plugins }}.zip if [ "${{ inputs.system }}" = "deb" ]; then if [ "${{ inputs.is_stage }}" = "true" ]; then PACKAGE_NAME=wazuh-dashboard_${VERSION}-${{ inputs.revision }}_${{ inputs.architecture }}.deb @@ -137,7 +141,9 @@ jobs: echo "PRODUCTION=$PRODUCTION" >> $GITHUB_OUTPUT echo "WAZUH_DASHBOARD_SLIM=$WAZUH_DASHBOARD_SLIM" >> $GITHUB_OUTPUT echo "WAZUH_SECURITY_PLUGIN=$WAZUH_SECURITY_PLUGIN" >> $GITHUB_OUTPUT - echo "WAZUH_PLUGINS=$WAZUH_PLUGINS" >> $GITHUB_OUTPUT + echo "WAZUH_PLUGINS_WAZUH=$WAZUH_PLUGINS_WAZUH" >> $GITHUB_OUTPUT + echo "WAZUH_PLUGINS_CORE=$WAZUH_PLUGINS_CORE" >> $GITHUB_OUTPUT + echo "WAZUH_PLUGINS_CHECK_UPDATES=$WAZUH_PLUGINS_CHECK_UPDATES" >> $GITHUB_OUTPUT echo "PACKAGE_NAME=$PACKAGE_NAME" >> $GITHUB_OUTPUT validate-job: @@ -213,7 +219,17 @@ jobs: - name: Download plugins artifacts uses: actions/download-artifact@v4 with: - name: ${{ needs.setup-variables.outputs.WAZUH_PLUGINS }} + name: ${{ needs.setup-variables.outputs.WAZUH_PLUGINS_WAZUH }} + path: ${{ needs.setup-variables.outputs.CURRENT_DIR }}/artifacts/plugins + - name: Download plugins artifacts + uses: actions/download-artifact@v4 + with: + name: ${{ needs.setup-variables.outputs.WAZUH_PLUGINS_CORE }} + path: ${{ needs.setup-variables.outputs.CURRENT_DIR }}/artifacts/plugins + - name: Download plugins artifacts + uses: actions/download-artifact@v4 + with: + name: ${{ needs.setup-variables.outputs.WAZUH_PLUGINS_CHECK_UPDATES }} path: ${{ needs.setup-variables.outputs.CURRENT_DIR }}/artifacts/plugins - name: Zip plugins From 77fe7b205d00734bb63a9076f45cf8ec7a4b3144 Mon Sep 17 00:00:00 2001 From: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com> Date: Thu, 28 Nov 2024 08:10:45 -0300 Subject: [PATCH 18/26] Unzip command not found in package generation action (#431) --- .../build_wazuh_dashboard_with_plugins.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_wazuh_dashboard_with_plugins.yml b/.github/workflows/build_wazuh_dashboard_with_plugins.yml index 4992944ade24..2766317d404d 100644 --- a/.github/workflows/build_wazuh_dashboard_with_plugins.yml +++ b/.github/workflows/build_wazuh_dashboard_with_plugins.yml @@ -117,10 +117,10 @@ jobs: PRODUCTION="" fi WAZUH_DASHBOARD_SLIM=wazuh-dashboard_${VERSION}-${REVISION}_x64.tar.gz - WAZUH_SECURITY_PLUGIN=wazuh-security-dashboards-plugin_${VERSION}-${REVISION}_${{ inputs.reference_security_plugins }}.zip - WAZUH_PLUGINS_WAZUH=wazuh-dashboard-plugins_wazuh_${VERSION}-${REVISION}_${{ inputs.reference_wazuh_plugins }}.zip - WAZUH_PLUGINS_CORE=wazuh-dashboard-plugins_wazuh-core_${VERSION}-${REVISION}_${{ inputs.reference_wazuh_plugins }}.zip - WAZUH_PLUGINS_CHECK_UPDATES=wazuh-dashboard-plugins_wazuh-check-updates_${VERSION}-${REVISION}_${{ inputs.reference_wazuh_plugins }}.zip + WAZUH_SECURITY_PLUGIN=wazuh-security-dashboards-plugin_${VERSION}-${REVISION}_$(echo ${{ inputs.reference_security_plugins }} | sed 's/\//-/g').zip + WAZUH_PLUGINS_WAZUH=wazuh-dashboard-plugins_wazuh_${VERSION}-${REVISION}_$(echo ${{ inputs.reference_wazuh_plugins }} | sed 's/\//-/g').zip + WAZUH_PLUGINS_CORE=wazuh-dashboard-plugins_wazuh-core_${VERSION}-${REVISION}_$(echo ${{ inputs.reference_wazuh_plugins }} | sed 's/\//-/g').zip + WAZUH_PLUGINS_CHECK_UPDATES=wazuh-dashboard-plugins_wazuh-check-updates_${VERSION}-${REVISION}_$(echo ${{ inputs.reference_wazuh_plugins }} | sed 's/\//-/g').zip if [ "${{ inputs.system }}" = "deb" ]; then if [ "${{ inputs.is_stage }}" = "true" ]; then PACKAGE_NAME=wazuh-dashboard_${VERSION}-${{ inputs.revision }}_${{ inputs.architecture }}.deb @@ -216,17 +216,17 @@ jobs: name: ${{ needs.setup-variables.outputs.WAZUH_SECURITY_PLUGIN }} path: ${{ needs.setup-variables.outputs.CURRENT_DIR }}/artifacts/security-plugin - - name: Download plugins artifacts + - name: Download main plugin's artifact uses: actions/download-artifact@v4 with: name: ${{ needs.setup-variables.outputs.WAZUH_PLUGINS_WAZUH }} path: ${{ needs.setup-variables.outputs.CURRENT_DIR }}/artifacts/plugins - - name: Download plugins artifacts + - name: Download core plugin's artifact uses: actions/download-artifact@v4 with: name: ${{ needs.setup-variables.outputs.WAZUH_PLUGINS_CORE }} path: ${{ needs.setup-variables.outputs.CURRENT_DIR }}/artifacts/plugins - - name: Download plugins artifacts + - name: Download check update plugin's artifact uses: actions/download-artifact@v4 with: name: ${{ needs.setup-variables.outputs.WAZUH_PLUGINS_CHECK_UPDATES }} From 7e5b99c7f002787e6bacb896d693e54d911ddeeb Mon Sep 17 00:00:00 2001 From: Antonio <34042064+Desvelao@users.noreply.github.com> Date: Tue, 3 Dec 2024 10:40:45 +0100 Subject: [PATCH 19/26] Bump 4.10.0 rev 06 (#436) --- .github/workflows/build_wazuh_dashboard_with_plugins.yml | 6 +++--- CHANGELOG.md | 2 +- package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_wazuh_dashboard_with_plugins.yml b/.github/workflows/build_wazuh_dashboard_with_plugins.yml index 2766317d404d..0ba28c58dde3 100644 --- a/.github/workflows/build_wazuh_dashboard_with_plugins.yml +++ b/.github/workflows/build_wazuh_dashboard_with_plugins.yml @@ -172,21 +172,21 @@ jobs: build-base: needs: [validate-job] name: Build dashboard - uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@v4.10.0-beta1 + uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@v4.10.0-rc1 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.0-beta1 + uses: wazuh/wazuh-dashboard-plugins/.github/workflows/manual-build.yml@v4.10.0-rc1 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.0-beta1 + uses: wazuh/wazuh-security-dashboards-plugin/.github/workflows/manual-build.yml@v4.10.0-rc1 with: reference: ${{ inputs.reference_security_plugins }} diff --git a/CHANGELOG.md b/CHANGELOG.md index fab307447f65..2c793a7ec33d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Wazuh app project will be documented in this file. -## Wazuh dashboard v4.10.0 - OpenSearch Dashboards 2.16.0 - Revision 05 +## Wazuh dashboard v4.10.0 - OpenSearch Dashboards 2.16.0 - Revision 06 ### Changed diff --git a/package.json b/package.json index 65d183b4e1be..d6abffa65564 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ }, "wazuh": { "version": "4.10.0", - "revision": "05" + "revision": "06" }, "homepage": "https://opensearch.org", "bugs": { From 5d949a870fbaaa707715aced97904710ed06949a Mon Sep 17 00:00:00 2001 From: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com> Date: Fri, 13 Dec 2024 13:40:18 -0300 Subject: [PATCH 20/26] Fix packages generation (#445) --- .github/workflows/build_wazuh_dashboard_with_plugins.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build_wazuh_dashboard_with_plugins.yml b/.github/workflows/build_wazuh_dashboard_with_plugins.yml index 0ba28c58dde3..fec95b81e733 100644 --- a/.github/workflows/build_wazuh_dashboard_with_plugins.yml +++ b/.github/workflows/build_wazuh_dashboard_with_plugins.yml @@ -104,6 +104,12 @@ jobs: - name: Checkout code uses: actions/checkout@v4 + - name: Setup Node + uses: actions/setup-node@v4 + with: + node-version-file: '.nvmrc' + registry-url: 'https://registry.npmjs.org' + - name: Setup variables id: setup-variables run: | From 24a0521aff5cf37595ed24bae4a9787ada0423fc Mon Sep 17 00:00:00 2001 From: Federico Rodriguez Date: Wed, 18 Dec 2024 10:15:09 +0100 Subject: [PATCH 21/26] Bump 4.10.0 rev 07 (#452) --- .github/workflows/build_wazuh_dashboard_with_plugins.yml | 6 +++--- CHANGELOG.md | 2 +- package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_wazuh_dashboard_with_plugins.yml b/.github/workflows/build_wazuh_dashboard_with_plugins.yml index fec95b81e733..1a0b6618a9ae 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.0-rc1 + uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@v4.10.0-rc2 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.0-rc1 + uses: wazuh/wazuh-dashboard-plugins/.github/workflows/manual-build.yml@v4.10.0-rc2 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.0-rc1 + uses: wazuh/wazuh-security-dashboards-plugin/.github/workflows/manual-build.yml@v4.10.0-rc2 with: reference: ${{ inputs.reference_security_plugins }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c793a7ec33d..e3ac35659117 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Wazuh app project will be documented in this file. -## Wazuh dashboard v4.10.0 - OpenSearch Dashboards 2.16.0 - Revision 06 +## Wazuh dashboard v4.10.0 - OpenSearch Dashboards 2.16.0 - Revision 07 ### Changed diff --git a/package.json b/package.json index d6abffa65564..5b88e97aea42 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ }, "wazuh": { "version": "4.10.0", - "revision": "06" + "revision": "07" }, "homepage": "https://opensearch.org", "bugs": { From 65217fbead9a1956d605298e67cb4f3d729df16e Mon Sep 17 00:00:00 2001 From: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com> Date: Fri, 20 Dec 2024 12:28:52 -0300 Subject: [PATCH 22/26] Support Wazuh 4.10.1 rev 00 (#464) Signed-off-by: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com> Co-authored-by: Guido Modarelli <38738725+guidomodarelli@users.noreply.github.com> --- .../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 1a0b6618a9ae..e73e422602df 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.0-rc2 + uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@4.10.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.10.0-rc2 + uses: wazuh/wazuh-dashboard-plugins/.github/workflows/manual-build.yml@4.10.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.10.0-rc2 + uses: wazuh/wazuh-security-dashboards-plugin/.github/workflows/manual-build.yml@4.10.1 with: reference: ${{ inputs.reference_security_plugins }} diff --git a/CHANGELOG.md b/CHANGELOG.md index e3ac35659117..eaf86089bbee 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.1 - OpenSearch Dashboards 2.16.0 - Revision 00 + +### Added + +- Support for Wazuh 4.10.1 + ## Wazuh dashboard v4.10.0 - OpenSearch Dashboards 2.16.0 - Revision 07 ### Changed diff --git a/VERSION b/VERSION index d3d9bf7a9c75..63c4177f6e55 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v4.10.0 +v4.10.1 diff --git a/dev-tools/build-packages/wazuh-dashboard.Dockerfile b/dev-tools/build-packages/wazuh-dashboard.Dockerfile index 5ce488909cca..d38dd9f79ac7 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.0 --build-arg WAZUH_DASHBOARDS_PLUGINS=4.10.0 --build-arg WAZUH_SECURITY_DASHBOARDS_PLUGIN_BRANCH=4.10.0 --build-arg OPENSEARCH_DASHBOARDS_VERSION=2.16.0 -t wzd:4.10.0 -f wazuh-dashboard.Dockerfile . +# 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 . 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.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.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 WORKDIR /home/node/wzd/dev-tools/build-packages/base/output RUN cp ./* /home/node/packages/ diff --git a/package.json b/package.json index 5b88e97aea42..c9a2c2305ffb 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,8 @@ "sha": "6cb7fec4e154faa0a4a3fee4b33dfef91b9870d9" }, "wazuh": { - "version": "4.10.0", - "revision": "07" + "version": "4.10.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 f1011d64dd56..3fd809a88630 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.0", + "wazuhVersion": "4.10.1", } `; @@ -106,7 +106,7 @@ Object { "uiPlugins": Array [], "vars": Object {}, "version": Any, - "wazuhVersion": "4.10.0", + "wazuhVersion": "4.10.1", } `; @@ -161,7 +161,7 @@ Object { "uiPlugins": Array [], "vars": Object {}, "version": Any, - "wazuhVersion": "4.10.0", + "wazuhVersion": "4.10.1", } `; @@ -220,7 +220,7 @@ Object { "uiPlugins": Array [], "vars": Object {}, "version": Any, - "wazuhVersion": "4.10.0", + "wazuhVersion": "4.10.1", } `; @@ -275,7 +275,7 @@ Object { "uiPlugins": Array [], "vars": Object {}, "version": Any, - "wazuhVersion": "4.10.0", + "wazuhVersion": "4.10.1", } `; @@ -330,7 +330,7 @@ Object { "uiPlugins": Array [], "vars": Object {}, "version": Any, - "wazuhVersion": "4.10.0", + "wazuhVersion": "4.10.1", } `; @@ -385,6 +385,6 @@ Object { "uiPlugins": Array [], "vars": Object {}, "version": Any, - "wazuhVersion": "4.10.0", + "wazuhVersion": "4.10.1", } `; From aa2f907438f244bb75c555378a616aedb4cf2617 Mon Sep 17 00:00:00 2001 From: Antonio <34042064+Desvelao@users.noreply.github.com> Date: Fri, 10 Jan 2025 13:27:21 +0100 Subject: [PATCH 23/26] Merge 4.10.0 into 4.10.1 (#478) Co-authored-by: JuanGarriuz Co-authored-by: Nicolas Agustin Guevara Pihen --- CHANGELOG.md | 6 +++++- package.json | 2 +- .../src/integration_tests/build.test.ts | 12 ++++++++++++ scripts/use_node | 6 ++++-- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eaf86089bbee..08e31727c005 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,12 +8,16 @@ All notable changes to the Wazuh app project will be documented in this file. - Support for Wazuh 4.10.1 -## Wazuh dashboard v4.10.0 - OpenSearch Dashboards 2.16.0 - Revision 07 +## Wazuh dashboard v4.10.0 - OpenSearch Dashboards 2.16.0 - Revision 08 ### Changed - Reduced the size of the loading logo [#373](https://github.com/wazuh/wazuh-dashboard/pull/373) +### Fixed + +- Apply the NodeJS options defined at node.options file to the node exec command [#471](https://github.com/wazuh/wazuh-dashboard/pull/471) + ### Removed - Removed the setting home:useNewHomePage from the advanced settings because the views are not finished [#282](https://github.com/wazuh/wazuh-dashboard/pull/282) diff --git a/package.json b/package.json index c9a2c2305ffb..d9664442275d 100644 --- a/package.json +++ b/package.json @@ -506,4 +506,4 @@ "node": ">=14.20.1 <19", "yarn": "^1.22.10" } -} \ No newline at end of file +} diff --git a/packages/osd-plugin-helpers/src/integration_tests/build.test.ts b/packages/osd-plugin-helpers/src/integration_tests/build.test.ts index 780682d27658..37e5b3aacd98 100644 --- 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