From 57774d5a552f41dd7c10a56e4a4d274e728074bc Mon Sep 17 00:00:00 2001 From: Alberto R Date: Tue, 24 May 2022 14:18:57 +0200 Subject: [PATCH 1/6] Changed copyright format --- LICENSE | 2 +- README.md | 2 +- roles/wazuh/ansible-filebeat-oss/README.md | 2 +- roles/wazuh/ansible-wazuh-agent/README.md | 2 +- roles/wazuh/ansible-wazuh-manager/README.md | 2 +- .../templates/var-ossec-rules-local_rules.xml.j2 | 2 +- roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2 | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/LICENSE b/LICENSE index 51ab7d2f..a6376ec3 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ - Portions Copyright (C) 2021 Wazuh, Inc. + Portions Copyright (C) 2017, Wazuh, Inc. Based on work Copyright (C) 2003 - 2013 Trend Micro, Inc. This program is a free software; you can redistribute it and/or modify diff --git a/README.md b/README.md index 64f6910a..def9bbd6 100644 --- a/README.md +++ b/README.md @@ -402,7 +402,7 @@ https://github.com/dj-wasabi/ansible-ossec-server ## License and copyright WAZUH -Copyright (C) 2016-2021 Wazuh Inc. (License GPLv2) +Copyright (C) 2016, Wazuh Inc. (License GPLv2) ## Web references diff --git a/roles/wazuh/ansible-filebeat-oss/README.md b/roles/wazuh/ansible-filebeat-oss/README.md index e8c26f13..cd091d26 100644 --- a/roles/wazuh/ansible-filebeat-oss/README.md +++ b/roles/wazuh/ansible-filebeat-oss/README.md @@ -27,7 +27,7 @@ Available variables are listed below, along with default values (see `defaults/m License and copyright --------------------- -WAZUH Copyright (C) 2021 Wazuh Inc. (License GPLv3) +WAZUH Copyright (C) 2016, Wazuh Inc. (License GPLv3) ### Based on previous work from geerlingguy diff --git a/roles/wazuh/ansible-wazuh-agent/README.md b/roles/wazuh/ansible-wazuh-agent/README.md index 14291b34..baf7e57e 100644 --- a/roles/wazuh/ansible-wazuh-agent/README.md +++ b/roles/wazuh/ansible-wazuh-agent/README.md @@ -47,7 +47,7 @@ The following is an example of how this role can be used: License and copyright --------------------- -WAZUH Copyright (C) 2021 Wazuh Inc. (License GPLv3) +WAZUH Copyright (C) 2016, Wazuh Inc. (License GPLv3) ### Based on previous work from dj-wasabi diff --git a/roles/wazuh/ansible-wazuh-manager/README.md b/roles/wazuh/ansible-wazuh-manager/README.md index ef99c1ff..38f0bf8f 100644 --- a/roles/wazuh/ansible-wazuh-manager/README.md +++ b/roles/wazuh/ansible-wazuh-manager/README.md @@ -218,7 +218,7 @@ Including an example of how to use your role (for instance, with variables passe License and copyright --------------------- -WAZUH Copyright (C) 2021 Wazuh Inc. (License GPLv3) +WAZUH Copyright (C) 2016, Wazuh Inc. (License GPLv3) ### Based on previous work from dj-wasabi diff --git a/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-rules-local_rules.xml.j2 b/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-rules-local_rules.xml.j2 index 39eb6a94..987d75a9 100644 --- a/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-rules-local_rules.xml.j2 +++ b/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-rules-local_rules.xml.j2 @@ -1,7 +1,7 @@ - + diff --git a/roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2 b/roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2 index 268c3023..879356ca 100644 --- a/roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2 +++ b/roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2 @@ -1,7 +1,7 @@ --- # # Wazuh app - App configuration file -# Copyright (C) 2015-2019 Wazuh, Inc. +# Copyright (C) 2016, Wazuh Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by From 5a1e02687996c3559c7295da6bf9225ee242f246 Mon Sep 17 00:00:00 2001 From: dfolcha Date: Fri, 27 May 2022 15:37:13 +0200 Subject: [PATCH 2/6] Update filebeat module version --- roles/wazuh/ansible-filebeat-oss/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml index 241e5026..808210d1 100644 --- a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml +++ b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml @@ -9,7 +9,7 @@ filebeat_output_indexer_hosts: - "localhost:9200" filebeat_module_package_url: https://packages.wazuh.com/4.x/filebeat -filebeat_module_package_name: wazuh-filebeat-0.1.tar.gz +filebeat_module_package_name: wazuh-filebeat-0.2.tar.gz filebeat_module_package_path: /tmp/ filebeat_module_destination: /usr/share/filebeat/module filebeat_module_folder: /usr/share/filebeat/module/wazuh From 94ee101dde9c02fdc75bf96b6d755ebdee199c27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Mon, 30 May 2022 10:34:06 -0300 Subject: [PATCH 3/6] Bump 4.3 to 4.3.2 --- CHANGELOG.md | 6 ++++++ README.md | 1 + VERSION | 4 ++-- molecule/default/tests/test_default.py | 2 +- molecule/distributed-wazuh/group_vars/all.yml | 8 ++++---- molecule/distributed-wazuh/tests/test_default.py | 2 +- pyproject.toml | 2 +- roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 6 +++--- roles/wazuh/ansible-wazuh-manager/defaults/main.yml | 4 ++-- roles/wazuh/vars/repo.yml | 2 +- roles/wazuh/vars/repo_dev.yml | 2 +- roles/wazuh/wazuh-dashboard/defaults/main.yml | 4 ++-- roles/wazuh/wazuh-dashboard/vars/debian.yml | 2 +- roles/wazuh/wazuh-indexer/defaults/main.yml | 2 +- 14 files changed, 27 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 110f7c2f..7faa2d78 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.3.2] + +### Added + +- Update to [Wazuh v4.3.2](https://github.com/wazuh/wazuh/blob/v4.3.2/CHANGELOG.md#v432) + ## [v4.3.1] ### Added diff --git a/README.md b/README.md index def9bbd6..a47616e0 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb | Wazuh version | Elastic | ODFE | |---------------|---------|--------| +| v4.3.2 | | | | v4.3.1 | | | | v4.3.0 | | | | v4.2.5 | 7.10.2 | 1.13.2 | diff --git a/VERSION b/VERSION index 22510756..a56074e5 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-ANSIBLE_VERSION="v4.3.1" -REVISION="40311" +WAZUH-ANSIBLE_VERSION="v4.3.2" +REVISION="40312" diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index fe9ab923..503a014a 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.3.1" + return "4.3.2" diff --git a/molecule/distributed-wazuh/group_vars/all.yml b/molecule/distributed-wazuh/group_vars/all.yml index 8bac41a5..4e39d923 100644 --- a/molecule/distributed-wazuh/group_vars/all.yml +++ b/molecule/distributed-wazuh/group_vars/all.yml @@ -30,10 +30,10 @@ indexer_node_name: '{{ ansible_facts.hostname }}' dashboard_node_name: '{{ ansible_facts.hostname }}' filebeat_node_name: '{{ ansible_facts.hostname }}' -indexer_version: 4.3.1 +indexer_version: 4.3.2 filebeat_version: 7.10.2 -wazuh_version: 4.3.1 +wazuh_version: 4.3.2 # Debian packages need the ${VERSION}-1 -wazuh_manager_version: 4.3.1-1 -wazuh_agent_version: 4.3.1-1 +wazuh_manager_version: 4.3.2-1 +wazuh_agent_version: 4.3.2-1 diff --git a/molecule/distributed-wazuh/tests/test_default.py b/molecule/distributed-wazuh/tests/test_default.py index 5685c926..ae2f38eb 100644 --- a/molecule/distributed-wazuh/tests/test_default.py +++ b/molecule/distributed-wazuh/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.3.1" + return "4.3.2" def test_wazuh_packages_are_installed(host): diff --git a/pyproject.toml b/pyproject.toml index ed528552..513555a5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "wazuh-ansible" -version = "4.3.1" +version = "4.3.2" description = "" authors = ["neonmei "] diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 283339e7..32c3d155 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -1,6 +1,6 @@ --- -wazuh_agent_version: 4.3.1-1 +wazuh_agent_version: 4.3.2-1 # Custom packages installation @@ -12,7 +12,7 @@ wazuh_custom_packages_installation_agent_rpm_url: "" wazuh_agent_sources_installation: enabled: false - branch: "v4.3.1" + branch: "v4.3.2" user_language: "y" user_no_stop: "y" user_install_type: "agent" @@ -55,7 +55,7 @@ wazuh_winagent_config: auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe check_md5: True md5: 337ab33c31e3bc1d688cd903be3691fc -wazuh_winagent_package_name: wazuh-agent-4.3.1-1.msi +wazuh_winagent_package_name: wazuh-agent-4.3.2-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 292bc887..b399232e 100644 --- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -1,6 +1,6 @@ --- -wazuh_manager_version: 4.3.1-1 +wazuh_manager_version: 4.3.2-1 wazuh_manager_fqdn: "wazuh-server" wazuh_manager_package_state: present @@ -13,7 +13,7 @@ wazuh_custom_packages_installation_manager_rpm_url: "https://s3-us-west-1.amazon # Sources installation wazuh_manager_sources_installation: enabled: false - branch: "v4.3.1" + branch: "v4.3.2" user_language: "en" user_no_stop: "y" user_install_type: "server" diff --git a/roles/wazuh/vars/repo.yml b/roles/wazuh/vars/repo.yml index 392fd391..2cf67321 100644 --- a/roles/wazuh/vars/repo.yml +++ b/roles/wazuh/vars/repo.yml @@ -3,7 +3,7 @@ wazuh_repo: yum: 'https://packages.wazuh.com/4.x/yum/' gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145' -wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.3.1-1.msi +wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.3.2-1.msi certs_gen_tool_version: 4.3 diff --git a/roles/wazuh/vars/repo_dev.yml b/roles/wazuh/vars/repo_dev.yml index a83a1303..7fd5697b 100644 --- a/roles/wazuh/vars/repo_dev.yml +++ b/roles/wazuh/vars/repo_dev.yml @@ -3,7 +3,7 @@ wazuh_repo: yum: 'https://packages-dev.wazuh.com/pre-release/yum/' gpg: 'https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH' key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145' -wazuh_winagent_config_url: https://packages-dev.wazuh.com/pre-release/windows/wazuh-agent-4.3.1-1.msi +wazuh_winagent_config_url: https://packages-dev.wazuh.com/pre-release/windows/wazuh-agent-4.3.2-1.msi certs_gen_tool_version: 4.3 diff --git a/roles/wazuh/wazuh-dashboard/defaults/main.yml b/roles/wazuh/wazuh-dashboard/defaults/main.yml index cdac138e..d39f9d52 100644 --- a/roles/wazuh/wazuh-dashboard/defaults/main.yml +++ b/roles/wazuh/wazuh-dashboard/defaults/main.yml @@ -8,12 +8,12 @@ dashboard_node_name: node-1 dashboard_server_host: "0.0.0.0" dashboard_server_port: "443" dashboard_server_name: "dashboard" -wazuh_version: 4.3.1 +wazuh_version: 4.3.2 indexer_cluster_nodes: - 127.0.0.1 # The Wazuh dashboard package repository -dashboard_version: "4.3.1" +dashboard_version: "4.3.2" # API credentials wazuh_api_credentials: diff --git a/roles/wazuh/wazuh-dashboard/vars/debian.yml b/roles/wazuh/wazuh-dashboard/vars/debian.yml index 09306ac5..a014ae88 100644 --- a/roles/wazuh/wazuh-dashboard/vars/debian.yml +++ b/roles/wazuh/wazuh-dashboard/vars/debian.yml @@ -1,3 +1,3 @@ --- -dashboard_version: 4.3.1 \ No newline at end of file +dashboard_version: 4.3.2 \ No newline at end of file diff --git a/roles/wazuh/wazuh-indexer/defaults/main.yml b/roles/wazuh/wazuh-indexer/defaults/main.yml index 2f38f199..8cbfefa8 100644 --- a/roles/wazuh/wazuh-indexer/defaults/main.yml +++ b/roles/wazuh/wazuh-indexer/defaults/main.yml @@ -1,6 +1,6 @@ --- # Cluster Settings -indexer_version: 4.3.1 +indexer_version: 4.3.2 single_node: false indexer_node_name: node-1 From c515b36cbcc42cc71f51232c49691e814bffd69c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Tue, 31 May 2022 09:35:10 -0300 Subject: [PATCH 4/6] Bump to 4.3.3 --- CHANGELOG.md | 6 ++++++ README.md | 1 + VERSION | 4 ++-- molecule/default/tests/test_default.py | 2 +- molecule/distributed-wazuh/group_vars/all.yml | 8 ++++---- molecule/distributed-wazuh/tests/test_default.py | 2 +- pyproject.toml | 2 +- roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 6 +++--- roles/wazuh/ansible-wazuh-manager/defaults/main.yml | 4 ++-- roles/wazuh/vars/repo.yml | 2 +- roles/wazuh/vars/repo_dev.yml | 2 +- roles/wazuh/wazuh-dashboard/defaults/main.yml | 4 ++-- roles/wazuh/wazuh-dashboard/vars/debian.yml | 2 +- roles/wazuh/wazuh-indexer/defaults/main.yml | 2 +- 14 files changed, 27 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7faa2d78..4532ef74 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.3.3] + +### Added + +- Update to [Wazuh v4.3.3](https://github.com/wazuh/wazuh/blob/v4.3.3/CHANGELOG.md#v433) + ## [v4.3.2] ### Added diff --git a/README.md b/README.md index a47616e0..9039cda1 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb | Wazuh version | Elastic | ODFE | |---------------|---------|--------| +| v4.3.3 | | | | v4.3.2 | | | | v4.3.1 | | | | v4.3.0 | | | diff --git a/VERSION b/VERSION index a56074e5..5f8f3a6b 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-ANSIBLE_VERSION="v4.3.2" -REVISION="40312" +WAZUH-ANSIBLE_VERSION="v4.3.3" +REVISION="40313" diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index 503a014a..eea733e1 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.3.2" + return "4.3.3" diff --git a/molecule/distributed-wazuh/group_vars/all.yml b/molecule/distributed-wazuh/group_vars/all.yml index 4e39d923..c40eaf61 100644 --- a/molecule/distributed-wazuh/group_vars/all.yml +++ b/molecule/distributed-wazuh/group_vars/all.yml @@ -30,10 +30,10 @@ indexer_node_name: '{{ ansible_facts.hostname }}' dashboard_node_name: '{{ ansible_facts.hostname }}' filebeat_node_name: '{{ ansible_facts.hostname }}' -indexer_version: 4.3.2 +indexer_version: 4.3.3 filebeat_version: 7.10.2 -wazuh_version: 4.3.2 +wazuh_version: 4.3.3 # Debian packages need the ${VERSION}-1 -wazuh_manager_version: 4.3.2-1 -wazuh_agent_version: 4.3.2-1 +wazuh_manager_version: 4.3.3-1 +wazuh_agent_version: 4.3.3-1 diff --git a/molecule/distributed-wazuh/tests/test_default.py b/molecule/distributed-wazuh/tests/test_default.py index ae2f38eb..f482bcaa 100644 --- a/molecule/distributed-wazuh/tests/test_default.py +++ b/molecule/distributed-wazuh/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.3.2" + return "4.3.3" def test_wazuh_packages_are_installed(host): diff --git a/pyproject.toml b/pyproject.toml index 513555a5..b6ba1b26 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "wazuh-ansible" -version = "4.3.2" +version = "4.3.3" description = "" authors = ["neonmei "] diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 32c3d155..2d5347f5 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -1,6 +1,6 @@ --- -wazuh_agent_version: 4.3.2-1 +wazuh_agent_version: 4.3.3-1 # Custom packages installation @@ -12,7 +12,7 @@ wazuh_custom_packages_installation_agent_rpm_url: "" wazuh_agent_sources_installation: enabled: false - branch: "v4.3.2" + branch: "v4.3.3" user_language: "y" user_no_stop: "y" user_install_type: "agent" @@ -55,7 +55,7 @@ wazuh_winagent_config: auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe check_md5: True md5: 337ab33c31e3bc1d688cd903be3691fc -wazuh_winagent_package_name: wazuh-agent-4.3.2-1.msi +wazuh_winagent_package_name: wazuh-agent-4.3.3-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 b399232e..049eb9fc 100644 --- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -1,6 +1,6 @@ --- -wazuh_manager_version: 4.3.2-1 +wazuh_manager_version: 4.3.3-1 wazuh_manager_fqdn: "wazuh-server" wazuh_manager_package_state: present @@ -13,7 +13,7 @@ wazuh_custom_packages_installation_manager_rpm_url: "https://s3-us-west-1.amazon # Sources installation wazuh_manager_sources_installation: enabled: false - branch: "v4.3.2" + branch: "v4.3.3" user_language: "en" user_no_stop: "y" user_install_type: "server" diff --git a/roles/wazuh/vars/repo.yml b/roles/wazuh/vars/repo.yml index 2cf67321..b4db9ad9 100644 --- a/roles/wazuh/vars/repo.yml +++ b/roles/wazuh/vars/repo.yml @@ -3,7 +3,7 @@ wazuh_repo: yum: 'https://packages.wazuh.com/4.x/yum/' gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145' -wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.3.2-1.msi +wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.3.3-1.msi certs_gen_tool_version: 4.3 diff --git a/roles/wazuh/vars/repo_dev.yml b/roles/wazuh/vars/repo_dev.yml index 7fd5697b..d373ccc8 100644 --- a/roles/wazuh/vars/repo_dev.yml +++ b/roles/wazuh/vars/repo_dev.yml @@ -3,7 +3,7 @@ wazuh_repo: yum: 'https://packages-dev.wazuh.com/pre-release/yum/' gpg: 'https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH' key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145' -wazuh_winagent_config_url: https://packages-dev.wazuh.com/pre-release/windows/wazuh-agent-4.3.2-1.msi +wazuh_winagent_config_url: https://packages-dev.wazuh.com/pre-release/windows/wazuh-agent-4.3.3-1.msi certs_gen_tool_version: 4.3 diff --git a/roles/wazuh/wazuh-dashboard/defaults/main.yml b/roles/wazuh/wazuh-dashboard/defaults/main.yml index d39f9d52..6e76ac30 100644 --- a/roles/wazuh/wazuh-dashboard/defaults/main.yml +++ b/roles/wazuh/wazuh-dashboard/defaults/main.yml @@ -8,12 +8,12 @@ dashboard_node_name: node-1 dashboard_server_host: "0.0.0.0" dashboard_server_port: "443" dashboard_server_name: "dashboard" -wazuh_version: 4.3.2 +wazuh_version: 4.3.3 indexer_cluster_nodes: - 127.0.0.1 # The Wazuh dashboard package repository -dashboard_version: "4.3.2" +dashboard_version: "4.3.3" # API credentials wazuh_api_credentials: diff --git a/roles/wazuh/wazuh-dashboard/vars/debian.yml b/roles/wazuh/wazuh-dashboard/vars/debian.yml index a014ae88..9eb6cba6 100644 --- a/roles/wazuh/wazuh-dashboard/vars/debian.yml +++ b/roles/wazuh/wazuh-dashboard/vars/debian.yml @@ -1,3 +1,3 @@ --- -dashboard_version: 4.3.2 \ No newline at end of file +dashboard_version: 4.3.3 \ No newline at end of file diff --git a/roles/wazuh/wazuh-indexer/defaults/main.yml b/roles/wazuh/wazuh-indexer/defaults/main.yml index 8cbfefa8..8e899a94 100644 --- a/roles/wazuh/wazuh-indexer/defaults/main.yml +++ b/roles/wazuh/wazuh-indexer/defaults/main.yml @@ -1,6 +1,6 @@ --- # Cluster Settings -indexer_version: 4.3.2 +indexer_version: 4.3.3 single_node: false indexer_node_name: node-1 From ba7df05860a783738e4165af38895fd1c1959083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Tue, 31 May 2022 12:30:46 -0300 Subject: [PATCH 5/6] Version updated --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 5f8f3a6b..2b2335f3 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-ANSIBLE_VERSION="v4.3.3" -REVISION="40313" +REVISION="40314" From 76de7a5c144259005d505d6c8e31efc0084ddabb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Wed, 1 Jun 2022 12:25:12 -0300 Subject: [PATCH 6/6] Bump to 4.4.0 --- CHANGELOG.md | 6 ++++++ README.md | 1 + VERSION | 4 ++-- molecule/default/tests/test_default.py | 2 +- molecule/distributed-wazuh/group_vars/all.yml | 8 ++++---- molecule/distributed-wazuh/tests/test_default.py | 2 +- pyproject.toml | 2 +- roles/wazuh/ansible-filebeat-oss/defaults/main.yml | 2 +- roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 6 +++--- roles/wazuh/ansible-wazuh-manager/defaults/main.yml | 4 ++-- roles/wazuh/vars/repo.yml | 4 ++-- roles/wazuh/vars/repo_dev.yml | 4 ++-- roles/wazuh/wazuh-dashboard/defaults/main.yml | 4 ++-- roles/wazuh/wazuh-dashboard/vars/debian.yml | 2 +- roles/wazuh/wazuh-indexer/defaults/main.yml | 2 +- 15 files changed, 30 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4532ef74..0baa4736 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.4.0] + +### Added + +- Update to [Wazuh v4.4.0](https://github.com/wazuh/wazuh/blob/v4.4.0/CHANGELOG.md#v440) + ## [v4.3.3] ### Added diff --git a/README.md b/README.md index 9039cda1..a16bd5e6 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb | Wazuh version | Elastic | ODFE | |---------------|---------|--------| +| v4.4.0 | | | | v4.3.3 | | | | v4.3.2 | | | | v4.3.1 | | | diff --git a/VERSION b/VERSION index 2b2335f3..c4c13927 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-ANSIBLE_VERSION="v4.3.3" -REVISION="40314" +WAZUH-ANSIBLE_VERSION="v4.4.0" +REVISION="40316" diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index eea733e1..2769e498 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.3.3" + return "4.4.0" diff --git a/molecule/distributed-wazuh/group_vars/all.yml b/molecule/distributed-wazuh/group_vars/all.yml index c40eaf61..ffad38bb 100644 --- a/molecule/distributed-wazuh/group_vars/all.yml +++ b/molecule/distributed-wazuh/group_vars/all.yml @@ -30,10 +30,10 @@ indexer_node_name: '{{ ansible_facts.hostname }}' dashboard_node_name: '{{ ansible_facts.hostname }}' filebeat_node_name: '{{ ansible_facts.hostname }}' -indexer_version: 4.3.3 +indexer_version: 4.4.0 filebeat_version: 7.10.2 -wazuh_version: 4.3.3 +wazuh_version: 4.4.0 # Debian packages need the ${VERSION}-1 -wazuh_manager_version: 4.3.3-1 -wazuh_agent_version: 4.3.3-1 +wazuh_manager_version: 4.4.0-1 +wazuh_agent_version: 4.4.0-1 diff --git a/molecule/distributed-wazuh/tests/test_default.py b/molecule/distributed-wazuh/tests/test_default.py index f482bcaa..d70bd1ea 100644 --- a/molecule/distributed-wazuh/tests/test_default.py +++ b/molecule/distributed-wazuh/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.3.3" + return "4.4.0" def test_wazuh_packages_are_installed(host): diff --git a/pyproject.toml b/pyproject.toml index b6ba1b26..9046d7ef 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "wazuh-ansible" -version = "4.3.3" +version = "4.4.0" description = "" authors = ["neonmei "] diff --git a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml index 808210d1..eb90b20a 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: 4.3 +wazuh_template_branch: 4.4 filebeat_node_name: node-1 diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 2d5347f5..7fa5cefd 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -1,6 +1,6 @@ --- -wazuh_agent_version: 4.3.3-1 +wazuh_agent_version: 4.4.0-1 # Custom packages installation @@ -12,7 +12,7 @@ wazuh_custom_packages_installation_agent_rpm_url: "" wazuh_agent_sources_installation: enabled: false - branch: "v4.3.3" + branch: "v4.4.0" user_language: "y" user_no_stop: "y" user_install_type: "agent" @@ -55,7 +55,7 @@ wazuh_winagent_config: auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe check_md5: True md5: 337ab33c31e3bc1d688cd903be3691fc -wazuh_winagent_package_name: wazuh-agent-4.3.3-1.msi +wazuh_winagent_package_name: wazuh-agent-4.4.0-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 049eb9fc..25742d0e 100644 --- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -1,6 +1,6 @@ --- -wazuh_manager_version: 4.3.3-1 +wazuh_manager_version: 4.4.0-1 wazuh_manager_fqdn: "wazuh-server" wazuh_manager_package_state: present @@ -13,7 +13,7 @@ wazuh_custom_packages_installation_manager_rpm_url: "https://s3-us-west-1.amazon # Sources installation wazuh_manager_sources_installation: enabled: false - branch: "v4.3.3" + branch: "v4.4.0" user_language: "en" user_no_stop: "y" user_install_type: "server" diff --git a/roles/wazuh/vars/repo.yml b/roles/wazuh/vars/repo.yml index b4db9ad9..c88ad60c 100644 --- a/roles/wazuh/vars/repo.yml +++ b/roles/wazuh/vars/repo.yml @@ -3,9 +3,9 @@ wazuh_repo: yum: 'https://packages.wazuh.com/4.x/yum/' gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145' -wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.3.3-1.msi +wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.4.0-1.msi -certs_gen_tool_version: 4.3 +certs_gen_tool_version: 4.4 # Url of certificates generator tool certs_gen_tool_url: "https://packages.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh" \ No newline at end of file diff --git a/roles/wazuh/vars/repo_dev.yml b/roles/wazuh/vars/repo_dev.yml index d373ccc8..00ff1f35 100644 --- a/roles/wazuh/vars/repo_dev.yml +++ b/roles/wazuh/vars/repo_dev.yml @@ -3,9 +3,9 @@ wazuh_repo: yum: 'https://packages-dev.wazuh.com/pre-release/yum/' gpg: 'https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH' key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145' -wazuh_winagent_config_url: https://packages-dev.wazuh.com/pre-release/windows/wazuh-agent-4.3.3-1.msi +wazuh_winagent_config_url: https://packages-dev.wazuh.com/pre-release/windows/wazuh-agent-4.4.0-1.msi -certs_gen_tool_version: 4.3 +certs_gen_tool_version: 4.4 # Url of certificates generator tool certs_gen_tool_url: "https://packages-dev.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh" \ No newline at end of file diff --git a/roles/wazuh/wazuh-dashboard/defaults/main.yml b/roles/wazuh/wazuh-dashboard/defaults/main.yml index 6e76ac30..2a1892a3 100644 --- a/roles/wazuh/wazuh-dashboard/defaults/main.yml +++ b/roles/wazuh/wazuh-dashboard/defaults/main.yml @@ -8,12 +8,12 @@ dashboard_node_name: node-1 dashboard_server_host: "0.0.0.0" dashboard_server_port: "443" dashboard_server_name: "dashboard" -wazuh_version: 4.3.3 +wazuh_version: 4.4.0 indexer_cluster_nodes: - 127.0.0.1 # The Wazuh dashboard package repository -dashboard_version: "4.3.3" +dashboard_version: "4.4.0" # API credentials wazuh_api_credentials: diff --git a/roles/wazuh/wazuh-dashboard/vars/debian.yml b/roles/wazuh/wazuh-dashboard/vars/debian.yml index 9eb6cba6..3f3c142a 100644 --- a/roles/wazuh/wazuh-dashboard/vars/debian.yml +++ b/roles/wazuh/wazuh-dashboard/vars/debian.yml @@ -1,3 +1,3 @@ --- -dashboard_version: 4.3.3 \ No newline at end of file +dashboard_version: 4.4.0 \ No newline at end of file diff --git a/roles/wazuh/wazuh-indexer/defaults/main.yml b/roles/wazuh/wazuh-indexer/defaults/main.yml index 8e899a94..fe3e2973 100644 --- a/roles/wazuh/wazuh-indexer/defaults/main.yml +++ b/roles/wazuh/wazuh-indexer/defaults/main.yml @@ -1,6 +1,6 @@ --- # Cluster Settings -indexer_version: 4.3.3 +indexer_version: 4.4.0 single_node: false indexer_node_name: node-1