Skip to content

Commit 768c9b0

Browse files
AlexRuiz7mcasas993JuanGarriuzf-gallandQU3B1M
committed
Merge 4.10.1 into 4.10.2 (#473)
* Merge 4.10.0 into 4.10.1 (#470) * Upgrade integrations to the last version (#447) * Upgrade third-party integrations to latest product versions (#368) * Upgrade third-party integrations to latest product versions * Improve comtability matrix * Change versions in /integrations/.env Signed-off-by: Malena Casas <[email protected]> * Fix Splunk integrations (#362) * Add table with the version of the integrations * Update CHANGELOG.md Signed-off-by: Álex Ruiz <[email protected]> --------- Signed-off-by: Malena Casas <[email protected]> Signed-off-by: Álex Ruiz <[email protected]> Co-authored-by: Álex Ruiz <[email protected]> Co-authored-by: JuanGarriuz <[email protected]> * Merge 4.9.1 into 4.10.0 (#454) * Prepare 4.9.1-rc2 (#436) * Update docker/README.md (#438) * Support new stage 4.9.1-rc3 (#443) * Update operational--integrations_maintenance_request.md (#449) Signed-off-by: Álex Ruiz <[email protected]> --------- Signed-off-by: Álex Ruiz <[email protected]> * Fix Github Actions build process dependency errors (#457) * Switch from latest to 22.04 runner * Remove non-existant packages from workflow provisioner * Remove freeglut3 from provision.sh * Update calendarTime and scan_date fields type (#458) * Merge 4.9.1 into 4.10.0 (#469) * Support for v4.9.1-alpha4 (#461) * Prepare final release notes for 4.9.1 --------- Signed-off-by: Malena Casas <[email protected]> Signed-off-by: Álex Ruiz <[email protected]> Co-authored-by: Malena Casas <[email protected]> Co-authored-by: JuanGarriuz <[email protected]> Co-authored-by: Fede Galland <[email protected]> Co-authored-by: Kevin Ledesma <[email protected]> * Fix release date for 4.10.0 in RPM spec file * Fix release date for 4.10.0 in RPM spec file --------- Signed-off-by: Malena Casas <[email protected]> Signed-off-by: Álex Ruiz <[email protected]> Co-authored-by: Malena Casas <[email protected]> Co-authored-by: JuanGarriuz <[email protected]> Co-authored-by: Fede Galland <[email protected]> Co-authored-by: Kevin Ledesma <[email protected]>
1 parent 56d47e5 commit 768c9b0

17 files changed

+72
-108
lines changed

‎.github/ISSUE_TEMPLATE/operational--integrations_maintenance_request.md

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
name: Integrations maintenance request
3+
about: Used by the Indexer team to maintain third-party software integrations and track the results.
4+
title: Integrations maintenance request
5+
labels: level/task, request/operational, type/maintenance
6+
assignees: ""
7+
---
8+
9+
## Description
10+
11+
The Wazuh Indexer team is responsible for the maintenance of the third-party integrations hosted in the wazuh/wazuh-indexer repository. We must ensure these integrations work under new releases of the third-party software (Splunk, Elastic, Logstash, …) and our own.
12+
13+
For that, we need to:
14+
15+
- [ ] Create a pull request that upgrades the components to the latest version.
16+
- [ ] Update our testing environments to verify the integrations work under new versions.
17+
- [ ] Test the integrations, checking that:
18+
- The Docker Compose project starts without errors.
19+
- The data arrives to the destination.
20+
- All the dashboards can be imported successfully.
21+
- All the dashboards are populated with data.
22+
- [ ] Finally, upgrade the compatibility matrix in integrations/README.md with the new versions.
23+
24+
> [!NOTE]
25+
> * For Logstash, we use the logstash-oss image.
26+
> * For Wazuh Indexer and Wazuh Dashboard, we use the opensearch and opensearch-dashboards images. These must match the opensearch version that we support (e.g: for Wazuh 4.9.0 it is OpenSearch 2.13.0).
27+
28+
## Issues
29+
30+
- _List here the detected issues_

‎CHANGELOG.md

+1-7
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
7777
- Bump `org.jruby.jcodings:jcodings` from 1.0.58 to 1.0.61 ([#17061](https://github.com/opensearch-project/OpenSearch/pull/17061))
7878

7979
### Changed
80-
- Indexed IP field supports `terms_query` with more than 1025 IP masks [#16391](https://github.com/opensearch-project/OpenSearch/pull/16391)
81-
- Make entries for dependencies from server/build.gradle to gradle version catalog ([#16707](https://github.com/opensearch-project/OpenSearch/pull/16707))
82-
- Sliced search only fans out to shards matched by the selected slice, reducing open search contexts ([#16771](https://github.com/opensearch-project/OpenSearch/pull/16771))
83-
- Allow extended plugins to be optional ([#16909](https://github.com/opensearch-project/OpenSearch/pull/16909))
84-
- Use the correct type to widen the sort fields when merging top docs ([#16881](https://github.com/opensearch-project/OpenSearch/pull/16881))
85-
- Limit reader writer separation to remote store enabled clusters [#16760](https://github.com/opensearch-project/OpenSearch/pull/16760)
86-
- Optimize innerhits query performance [#16937](https://github.com/opensearch-project/OpenSearch/pull/16937)
80+
- Upgrade third-party integrations to the latest versions ([#447](https://github.com/wazuh/wazuh-indexer/pull/447))
8781

8882
### Deprecated
8983
- Performing update operation with default pipeline or final pipeline is deprecated ([#16712](https://github.com/opensearch-project/OpenSearch/pull/16712))

‎distribution/packages/src/rpm/wazuh-indexer.rpm.spec

+3-3
Original file line numberDiff line numberDiff line change
@@ -268,11 +268,11 @@ exit 0
268268
%changelog
269269
* Tue Feb 20 2025 support <[email protected]> - 4.10.2
270270
- More info: https://documentation.wazuh.com/current/release-notes/release-4-10-2.html
271-
* Fri Nov 06 2024 support <[email protected]> - 4.10.1
271+
* Tue Jan 28 2025 support <[email protected]> - 4.10.1
272272
- More info: https://documentation.wazuh.com/current/release-notes/release-4-10-1.html
273-
* Mon Sep 23 2024 support <[email protected]> - 4.10.0
273+
* Tue Nov 26 2024 support <[email protected]> - 4.10.0
274274
- More info: https://documentation.wazuh.com/current/release-notes/release-4-10-0.html
275-
* Fri Sep 20 2024 support <[email protected]> - 4.9.1
275+
* Tue Oct 15 2024 support <[email protected]> - 4.9.1
276276
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-1.html
277277
* Thu Aug 15 2024 support <[email protected]> - 4.9.0
278278
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html

‎docker/README.md

+11-50
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,19 @@
1-
# Indexer development environments
1+
# Docker environments
22

3-
Install [Docker Desktop][docker-desktop] as per its instructions, available for Windows, Mac
4-
and Linux (Ubuntu, Debian & Fedora).
5-
This ensures that the development experience between Linux, Mac and Windows is as
6-
similar as possible.
7-
8-
> IMPORTANT: be methodic during the installation of Docker Desktop, and proceed
9-
> step by step as described in their documentation. Make sure that your system
10-
> meets the system requirements before installing Docker Desktop, and read any
11-
> post-installation note, specially on Linux: [Differences between
12-
> Docker Desktop for Linux and Docker Engine][docker-variant].
3+
Multipurpose Docker environments to run, test and build `wazuh-indexer`.
134

145
## Pre-requisites
156

16-
1. Assign resources to [Docker Desktop][docker-desktop]. The requirements for the
17-
environments are:
7+
1. Install [Docker][docker] as per its instructions.
8+
9+
1. Your workstation must meet the minimum hardware requirements:
1810

1911
- 8 GB of RAM (minimum)
2012
- 4 cores
2113

2214
The more resources the better ☺
2315

24-
2. Clone the [wazuh-indexer][wi-repo].
25-
26-
3. Set up user permissions
27-
28-
The Docker volumes will be created by the internal Docker user, making them
29-
read-only. To prevent this, a new group named `docker-desktop` and GUID 100999
30-
needs to be created, then added to your user and the source code folder:
31-
32-
```bash
33-
sudo groupadd -g 100999 docker-desktop
34-
sudo useradd -u 100999 -g 100999 -M docker-desktop
35-
sudo chown -R docker-desktop:docker-desktop $WZD_HOME
36-
sudo usermod -aG docker-desktop $USER
37-
```
38-
39-
## Understanding Docker contexts
40-
41-
Before we begin starting Docker containers, we need to understand the
42-
differences between Docker Engine and Docker Desktop, more precisely, that the
43-
use different contexts.
44-
45-
Carefully read these two sections of the Docker documentation:
46-
47-
- [Differences between Docker Desktop for Linux and Docker Engine][docker-variant].
48-
- [Switch between Docker Desktop and Docker Engine][docker-context].
49-
50-
Docker Desktop will change to its context automatically at start, so be sure
51-
that any existing Docker container using the default context is **stopped**
52-
before starting Docker Desktop and any of the environments in this folder.
16+
1. Clone the [wazuh-indexer][wi-repo].
5317

5418
## Development environments
5519

@@ -61,27 +25,24 @@ Example:
6125
Usage: ./dev.sh {up|down|stop}
6226
```
6327

64-
Once the `wi-dev:x.y.z` container is up, attach a shell to it and run `./gradlew run`
65-
to start the application.
28+
Once the `wi-dev:x.y.z` container is up, attach a shell to it and run `./gradlew run` to start the application.
6629

6730
## Containers to generate packages
6831

6932
Use the `ci/ci.sh` script to start provisioned containers to generate packages.
7033

7134
```bash
72-
Usage: ./ci.sh {up|down|stop} [ci]
35+
Usage: ./ci.sh {up|down|stop}
7336
```
7437

75-
Refer to [scripts/README.md](../scripts/README.md) for details about how to build packages.
38+
Refer to [packaging_scripts/README.md](../packaging_scripts/README.md) for details about how to build packages.
7639

77-
[docker-desktop]: https://docs.docker.com/get-docker
78-
[docker-variant]: https://docs.docker.com/desktop/install/linux-install/#differences-between-docker-desktop-for-linux-and-docker-engine
79-
[docker-context]: https://docs.docker.com/desktop/install/linux-install/#context
40+
[docker]: https://docs.docker.com/engine/install
8041
[wi-repo]: https://github.com/wazuh/wazuh-indexer
8142

8243
## Building Docker images
8344

84-
The [prod](./prod) folder contains the code to build Docker images. A tarball of `wazuh-indexer` needs to be located at the same level that the Dockerfile. Below there is example of the command needed to build the image. Set the build arguments and the image tag accordingly.
45+
The [prod](./prod) folder contains the code to build Docker images. A tarball of `wazuh-indexer` needs to be located at the same level that the Dockerfile. Below there is an example of the command needed to build the image. Set the build arguments and the image tag accordingly.
8546

8647
```console
8748
docker build --build-arg="VERSION=4.10.2" --build-arg="INDEXER_TAR_NAME=wazuh-indexer-4.10.2-1_linux-x64_cfca84f.tar.gz" --tag=wazuh-indexer:4.10.2 --progress=plain --no-cache .

‎docker/ci/ci.yml

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: "3.9"
2-
31
services:
42
# Essentially wi-dev, but doesn't expose port 9200
53
wi-build:

‎docker/dev/dev.yml

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: "3.9"
2-
31
services:
42
wi-dev:
53
image: wi-dev:${VERSION}

‎integrations/README.md

+7
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,10 @@ We host development environments to support the following integrations:
2424
- [Splunk](./splunk/README.md).
2525
- [Elasticsearch](./elastic/README.md).
2626
- [OpenSearch](./opensearch/README.md).
27+
28+
**Compatibility matrix**
29+
30+
| | Wazuh | Logstash | OpenSearch | Elastic | Splunk |
31+
| -------------- | ----- | -------- | ---------- | ------- | ------ |
32+
| v1.0 | 4.8.1 | 8.9.0 | 2.14.0 | 8.14.3 | 9.1.4 |
33+
| Latest version | 4.9.0 | 8.9.0 | 2.17.1 | 8.15.2 | 9.3.1 |

‎integrations/docker/.env

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,25 @@ KIBANA_PORT=5602
2020
MEM_LIMIT=1073741824
2121

2222
# Wazuh version
23-
WAZUH_VERSION=4.8.1
23+
WAZUH_VERSION=4.9.0
2424

2525
# Wazuh Indexer version (Provisionally using OpenSearch)
26-
WAZUH_INDEXER_VERSION=2.14.0
26+
WAZUH_INDEXER_VERSION=2.13.0
2727

2828
# Wazuh Dashboard version (Provisionally using OpenSearch Dashboards)
29-
WAZUH_DASHBOARD_VERSION=2.14.0
29+
WAZUH_DASHBOARD_VERSION=2.13.0
3030

3131
# Wazuh certs generator version
3232
WAZUH_CERTS_GENERATOR_VERSION=0.0.1
3333

3434
# OpenSearch destination cluster version
35-
OS_VERSION=2.14.0
35+
OS_VERSION=2.17.1
3636

3737
# Logstash version:
3838
LOGSTASH_OSS_VERSION=8.9.0
3939

4040
# Splunk version:
41-
SPLUNK_VERSION=9.1.4
41+
SPLUNK_VERSION=9.3.1
4242

4343
# Version of Elastic products
44-
STACK_VERSION=8.14.3
44+
STACK_VERSION=8.15.2

‎integrations/opensearch/dashboards.ndjson

+2-2
Large diffs are not rendered by default.

‎integrations/splunk/wazuh-amazon-aws

+1-5
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,7 @@
8383
"type": "input.timerange",
8484
"options": {
8585
"token": "global_time",
86-
"defaultValue": "-60m@m,now",
87-
"queryParameters": {
88-
"latest": "$global_time.latest$",
89-
"earliest": "$global_time.earliest$"
90-
}
86+
"defaultValue": "-60m@m,now"
9187
},
9288
"title": "Global Time Range"
9389
}

‎integrations/splunk/wazuh-incident-response

+1-5
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,7 @@
8282
"type": "input.timerange",
8383
"options": {
8484
"token": "global_time",
85-
"defaultValue": "-60m@m,now",
86-
"queryParameters": {
87-
"latest": "$global_time.latest$",
88-
"earliest": "$global_time.earliest$"
89-
}
85+
"defaultValue": "-60m@m,now"
9086
},
9187
"title": "Global Time Range"
9288
}

‎integrations/splunk/wazuh-malware-detection

+1-5
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,7 @@
8383
"type": "input.timerange",
8484
"options": {
8585
"token": "global_time",
86-
"defaultValue": "-60m@m,now",
87-
"queryParameters": {
88-
"latest": "$global_time.latest$",
89-
"earliest": "$global_time.earliest$"
90-
}
86+
"defaultValue": "-60m@m,now"
9187
},
9288
"title": "Global Time Range"
9389
}

‎integrations/splunk/wazuh-pci-dss

+2-6
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,7 @@
8383
"type": "input.timerange",
8484
"options": {
8585
"token": "global_time",
86-
"defaultValue": "-60m@m,now",
87-
"queryParameters": {
88-
"latest": "$global_time.latest$",
89-
"earliest": "$global_time.earliest$"
90-
}
86+
"defaultValue": "-60m@m,now"
9187
},
9288
"title": "Global Time Range"
9389
}
@@ -133,4 +129,4 @@
133129
},
134130
"description": "",
135131
"title": "wazuh-pci-dss-v1.0"
136-
}
132+
}

‎integrations/splunk/wazuh-security-events

+2-6
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,7 @@
203203
"type": "input.timerange",
204204
"options": {
205205
"token": "global_time",
206-
"defaultValue": "-60m@m,now",
207-
"queryParameters": {
208-
"latest": "$global_time.latest$",
209-
"earliest": "$global_time.earliest$"
210-
}
206+
"defaultValue": "-60m@m,now"
211207
},
212208
"title": "Global Time Range"
213209
}
@@ -293,4 +289,4 @@
293289
},
294290
"description": "",
295291
"title": "wazuh-security-events-v1.0"
296-
}
292+
}

‎integrations/splunk/wazuh-vulnerabilities

+1-5
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,7 @@
178178
"type": "input.timerange",
179179
"options": {
180180
"token": "global_time",
181-
"defaultValue": "-60m@m,now",
182-
"queryParameters": {
183-
"latest": "$global_time.latest$",
184-
"earliest": "$global_time.earliest$"
185-
}
181+
"defaultValue": "-60m@m,now"
186182
},
187183
"title": "Global Time Range"
188184
}

‎packaging_scripts/provision.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
# Install necessary packages
66
apt-get update -y && apt-get upgrade -y && apt-get install -y curl build-essential &&
77
apt-get install -y debmake debhelper-compat &&
8-
apt-get install -y libxrender1 libxtst6 libasound2 libxi6 libgconf-2-4 &&
9-
apt-get install -y libatk1.0-0 libatk-bridge2.0-0 libcups2 libdrm2 libatspi2.0-dev libxcomposite-dev libxdamage1 libxfixes3 libxfixes-dev libxrandr2 libgbm-dev libxkbcommon-x11-0 libpangocairo-1.0-0 libcairo2 libcairo2-dev libnss3 libnspr4 libnspr4-dev freeglut3 &&
8+
apt-get install -y libxrender1 libxtst6 libxi6 &&
9+
apt-get install -y libatk1.0-0 libatk-bridge2.0-0 libcups2 libdrm2 libatspi2.0-dev libxcomposite-dev libxdamage1 libxfixes3 libxfixes-dev libxrandr2 libgbm-dev libxkbcommon-x11-0 libpangocairo-1.0-0 libcairo2 libcairo2-dev libnss3 libnspr4 libnspr4-dev &&
1010
apt-get clean -y

‎release-notes/wazuh.release-notes-4.9.1-rc1.md ‎release-notes/wazuh.release-notes-4.9.1.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
## 2024-09-20 Version 4.9.1-rc1 Release Notes
1+
## 2024-09-27 Version 4.9.1-rc2 Release Notes
22

3-
## [4.9.1-rc1]
3+
## [4.9.1]
44
### Added
55
-
66

0 commit comments

Comments
 (0)