From 0094d56919c39ec63e50c948253318059ece063c Mon Sep 17 00:00:00 2001 From: dfolcha Date: Mon, 24 May 2021 15:46:59 +0200 Subject: [PATCH] Change OD version to 1.13.2 --- README.md | 6 ++++-- 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 +- .../opendistro/opendistro-elasticsearch/defaults/main.yml | 2 +- roles/opendistro/opendistro-kibana/defaults/main.yml | 4 ++-- roles/opendistro/opendistro-kibana/vars/debian.yml | 2 +- roles/wazuh/ansible-filebeat-oss/defaults/main.yml | 2 +- 8 files changed, 15 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 8277167b..c49caf83 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,11 @@ These playbooks install and configure Wazuh agent, manager and Elastic Stack. | Wazuh version | Elastic | ODFE | |---------------|---------|--------| -| v4.3.0 | 7.10.0 | 1.12.0 | +| v4.3.0 | 7.10.2 | 1.13.2 | |---------------|---------|--------| -| 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 8526d8e0..545ced7c 100644 --- a/molecule/default/tests/test_default.py +++ b/molecule/default/tests/test_default.py @@ -62,4 +62,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 afd3c9b3..b6ce95f3 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.3.0-1 diff --git a/molecule/distributed-wazuh-odfe/tests/test_default.py b/molecule/distributed-wazuh-odfe/tests/test_default.py index e142551b..75940cf0 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-elasticsearch/defaults/main.yml b/roles/opendistro/opendistro-elasticsearch/defaults/main.yml index 232f3a20..2a6b7043 100644 --- a/roles/opendistro/opendistro-elasticsearch/defaults/main.yml +++ b/roles/opendistro/opendistro-elasticsearch/defaults/main.yml @@ -1,6 +1,6 @@ --- # Cluster Settings -opendistro_version: 1.12.0 +opendistro_version: 1.13.2 single_node: false elasticsearch_node_name: node-1 diff --git a/roles/opendistro/opendistro-kibana/defaults/main.yml b/roles/opendistro/opendistro-kibana/defaults/main.yml index 71d1fcd1..782c4ec9 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: 2 wazuh_version: 4.3.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/opendistro/opendistro-kibana/vars/debian.yml b/roles/opendistro/opendistro-kibana/vars/debian.yml index 14c7aa99..9edcdddc 100644 --- a/roles/opendistro/opendistro-kibana/vars/debian.yml +++ b/roles/opendistro/opendistro-kibana/vars/debian.yml @@ -1,3 +1,3 @@ --- -kibana_opendistro_version: 1.12.0 \ No newline at end of file +kibana_opendistro_version: 1.13.2 \ No newline at end of file diff --git a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml index 1df647d0..dd469d1e 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.3.0