Skip to content

Commit f3fb4fa

Browse files
authored
Merge 4.14.0 into main (#7472)
### Description Merge 4.14.0 into main
2 parents a6094c7 + a04c5f3 commit f3fb4fa

File tree

300 files changed

+17723
-25523
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

300 files changed

+17723
-25523
lines changed

.github/ISSUE_TEMPLATE/compatibility_request.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,20 @@ about: Suggest supporting a new platform version (Elastic, OpenSearch)
44
title: 'Compatibility with [Elastic | OpenSearch] (version)'
55
labels: compatibility
66
assignees: ''
7-
87
---
98

109
## Description
10+
1111
We need to ensure the UI compatibility with the next version of Elastic vX.X | OpenSearch vX.X.
1212
This update is still being discussed, but we need to be aware of potential issues.
1313

1414
For that, we need to:
1515

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

20-
2121
## Issues
22-
- _List here the detected issues_
22+
23+
- _List here the detected issues_

.github/workflows/dependency-review.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,17 @@
55
# Source repository: https://github.com/actions/dependency-review-action
66
# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
77
name: 'Dependency Review'
8-
on: [pull_request]
8+
on:
9+
pull_request:
10+
types: [opened, synchronize, reopened, ready_for_review]
911

1012
permissions:
1113
contents: read
1214

1315
jobs:
1416
dependency-review:
1517
runs-on: ubuntu-24.04
18+
if: github.event.pull_request.draft == false
1619
steps:
1720
- name: 'Checkout Repository'
1821
uses: actions/checkout@v4

.github/workflows/eslint.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ on:
1515
- 2.*
1616
- 3.*
1717
- 4.*
18-
18+
types: [opened, synchronize, reopened, ready_for_review]
1919
jobs:
2020
linter:
2121
name: Ensure the code format on the changed files
2222
runs-on: ubuntu-24.04
23+
if: github.event.pull_request.draft == false
2324
steps:
2425
# https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
2526
- name: Checkout code

.github/workflows/prettier.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ name: Prettier
22

33
on:
44
pull_request:
5-
5+
types: [opened, synchronize, reopened, ready_for_review]
66
jobs:
77
prettier:
88
name: Ensure the code format on the changed files
99
runs-on: ubuntu-24.04
10+
if: github.event.pull_request.draft == false
1011
steps:
1112
# https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
1213
- name: Checkout code

.github/workflows/unit-test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@ on:
2323
options:
2424
- 'yarn test:jest'
2525
pull_request:
26+
types: [opened, synchronize, reopened, ready_for_review]
2627

2728
jobs:
2829
# Run unit tests with Jest
2930
test:
31+
if: github.event.pull_request.draft == false
3032
name: Run unit tests
3133
uses: ./.github/workflows/dev-environment.yml
3234
with:

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ scripts/vulnerabilities-events-injector/generatedData.json
9191
__pycache__
9292
python3.*
9393
bin/
94+
site-packages/
9495
lib64
9596
pyvenv.cfg
96-
97-
scripts/sample-data/config.json

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@
1616
"typescript.updateImportsOnFileMove.enabled": "always",
1717
"[ignore]": {
1818
"editor.defaultFormatter": "foxundermoon.shell-format"
19-
}
19+
},
20+
"eslint.enable": false
2021
}

CHANGELOG.md

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,36 @@ All notable changes to the Wazuh app project will be documented in this file.
88

99
- Support for Wazuh 5.0.0
1010

11-
## Wazuh v4.13.0 - OpenSearch Dashboards 2.19.1 - Revision 00
11+
## Wazuh v4.14.0 - OpenSearch Dashboards 2.19.2 - Revision 00
12+
13+
### Added
14+
15+
- Support for Wazuh 4.14.0
16+
17+
## Wazuh v4.13.0 - OpenSearch Dashboards 2.19.2 - Revision 00
1218

1319
### Added
1420

