From 5ad76a1e3678e99124c39774353efb808a53c2d1 Mon Sep 17 00:00:00 2001 From: zenidd Date: Tue, 20 Oct 2020 17:40:28 +0200 Subject: [PATCH] Bump versions --- CHANGELOG.md | 6 ++++++ molecule/default/tests/test_default.py | 6 ++---- .../elastic-stack/ansible-kibana/defaults/main.yml | 6 +++--- roles/wazuh/ansible-filebeat-oss/defaults/main.yml | 4 ++-- roles/wazuh/ansible-filebeat/defaults/main.yml | 4 ++-- roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 14 +++++++------- .../wazuh/ansible-wazuh-manager/defaults/main.yml | 13 ++++++------- 7 files changed, 28 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ba466ff..07318fd9 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.0.0] + +### Added + +- Update to Wazuh v4.0.0 + ## [v3.13.1_7.8.0] ### Added diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index e63a0bab..10b1210d 100644 --- a/molecule/default/tests/test_default.py +++ b/molecule/default/tests/test_default.py @@ -7,7 +7,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( def get_wazuh_version(): """This return the version of Wazuh.""" - return "3.13.1" + return "4.0.0" def test_wazuh_packages_are_installed(host): """Test if the main packages are installed.""" @@ -26,9 +26,7 @@ def test_wazuh_services_are_running(host): """ manager = host.service("wazuh-manager") api = host.service("wazuh-api") - # assert manager.is_running assert manager.is_running - # assert api.is_running assert api.is_running @pytest.mark.parametrize("wazuh_file, wazuh_owner, wazuh_group, wazuh_mode", [ @@ -49,4 +47,4 @@ def test_filebeat_is_installed(host): """Test if the elasticsearch package is installed.""" filebeat = host.package("filebeat") assert filebeat.is_installed - assert filebeat.version.startswith('7.8.0') + assert filebeat.version.startswith('7.9.1') diff --git a/roles/elastic-stack/ansible-kibana/defaults/main.yml b/roles/elastic-stack/ansible-kibana/defaults/main.yml index e252cc4a..ae6ece7d 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.8.0 -wazuh_version: 3.13.1 +elastic_stack_version: 7.9.2 +wazuh_version: 4.0.0 wazuh_app_url: https://packages.wazuh.com/wazuhapp/wazuhapp elasticrepo: @@ -49,7 +49,7 @@ nodejs: # Build from sources build_from_sources: false -wazuh_plugin_branch: 3.13-7.8 +wazuh_plugin_branch: 4.0-7.9 #Nodejs NODE_OPTIONS node_options: --no-warnings --max-old-space-size=2048 --max-http-header-size=65536 diff --git a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml index 1ef027e7..d802febd 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.8.0 +filebeat_version: 7.9.1 -wazuh_template_branch: v3.13.1 +wazuh_template_branch: v4.0.0 filebeat_create_config: true diff --git a/roles/wazuh/ansible-filebeat/defaults/main.yml b/roles/wazuh/ansible-filebeat/defaults/main.yml index d9599520..3a8cc186 100644 --- a/roles/wazuh/ansible-filebeat/defaults/main.yml +++ b/roles/wazuh/ansible-filebeat/defaults/main.yml @@ -1,7 +1,7 @@ --- -filebeat_version: 7.8.0 +filebeat_version: 7.9.2 -wazuh_template_branch: v3.13.1 +wazuh_template_branch: v4.0.0 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 b210303e..1b6ee516 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -1,18 +1,18 @@ --- -wazuh_agent_version: 3.13.1-1 +wazuh_agent_version: 4.0.0-1 # Custom packages installation -wazuh_custom_packages_installation_agent_enabled: true -wazuh_custom_packages_installation_agent_deb_url: "https://s3-us-west-1.amazonaws.com/packages-dev.wazuh.com/pre-release/apt/pool/main/w/wazuh-agent/wazuh-agent_4.0.0-1_amd64.deb" -wazuh_custom_packages_installation_agent_rpm_url: "https://s3-us-west-1.amazonaws.com/packages-dev.wazuh.com/pre-release/yum/wazuh-agent-4.0.0-1.x86_64.rpm" +wazuh_custom_packages_installation_agent_enabled: false +wazuh_custom_packages_installation_agent_deb_url: "" +wazuh_custom_packages_installation_agent_rpm_url: "" # Sources installation wazuh_agent_sources_installation: enabled: false - branch: "v3.13.1" + branch: "v4.0.0" user_language: "y" user_no_stop: "y" user_install_type: "agent" @@ -67,8 +67,8 @@ wazuh_winagent_config: auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe check_md5: True md5: d0f13c0c417c74ccbad7b45f66518513 -wazuh_winagent_config_url: https://packages.wazuh.com/3.x/windows/wazuh-agent-3.13.1-1.msi -wazuh_winagent_package_name: wazuh-agent-3.13.1-1.msi +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 wazuh_agent_config: repo: apt: 'deb https://packages.wazuh.com/3.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 3efdd492..161a2ef2 100644 --- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -1,18 +1,18 @@ --- -wazuh_manager_version: 3.13.1-1 +wazuh_manager_version: 4.0.0-1 wazuh_manager_fqdn: "wazuh-server" wazuh_manager_package_state: present # Custom packages installation wazuh_custom_packages_installation_manager_enabled: false -wazuh_custom_packages_installation_manager_deb_url: "https://s3-us-west-1.amazonaws.com/packages-dev.wazuh.com/" -wazuh_custom_packages_installation_manager_rpm_url: " +´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" +wazuh_custom_packages_installation_manager_deb_url: "" +wazuh_custom_packages_installation_manager_rpm_url: "" # Sources installation wazuh_manager_sources_installation: enabled: false - branch: "v3.13.1" + branch: "v4.0.0" user_language: "en" user_no_stop: "y" user_install_type: "server" @@ -36,9 +36,8 @@ wazuh_manager_sources_installation: threads: "2" # wazuh_api_users: -# - username: custom_user5 -# password: Custom_password0 -# role: administrator +# - username: custom_user +# password: changeme wazuh_manager_config: repo: