Skip to content

Commit

Permalink
Merge 4.9.1 into 4.9.2 (#377)
Browse files Browse the repository at this point in the history
* Merge 4.9.0 into 4.9.1 (#376)

* 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 <[email protected]>

* Fixing chown command (#347)

* Add Changelog for 4.9.0 (#364)

---------

Co-authored-by: Federico Gustavo Galland <[email protected]>

* Merge 4.9.1 into 4.9.2

---------

Co-authored-by: Federico Gustavo Galland <[email protected]>
  • Loading branch information
AlexRuiz7 and f-galland committed Sep 6, 2024
1 parent d882a83 commit 2c2bf1f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,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 2.15.x]
## [Unreleased 4.9.x]
### Added

### Dependencies
Expand All @@ -18,4 +18,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

### Security

[Unreleased 2.15.x]: https://github.com/opensearch-project/OpenSearch/compare/0fb7c7389e69005ec581de5433861afdbeb54b4b...2.15
[Unreleased 4.9.x]: https://github.com/wazuh/wazuh-indexer/compare/5a53a90d05a7bad0ca5803ac70025dea744d789a...4.10.0
2 changes: 2 additions & 0 deletions distribution/packages/src/rpm/wazuh-indexer.rpm.spec
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,8 @@ exit 0
%changelog
* Tue Aug 20 2024 support <[email protected]> - 4.10.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-10-0.html
* 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
10 changes: 5 additions & 5 deletions packaging_scripts/README.md
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.10.0_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.10.0_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.10.0_amd64.deb
| `-- wazuh-indexer_4.10.0_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.10.0_amd64.deb
`-- debian/
| -- control
| -- copyright
Expand Down

0 comments on commit 2c2bf1f

Please sign in to comment.