1521
- Support for Wazuh 4.13.0
16-
- Add persistence for selected columns and page size in data grid settings [#7379](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7379)
22+
- Added `It Hygiene` application [#7368](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7368)
23+
- Added hardware and system information to the agent overview [#7368](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7368)
24+
- Added settings to manage the FIM and IT Hygiene inventories data [#7368](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7368)
25+
- Added persistence for selected columns and page size in data grid settings [#7379](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7379)
26+
- 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)
27+
28+
## Changed
29+
30+
- Moved `/elastic/samplealerts` API endpoints to `/indexer/samplealerts` [#7373](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7373)
31+
32+
### Fixed
33+
34+
- 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)
35+
36+
### Removed
37+
38+
- Removed `Inventory data` view from agent overview [#7368](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7368)
39+
- Removed `GET /api/syscollector` API endpoint [#7368](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7368)
40+
- Removed inventory data report and `POST /reports/agents/{agentID}/inventory` API endpoint [#7368](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7368)
1741

1842
### Fixed
1943

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

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

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

3055
### Added
3156

3257
- Support for Wazuh 4.12.1
58+
- Add UUID field to APIs table [#7412](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7412)
59+
60+
### Changed
61+
62+
- Changed macOS agent startup command [#7430](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7430)
63+
64+
### Fixed
65+
66+
- Fixed X-axis label in "Vulnerabilities by year of publication" visualization [#7422](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7422)
3367

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

docker/imposter/manager/info.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"data": {
3+
"affected_items": [
4+
{
5+
"path": "/var/ossec",
6+
"version": "v4.12.1",
7+
"type": "server",
8+
"max_agents": "unlimited",
9+
"openssl_support": true,
10+
"tz_offset": 0,
11+
"tz_name": "UTC",
12+
"uuid": "c842f85c-c24b-4b39-9508-093ce53482e7"
13+
}
14+
],
15+
"total_affected_items": 1,
16+
"total_failed_items": 0,
17+
"failed_items": []
18+
},
19+
"message": "Basic information was successfully read in specified node",
20+
"error": 0
21+
}

docker/imposter/wazuh-config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,9 @@ resources:
451451
# Get information
452452
- method: GET
453453
path: /manager/info
454+
response:
455+
statusCode: 200
456+
staticFile: manager/info.json
454457

455458
# Get configuration
456459
- method: GET

docker/osd-dev/README.md

Lines changed: 71 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,80 @@ Use always the provided script to bring up or down the development
2626
environment. For example:
2727

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

32-
The script will ask you all the required parameters to bring up the
33-
environment, including the version of the elastic stack you want to
34-
develop for, and the source code folder where the wazuh-dashboard-plugins is
35-
located.
32+
### Parameters
33+
34+
- -o <os_version> : (Optional) Specifies the OpenSearch version. If not provided, it's obtained from plugins/wazuh-core/package.json .
35+
- -d <osd_version> : (Optional) Specifies the OpenSearch Dashboards version. If not provided, it's obtained from plugins/wazuh-core/package.json .
36+
- -a <agents_up> : (Optional) Relevant when using server-local mode. Specifies agent deployment:
37+
- rpm : Deploys an RPM-based agent.
38+
- deb : Deploys a DEB-based agent.
39+
- without : Deploys no agents.
40+
- 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 ).
41+
- <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.
42+
- <action> : (Required) The action to perform:
43+
- up : Brings up the environment.
44+
- down : Stops the environment and removes volumes.
45+
- stop : Stops the services.
46+
- start : Starts previously stopped services.
47+
- <mode> : (Optional) Specifies the deployment mode. Can be one of:
48+
- saml : Deploys a SAML-enabled environment with KeyCloak IDP.
49+
- 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.
50+
```
51+
# Example entry in /etc/hosts
52+
127.0.0.1 idp
53+
```
54+
- server : Deploys an environment with a real Wazuh server. Requires <server_version> .
55+
- server-local : Deploys an environment with a local Wazuh server package. Requires <server_version> (which will be used as IMAGE_TAG ).
56+
- **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.
57+
- If omitted, a standard development environment is deployed (profile standard ).
58+
- <server_version> : (Optional) Required if <mode> is server or server-local .
59+
- For server mode: Specifies the Wazuh release version (e.g., 4.7.2 ) to be used for the WAZUH_STACK variable.
60+
- 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.
61+
62+
### Examples
63+
64+
Standard environment:
3665
37-
Use the `saml` flag to bring up KeyCloak IDP. **Add idp to your hosts and start
38-
the server using the `--no-base-path`**.
66+
```
67+
./dev.sh /absolute/path/to/wazuh-dashboard-plugins up
68+
```
69+
70+
With specific OpenSearch/OSD versions:
71+
72+
```
73+
./dev.sh -o 2.11.0 -d 2.11.0 /absolute/path/to/wazuh-dashboard-plugins up
74+
```
75+
76+
SAML-enabled environment:
77+
78+
```
79+
./dev.sh /absolute/path/to/wazuh-dashboard-plugins up saml
80+
```
81+
82+
Environment with a real Wazuh server:
3983
40-
```apacheconf
41-
# Linux systems: /etc/hosts
42-
# Windows systems: C:\Windows\System32\drivers\etc\hosts
43-
127.0.0.1 idp
84+
```
85+
./dev.sh /absolute/path/to/wazuh-dashboard-plugins up server 4.7.2
86+
```
87+
88+
Environment with a local Wazuh server build and DEB agent:
89+
90+
```
91+
./dev.sh -a deb /absolute/path/to/wazuh-dashboard-plugins up server-local my-custom-tag
4492
```
4593
46-
**The script will not select the appropriate version of the
47-
wazuh-dashboard-plugins to use, so be sure to check out the appropriate version
48-
before bringing up the environment!**
94+
Environment with a local Wazuh server build and no agents:
95+
96+
```
97+
./dev.sh -a without /absolute/path/to/wazuh-dashboard-plugins up server-local my-custom-tag
98+
```
99+
100+
Important Note about Plugin Version:
101+
102+
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!
49103
50104
### UI Credentials
51105
@@ -71,7 +125,6 @@ This environment will start a working deployment with:
71125
- Elasticsearch-exporter - Elasticsearch metrics to Prometheus adapter.
72126
- OpenSearch single-node cluster.
73127
- OpenSearch Dashboards development environment.
74-
75-
The OpenSearch Dashboards development environment includes an already
76-
bootstrapped Kibana, with all the node modules precompiled and ready to
77-
use in a development session.
128+
The OpenSearch Dashboards development environment includes an already
129+
bootstrapped Kibana, with all the node modules precompiled and ready to
130+
use in a development session.

docker/osd-dev/agents/.gitkeep

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*

docker/osd-dev/config/2.x/osd/wazuh.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ hosts:
1717
username: wazuh-wui
1818
password: MyS3cr37P450r.*-
1919
run_as: false
20-
20+
- manager-local:
21+
url: 'https://wazuh.manager.local'
22+
port: 55000
23+
username: wazuh-wui
24+
password: wazuh-wui
25+
run_as: false
2126

2227
wazuh.updates.disabled: true

0 commit comments

Comments
 (0)