637-merge-tag4.2-to-master
This commit is contained in:
commit
b7e900245e
@ -6,6 +6,13 @@ All notable changes to this project will be documented in this file.
|
|||||||
### Added
|
### Added
|
||||||
|
|
||||||
- Update to [Wazuh v4.3.0](https://github.com/wazuh/wazuh/blob/v4.3.0/CHANGELOG.md#v430)
|
- Update to [Wazuh v4.3.0](https://github.com/wazuh/wazuh/blob/v4.3.0/CHANGELOG.md#v430)
|
||||||
|
|
||||||
|
## [v4.2.3]
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Update to [Wazuh v4.2.3](https://github.com/wazuh/wazuh/blob/v4.2.3/CHANGELOG.md#v420)
|
||||||
|
|
||||||
## [v4.2.2]
|
## [v4.2.2]
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|||||||
@ -16,6 +16,7 @@ These playbooks install and configure Wazuh agent, manager and Elastic Stack.
|
|||||||
| Wazuh version | Elastic | ODFE |
|
| Wazuh version | Elastic | ODFE |
|
||||||
|---------------|---------|--------|
|
|---------------|---------|--------|
|
||||||
| v4.3.0 | 7.10.2 | 1.13.2 |
|
| v4.3.0 | 7.10.2 | 1.13.2 |
|
||||||
|
| v4.2.3 | 7.10.2 | 1.13.2 |
|
||||||
| v4.2.2 | 7.10.2 | 1.13.2 |
|
| v4.2.2 | 7.10.2 | 1.13.2 |
|
||||||
| v4.2.1 | 7.10.2 | 1.13.2 |
|
| v4.2.1 | 7.10.2 | 1.13.2 |
|
||||||
| v4.2.0 | 7.10.2 | 1.13.2 |
|
| v4.2.0 | 7.10.2 | 1.13.2 |
|
||||||
|
|||||||
@ -1,4 +1,8 @@
|
|||||||
---
|
---
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
wazuh_agent_version: 4.2.3-1
|
||||||
|
>>>>>>> 4.2
|
||||||
|
|
||||||
wazuh_agent_version: 4.3.0-1
|
wazuh_agent_version: 4.3.0-1
|
||||||
|
|
||||||
@ -12,7 +16,11 @@ wazuh_custom_packages_installation_agent_rpm_url: ""
|
|||||||
|
|
||||||
wazuh_agent_sources_installation:
|
wazuh_agent_sources_installation:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
<<<<<<< HEAD
|
||||||
branch: "v4.3.0"
|
branch: "v4.3.0"
|
||||||
|
=======
|
||||||
|
branch: "v4.2.3"
|
||||||
|
>>>>>>> 4.2
|
||||||
user_language: "y"
|
user_language: "y"
|
||||||
user_no_stop: "y"
|
user_no_stop: "y"
|
||||||
user_install_type: "agent"
|
user_install_type: "agent"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user