Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 4.9.1 into 4.9.2 #377

Merged
merged 2 commits into from
Sep 6, 2024
Merged

Merge 4.9.1 into 4.9.2 #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0e07b3
Merge 4.9.0 into 4.9.1 (#376)
AlexRuiz7 Sep 6, 2024
4b0236a
Merge 4.9.1 into 4.9.2
AlexRuiz7 Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.9.1
4.9.2
2 changes: 2 additions & 0 deletions distribution/packages/src/rpm/wazuh-indexer.rpm.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,8 @@ exit 0
%attr(750, %{name}, %{name}) %{product_dir}/performance-analyzer-rca/bin/*

%changelog
* Fri Sep 06 2024 support <[email protected]> - 4.9.2
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-1.html
* Thu Aug 15 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
Expand Down
4 changes: 2 additions & 2 deletions docker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
10 changes: 5 additions & 5 deletions packaging_scripts/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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`.
Expand All @@ -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
Expand All @@ -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
Expand Down