wazuh/wazuh-indexer-plugins
1
0
Fork 0
mirror of https://github.com/wazuh/wazuh-indexer-plugins.git synced 2025-12-15 21:33:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Support new version 6.0.0 (#417)

Browse Source 
* Support new version 6.0.0

* Update CHANGELOG.md

Signed-off-by: Álex Ruiz Becerra <alex-r-b@hotmail.com>

* Patch workflows to not depend on main

* Fix broken link

* Add 6.0.0 to list of branches to build the docs from

---------

Signed-off-by: Álex Ruiz Becerra <alex-r-b@hotmail.com>
Co-authored-by: Álex Ruiz Becerra <alejandro.ruiz.becerra@wazuh.com>
This commit is contained in:
Fede Galland 2025-05-14 06:58:04 -03:00 committed by GitHub
parent 1a0ddff355
commit d80accc478
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
19 changed files with 39 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/5_builderpackage_docs.yml vendored
View File

@ -7,6 +7,7 @@ on:
push:
branches:
- main
- 6.0.0
paths:
- "docs/**"

2
.github/workflows/5_builderpackage_plugins_onpush.yml vendored
View File

@ -28,6 +28,8 @@ jobs:
- name: Detect modified plugins
id: detect_changes
uses: ./.github/actions/5_codeanalysis_detect_modified_plugins
with:
base_branch: ${{ github.event.repository.default_branch }}
call-build-workflow:
needs: modified-plugins

1
.github/workflows/5_builderpackage_templates.yml vendored
View File

@ -37,6 +37,7 @@ jobs:
COMMITTER_USERNAME: "Wazuh Indexer Bot"
SSH_PRIVATE_KEY: ${{ secrets.INDEXER_BOT_PRIVATE_SSH_KEY }}
SSH_PUBLIC_KEY: ${{ secrets.INDEXER_BOT_PUBLIC_SSH_KEY }}
BASE_BRANCH: ${{ github.event.repository.default_branch }}
run: |
bash ecs/scripts/generate-and-push-templates.sh \
-b ${{ steps.branch-name.outputs.branch }} \

2
.github/workflows/5_testintegration_gradlecheck.yml vendored
View File

@ -29,6 +29,8 @@ jobs:
- name: Detect modified plugins
id: detect_changes
uses: ./.github/actions/5_codeanalysis_detect_modified_plugins
with:
base_branch: ${{ github.event.repository.default_branch }}
# Run tests for affected projects
- name: Run tests for affected projects

4
CHANGELOG.md
View File

