From 6e38123d15d599713fcd8ab971ea9e063075d7a5 Mon Sep 17 00:00:00 2001 From: dfolcha Date: Mon, 24 May 2021 15:49:37 +0200 Subject: [PATCH 1/2] Change OD version --- README.md | 4 +++- molecule/default/tests/test_default.py | 2 +- molecule/distributed-wazuh-odfe/group_vars/all.yml | 8 ++++---- molecule/distributed-wazuh-odfe/tests/test_default.py | 2 +- roles/opendistro/opendistro-kibana/defaults/main.yml | 4 ++-- roles/wazuh/ansible-filebeat-oss/defaults/main.yml | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 76a308ce..e3da20dc 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,9 @@ These playbooks install and configure Wazuh agent, manager and Elastic Stack. | Wazuh version | Elastic | ODFE | |---------------|---------|--------| -| v4.2.0 | 7.10.0 | 1.12.0 | +| v4.2.0 | 7.10.2 | 1.13.2 | +|---------------|---------|--------| +| v4.1.5 | 7.10.2 | 1.13.2 | |---------------|---------|--------| | v4.1.4 | 7.10.0 | 1.12.0 | |---------------|---------|--------| diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index 07b66ff0..f84cbb7a 100644 --- a/molecule/default/tests/test_default.py +++ b/molecule/default/tests/test_default.py @@ -61,4 +61,4 @@ def test_filebeat_is_installed(host): """Test the elasticsearch package is installed.""" filebeat = host.package("filebeat") assert filebeat.is_installed - assert filebeat.version.startswith('7.10.0') + assert filebeat.version.startswith('7.10.2') diff --git a/molecule/distributed-wazuh-odfe/group_vars/all.yml b/molecule/distributed-wazuh-odfe/group_vars/all.yml index c58872e5..a001f2bb 100644 --- a/molecule/distributed-wazuh-odfe/group_vars/all.yml +++ b/molecule/distributed-wazuh-odfe/group_vars/all.yml @@ -34,10 +34,10 @@ filebeat_node_name: '{{ ansible_hostname }}' # Versions # See: https://opendistro.github.io/for-elasticsearch-docs/version-history/ -elastic_stack_version: 7.10.0 -opendistro_version: 1.12.0 -filebeat_version: 7.10.0 -kibana_opendistro_version: 1.12.0-1 +elastic_stack_version: 7.10.2 +opendistro_version: 1.13.2 +filebeat_version: 7.10.2 +kibana_opendistro_version: 1.13.2-1 # Debian packages need the ${VERSION}-1 wazuh_manager_version: 4.2.0-1 diff --git a/molecule/distributed-wazuh-odfe/tests/test_default.py b/molecule/distributed-wazuh-odfe/tests/test_default.py index 07b66ff0..f84cbb7a 100644 --- a/molecule/distributed-wazuh-odfe/tests/test_default.py +++ b/molecule/distributed-wazuh-odfe/tests/test_default.py @@ -61,4 +61,4 @@ def test_filebeat_is_installed(host): """Test the elasticsearch package is installed.""" filebeat = host.package("filebeat") assert filebeat.is_installed - assert filebeat.version.startswith('7.10.0') + assert filebeat.version.startswith('7.10.2') diff --git a/roles/opendistro/opendistro-kibana/defaults/main.yml b/roles/opendistro/opendistro-kibana/defaults/main.yml index dffa0fc1..00030645 100644 --- a/roles/opendistro/opendistro-kibana/defaults/main.yml +++ b/roles/opendistro/opendistro-kibana/defaults/main.yml @@ -9,12 +9,12 @@ kibana_server_host: "0.0.0.0" kibana_server_port: "5601" kibana_server_name: "kibana" kibana_max_payload_bytes: 1048576 -elastic_stack_version: 7.10.0 +elastic_stack_version: 7.10.2 wazuh_version: 4.2.0 wazuh_app_url: https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana # The OpenDistro package repository -kibana_opendistro_version: 1.12.0-1 # Version includes the - for RedHat family compatibility, replace with = for Debian hosts +kibana_opendistro_version: 1.13.2-1 # Version includes the - for RedHat family compatibility, replace with = for Debian hosts package_repos: yum: diff --git a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml index b452e481..4fe7ea39 100644 --- a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml +++ b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml @@ -1,5 +1,5 @@ --- -filebeat_version: 7.10.0 +filebeat_version: 7.10.2 wazuh_template_branch: v4.2.0 From 33a47974ba9c78ceeece5aa349833b14acdcc918 Mon Sep 17 00:00:00 2001 From: dfolcha Date: Mon, 24 May 2021 16:24:48 +0200 Subject: [PATCH 2/2] Fix compatibility matrix --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index e3da20dc..944c1661 100644 --- a/README.md +++ b/README.md @@ -15,15 +15,10 @@ These playbooks install and configure Wazuh agent, manager and Elastic Stack. | Wazuh version | Elastic | ODFE | |---------------|---------|--------| | v4.2.0 | 7.10.2 | 1.13.2 | -|---------------|---------|--------| | v4.1.5 | 7.10.2 | 1.13.2 | -|---------------|---------|--------| | v4.1.4 | 7.10.0 | 1.12.0 | -|---------------|---------|--------| | v4.1.3 | 7.10.0 | 1.12.0 | -|---------------|---------|--------| | v4.1.1 | 7.10.0 | 1.12.0 | -|---------------|---------|--------| ## Documentation