diff --git a/.github/actions/comment-test-coverage/README.md b/.github/actions/comment-test-coverage/README.md index b20a220ab1..d9e0f3039b 100644 --- a/.github/actions/comment-test-coverage/README.md +++ b/.github/actions/comment-test-coverage/README.md @@ -13,7 +13,7 @@ name: test-pull-request on: [pull_request] jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Checkout Code uses: actions/checkout@v4 diff --git a/.github/workflows/5_builderpackage_plugins.yml b/.github/workflows/5_builderpackage_plugins.yml index 9c1a937917..08ef6f8087 100644 --- a/.github/workflows/5_builderpackage_plugins.yml +++ b/.github/workflows/5_builderpackage_plugins.yml @@ -46,7 +46,7 @@ jobs: test-packages: needs: build name: Test packages - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 strategy: matrix: plugin: [wazuh-core, wazuh-check-updates] diff --git a/.github/workflows/5_builderprecompiled_base-dev-environment.yml b/.github/workflows/5_builderprecompiled_base-dev-environment.yml index af1752d3a6..2d12676443 100644 --- a/.github/workflows/5_builderprecompiled_base-dev-environment.yml +++ b/.github/workflows/5_builderprecompiled_base-dev-environment.yml @@ -52,7 +52,7 @@ jobs: # using a pre-built Docker image, hosted in Quay.io. deploy_and_run_command: name: Deploy and run command - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 strategy: matrix: plugins: diff --git a/.github/workflows/5_codeanalysis_dependency-review.yml b/.github/workflows/5_codeanalysis_dependency-review.yml index 25cf1dcf9e..487a5bdebe 100644 --- a/.github/workflows/5_codeanalysis_dependency-review.yml +++ b/.github/workflows/5_codeanalysis_dependency-review.yml @@ -18,7 +18,9 @@ # - 🚨 Automatically blocks insecure dependency additions when configured. name: 'Dependency Review' -on: [pull_request] +on: + pull_request: + types: [opened, synchronize, reopened, ready_for_review] concurrency: group: pr-${{ github.event.pull_request.number || github.ref }} @@ -29,7 +31,8 @@ permissions: jobs: dependency-review: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 + if: github.event.pull_request.draft == false steps: - name: 'Checkout Repository' uses: actions/checkout@v4 diff --git a/.github/workflows/5_codequality_lint-and-format.yml b/.github/workflows/5_codequality_lint-and-format.yml index e26e382948..64eab80a40 100644 --- a/.github/workflows/5_codequality_lint-and-format.yml +++ b/.github/workflows/5_codequality_lint-and-format.yml @@ -22,6 +22,7 @@ name: Code Quality Assurance on: pull_request: + types: [opened, synchronize, reopened, ready_for_review] branches-ignore: - 2.* - 3.* @@ -34,7 +35,8 @@ concurrency: jobs: lint_and_format: name: Ensure code quality and format on the changed files - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 + if: github.event.pull_request.draft == false strategy: matrix: tool: diff --git a/.github/workflows/5_testunit_jest.yml b/.github/workflows/5_testunit_jest.yml index 867c1792aa..9309fc5c4b 100644 --- a/.github/workflows/5_testunit_jest.yml +++ b/.github/workflows/5_testunit_jest.yml @@ -31,6 +31,7 @@ on: options: - 'yarn test:jest' pull_request: + types: [opened, synchronize, reopened, ready_for_review] concurrency: group: pr-${{ github.event.pull_request.number || github.ref }} @@ -39,6 +40,7 @@ concurrency: jobs: # Run unit tests with Jest test: + if: github.event.pull_request.draft == false name: Run unit tests uses: ./.github/workflows/5_builderprecompiled_base-dev-environment.yml with: diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 0ec179e266..340e1863f3 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -8,7 +8,7 @@ on: jobs: backport: name: Backport - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 # Only react to merged PRs for security reasons. # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target. if: > diff --git a/CHANGELOG.md b/CHANGELOG.md index 983bdfad65..2b0b0ef84c 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 v6.0.0 - OpenSearch Dashboards 2.19.1 - Revision 00 +## Wazuh v6.0.0 - OpenSearch Dashboards 2.19.2 - Revision 00 ### Added diff --git a/docker/osd-dev/dev.sh b/docker/osd-dev/dev.sh index 26b921cb24..95eec2a756 100755 --- a/docker/osd-dev/dev.sh +++ b/docker/osd-dev/dev.sh @@ -63,7 +63,7 @@ required_argument() { } MAJOR_MINOR_PATCH_PATTERN="[0-9]+(\.[0-9]+){2}" -VERSIONING_SUFFIX_PATTERN="(-${MAJOR_MINOR_PATCH_PATTERN})?(\.[a-z]+)?" +VERSIONING_SUFFIX_PATTERN="(-${MAJOR_MINOR_PATCH_PATTERN})?(\.[a-z]+|-arm)?" VERSION_PATTERN="^${MAJOR_MINOR_PATCH_PATTERN}${VERSIONING_SUFFIX_PATTERN}$" validate_argument() { local arg="$1" diff --git a/plugins/main/package.json b/plugins/main/package.json index 90190b5331..e44b733724 100644 --- a/plugins/main/package.json +++ b/plugins/main/package.json @@ -3,7 +3,7 @@ "version": "6.0.0", "revision": "00", "pluginPlatform": { - "version": "2.19.1" + "version": "2.19.2" }, "description": "Wazuh dashboard", "keywords": [ diff --git a/plugins/wazuh-analysis/package.json b/plugins/wazuh-analysis/package.json index 15060b73ed..5c60b19119 100644 --- a/plugins/wazuh-analysis/package.json +++ b/plugins/wazuh-analysis/package.json @@ -3,7 +3,7 @@ "version": "6.0.0", "revision": "00", "pluginPlatform": { - "version": "2.19.1" + "version": "2.19.2" }, "description": "Wazuh Analysis", "private": true, diff --git a/plugins/wazuh-check-updates/package.json b/plugins/wazuh-check-updates/package.json index ff20da1689..57014dcc16 100644 --- a/plugins/wazuh-check-updates/package.json +++ b/plugins/wazuh-check-updates/package.json @@ -3,7 +3,7 @@ "version": "6.0.0", "revision": "00", "pluginPlatform": { - "version": "2.19.1" + "version": "2.19.2" }, "description": "Wazuh Check Updates", "private": true, diff --git a/plugins/wazuh-core/package.json b/plugins/wazuh-core/package.json index 1951da3304..3cac7af3ff 100644 --- a/plugins/wazuh-core/package.json +++ b/plugins/wazuh-core/package.json @@ -3,7 +3,7 @@ "version": "6.0.0", "revision": "00", "pluginPlatform": { - "version": "2.19.1" + "version": "2.19.2" }, "description": "Wazuh Core", "private": true, diff --git a/plugins/wazuh-core/server/initialization/server-api.test.ts b/plugins/wazuh-core/server/initialization/server-api.test.ts index 499d5d0b98..25d9e91621 100644 --- a/plugins/wazuh-core/server/initialization/server-api.test.ts +++ b/plugins/wazuh-core/server/initialization/server-api.test.ts @@ -38,7 +38,7 @@ describe('checkAppServerCompatibility', () => { describe('serverAPIConnectionCompatibility', () => { it.each` apiHostID | apiVersionResponse | isCompatible - ${'server1'} | ${{ api_version: '5.0.0' }} | ${true} + ${'server1'} | ${{ api_version: '6.0.0' }} | ${true} ${'server2'} | ${{ api_version: '0.0.0' }} | ${false} ${'server3'} | ${{ missing_api_version_field: null }} | ${false} `( diff --git a/plugins/wazuh-engine/package.json b/plugins/wazuh-engine/package.json index 9435790fae..9ea8f20474 100644 --- a/plugins/wazuh-engine/package.json +++ b/plugins/wazuh-engine/package.json @@ -3,7 +3,7 @@ "version": "6.0.0", "revision": "00", "pluginPlatform": { - "version": "2.19.1" + "version": "2.19.2" }, "description": "Wazuh Engine", "private": true, diff --git a/plugins/wazuh-fleet/package.json b/plugins/wazuh-fleet/package.json index be99fc1775..08b1b7a593 100644 --- a/plugins/wazuh-fleet/package.json +++ b/plugins/wazuh-fleet/package.json @@ -3,7 +3,7 @@ "version": "6.0.0", "revision": "00", "pluginPlatform": { - "version": "2.19.1" + "version": "2.19.2" }, "description": "Wazuh Fleet", "private": true, diff --git a/plugins/wazuh-fleet/public/application/pages/enroll-agent/components/optionals-inputs/__snapshots__/optionals-inputs.test.tsx.snap b/plugins/wazuh-fleet/public/application/pages/enroll-agent/components/optionals-inputs/__snapshots__/optionals-inputs.test.tsx.snap index 40147fa098..799d8c7041 100644 --- a/plugins/wazuh-fleet/public/application/pages/enroll-agent/components/optionals-inputs/__snapshots__/optionals-inputs.test.tsx.snap +++ b/plugins/wazuh-fleet/public/application/pages/enroll-agent/components/optionals-inputs/__snapshots__/optionals-inputs.test.tsx.snap @@ -135,7 +135,7 @@ exports[`Enrollment key input match the snapshopt 1`] = ` The agent name must be unique. It can’t be changed once the agent has been enrolled.