From 29e84158a99b3dff5c2f7260d1f16906c20c8911 Mon Sep 17 00:00:00 2001 From: Nicolas Lastra Date: Thu, 9 Sep 2021 15:13:25 -0300 Subject: [PATCH] 4.2.1 tag update --- CHANGELOG.md | 6 ++++++ README.md | 1 + molecule/default/tests/test_default.py | 2 +- molecule/distributed-wazuh-elk-xpack/group_vars/all.yml | 6 +++--- .../distributed-wazuh-elk-xpack/tests/test_default.py | 2 +- molecule/distributed-wazuh-elk/group_vars/all.yml | 6 +++--- molecule/distributed-wazuh-elk/tests/test_default.py | 2 +- molecule/distributed-wazuh-odfe/group_vars/all.yml | 6 +++--- molecule/distributed-wazuh-odfe/tests/test_default.py | 2 +- pyproject.toml | 2 +- roles/elastic-stack/ansible-kibana/defaults/main.yml | 2 +- roles/opendistro/opendistro-kibana/defaults/main.yml | 2 +- roles/wazuh/ansible-filebeat-oss/defaults/main.yml | 2 +- roles/wazuh/ansible-filebeat/defaults/main.yml | 2 +- roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 8 ++++---- roles/wazuh/ansible-wazuh-manager/defaults/main.yml | 4 ++-- 16 files changed, 31 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0456219ea..68cccde3e 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Change Log All notable changes to this project will be documented in this file. +## [v4.2.1] + +### Added + +- Update to [Wazuh v4.2.1](https://github.com/wazuh/wazuh/blob/v4.2.1/CHANGELOG.md#v420) + ## [v4.2.0] ### Added diff --git a/README.md b/README.md index 944c16612..6f7b6fd9c 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ These playbooks install and configure Wazuh agent, manager and Elastic Stack. | Wazuh version | Elastic | ODFE | |---------------|---------|--------| +| v4.2.1 | 7.10.2 | 1.13.2 | | 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 f84cbb7ad..db20ee046 100644 --- a/molecule/default/tests/test_default.py +++ b/molecule/default/tests/test_default.py @@ -8,7 +8,7 @@ def get_wazuh_version(): """This return the version of Wazuh.""" - return "4.2.0" + return "4.2.1" def test_wazuh_packages_are_installed(host): diff --git a/molecule/distributed-wazuh-elk-xpack/group_vars/all.yml b/molecule/distributed-wazuh-elk-xpack/group_vars/all.yml index 8c5b9a7a2..ff802f946 100644 --- a/molecule/distributed-wazuh-elk-xpack/group_vars/all.yml +++ b/molecule/distributed-wazuh-elk-xpack/group_vars/all.yml @@ -18,11 +18,11 @@ elastic_stack_version: 7.10.2 filebeat_version: 7.10.2 # Debian packages need the ${VERSION}-1 -wazuh_manager_version: 4.2.0-1 -wazuh_agent_version: 4.2.0-1 +wazuh_manager_version: 4.2.1-1 +wazuh_agent_version: 4.2.1-1 # Kibana role appends it automatically. -wazuh_version: 4.2.0 +wazuh_version: 4.2.1 ######################################################## diff --git a/molecule/distributed-wazuh-elk-xpack/tests/test_default.py b/molecule/distributed-wazuh-elk-xpack/tests/test_default.py index f84cbb7ad..db20ee046 100644 --- a/molecule/distributed-wazuh-elk-xpack/tests/test_default.py +++ b/molecule/distributed-wazuh-elk-xpack/tests/test_default.py @@ -8,7 +8,7 @@ def get_wazuh_version(): """This return the version of Wazuh.""" - return "4.2.0" + return "4.2.1" def test_wazuh_packages_are_installed(host): diff --git a/molecule/distributed-wazuh-elk/group_vars/all.yml b/molecule/distributed-wazuh-elk/group_vars/all.yml index bfb56ca5a..77cbb3dcd 100644 --- a/molecule/distributed-wazuh-elk/group_vars/all.yml +++ b/molecule/distributed-wazuh-elk/group_vars/all.yml @@ -16,8 +16,8 @@ elastic_stack_version: 7.10.2 filebeat_version: 7.10.2 # Debian packages need the ${VERSION}-1 -wazuh_manager_version: 4.2.0-1 -wazuh_agent_version: 4.2.0-1 +wazuh_manager_version: 4.2.1-1 +wazuh_agent_version: 4.2.1-1 # Kibana role appends it automatically. -wazuh_version: 4.2.0 +wazuh_version: 4.2.1 diff --git a/molecule/distributed-wazuh-elk/tests/test_default.py b/molecule/distributed-wazuh-elk/tests/test_default.py index f84cbb7ad..db20ee046 100644 --- a/molecule/distributed-wazuh-elk/tests/test_default.py +++ b/molecule/distributed-wazuh-elk/tests/test_default.py @@ -8,7 +8,7 @@ def get_wazuh_version(): """This return the version of Wazuh.""" - return "4.2.0" + return "4.2.1" def test_wazuh_packages_are_installed(host): diff --git a/molecule/distributed-wazuh-odfe/group_vars/all.yml b/molecule/distributed-wazuh-odfe/group_vars/all.yml index a001f2bbe..600a6cb43 100644 --- a/molecule/distributed-wazuh-odfe/group_vars/all.yml +++ b/molecule/distributed-wazuh-odfe/group_vars/all.yml @@ -40,8 +40,8 @@ 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 -wazuh_agent_version: 4.2.0-1 +wazuh_manager_version: 4.2.1-1 +wazuh_agent_version: 4.2.1-1 # Kibana role appends it automatically. -wazuh_version: 4.2.0 +wazuh_version: 4.2.1 diff --git a/molecule/distributed-wazuh-odfe/tests/test_default.py b/molecule/distributed-wazuh-odfe/tests/test_default.py index f84cbb7ad..db20ee046 100644 --- a/molecule/distributed-wazuh-odfe/tests/test_default.py +++ b/molecule/distributed-wazuh-odfe/tests/test_default.py @@ -8,7 +8,7 @@ def get_wazuh_version(): """This return the version of Wazuh.""" - return "4.2.0" + return "4.2.1" def test_wazuh_packages_are_installed(host): diff --git a/pyproject.toml b/pyproject.toml index ec1c35e3e..fd1122bcb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "wazuh-ansible" -version = "4.2.0" +version = "4.2.1" description = "" authors = ["neonmei "] diff --git a/roles/elastic-stack/ansible-kibana/defaults/main.yml b/roles/elastic-stack/ansible-kibana/defaults/main.yml index 916b4aa26..be586dc41 100644 --- a/roles/elastic-stack/ansible-kibana/defaults/main.yml +++ b/roles/elastic-stack/ansible-kibana/defaults/main.yml @@ -7,7 +7,7 @@ kibana_server_host: "0.0.0.0" kibana_server_port: "5601" kibana_conf_path: /etc/kibana elastic_stack_version: 7.10.2 -wazuh_version: 4.2.0 +wazuh_version: 4.2.1 wazuh_app_url: https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana elasticrepo: diff --git a/roles/opendistro/opendistro-kibana/defaults/main.yml b/roles/opendistro/opendistro-kibana/defaults/main.yml index 7b0d27631..be58db064 100644 --- a/roles/opendistro/opendistro-kibana/defaults/main.yml +++ b/roles/opendistro/opendistro-kibana/defaults/main.yml @@ -10,7 +10,7 @@ kibana_server_port: "5601" kibana_server_name: "kibana" kibana_max_payload_bytes: 1048576 elastic_stack_version: 7.10.2 -wazuh_version: 4.2.0 +wazuh_version: 4.2.1 wazuh_app_url: https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana # The OpenDistro package repository diff --git a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml index 4fe7ea399..c148390cb 100644 --- a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml +++ b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml @@ -1,7 +1,7 @@ --- filebeat_version: 7.10.2 -wazuh_template_branch: v4.2.0 +wazuh_template_branch: v4.2.1 filebeat_output_elasticsearch_hosts: - "localhost:9200" diff --git a/roles/wazuh/ansible-filebeat/defaults/main.yml b/roles/wazuh/ansible-filebeat/defaults/main.yml index ca375b6fa..a1b2778ad 100644 --- a/roles/wazuh/ansible-filebeat/defaults/main.yml +++ b/roles/wazuh/ansible-filebeat/defaults/main.yml @@ -1,7 +1,7 @@ --- filebeat_version: 7.10.2 -wazuh_template_branch: v4.2.0 +wazuh_template_branch: v4.2.1 filebeat_create_config: true diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 8fc9007bf..b1766a764 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -1,5 +1,5 @@ --- -wazuh_agent_version: 4.2.0-1 +wazuh_agent_version: 4.2.1-1 # Custom packages installation @@ -12,7 +12,7 @@ wazuh_custom_packages_installation_agent_rpm_url: "" wazuh_agent_sources_installation: enabled: false - branch: "v4.2.0" + branch: "v4.2.1" user_language: "y" user_no_stop: "y" user_install_type: "agent" @@ -55,8 +55,8 @@ wazuh_winagent_config: auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe check_md5: True md5: 8ffa75d13280f1aa6ffca54f4273df4d -wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.2.0-1.msi -wazuh_winagent_package_name: wazuh-agent-4.2.0-1.msi +wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.2.1-1.msi +wazuh_winagent_package_name: wazuh-agent-4.2.1-1.msi wazuh_dir: "/var/ossec" diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index b285f5eb7..80368ef85 100644 --- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -1,5 +1,5 @@ --- -wazuh_manager_version: 4.2.0-1 +wazuh_manager_version: 4.2.1-1 wazuh_manager_fqdn: "wazuh-server" wazuh_manager_package_state: present @@ -12,7 +12,7 @@ wazuh_custom_packages_installation_manager_rpm_url: "https://s3-us-west-1.amazon # Sources installation wazuh_manager_sources_installation: enabled: false - branch: "v4.2.0" + branch: "v4.2.1" user_language: "en" user_no_stop: "y" user_install_type: "server"