From a0e07b394a557f3411575f9c4d0275c7c16b45dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Ruiz?= Date: Fri, 6 Sep 2024 11:04:37 +0200 Subject: [PATCH 1/2] Merge 4.9.0 into 4.9.1 (#376) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Adding /var/run/wazuh-indexer to the list of ignored files (#339) * Fix sysv files (#343) * Change sysv script to reference opensearch script * Correct permissions on sysv script * Updating sysv service file permissions to match 4.8 * Moving logstash dockerfile and associated files to its own folder (#302) * Moving logstash dockerfile and associated files to its own folder * Removing unused context from logstash container in splunk compose * Changing context in manager to splunk integration to newly created logstash folder * Using common logstash container for Security Lake integration * Removing unused dockerfiles * Adding gzip to logstash pipeline * Adding gzip decompression to lambda * Changing aws REGION variable name * Cleanup commented code * Adding environment variables for docker images versions * Adding logstash version to .env * Fixing minor issues in compose files * Removing certs configuration * Format YAML and Readme file from 3rd-party integrations * Remove unused code * Upgrade integrations to the latest Wazuh version * Fic environment variable * Remove unused code and fix ASL documentation --------- Co-authored-by: Álex Ruiz * Fixing chown command (#347) * Add Changelog for 4.9.0 (#364) --------- Co-authored-by: Federico Gustavo Galland <99492720+f-galland@users.noreply.github.com> --- CHANGELOG.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95ad15737ba87..38621c6b6c644 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,13 +3,18 @@ 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 2.x] +## [Unreleased 4.9.x] ### Added +- [Amazon Security Lake integration as source](https://github.com/wazuh/wazuh-indexer/issues/128) +- [Splunk, OpenSearch and Elastic integrations](https://github.com/wazuh/wazuh-indexer/issues/250) + ### Dependencies ### Changed +- [Wazuh indexer fork update](https://github.com/wazuh/wazuh-indexer/issues/54) + ### Deprecated ### Removed @@ -18,4 +23,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Security -[Unreleased 2.x]: https://github.com/opensearch-project/OpenSearch/compare/2.12...2.x +[Unreleased 4.9.x]: https://github.com/wazuh/wazuh-indexer/compare/BASE...4.9.0 From 4b0236add36c1bc4ec1719793f32f230dfa9489d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Ruiz?= Date: Fri, 6 Sep 2024 11:13:36 +0200 Subject: [PATCH 2/2] Merge 4.9.1 into 4.9.2 --- VERSION | 2 +- distribution/packages/src/rpm/wazuh-indexer.rpm.spec | 2 ++ docker/README.md | 4 ++-- packaging_scripts/README.md | 10 +++++----- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/VERSION b/VERSION index 5b341fd799e8d..dad10c76dbf6d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.9.1 +4.9.2 diff --git a/distribution/packages/src/rpm/wazuh-indexer.rpm.spec b/distribution/packages/src/rpm/wazuh-indexer.rpm.spec index 34048a66ac59a..3a0e4cb1253a4 100644 --- a/distribution/packages/src/rpm/wazuh-indexer.rpm.spec +++ b/distribution/packages/src/rpm/wazuh-indexer.rpm.spec @@ -265,6 +265,8 @@ exit 0 %attr(750, %{name}, %{name}) %{product_dir}/performance-analyzer-rca/bin/* %changelog +* Fri Sep 06 2024 support - 4.9.2 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-1.html * Thu Aug 15 2024 support - 4.9.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-1.html * Thu Aug 15 2024 support - 4.9.0 diff --git a/docker/README.md b/docker/README.md index 450d986bed065..305136fbd2342 100644 --- a/docker/README.md +++ b/docker/README.md @@ -84,11 +84,11 @@ Refer to [scripts/README.md](../scripts/README.md) for details about how to buil 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. ```console -docker build --build-arg="VERSION=4.9.1" --build-arg="INDEXER_TAR_NAME=wazuh-indexer-4.9.1-1_linux-x64_cfca84f.tar.gz" --tag=wazuh-indexer:4.9.1 --progress=plain --no-cache . +docker build --build-arg="VERSION=4.9.2" --build-arg="INDEXER_TAR_NAME=wazuh-indexer-4.9.2-1_linux-x64_cfca84f.tar.gz" --tag=wazuh-indexer:4.9.2 --progress=plain --no-cache . ``` Then, start a container with: ```console -docker run -it --rm wazuh-indexer:4.9.1 +docker run -it --rm wazuh-indexer:4.9.2 ``` diff --git a/packaging_scripts/README.md b/packaging_scripts/README.md index 1c6c7cb35173a..d778374c5595c 100644 --- a/packaging_scripts/README.md +++ b/packaging_scripts/README.md @@ -77,7 +77,7 @@ For DEB packages, the `assemble.sh` script will perform the following operations ``` artifacts/ |-- dist - | |-- wazuh-indexer-min_4.9.1_amd64.deb + | |-- wazuh-indexer-min_4.9.2_amd64.deb `-- tmp `-- deb |-- Makefile @@ -86,7 +86,7 @@ For DEB packages, the `assemble.sh` script will perform the following operations |-- etc |-- usr |-- var - `-- wazuh-indexer-min_4.9.1_amd64.deb + `-- wazuh-indexer-min_4.9.2_amd64.deb ``` `usr`, `etc` and `var` folders contain `wazuh-indexer` files, extracted from `wazuh-indexer-min-*.deb`. @@ -109,8 +109,8 @@ For DEB packages, the `assemble.sh` script will perform the following operations artifacts/ |-- artifact_name.txt |-- dist - | |-- wazuh-indexer-min_4.9.1_amd64.deb - | `-- wazuh-indexer_4.9.1_amd64.deb + | |-- wazuh-indexer-min_4.9.2_amd64.deb + | `-- wazuh-indexer_4.9.2_amd64.deb `-- tmp `-- deb |-- Makefile @@ -119,7 +119,7 @@ For DEB packages, the `assemble.sh` script will perform the following operations |-- etc |-- usr |-- var - |-- wazuh-indexer-min_4.9.1_amd64.deb + |-- wazuh-indexer-min_4.9.2_amd64.deb `-- debian/ | -- control | -- copyright