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]>
wazuh · Oct 10, 2024 · 1938126 · 1938126
1 parent 220c75d
commit 1938126
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 59 deletions.
diff --git a/.github/ISSUE_TEMPLATE/operational--integrations_maintenance_request.md b/.github/ISSUE_TEMPLATE/operational--integrations_maintenance_request.md
@@ -0,0 +1,30 @@
+---
+name: Integrations maintenance request
+about: Used by the Indexer team to maintain third-party software integrations and track the results.
+title: Integrations maintenance request
+labels: level/task, request/operational, type/maintenance
+assignees: ""
+---
+
+## Description
+
+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.
+
+For that, we need to:
+
+-   [ ] Create a pull request that upgrades the components to the latest version.
+-   [ ] Update our testing environments to verify the integrations work under new versions.
+-   [ ] Test the integrations, checking that:
+  - The Docker Compose project starts without errors.
+  - The data arrives to the destination.
+  - All the dashboards can be imported successfully.
+  - All the dashboards are populated with data.
+-   [ ] Finally, upgrade the compatibility matrix in integrations/README.md with the new versions.
+
+> [!NOTE]
+> * For Logstash, we use the logstash-oss image.
+> * 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). 
+
+## Issues
+
+-   _List here the detected issues_
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,4 +19,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Security
 
-[Unreleased 4.10.x]: https://github.com/wazuh/wazuh-indexer/compare/5a53a90d05a7bad0ca5803ac70025dea744d789a...4.10.0
+[Unreleased 4.10.x]: https://github.com/wazuh/wazuh-indexer/compare/95f1e12e409c9e1495c130633d064a174a73786e...4.10.0
diff --git a/distribution/packages/src/rpm/wazuh-indexer.rpm.spec b/distribution/packages/src/rpm/wazuh-indexer.rpm.spec
@@ -266,9 +266,9 @@ exit 0
 %attr(750, %{name}, %{name}) %{product_dir}/performance-analyzer-rca/bin/*
 
 %changelog
-* Mon Sep 23 2024 support <[email protected]> - 4.10.0
+* Thu Oct 10 2024 support <[email protected]> - 4.10.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-10-0.html
-* Fri Sep 20 2024 support <[email protected]> - 4.9.1
+* Fri Sep 27 2024 support <[email protected]> - 4.9.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-1.html
 * Thu Aug 15 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html

diff --git a/docker/README.md b/docker/README.md
@@ -1,55 +1,19 @@
-# Indexer development environments
+# Docker environments
 
-Install [Docker Desktop][docker-desktop] as per its instructions, available for Windows, Mac
-and Linux (Ubuntu, Debian & Fedora).
-This ensures that the development experience between Linux, Mac and Windows is as
-similar as possible.
-
-> IMPORTANT: be methodic during the installation of Docker Desktop, and proceed
-> step by step as described in their documentation. Make sure that your system
-> meets the system requirements before installing Docker Desktop, and read any
-> post-installation note, specially on Linux: [Differences between
-> Docker Desktop for Linux and Docker Engine][docker-variant].
+Multipurpose Docker environments to run, test and build `wazuh-indexer`.
 
 ## Pre-requisites
 
-1. Assign resources to [Docker Desktop][docker-desktop]. The requirements for the
-   environments are:
+1. Install [Docker][docker] as per its instructions.
+
+1. Your workstation must meet the minimum hardware requirements:
 
    - 8 GB of RAM (minimum)
    - 4 cores
 
    The more resources the better ☺
 
-2. Clone the [wazuh-indexer][wi-repo].
-
-3. Set up user permissions
-
-   The Docker volumes will be created by the internal Docker user, making them
-   read-only. To prevent this, a new group named `docker-desktop` and GUID 100999
-   needs to be created, then added to your user and the source code folder:
-
-   ```bash
-   sudo groupadd -g 100999 docker-desktop
-   sudo useradd -u 100999 -g 100999 -M docker-desktop
-   sudo chown -R docker-desktop:docker-desktop $WZD_HOME
-   sudo usermod -aG docker-desktop $USER
-   ```
-
-## Understanding Docker contexts
-
-Before we begin starting Docker containers, we need to understand the
-differences between Docker Engine and Docker Desktop, more precisely, that the
-use different contexts.
-
-Carefully read these two sections of the Docker documentation:
-
-- [Differences between Docker Desktop for Linux and Docker Engine][docker-variant].
-- [Switch between Docker Desktop and Docker Engine][docker-context].
-
-Docker Desktop will change to its context automatically at start, so be sure
-that any existing Docker container using the default context is **stopped**
-before starting Docker Desktop and any of the environments in this folder.
+1. Clone the [wazuh-indexer][wi-repo].
 
 ## Development environments
 
@@ -61,27 +25,24 @@ Example:
 Usage: ./dev.sh {up|down|stop}
 ```
 
-Once the `wi-dev:x.y.z` container is up, attach a shell to it and run `./gradlew run`
-to start the application.
+Once the `wi-dev:x.y.z` container is up, attach a shell to it and run `./gradlew run` to start the application.
 
 ## Containers to generate packages
 
 Use the `ci/ci.sh` script to start provisioned containers to generate packages.
 
 ```bash
-Usage: ./ci.sh {up|down|stop} [ci]
+Usage: ./ci.sh {up|down|stop}
 ```
 
-Refer to [scripts/README.md](../scripts/README.md) for details about how to build packages.
+Refer to [packaging_scripts/README.md](../packaging_scripts/README.md) for details about how to build packages.
 
-[docker-desktop]: https://docs.docker.com/get-docker
-[docker-variant]: https://docs.docker.com/desktop/install/linux-install/#differences-between-docker-desktop-for-linux-and-docker-engine
-[docker-context]: https://docs.docker.com/desktop/install/linux-install/#context
+[docker]: https://docs.docker.com/engine/install
 [wi-repo]: https://github.com/wazuh/wazuh-indexer
 
 ## Building Docker images
 
-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.
+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.
 
 ```console
 docker build --build-arg="VERSION=4.10.0" --build-arg="INDEXER_TAR_NAME=wazuh-indexer-4.10.0-1_linux-x64_cfca84f.tar.gz" --tag=wazuh-indexer:4.10.0 --progress=plain --no-cache .

diff --git a/docker/ci/ci.yml b/docker/ci/ci.yml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
   # Essentially wi-dev, but doesn't expose port 9200
   wi-build:

diff --git a/docker/dev/dev.yml b/docker/dev/dev.yml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
   wi-dev:
     image: wi-dev:${VERSION}

diff --git a/...se-notes/wazuh.release-notes-4.9.1-rc1.md → ...se-notes/wazuh.release-notes-4.9.1-rc3.md b/...se-notes/wazuh.release-notes-4.9.1-rc1.md → ...se-notes/wazuh.release-notes-4.9.1-rc3.md
@@ -1,6 +1,6 @@
-## 2024-09-20 Version 4.9.1-rc1 Release Notes
+## 2024-09-27 Version 4.9.1-rc2 Release Notes
 
-## [4.9.1-rc1]
+## [4.9.1-rc2]
 ### Added
 -