From 333816831a65a340c41f493e4e0ffdd18e3c70f5 Mon Sep 17 00:00:00 2001 From: neonmei Date: Mon, 23 Nov 2020 17:17:04 -0300 Subject: [PATCH 1/3] release: bump Wazuh version to 4.0.2 --- CHANGELOG.md | 10 +++++++++- README.md | 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 ++-- 9 files changed, 21 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5032bf99..a7f7759e 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ # Change Log All notable changes to this project will be documented in this file. +## [v4.0.2] + +- Update to Wazuh v4.0.2 + +### Added + +### Fixed + ## [v4.0.1] ### Added @@ -13,7 +21,7 @@ All notable changes to this project will be documented in this file. - Roles/elastic-stack: update jvm.options template per upstream updates ([@neonmei](https://github.com/neonmei)) [PR#501](https://github.com/wazuh/wazuh-ansible/pull/501) - Improve linting history ([@neonmei](https://github.com/neonmei)) - - Fix lint opendistro kibana [PR#497](https://github.com/wazuh/wazuh-ansible/pull/497) + - Fix lint opendistro kibana [PR#497](https://github.com/wazuh/wazuh-ansible/pull/497) - Feature lint roles configurations [PR#496](https://github.com/wazuh/wazuh-ansible/pull/496) - Feature lint role wazuh agent [PR#495](https://github.com/wazuh/wazuh-ansible/pull/495) - Feature lint role filebeat oss [PR#494](https://github.com/wazuh/wazuh-ansible/pull/494) diff --git a/README.md b/README.md index 42cae4e4..9895be44 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.1 | 7.9.3 | 1.11.0 | +| v4.0.2 | 7.9.3 | 1.11.0 | ## Documentation diff --git a/pyproject.toml b/pyproject.toml index 8db66cca..8b4b0a71 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "wazuh-ansible" -version = "4.0.1" +version = "4.0.2" description = "" authors = ["neonmei "] diff --git a/roles/elastic-stack/ansible-kibana/defaults/main.yml b/roles/elastic-stack/ansible-kibana/defaults/main.yml index e61495a0..ad473430 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.1 +wazuh_version: 4.0.2 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 4fe1c819..612822d0 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.1 +wazuh_version: 4.0.2 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 be1eae13..0b977cdd 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.1 +wazuh_template_branch: v4.0.2 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 401983ff..1ef9493f 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.1 +wazuh_template_branch: v4.0.2 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 d4684ab4..6e31e857 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.1-1 +wazuh_agent_version: 4.0.2-1 # Custom packages installation @@ -12,7 +12,7 @@ wazuh_custom_packages_installation_agent_rpm_url: "" wazuh_agent_sources_installation: enabled: false - branch: "v4.0.1" + branch: "v4.0.2" 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.1-1.msi -wazuh_winagent_package_name: wazuh-agent-4.0.1-1.msi +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_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 9d496170..85e63ecd 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.1-1 +wazuh_manager_version: 4.0.2-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.1" + branch: "v4.0.2" user_language: "en" user_no_stop: "y" user_install_type: "server" From 8f5144587887a7fc1872e15d36ad8ec174adbdc3 Mon Sep 17 00:00:00 2001 From: neonmei Date: Wed, 25 Nov 2020 10:33:41 -0300 Subject: [PATCH 2/3] release: make molecule tests component versions explicit and point them to release v4.0.2 --- .../group_vars/all.yml | 16 ++++++++++--- .../distributed-wazuh-elk/group_vars/all.yml | 10 ++++++++ .../distributed-wazuh-odfe/group_vars/all.yml | 24 +++++++++++++------ 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/molecule/distributed-wazuh-elk-xpack/group_vars/all.yml b/molecule/distributed-wazuh-elk-xpack/group_vars/all.yml index 715e921c..45028909 100644 --- a/molecule/distributed-wazuh-elk-xpack/group_vars/all.yml +++ b/molecule/distributed-wazuh-elk-xpack/group_vars/all.yml @@ -12,6 +12,19 @@ manager_addresses: "{{ managers_hostvars | map(attribute='private_ip') | list }} elastic_addresses: "{{ elastic_hostvars | map(attribute='private_ip') | list }}" kibana_addresses: "{{ kibana_hostvars | map(attribute='private_ip') | list }}" +######################################################## +# Versions +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 + +# Kibana role appends it automatically. +wazuh_version: 4.0.2 + + ######################################################## # General ELK stack variables @@ -22,6 +35,3 @@ kibana_xpack_security: true elasticsearch_xpack_security: true elasticsearch_xpack_security_user: elastic elasticsearch_xpack_security_password: elastic_pass - -elastic_stack_version: 7.9.3 -filebeat_version: 7.9.3 \ No newline at end of file diff --git a/molecule/distributed-wazuh-elk/group_vars/all.yml b/molecule/distributed-wazuh-elk/group_vars/all.yml index c5d04fe9..48ae39eb 100644 --- a/molecule/distributed-wazuh-elk/group_vars/all.yml +++ b/molecule/distributed-wazuh-elk/group_vars/all.yml @@ -10,4 +10,14 @@ elastic_hostvars: "{{ groups['elastic'] | map('extract', hostvars) | list }}" manager_addresses: "{{ managers_hostvars | map(attribute='private_ip') | list }}" elastic_addresses: "{{ elastic_hostvars | map(attribute='private_ip') | list }}" +######################################################## +# Versions 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 + +# Kibana role appends it automatically. +wazuh_version: 4.0.2 \ 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 998bbbb5..393ec495 100644 --- a/molecule/distributed-wazuh-odfe/group_vars/all.yml +++ b/molecule/distributed-wazuh-odfe/group_vars/all.yml @@ -15,12 +15,6 @@ kibana_addresses: "{{ kibana_hostvars | map(attribute='private_ip') | list }}" ######################################################## # General ELK stack variables -# Cluster Settings -#es_version: "7.9.1" -#es_major_version: "7.x" -#opendistro_version: 1.10.1 -filebeat_version: 7.9.1 - # OpenDistro kibana_opendistro_security: true @@ -34,4 +28,20 @@ opendistro_admin_password: changeme # All nodes are called by IP name elasticsearch_node_name: '{{ ansible_hostname }}' kibana_node_name: '{{ ansible_hostname }}' -filebeat_node_name: '{{ ansible_hostname }}' \ No newline at end of file +filebeat_node_name: '{{ ansible_hostname }}' + +######################################################## +# Versions +# See: https://opendistro.github.io/for-elasticsearch-docs/version-history/ + +elastic_stack_version: 7.9.1 +opendistro_version: 1.11.0 +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 + +# Kibana role appends it automatically. +wazuh_version: 4.0.2 \ No newline at end of file From 2501ee6624d8a921b3fe4fd6b3c822ac66e40783 Mon Sep 17 00:00:00 2001 From: neonmei Date: Wed, 25 Nov 2020 11:02:18 -0300 Subject: [PATCH 3/3] release: update CHANGELOG.md for v4.0.2 --- CHANGELOG.md | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7f7759e..91000121 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,12 +3,22 @@ All notable changes to this project will be documented in this file. ## [v4.0.2] -- Update to Wazuh v4.0.2 - ### Added +- Update to Wazuh v4.0.2 + +### Changed + +- New role variables have been introduced (e.g: `wazuh_agent_api_validate`), see documentation or PRs listed here for details. +- Some variables have been deprecated (e.g: `wazuh_agent_nat`) in favour of other ones, see documentation or PRs listed here for details. + ### Fixed +- Fix agent enrollment default value. Fix authd registration. [PR#505](https://github.com/wazuh/wazuh-ansible/issues/505) +- Remove async clause causing agent install timeout on resource-constrained Centos installations [PR#507](https://github.com/wazuh/wazuh-ansible/issues/507) +- Fix REST registration method for agents [PR#509](https://github.com/wazuh/wazuh-ansible/issues/509) +- `authd_pass` and `api_pass` [precedence](https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html#variable-precedence-where-should-i-put-a-variable) too high, lower to role defaults [PR#488](https://github.com/wazuh/wazuh-ansible/issues/488) + ## [v4.0.1] ### Added