Skip to content

Merge 4.14.0 into main #7472

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

Merged
merged 25 commits into from
May 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
278683f
Support Opensearch 2.19.2
Tostti May 7, 2025
a4f98f4
Prevent actions from running on draft prs
Tostti May 7, 2025
732196b
Prevent actions from running on draft prs
Tostti May 7, 2025
9b4321c
Merge branch '4.13.0' into merge-4.13.0-to-2.19.2
Tostti May 8, 2025
10bccec
Change "Vulnerabilities by year of publication" visualization label -…
gonzaarancibia May 9, 2025
3d69e48
Add UUID field to APIs table (#7412)
gonzaarancibia May 9, 2025
64805dd
Add condition to workflow
Tostti May 12, 2025
f231cac
Add condition to workflows
Tostti May 12, 2025
10e1036
Prettier
Tostti May 12, 2025
eb31300
Upgrade `cross-spawn` and `dompurify` (#7435)
Tostti May 13, 2025
fc21834
Change the agent startup command in macOS (#7430)
yenienserrano May 13, 2025
d61260f
Compatibility with opensearch 2.19.2 (#7418)
Tostti May 13, 2025
4812395
Add back button to endpoints summary (#7443)
gonzaarancibia May 16, 2025
b7f86fd
Setup dev environment (#7440)
guidomodarelli May 19, 2025
1dd442a
Support wazuh 4.14.0 (#7448)
Tostti May 19, 2025
569bbdb
Add global FIM and system inventories (#7368)
Desvelao May 20, 2025
ab67ab0
Fix wazuh.cluster.name field in sample data of IT Hygiene, FIM and vu…
Desvelao May 20, 2025
288c82f
Merge branch '4.12.2' into merge-4.12.1-into-4.12.2
Tostti May 27, 2025
6e2f1e1
Merge 4.12.1 into 4.12.2 (#7467)
Tostti May 27, 2025
f119075
Merge branch '4.13.0' into merge-4.12.2-into-4.13.0
Tostti May 27, 2025
5f288e9
Update package.json
Tostti May 27, 2025
5b60e7e
Merge 4.12.2 into 4.13.0 (#7470)
Tostti May 27, 2025
e4078d3
Merge branch '4.14.0' into merge-4.13.0-into-4.14.0
Tostti May 27, 2025
407998d
Merge 4.13.0 into 4.14.0 (#7471)
Tostti May 27, 2025
a04c5f3
Merge branch 'main' into merge-4.14.0-into-main
Tostti May 27, 2025
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
9 changes: 5 additions & 4 deletions .github/ISSUE_TEMPLATE/compatibility_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,20 @@ about: Suggest supporting a new platform version (Elastic, OpenSearch)
title: 'Compatibility with [Elastic | OpenSearch] (version)'
labels: compatibility
assignees: ''

---

## Description

We need to ensure the UI compatibility with the next version of Elastic vX.X | OpenSearch vX.X.
This update is still being discussed, but we need to be aware of potential issues.

For that, we need to:

- [ ] Review opensearch and opensearch-dashboard latest stable changelog.
- [ ] Review opensearch and opensearch-dashboard latest stable changelog.
- [ ] Identify improvements and potential impact on the UI.
- [ ] Check if any dependencies were upgraded and upgrade it in our plugins.
- [ ] Develop a testing environment to verify our components would work under this new build.


## Issues
- _List here the detected issues_

- _List here the detected issues_
5 changes: 4 additions & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,17 @@
# Source repository: https://github.com/actions/dependency-review-action
# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
name: 'Dependency Review'
on: [pull_request]
on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]

permissions:
contents: read

jobs:
dependency-review:
runs-on: ubuntu-24.04
if: github.event.pull_request.draft == false
steps:
- name: 'Checkout Repository'
uses: actions/checkout@v4
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ on:
- 2.*
- 3.*
- 4.*

types: [opened, synchronize, reopened, ready_for_review]
jobs:
linter:
name: Ensure the code format on the changed files
runs-on: ubuntu-24.04
if: github.event.pull_request.draft == false
steps:
# https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
- name: Checkout code
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/prettier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ name: Prettier

on:
pull_request:

types: [opened, synchronize, reopened, ready_for_review]
jobs:
prettier:
name: Ensure the code format on the changed files
runs-on: ubuntu-24.04
if: github.event.pull_request.draft == false
steps:
# https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
- name: Checkout code
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ on:
options:
- 'yarn test:jest'
pull_request:
types: [opened, synchronize, reopened, ready_for_review]

jobs:
# Run unit tests with Jest
test:
if: github.event.pull_request.draft == false
name: Run unit tests
uses: ./.github/workflows/dev-environment.yml
with:
Expand Down
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ scripts/vulnerabilities-events-injector/generatedData.json
__pycache__
python3.*
bin/
site-packages/
lib64
pyvenv.cfg

scripts/sample-data/config.json
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
"typescript.updateImportsOnFileMove.enabled": "always",
"[ignore]": {
"editor.defaultFormatter": "foxundermoon.shell-format"
}
},
"eslint.enable": false
}
38 changes: 36 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,36 @@ All notable changes to the Wazuh app project will be documented in this file.

- Support for Wazuh 5.0.0

## Wazuh v4.13.0 - OpenSearch Dashboards 2.19.1 - Revision 00
## Wazuh v4.14.0 - OpenSearch Dashboards 2.19.2 - Revision 00

### Added

- Support for Wazuh 4.14.0

## Wazuh v4.13.0 - OpenSearch Dashboards 2.19.2 - Revision 00

### Added

- Support for Wazuh 4.13.0
- Add persistence for selected columns and page size in data grid settings [#7379](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7379)
- Added `It Hygiene` application [#7368](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7368)
- Added hardware and system information to the agent overview [#7368](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7368)
- Added settings to manage the FIM and IT Hygiene inventories data [#7368](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7368)
- Added persistence for selected columns and page size in data grid settings [#7379](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7379)
- Added the ability to manage the sample data from FIM, IT Higiene and vulnerabilities inventories and new settings to define the index names prefixes. [#7373](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7373) [7449](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7449)

## Changed

- Moved `/elastic/samplealerts` API endpoints to `/indexer/samplealerts` [#7373](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7373)

### Fixed

- Fixed a problem in Vulnerabilities > Dashboard and Inventory when there is no indices matching with the index pattern [#7368](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7368)

### Removed

- Removed `Inventory data` view from agent overview [#7368](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7368)
- Removed `GET /api/syscollector` API endpoint [#7368](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7368)
- Removed inventory data report and `POST /reports/agents/{agentID}/inventory` API endpoint [#7368](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7368)

### Fixed

Expand All @@ -24,12 +48,22 @@ All notable changes to the Wazuh app project will be documented in this file.
### Added

- Support for Wazuh 4.12.2
- Added back button to Deploy Agent page that redirects to Endpoints Summary [#7443](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7443)

## Wazuh v4.12.1 - OpenSearch Dashboards 2.19.1 - Revision 00

### Added

- Support for Wazuh 4.12.1
- Add UUID field to APIs table [#7412](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7412)

### Changed

- Changed macOS agent startup command [#7430](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7430)

### Fixed

- Fixed X-axis label in "Vulnerabilities by year of publication" visualization [#7422](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7422)

## Wazuh v4.12.0 - OpenSearch Dashboards 2.19.1 - Revision 03

Expand Down
21 changes: 21 additions & 0 deletions docker/imposter/manager/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"data": {
"affected_items": [
{
"path": "/var/ossec",
"version": "v4.12.1",
"type": "server",
"max_agents": "unlimited",
"openssl_support": true,
"tz_offset": 0,
"tz_name": "UTC",
"uuid": "c842f85c-c24b-4b39-9508-093ce53482e7"
}
],
"total_affected_items": 1,
"total_failed_items": 0,
"failed_items": []
},
"message": "Basic information was successfully read in specified node",
"error": 0
}
3 changes: 3 additions & 0 deletions docker/imposter/wazuh-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,9 @@ resources:
# Get information
- method: GET
path: /manager/info
response:
statusCode: 200
staticFile: manager/info.json

# Get configuration
- method: GET
Expand Down
89 changes: 71 additions & 18 deletions docker/osd-dev/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,26 +26,80 @@ Use always the provided script to bring up or down the development
environment. For example:

```bash
./dev.sh [-o 1.2.4] [-d 1.2.0] $WZ_HOME up [saml]
./dev.sh [-o <os_version>] [-d <osd_version>] [-a <agents_up>] <wazuh_app_src> <action> [<mode>] [<server_version>]
```

The script will ask you all the required parameters to bring up the
environment, including the version of the elastic stack you want to
develop for, and the source code folder where the wazuh-dashboard-plugins is
located.
### Parameters

- -o <os_version> : (Optional) Specifies the OpenSearch version. If not provided, it's obtained from plugins/wazuh-core/package.json .
- -d <osd_version> : (Optional) Specifies the OpenSearch Dashboards version. If not provided, it's obtained from plugins/wazuh-core/package.json .
- -a <agents_up> : (Optional) Relevant when using server-local mode. Specifies agent deployment:
- rpm : Deploys an RPM-based agent.
- deb : Deploys a DEB-based agent.
- without : Deploys no agents.
- If this option is not used with server-local mode (or an empty string is provided), the default agent configuration for the server-local profile is used ( 2 agents, one RPM-based and one DEB-based ).
- <wazuh_app_src> : (Required) Absolute path to the Wazuh Dashboard plugins source code (e.g., /absolute/path/to/wazuh-dashboard-plugins ). The script checks that the path is absolute.
- <action> : (Required) The action to perform:
- up : Brings up the environment.
- down : Stops the environment and removes volumes.
- stop : Stops the services.
- start : Starts previously stopped services.
- <mode> : (Optional) Specifies the deployment mode. Can be one of:
- saml : Deploys a SAML-enabled environment with KeyCloak IDP.
- Note for SAML : You need to add idp to your hosts file ( /etc/hosts on Linux/macOS, C:\Windows\System32\drivers\etc\hosts on Windows) pointing to 127.0.0.1 . Also, based on previous configurations, KeyCloak IDP might need to be started with the --no-base-path option.
```
# Example entry in /etc/hosts
127.0.0.1 idp
```
- server : Deploys an environment with a real Wazuh server. Requires <server_version> .
- server-local : Deploys an environment with a local Wazuh server package. Requires <server_version> (which will be used as IMAGE_TAG ).
- **Important for `server-local` mode**: You must place the Wazuh manager installation packages (`.deb` file) in a folder named `manager` within the `wazuh-dashboard-plugins/docker/osd-dev/` directory. Similarly, any Wazuh agent installation packages (`.rpm` or/and `.deb` files) should be placed in a folder named `agents` within the same directory. These packages will be used to build the local server and agent images.
- If omitted, a standard development environment is deployed (profile standard ).
- <server_version> : (Optional) Required if <mode> is server or server-local .
- For server mode: Specifies the Wazuh release version (e.g., 4.7.2 ) to be used for the WAZUH_STACK variable.
- For server-local mode: Specifies the image tag (e.g., my-custom-image ) for the local server build, to be used for the IMAGE_TAG variable.

### Examples

Standard environment:

Use the `saml` flag to bring up KeyCloak IDP. **Add idp to your hosts and start
the server using the `--no-base-path`**.
```
./dev.sh /absolute/path/to/wazuh-dashboard-plugins up
```

With specific OpenSearch/OSD versions:

```
./dev.sh -o 2.11.0 -d 2.11.0 /absolute/path/to/wazuh-dashboard-plugins up
```

SAML-enabled environment:

```
./dev.sh /absolute/path/to/wazuh-dashboard-plugins up saml
```

Environment with a real Wazuh server:

```apacheconf
# Linux systems: /etc/hosts
# Windows systems: C:\Windows\System32\drivers\etc\hosts
127.0.0.1 idp
```
./dev.sh /absolute/path/to/wazuh-dashboard-plugins up server 4.7.2
```

Environment with a local Wazuh server build and DEB agent:

```
./dev.sh -a deb /absolute/path/to/wazuh-dashboard-plugins up server-local my-custom-tag
```

**The script will not select the appropriate version of the
wazuh-dashboard-plugins to use, so be sure to check out the appropriate version
before bringing up the environment!**
Environment with a local Wazuh server build and no agents:

```
./dev.sh -a without /absolute/path/to/wazuh-dashboard-plugins up server-local my-custom-tag
```

Important Note about Plugin Version:

The script will not select the appropriate version of the wazuh-dashboard-plugins to use, so be sure to check out the appropriate version before bringing up the environment!

### UI Credentials

Expand All @@ -71,7 +125,6 @@ This environment will start a working deployment with:
- Elasticsearch-exporter - Elasticsearch metrics to Prometheus adapter.
- OpenSearch single-node cluster.
- OpenSearch Dashboards development environment.

The OpenSearch Dashboards development environment includes an already
bootstrapped Kibana, with all the node modules precompiled and ready to
use in a development session.
The OpenSearch Dashboards development environment includes an already
bootstrapped Kibana, with all the node modules precompiled and ready to
use in a development session.
1 change: 1 addition & 0 deletions docker/osd-dev/agents/.gitkeep
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*
7 changes: 6 additions & 1 deletion docker/osd-dev/config/2.x/osd/wazuh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ hosts:
username: wazuh-wui
password: MyS3cr37P450r.*-
run_as: false

- manager-local:
url: 'https://wazuh.manager.local'
port: 55000
username: wazuh-wui
password: wazuh-wui
run_as: false

wazuh.updates.disabled: true
Loading
Loading