From dac3ddc1fb1b5e2de7b7785bacd7c534dd912412 Mon Sep 17 00:00:00 2001 From: zenidd Date: Fri, 13 Nov 2020 10:57:20 +0100 Subject: [PATCH] wazuh-ansible: bump versions, update README --- CHANGELOG.md | 28 +++++++++++++++++-- README.md | 2 +- molecule/default/tests/test_default.py | 2 +- .../group_vars/all.yml | 4 +-- .../tests/test_default.py | 4 +-- .../distributed-wazuh-elk/group_vars/all.yml | 2 +- .../tests/test_default.py | 4 +-- .../tests/test_default.py | 2 +- pyproject.toml | 2 +- .../ansible-elasticsearch/defaults/main.yml | 2 +- .../ansible-kibana/defaults/main.yml | 4 +-- .../defaults/main.yml | 2 +- .../opendistro-kibana/defaults/main.yml | 4 +-- .../ansible-filebeat-oss/defaults/main.yml | 2 +- .../wazuh/ansible-filebeat/defaults/main.yml | 4 +-- .../ansible-wazuh-agent/defaults/main.yml | 10 +++---- .../ansible-wazuh-manager/defaults/main.yml | 4 +-- 17 files changed, 52 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 295cafaf..af2fd0e4 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,20 +1,42 @@ # Change Log All notable changes to this project will be documented in this file. +## [v4.0.1] + +### Added + +- Update to Wazuh v4.0.1 +- Allow installing fixed Filebeat-oss version ([@Zenidd](https://github.com/Zenidd)) [PR#486](https://github.com/wazuh/wazuh-ansible/pull/486) +- Feature adapt molecule tests ([@neonmei](https://github.com/neonmei)) [PR#477](https://github.com/wazuh/wazuh-ansible/pull/477) + +### Fixed + +- Improve linting history ([@neonmei](https://github.com/neonmei)) + - Fix lint opendistro kibana [PR#468](https://github.com/wazuh/wazuh-ansible/pull/468) + - 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) + - Lint role wazuh-manager [PR#493](https://github.com/wazuh/wazuh-ansible/pull/493) + - Feature lint role elasticsearch [PR#492](https://github.com/wazuh/wazuh-ansible/pull/492) + - Feature lint role opendistro-elasticsearch [PR#491](https://github.com/wazuh/wazuh-ansible/pull/491) +- Remove unnecesary nodejs dependency ([@neonmei](https://github.com/neonmei)) [PR#482](https://github.com/wazuh/wazuh-ansible/pull/482) +- Feature manager configuration unnest ([@neonmei](https://github.com/neonmei)) [PR#481](https://github.com/wazuh/wazuh-ansible/pull/481) +- Elastic API check fix ([@Zenidd](https://github.com/Zenidd)) [PR#480](https://github.com/wazuh/wazuh-ansible/pull/480) +- Improve handling of run_once at opendistro-elasticsearch role ([@neonmei](https://github.com/neonmei)) [PR#478](https://github.com/wazuh/wazuh-ansible/pull/478) + + ## [v4.0.0] ### Added - Update to Wazuh v4.0.0 +- New example playbooks on README ([@Zenidd](https://github.com/Zenidd)) [PR#468](https://github.com/wazuh/wazuh-ansible/pull/468) ### Fixed - Ensure recursive /usr/share/kibana permissions before installing WUI ([@Zenidd](https://github.com/Zenidd)) [PR#471](https://github.com/wazuh/wazuh-ansible/pull/471) - Remove vuls integration ([@manuasir](https://github.com/manuasir)) [PR#469](https://github.com/wazuh/wazuh-ansible/pull/469) -### Added - -- New example playbooks on README ([@Zenidd](https://github.com/Zenidd)) [PR#468](https://github.com/wazuh/wazuh-ansible/pull/468) ## [v3.13.2] diff --git a/README.md b/README.md index 47235d22..42cae4e4 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.0 | 7.9.2 | 1.10.1 | +| v4.0.1 | 7.9.3 | 1.11.0 | ## Documentation diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index a6a86674..762c593e 100644 --- a/molecule/default/tests/test_default.py +++ b/molecule/default/tests/test_default.py @@ -8,7 +8,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( def get_wazuh_version(): """This return the version of Wazuh.""" - return "4.0.0" + return "4.0.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 fcf3b407..715e921c 100644 --- a/molecule/distributed-wazuh-elk-xpack/group_vars/all.yml +++ b/molecule/distributed-wazuh-elk-xpack/group_vars/all.yml @@ -23,5 +23,5 @@ elasticsearch_xpack_security: true elasticsearch_xpack_security_user: elastic elasticsearch_xpack_security_password: elastic_pass -elastic_stack_version: 7.9.1 -filebeat_version: 7.9.1 \ No newline at end of file +elastic_stack_version: 7.9.3 +filebeat_version: 7.9.3 \ No newline at end of file diff --git a/molecule/distributed-wazuh-elk-xpack/tests/test_default.py b/molecule/distributed-wazuh-elk-xpack/tests/test_default.py index a6a86674..e9192994 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 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( def get_wazuh_version(): """This return the version of Wazuh.""" - return "4.0.0" + return "4.0.1" def test_wazuh_packages_are_installed(host): @@ -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.9.1') + assert filebeat.version.startswith('7.9.3') diff --git a/molecule/distributed-wazuh-elk/group_vars/all.yml b/molecule/distributed-wazuh-elk/group_vars/all.yml index a706caae..c5d04fe9 100644 --- a/molecule/distributed-wazuh-elk/group_vars/all.yml +++ b/molecule/distributed-wazuh-elk/group_vars/all.yml @@ -10,4 +10,4 @@ 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 }}" -elastic_stack_version: 7.9.1 +elastic_stack_version: 7.9.3 diff --git a/molecule/distributed-wazuh-elk/tests/test_default.py b/molecule/distributed-wazuh-elk/tests/test_default.py index a6a86674..e9192994 100644 --- a/molecule/distributed-wazuh-elk/tests/test_default.py +++ b/molecule/distributed-wazuh-elk/tests/test_default.py @@ -8,7 +8,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( def get_wazuh_version(): """This return the version of Wazuh.""" - return "4.0.0" + return "4.0.1" def test_wazuh_packages_are_installed(host): @@ -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.9.1') + assert filebeat.version.startswith('7.9.3') diff --git a/molecule/distributed-wazuh-odfe/tests/test_default.py b/molecule/distributed-wazuh-odfe/tests/test_default.py index a6a86674..762c593e 100644 --- a/molecule/distributed-wazuh-odfe/tests/test_default.py +++ b/molecule/distributed-wazuh-odfe/tests/test_default.py @@ -8,7 +8,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( def get_wazuh_version(): """This return the version of Wazuh.""" - return "4.0.0" + return "4.0.1" def test_wazuh_packages_are_installed(host): diff --git a/pyproject.toml b/pyproject.toml index aa98c6a0..8db66cca 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "wazuh-ansible" -version = "4.0.0" +version = "4.0.1" description = "" authors = ["neonmei "] diff --git a/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml b/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml index 5a638104..5c80ad7a 100644 --- a/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml +++ b/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml @@ -4,7 +4,7 @@ elasticsearch_http_port: 9200 elasticsearch_network_host: 127.0.0.1 elasticsearch_reachable_host: 127.0.0.1 elasticsearch_jvm_xms: null -elastic_stack_version: 7.9.1 +elastic_stack_version: 7.9.3 elasticsearch_lower_disk_requirements: false elasticsearch_path_repo: [] diff --git a/roles/elastic-stack/ansible-kibana/defaults/main.yml b/roles/elastic-stack/ansible-kibana/defaults/main.yml index 35bae043..99d6da9a 100644 --- a/roles/elastic-stack/ansible-kibana/defaults/main.yml +++ b/roles/elastic-stack/ansible-kibana/defaults/main.yml @@ -6,8 +6,8 @@ elasticsearch_network_host: "127.0.0.1" kibana_server_host: "0.0.0.0" kibana_server_port: "5601" kibana_conf_path: /etc/kibana -elastic_stack_version: 7.9.2 -wazuh_version: 4.0.0 +elastic_stack_version: 7.9.3 +wazuh_version: 4.0.1 wazuh_app_url: https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana elasticrepo: diff --git a/roles/opendistro/opendistro-elasticsearch/defaults/main.yml b/roles/opendistro/opendistro-elasticsearch/defaults/main.yml index 9925c3eb..9f58cf70 100644 --- a/roles/opendistro/opendistro-elasticsearch/defaults/main.yml +++ b/roles/opendistro/opendistro-elasticsearch/defaults/main.yml @@ -3,7 +3,7 @@ es_version: "7.9.1" es_major_version: "7.x" -opendistro_version: 1.10.1 +opendistro_version: 1.11.0 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 2974bf3d..cbd56062 100644 --- a/roles/opendistro/opendistro-kibana/defaults/main.yml +++ b/roles/opendistro/opendistro-kibana/defaults/main.yml @@ -14,11 +14,11 @@ kibana_server_port: "5601" kibana_server_name: "kibana" kibana_max_payload_bytes: 1048576 elastic_stack_version: 7.9.1 -wazuh_version: 4.0.0 +wazuh_version: 4.0.1 wazuh_app_url: https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana # The OpenDistro package repository -kibana_opendistro_version: -1.10.1-1 # Version includes the - for RedHat family compatibility, replace with = for Debian hosts +kibana_opendistro_version: -1.11.0-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 ace9077f..98288be6 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.0 +wazuh_template_branch: v4.0.1 filebeat_create_config: true diff --git a/roles/wazuh/ansible-filebeat/defaults/main.yml b/roles/wazuh/ansible-filebeat/defaults/main.yml index f2c02a48..17ffede0 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.2 +filebeat_version: 7.9.3 -wazuh_template_branch: v4.0.0 +wazuh_template_branch: v4.0.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 38ff1151..51d5f72e 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.0-1 +wazuh_agent_version: 4.0.1-1 # Custom packages installation @@ -12,7 +12,7 @@ wazuh_custom_packages_installation_agent_rpm_url: "" wazuh_agent_sources_installation: enabled: false - branch: "v4.0.0" + branch: "v4.0.1" user_language: "y" user_no_stop: "y" user_install_type: "agent" @@ -66,9 +66,9 @@ 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: f9737cbd7df7104c1bee9f3e8b9ca26e -wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.0.0-1.msi -wazuh_winagent_package_name: wazuh-agent-4.0.0-1.msi + 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_agent_config: 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 72227a5f..9d496170 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.0-1 +wazuh_manager_version: 4.0.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.0.0" + branch: "v4.0.1" user_language: "en" user_no_stop: "y" user_install_type: "server"