Merge branch 'master' into 4.3

This commit is contained in:
Víctor Moreno Jiménez 2021-04-21 08:17:44 +02:00 committed by GitHub
commit 151d508671
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 4 deletions

View File

@ -25,6 +25,12 @@ All notable changes to this project will be documented in this file.
- Update to [Wazuh v4.1.3](https://github.com/wazuh/wazuh/blob/v4.1.3/CHANGELOG.md#v413) - Update to [Wazuh v4.1.3](https://github.com/wazuh/wazuh/blob/v4.1.3/CHANGELOG.md#v413)
## [v4.1.2]
### Added
- Update to [Wazuh v4.1.2](https://github.com/wazuh/wazuh/blob/v4.1.2/CHANGELOG.md#v412)
## [v4.1.1] ## [v4.1.1]
### Added ### Added

View File

@ -22,9 +22,12 @@ These playbooks install and configure Wazuh agent, manager and Elastic Stack.
|---------------|---------|--------| |---------------|---------|--------|
| v4.1.3 | 7.10.0 | 1.12.0 | | v4.1.3 | 7.10.0 | 1.12.0 |
|---------------|---------|--------| |---------------|---------|--------|
| v4.1.2 | 7.10.0 | 1.12.0 |
|---------------|---------|--------|
| v4.1.1 | 7.10.0 | 1.12.0 | | v4.1.1 | 7.10.0 | 1.12.0 |
|---------------|---------|--------| |---------------|---------|--------|
## Documentation ## Documentation
* [Wazuh Ansible documentation](https://documentation.wazuh.com/current/deploying-with-ansible/index.html) * [Wazuh Ansible documentation](https://documentation.wazuh.com/current/deploying-with-ansible/index.html)

View File

@ -11,6 +11,7 @@ def get_wazuh_version():
return "4.3.0" return "4.3.0"
def test_wazuh_packages_are_installed(host): def test_wazuh_packages_are_installed(host):
"""Test the main packages are installed.""" """Test the main packages are installed."""
manager = host.package("wazuh-manager") manager = host.package("wazuh-manager")

View File

@ -24,7 +24,6 @@ wazuh_agent_version: 4.3.0-1
# Kibana role appends it automatically. # Kibana role appends it automatically.
wazuh_version: 4.3.0 wazuh_version: 4.3.0
######################################################## ########################################################
# General ELK stack variables # General ELK stack variables

View File

@ -3,6 +3,7 @@ filebeat_version: 7.10.2
wazuh_template_branch: v4.3.0 wazuh_template_branch: v4.3.0
filebeat_create_config: true filebeat_create_config: true
filebeat_node_name: node-1 filebeat_node_name: node-1

View File

@ -1,6 +1,6 @@
--- ---
wazuh_agent_version: 4.3.0-1
wazuh_agent_version: 4.3.0-1
# Custom packages installation # Custom packages installation

View File

@ -1,4 +1,5 @@
--- ---
wazuh_manager_version: 4.3.0-1 wazuh_manager_version: 4.3.0-1
wazuh_manager_fqdn: "wazuh-server" wazuh_manager_fqdn: "wazuh-server"
@ -71,8 +72,8 @@ wazuh_manager_globals:
- '^localhost.localdomain$' - '^localhost.localdomain$'
- '127.0.0.53' - '127.0.0.53'
wazuh_manager_agent_disconnection_time: '20s' wazuh_manager_agent_disconnection_time: '10m'
wazuh_manager_agents_disconnection_alert_time: '100s' wazuh_manager_agents_disconnection_alert_time: '0'
## Alerts ## Alerts
wazuh_manager_log_level: 3 wazuh_manager_log_level: 3