Skip to content

Compatibility with OpenSearch 2.19.2 for Wazuh 6.x #7459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: 6.0.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/comment-test-coverage/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/5_builderpackage_plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/5_codeanalysis_dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/5_codequality_lint-and-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ name: Code Quality Assurance

on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
branches-ignore:
- 2.*
- 3.*
Expand All @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/5_testunit_jest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: >
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docker/osd-dev/dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion plugins/main/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "6.0.0",
"revision": "00",
"pluginPlatform": {
"version": "2.19.1"
"version": "2.19.2"
},
"description": "Wazuh dashboard",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion plugins/wazuh-analysis/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "6.0.0",
"revision": "00",
"pluginPlatform": {
"version": "2.19.1"
"version": "2.19.2"
},
"description": "Wazuh Analysis",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion plugins/wazuh-check-updates/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion plugins/wazuh-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "6.0.0",
"revision": "00",
"pluginPlatform": {
"version": "2.19.1"
"version": "2.19.2"
},
"description": "Wazuh Core",
"private": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}
`(
Expand Down
2 changes: 1 addition & 1 deletion plugins/wazuh-engine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "6.0.0",
"revision": "00",
"pluginPlatform": {
"version": "2.19.1"
"version": "2.19.2"
},
"description": "Wazuh Engine",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion plugins/wazuh-fleet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "6.0.0",
"revision": "00",
"pluginPlatform": {
"version": "2.19.1"
"version": "2.19.2"
},
"description": "Wazuh Fleet",
"private": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
<a
class="euiLink euiLink--primary"
href="https://documentation.wazuh.com/5.0/user-manual/reference/ossec-conf/client.html#enrollment-agent-name"
href="https://documentation.wazuh.com/6.0/user-manual/reference/ossec-conf/client.html#enrollment-agent-name"
rel="noopener noreferrer"
target="_blank"
>
Expand Down
Loading