@ -4,7 +4,7 @@ All notable changes to this project are documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). See the [CONTRIBUTING guide](./CONTRIBUTING.md#Changelog) for instructions on how to add changelog entries.
## [Unreleased 5.0.x]
## [Unreleased 6.0.x]
### Added
- Add RBAC index templates with its corresponding event generator [(#303)](https://github.com/wazuh/wazuh-indexer-plugins/pull/303)
@ -60,4 +60,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### Security
-
[Unreleased 5.0.x]: https://github.com/wazuh/wazuh-indexer-plugins/compare/main...main
[Unreleased 6.0.x]: https://github.com/wazuh/wazuh-indexer-plugins/compare/6.0.0...6.0.0

2
VERSION.json
View File

@ -1,4 +1,4 @@
{
"version": "5.0.0",
"version": "6.0.0",
"stage": "alpha0"
}

8
docs/dev/build-image.md
View File

@ -35,9 +35,9 @@ The Docker image is built from a wazuh-indexer tarball (tar.gz), which must be p
```bash
docker build \
--build-arg="VERSION=5.0.0" \
--build-arg="INDEXER_TAR_NAME=wazuh-indexer_5.0.0-0_linux-x64.tar.gz" \
--tag=wazuh-indexer:5.0.0-0 \
--build-arg="VERSION=6.0.0" \
--build-arg="INDEXER_TAR_NAME=wazuh-indexer_6.0.0-0_linux-x64.tar.gz" \
--tag=wazuh-indexer:6.0.0-0 \
--progress=plain \
--no-cache .
```
@ -45,7 +45,7 @@ docker build \
Then, start a container with:
```bash
docker run -p 9200:9200 -it --rm wazuh-indexer:5.0.0-0
docker run -p 9200:9200 -it --rm wazuh-indexer:6.0.0-0
```
The `build-and-push-docker-image.sh` script automates the process to build and push Wazuh Indexer Docker images to our repository in quay.io. The script takes several parameters. Use the `-h` option to display them.

2
docs/dev/build-packages.md
View File

@ -57,4 +57,4 @@ bash builder.sh -d deb -a x64 -R 1 -s true
The resulting package will be stored at `wazuh-indexer/artifacts/dist`.
> The `STAGE` option defines the naming of the package. When set to `false`, the package will be unequivocally named with the commits' SHA of the `wazuh-indexer`, `wazuh-indexer-plugins` and `wazuh-indexer-reporting` repositories, in that order. For example: `wazuh-indexer_5.0.0-0_x86_64_aff30960363-846f143-494d125.rpm`.
> The `STAGE` option defines the naming of the package. When set to `false`, the package will be unequivocally named with the commits' SHA of the `wazuh-indexer`, `wazuh-indexer-plugins` and `wazuh-indexer-reporting` repositories, in that order. For example: `wazuh-indexer_6.0.0-0_x86_64_aff30960363-846f143-494d125.rpm`.

2
docs/dev/run-tests.md
View File

@ -16,6 +16,6 @@ To run integration tests, use the `./gradlew integTest` and the `./gradlew yamlr
### Package testing
For package testing, we conduct smoke tests on the packages using the [GitHub Actions Workflows](https://github.com/wazuh/wazuh-indexer/blob/main/.github/workflows/5_builderpackage_indexer.yml). These tests consist on installing the packages on a supported operating system. DEB packages are installed in the “Ubuntu 24.04” runner executing the workflow, while RPM packages are installed in a Red Hat 9 Docker container, as there is no RPM compatible runner available in GitHub Actions.
For package testing, we conduct smoke tests on the packages using the [GitHub Actions Workflows](https://github.com/wazuh/wazuh-indexer/blob/6.0.0/.github/workflows/5_builderpackage_indexer.yml). These tests consist on installing the packages on a supported operating system. DEB packages are installed in the “Ubuntu 24.04” runner executing the workflow, while RPM packages are installed in a Red Hat 9 Docker container, as there is no RPM compatible runner available in GitHub Actions.
As a last note, there is also a **Vagrantfile** and **testing scripts** in the [repository](https://github.com/wazuh/wazuh-indexer-plugins/tree/main/test-tools) to perform some tests on a real wazuh-indexer service running on a virtual machine. Refer to its README.md for more information about how to run these tests.

2
docs/ref/compatibility.md
View File

@ -4,7 +4,7 @@
We aim to support as many operating systems as [OpenSearch](https://opensearch.org/docs/latest/install-and-configure/install-opensearch/index/#operating-system-compatibility) does. Wazuh indexer should work on many Linux distributions, but we only test a handful. The following table lists the operating system versions that we currently support.
For 5.0.0 and above, we support the operating system versions and architectures included in the table below.
For 6.0.0 and above, we support the operating system versions and architectures included in the table below.
| Name | Version | Architecture |
| ------------ | ------------ | --------------- |
| Red Hat | 8, 9 | x86_64, aarch64 |

4
docs/ref/getting-started/installation.md
View File

@ -19,8 +19,8 @@ Install and configure the Wazuh indexer as a single-node or multi-node cluster,
1. Download the `wazuh-certs-tool.sh` script and the `config.yml` configuration file. This creates the certificates that encrypt communications between the Wazuh central components.
```bash
curl -sO https://packages-dev.wazuh.com/5.0/wazuh-certs-tool.sh
curl -sO https://packages-dev.wazuh.com/5.0/config.yml
curl -sO https://packages-dev.wazuh.com/6.0/wazuh-certs-tool.sh
curl -sO https://packages-dev.wazuh.com/6.0/config.yml
```
1. Edit `./config.yml` and replace the node names and IP values with the corresponding names and IP addresses. You need to do this for all Wazuh server, Wazuh indexer, and Wazuh dashboard nodes. Add as many node fields as needed.

2
docs/ref/modules/command-manager/README.md
View File

@ -67,4 +67,4 @@ The Command Manager generates a unique ID for each of the order received. This I
- The plugin exposes a Rest API with a single endpoint that listens for POST requests.
- The plugin extends the Job Scheduler plugin via its SPI. The job periodically looks for past due orders in “pending” state and changes their state to "failed".
The [Command Manager plugin](https://github.com/wazuh/wazuh-indexer/issues/349) appears for the first time in Wazuh 5.0.0.
The [Command Manager plugin](https://github.com/wazuh/wazuh-indexer/issues/349) appears for the first time in Wazuh 6.0.0.

18
docs/ref/modules/command-manager/architecture.md
View File

@ -54,7 +54,7 @@ The command takes no arguments (`action.args`). Any provided argument is ignored
"action": {
"name": "fetch-config",
"args": {},
"version": "5.0.0"
"version": "6.0.0"
},
"source": "Users/Services",
"user": "Management API",
@ -88,7 +88,7 @@ The command takes the `groups` argument, an array of strings depicting the **ful
"group_2"
]
},
"version": "5.0.0"
"version": "6.0.0"
},
"source": "Users/Services",
"user": "Management API",
@ -120,7 +120,7 @@ The command takes the `index` and `offset` arguments, strings depicting the inde
"index": "content-index",
"offset": "1111"
},
"version": "5.0.0"
"version": "6.0.0"
},
"source": "Content Manager",
"timeout": 100,
@ -152,7 +152,7 @@ The command accepts an optional `index` argument, which must be an array of stri
"args": {
"index": ["index-a", "index-b"], // Optional
},
"version": "5.0.0"
"version": "6.0.0"
},
"source": "Users/Services",
"timeout": 100,
@ -176,7 +176,7 @@ Commands can be targeted to a group of agents, too. This is achieved by setting
"action": {
"name": "fetch-config",
"args": {},
"version": "5.0.0"
"version": "6.0.0"
},
"source": "Users/Services",
"user": "Management API",
@ -205,7 +205,7 @@ The command is processed by the Command Manager and expanded. We refer to expans
"action": {
"name": "fetch-config",
"args": {},
"version": "5.0.0"
"version": "6.0.0"
},
"timeout": 100,
"status": "pending"
@ -222,7 +222,7 @@ The command is processed by the Command Manager and expanded. We refer to expans
"action": {
"name": "fetch-config",
"args": {},
"version": "5.0.0"
"version": "6.0.0"
},
"timeout": 100,
"status": "pending"
@ -239,7 +239,7 @@ The command is processed by the Command Manager and expanded. We refer to expans
"action": {
"name": "fetch-config",
"args": {},
"version": "5.0.0"
"version": "6.0.0"
},
"timeout": 100,
"status": "pending"
@ -297,7 +297,7 @@ GET wazuh-commands/_search
"group_2"
]
},
"version": "5.0.0"
"version": "6.0.0"
},
"timeout": 100,
"status": "pending",

2
docs/ref/modules/content-manager/README.md
View File

@ -1,6 +1,6 @@
# Content Manager
The Content Manager is a plugin for Wazuh 5.0 responsible for the management of the Wazuh Catalog within the Indexer. The **catalog** is structured into **contexts**. Each context contains a collection of **resources**. Each **change** made to these resources generates a new **offset**. A **consumer** is a customized view of a context, and it's used to consume the catalog within the CTI API.
The Content Manager is a plugin for Wazuh 6.0 responsible for the management of the Wazuh Catalog within the Indexer. The **catalog** is structured into **contexts**. Each context contains a collection of **resources**. Each **change** made to these resources generates a new **offset**. A **consumer** is a customized view of a context, and it's used to consume the catalog within the CTI API.
The Content Manager manages multiple Contexts, having a single Consumer each. These are preconfigured in the plugin by default, and not configurable.

2
plugins/command-manager/build.gradle
View File

@ -6,7 +6,7 @@ buildscript {
opensearch_no_snapshot = opensearch_version.replace("-SNAPSHOT","")
opensearch_build = opensearch_no_snapshot + ".0"
job_scheduler_version = System.getProperty("job_scheduler.version", opensearch_build)
wazuh_version = System.getProperty("version", "5.0.0")
wazuh_version = System.getProperty("version", "6.0.0")
revision = System.getProperty("revision", "0")
}

12
plugins/command-manager/openapi.yml
View File

@ -25,7 +25,7 @@ paths:
- action:
name: restart
args: {}
version: "5.0.0"
version: "6.0.0"
source: "Users/Services"
user: "Management API"
timeout: 100
@ -39,7 +39,7 @@ paths:
- action:
name: fetch-config
args: {}
version: "5.0.0"
version: "6.0.0"
source: "Users/Services"
user: "Management API"
timeout: 100
@ -56,7 +56,7 @@ paths:
groups:
- "group_1"
- "group_2"
version: "5.0.0"
version: "6.0.0"
source: "Users/Services"
user: "Management API"
timeout: 100
@ -72,7 +72,7 @@ paths:
args:
index: "content-index"
offset: "1111"
version: "5.0.0"
version: "6.0.0"
source: "Content Manager"
timeout: 100
target:
@ -88,7 +88,7 @@ paths:
index:
- "index-a" # Optional: You can specify multiple indices
- "index-b"
version: "5.0.0"
version: "6.0.0"
source: "Users/Services"
timeout: 100
target:
@ -155,4 +155,4 @@ components:
- "group_2"
version:
type: string
example: "5.0.0"
example: "6.0.0"

2
plugins/content-manager/build.gradle
View File

@ -6,7 +6,7 @@ buildscript {
ext {
opensearch_version = System.getProperty("opensearch.version", "2.19.2-SNAPSHOT")
opensearch_build = opensearch_version.replace("-SNAPSHOT","") + ".0"
wazuh_version = System.getProperty("version", "5.0.0")
wazuh_version = System.getProperty("version", "6.0.0")
revision = System.getProperty("revision", "0")
}

2
plugins/content-manager/src/main/java/com/wazuh/contentmanager/model/command/Command.java
View File

@ -46,7 +46,7 @@ public class Command {
.field("index", "content-index")
.field("offset", offset)
.endObject()
.field("version", "5.0.0") // Dynamic version
.field("version", "6.0.0") // Dynamic version
.endObject()
.field("source", "Content Manager")
.field("timeout", 100)

2
plugins/setup/build.gradle
View File

@ -6,7 +6,7 @@ buildscript {
opensearch_version = System.getProperty("opensearch.version", "2.19.2-SNAPSHOT")
opensearch_build = opensearch_version.replace("-SNAPSHOT","") + ".0"
job_scheduler_version = System.getProperty("job_scheduler.version", opensearch_build)
wazuh_version = System.getProperty("version", "5.0.0")
wazuh_version = System.getProperty("version", "6.0.0")
revision = System.getProperty("revision", "0")
}