From ea12701d6b8e65392f46d4753948f3c76f349431 Mon Sep 17 00:00:00 2001 From: neonmei Date: Mon, 30 Nov 2020 12:58:32 -0300 Subject: [PATCH 1/6] release: bump Wazuh version across roles to 4.0.3 --- 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 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/roles/elastic-stack/ansible-kibana/defaults/main.yml b/roles/elastic-stack/ansible-kibana/defaults/main.yml index ad473430..8671d52b 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.9.3 -wazuh_version: 4.0.2 +wazuh_version: 4.0.3 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 612822d0..e7fa2689 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.9.1 -wazuh_version: 4.0.2 +wazuh_version: 4.0.3 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 0b977cdd..9552d58e 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.9.1 -wazuh_template_branch: v4.0.2 +wazuh_template_branch: v4.0.3 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 1ef9493f..ba4ade1f 100644 --- a/roles/wazuh/ansible-filebeat/defaults/main.yml +++ b/roles/wazuh/ansible-filebeat/defaults/main.yml @@ -1,7 +1,7 @@ --- filebeat_version: 7.9.3 -wazuh_template_branch: v4.0.2 +wazuh_template_branch: v4.0.3 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 4e1725b7..f0d32607 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.0.2-1 +wazuh_agent_version: 4.0.3-1 # Custom packages installation @@ -12,7 +12,7 @@ wazuh_custom_packages_installation_agent_rpm_url: "" wazuh_agent_sources_installation: enabled: false - branch: "v4.0.2" + branch: "v4.0.3" 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: f2444d89dab2c4c31bbdef454c95eb28 -wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.0.2.msi -wazuh_winagent_package_name: wazuh-agent-4.0.2.msi +wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.0.3.msi +wazuh_winagent_package_name: wazuh-agent-4.0.3.msi wazuh_agent_repo: apt: 'deb https://packages.wazuh.com/4.x/apt/ stable main' diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index 85e63ecd..a0fcf491 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.0.2-1 +wazuh_manager_version: 4.0.3-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.0.2" + branch: "v4.0.3" user_language: "en" user_no_stop: "y" user_install_type: "server" From 9b92651e1a08ac4a3fc178e26c5fa42a246777ea Mon Sep 17 00:00:00 2001 From: neonmei Date: Mon, 30 Nov 2020 12:58:59 -0300 Subject: [PATCH 2/6] release: bump Wazuh version in README.md to v4.0.3 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9895be44..f7610e01 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ These playbooks install and configure Wazuh agent, manager and Elastic Stack. | Wazuh version | Elastic | ODFE | |---------------|---------|--------| -| v4.0.2 | 7.9.3 | 1.11.0 | +| v4.0.3 | 7.9.3 | 1.11.0 | ## Documentation From 8d565de581754fafb8f45c0b3c4b43b980805524 Mon Sep 17 00:00:00 2001 From: neonmei Date: Mon, 30 Nov 2020 13:03:32 -0300 Subject: [PATCH 3/6] release: update CHANGELOG.md for v4.0.3 --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91000121..73d72e71 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,16 @@ # Change Log All notable changes to this project will be documented in this file. +## [v4.0.3] + +### Added + +- Update to Wazuh v4.0.3 + +### Fixed + +- Fix wrong `delegate_to` in task added by PR#488, hotfixed in `v4.0.2` in [PR#511](https://github.com/wazuh/wazuh-ansible/pull/511) + ## [v4.0.2] ### Added From 8207182c4a01b08400e18529f245a464edc33ca7 Mon Sep 17 00:00:00 2001 From: neonmei Date: Mon, 30 Nov 2020 13:11:01 -0300 Subject: [PATCH 4/6] release: update molecule tests for Wazuh version v4.0.3 --- molecule/distributed-wazuh-elk-xpack/group_vars/all.yml | 6 +++--- molecule/distributed-wazuh-elk/group_vars/all.yml | 6 +++--- molecule/distributed-wazuh-odfe/group_vars/all.yml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/molecule/distributed-wazuh-elk-xpack/group_vars/all.yml b/molecule/distributed-wazuh-elk-xpack/group_vars/all.yml index 45028909..48fd2503 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.9.3 filebeat_version: 7.9.3 # Debian packages need the ${VERSION}-1 -wazuh_manager_version: 4.0.2-1 -wazuh_agent_version: 4.0.2-1 +wazuh_manager_version: 4.0.3-1 +wazuh_agent_version: 4.0.3-1 # Kibana role appends it automatically. -wazuh_version: 4.0.2 +wazuh_version: 4.0.3 ######################################################## diff --git a/molecule/distributed-wazuh-elk/group_vars/all.yml b/molecule/distributed-wazuh-elk/group_vars/all.yml index 48ae39eb..39272811 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.9.3 filebeat_version: 7.9.3 # Debian packages need the ${VERSION}-1 -wazuh_manager_version: 4.0.2-1 -wazuh_agent_version: 4.0.2-1 +wazuh_manager_version: 4.0.3-1 +wazuh_agent_version: 4.0.3-1 # Kibana role appends it automatically. -wazuh_version: 4.0.2 \ No newline at end of file +wazuh_version: 4.0.3 \ No newline at end of file diff --git a/molecule/distributed-wazuh-odfe/group_vars/all.yml b/molecule/distributed-wazuh-odfe/group_vars/all.yml index 393ec495..18249c2b 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.9.1 kibana_opendistro_version: -1.11.0-1 # Debian packages need the ${VERSION}-1 -wazuh_manager_version: 4.0.2-1 -wazuh_agent_version: 4.0.2-1 +wazuh_manager_version: 4.0.3-1 +wazuh_agent_version: 4.0.3-1 # Kibana role appends it automatically. -wazuh_version: 4.0.2 \ No newline at end of file +wazuh_version: 4.0.3 \ No newline at end of file From 4547cde8f8a38c6114fb14ed597300880776d58a Mon Sep 17 00:00:00 2001 From: neonmei Date: Mon, 30 Nov 2020 14:00:47 -0300 Subject: [PATCH 5/6] release: update wazuh-agent url for windows installer --- roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index f0d32607..ff40a16b 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -54,9 +54,8 @@ wazuh_winagent_config: # Adding quotes to auth_path_x86 since win_shell outputs error otherwise auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe check_md5: True - md5: f2444d89dab2c4c31bbdef454c95eb28 -wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.0.3.msi -wazuh_winagent_package_name: wazuh-agent-4.0.3.msi +wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.0.3-1.msi +wazuh_winagent_package_name: wazuh-agent-4.0.3-1.msi wazuh_agent_repo: apt: 'deb https://packages.wazuh.com/4.x/apt/ stable main' From b084e33bd6381c3082b9894caa563f25a28075c6 Mon Sep 17 00:00:00 2001 From: neonmei Date: Mon, 30 Nov 2020 14:00:58 -0300 Subject: [PATCH 6/6] release: update wazuh-agent windows installer md5 --- roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index ff40a16b..bcf134f1 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -54,6 +54,7 @@ wazuh_winagent_config: # Adding quotes to auth_path_x86 since win_shell outputs error otherwise auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe check_md5: True + md5: ac2a7f83cab1f8e217083965de7b0c84 wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.0.3-1.msi wazuh_winagent_package_name: wazuh-agent-4.0.3-1.msi