From 46000c0a4d96ba34cac4cafffdafbd678d2db795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Fri, 29 Jul 2022 07:59:38 -0300 Subject: [PATCH 01/11] Quotes added to repo vars files --- roles/wazuh/vars/repo.yml | 2 +- roles/wazuh/vars/repo_dev.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/wazuh/vars/repo.yml b/roles/wazuh/vars/repo.yml index ae6ea0a6..2ec55ff1 100644 --- a/roles/wazuh/vars/repo.yml +++ b/roles/wazuh/vars/repo.yml @@ -4,7 +4,7 @@ wazuh_repo: 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-{{ wazuh_agent_version }}-1.msi" -wazuh_winagent_package_name: wazuh-agent-{{ wazuh_agent_version }}-1.msi +wazuh_winagent_package_name: "wazuh-agent-{{ wazuh_agent_version }}-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 ca9feec0..6dd08dc6 100644 --- a/roles/wazuh/vars/repo_dev.yml +++ b/roles/wazuh/vars/repo_dev.yml @@ -3,8 +3,8 @@ 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-{{ wazuh_agent_version }}-1.msi -wazuh_winagent_package_name: wazuh-agent-{{ wazuh_agent_version }}-1.msi +wazuh_winagent_config_url: "https://packages-dev.wazuh.com/pre-release/windows/wazuh-agent-{{ wazuh_agent_version }}-1.msi" +wazuh_winagent_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.msi" certs_gen_tool_version: 4.3 From 0430b443cc0cb8c4094824648bb75b517e4ad977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Fri, 29 Jul 2022 08:21:13 -0300 Subject: [PATCH 02/11] Braces removed from include vars condition --- roles/wazuh/ansible-wazuh-agent/tasks/main.yml | 4 ++-- roles/wazuh/ansible-wazuh-manager/tasks/main.yml | 4 ++-- roles/wazuh/wazuh-dashboard/tasks/main.yml | 4 ++-- roles/wazuh/wazuh-indexer/tasks/main.yml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/wazuh/ansible-wazuh-agent/tasks/main.yml b/roles/wazuh/ansible-wazuh-agent/tasks/main.yml index 10f3ab51..f84d3748 100644 --- a/roles/wazuh/ansible-wazuh-agent/tasks/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/tasks/main.yml @@ -7,10 +7,10 @@ delegate_to: localhost - include_vars: ../../vars/repo.yml - when: "{{ wazuh_latest_release.stdout is version(wazuh_agent_version, operator='ge') }}" + when: "wazuh_latest_release.stdout is version(wazuh_agent_version, operator='ge')" - include_vars: ../../vars/repo_dev.yml - when: "{{ wazuh_latest_release.stdout is version(wazuh_agent_version, operator='lt') }}" + when: "wazuh_latest_release.stdout is version(wazuh_agent_version, operator='lt')" - name: Overlay wazuh_agent_config on top of defaults set_fact: diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/main.yml b/roles/wazuh/ansible-wazuh-manager/tasks/main.yml index b3af417a..e27784ca 100644 --- a/roles/wazuh/ansible-wazuh-manager/tasks/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/tasks/main.yml @@ -14,10 +14,10 @@ register: wazuh_latest_release - include_vars: ../../vars/repo.yml - when: "{{ wazuh_latest_release.stdout is version(wazuh_manager_version, operator='ge') }}" + when: "wazuh_latest_release.stdout is version(wazuh_manager_version, operator='ge')" - include_vars: ../../vars/repo_dev.yml - when: "{{ wazuh_latest_release.stdout is version(wazuh_manager_version, operator='lt') }}" + when: "wazuh_latest_release.stdout is version(wazuh_manager_version, operator='lt')" - name: Overlay wazuh_manager_config on top of defaults set_fact: diff --git a/roles/wazuh/wazuh-dashboard/tasks/main.yml b/roles/wazuh/wazuh-dashboard/tasks/main.yml index 6e010d5c..44bcaa1c 100755 --- a/roles/wazuh/wazuh-dashboard/tasks/main.yml +++ b/roles/wazuh/wazuh-dashboard/tasks/main.yml @@ -4,10 +4,10 @@ register: wazuh_latest_release - include_vars: ../../vars/repo.yml - when: "{{ wazuh_latest_release.stdout is version(dashboard_version, operator='ge') }}" + when: "wazuh_latest_release.stdout is version(dashboard_version, operator='ge')" - include_vars: ../../vars/repo_dev.yml - when: "{{ wazuh_latest_release.stdout is version(dashboard_version, operator='lt') }}" + when: "wazuh_latest_release.stdout is version(dashboard_version, operator='lt')" - import_tasks: RedHat.yml when: ansible_os_family == 'RedHat' diff --git a/roles/wazuh/wazuh-indexer/tasks/main.yml b/roles/wazuh/wazuh-indexer/tasks/main.yml index 0e18d05f..f3afe7f8 100644 --- a/roles/wazuh/wazuh-indexer/tasks/main.yml +++ b/roles/wazuh/wazuh-indexer/tasks/main.yml @@ -4,10 +4,10 @@ register: wazuh_latest_release - include_vars: ../../vars/repo.yml - when: "{{ wazuh_latest_release.stdout is version(indexer_version, operator='ge') }}" + when: "wazuh_latest_release.stdout is version(indexer_version, operator='ge')" - include_vars: ../../vars/repo_dev.yml - when: "{{ wazuh_latest_release.stdout is version(indexer_version, operator='lt') }}" + when: "wazuh_latest_release.stdout is version(indexer_version, operator='lt')" - import_tasks: local_actions.yml when: From d0327844bc1c604e711439989d98b581a7453966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Fri, 12 Aug 2022 12:51:13 -0300 Subject: [PATCH 03/11] Bump to 4.3.7 --- 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 | 4 ++-- roles/wazuh/ansible-wazuh-manager/defaults/main.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 +- 12 files changed, 24 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecf41a62..282e3ff5 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.7] + +### Added + +- Update to [Wazuh v4.3.7](https://github.com/wazuh/wazuh/blob/v4.3.7/CHANGELOG.md#v437) + ## [v4.3.6] ### Added diff --git a/README.md b/README.md index 2c2dbad5..bdf5a837 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.7 | | | | v4.3.6 | | | | v4.3.5 | | | | v4.3.4 | | | diff --git a/VERSION b/VERSION index d91ea838..99e6531b 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-ANSIBLE_VERSION="v4.3.6" -REVISION="40318" +WAZUH-ANSIBLE_VERSION="v4.3.7" +REVISION="40319" diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index 26d8c728..2296fd34 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.6" + return "4.3.7" diff --git a/molecule/distributed-wazuh/group_vars/all.yml b/molecule/distributed-wazuh/group_vars/all.yml index f90b467d..fa07b228 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.6 +indexer_version: 4.3.7 filebeat_version: 7.10.2 -wazuh_version: 4.3.6 +wazuh_version: 4.3.7 # Debian packages need the ${VERSION}-1 -wazuh_manager_version: 4.3.6 -wazuh_agent_version: 4.3.6 +wazuh_manager_version: 4.3.7 +wazuh_agent_version: 4.3.7 diff --git a/molecule/distributed-wazuh/tests/test_default.py b/molecule/distributed-wazuh/tests/test_default.py index d796a0a3..5891c86b 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.6" + return "4.3.7" def test_wazuh_packages_are_installed(host): diff --git a/pyproject.toml b/pyproject.toml index a0a6b319..08af24c9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "wazuh-ansible" -version = "4.3.6" +version = "4.3.7" description = "" authors = ["neonmei "] diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 48a30ba1..4191122e 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.6 +wazuh_agent_version: 4.3.7 # Custom packages installation @@ -12,7 +12,7 @@ wazuh_custom_packages_installation_agent_rpm_url: "" wazuh_agent_sources_installation: enabled: false - branch: "v4.3.6" + branch: "v4.3.7" user_language: "y" user_no_stop: "y" user_install_type: "agent" diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index 536ab7f5..ea9d3067 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.6 +wazuh_manager_version: 4.3.7 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.6" + branch: "v4.3.7" user_language: "en" user_no_stop: "y" user_install_type: "server" diff --git a/roles/wazuh/wazuh-dashboard/defaults/main.yml b/roles/wazuh/wazuh-dashboard/defaults/main.yml index c90e8083..666d0146 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.6 +wazuh_version: 4.3.7 indexer_cluster_nodes: - 127.0.0.1 # The Wazuh dashboard package repository -dashboard_version: "4.3.6" +dashboard_version: "4.3.7" # API credentials wazuh_api_credentials: diff --git a/roles/wazuh/wazuh-dashboard/vars/debian.yml b/roles/wazuh/wazuh-dashboard/vars/debian.yml index 91466899..855788a9 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.6 \ No newline at end of file +dashboard_version: 4.3.7 \ 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 4770b1cc..63e36e59 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.6 +indexer_version: 4.3.7 single_node: false indexer_node_name: node-1 From e7c104b2569ee5baba3dbe2b6d879a5ac5a3e94e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Wed, 24 Aug 2022 10:26:12 -0300 Subject: [PATCH 04/11] Win agent md5sum updated --- roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 4191122e..e5a613a1 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -54,7 +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: cf18c7a255dc076c5a7f78490f9c4628 + md5: d7c1d0fecff396094dd1d3b54e6c4d2b wazuh_dir: "/var/ossec" From d4a1493cddaa27ab73ef0b9cdfaa2b603e173188 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 8 Sep 2022 15:45:11 -0300 Subject: [PATCH 05/11] add Double quote in wazuh.yml --- roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2 b/roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2 index 879356ca..030c7506 100644 --- a/roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2 +++ b/roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2 @@ -130,5 +130,5 @@ hosts: url: {{ api['url'] }} port: {{ api['port'] }} username: {{ api['username'] }} - password: {{ api['password'] }} + password: "{{ api['password'] }}" {% endfor %} From e354d33ce9cc9aed48c1a669cc32a44c8388b938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Mon, 12 Sep 2022 09:43:58 -0300 Subject: [PATCH 06/11] Bump to 4.3.8 --- CHANGELOG.md | 6 ++++++ 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 | 4 ++-- roles/wazuh/ansible-wazuh-manager/defaults/main.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 +- 11 files changed, 23 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 282e3ff5..03cda9e7 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.8] + +### Added + +- Update to [Wazuh v4.3.8](https://github.com/wazuh/wazuh/blob/v4.3.8/CHANGELOG.md#v438) + ## [v4.3.7] ### Added diff --git a/VERSION b/VERSION index 99e6531b..8ff6c514 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-ANSIBLE_VERSION="v4.3.7" -REVISION="40319" +WAZUH-ANSIBLE_VERSION="v4.3.8" +REVISION="40321" diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index 2296fd34..47b73fee 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.7" + return "4.3.8" diff --git a/molecule/distributed-wazuh/group_vars/all.yml b/molecule/distributed-wazuh/group_vars/all.yml index fa07b228..29dfc36f 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.7 +indexer_version: 4.3.8 filebeat_version: 7.10.2 -wazuh_version: 4.3.7 +wazuh_version: 4.3.8 # Debian packages need the ${VERSION}-1 -wazuh_manager_version: 4.3.7 -wazuh_agent_version: 4.3.7 +wazuh_manager_version: 4.3.8 +wazuh_agent_version: 4.3.8 diff --git a/molecule/distributed-wazuh/tests/test_default.py b/molecule/distributed-wazuh/tests/test_default.py index 5891c86b..ef1b6c14 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.7" + return "4.3.8" def test_wazuh_packages_are_installed(host): diff --git a/pyproject.toml b/pyproject.toml index 08af24c9..f6e2278d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "wazuh-ansible" -version = "4.3.7" +version = "4.3.8" description = "" authors = ["neonmei "] diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index e5a613a1..fd758977 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.7 +wazuh_agent_version: 4.3.8 # Custom packages installation @@ -12,7 +12,7 @@ wazuh_custom_packages_installation_agent_rpm_url: "" wazuh_agent_sources_installation: enabled: false - branch: "v4.3.7" + branch: "v4.3.8" user_language: "y" user_no_stop: "y" user_install_type: "agent" diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index ea9d3067..b9e93fb4 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.7 +wazuh_manager_version: 4.3.8 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.7" + branch: "v4.3.8" user_language: "en" user_no_stop: "y" user_install_type: "server" diff --git a/roles/wazuh/wazuh-dashboard/defaults/main.yml b/roles/wazuh/wazuh-dashboard/defaults/main.yml index 666d0146..41c9aae0 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.7 +wazuh_version: 4.3.8 indexer_cluster_nodes: - 127.0.0.1 # The Wazuh dashboard package repository -dashboard_version: "4.3.7" +dashboard_version: "4.3.8" # API credentials wazuh_api_credentials: diff --git a/roles/wazuh/wazuh-dashboard/vars/debian.yml b/roles/wazuh/wazuh-dashboard/vars/debian.yml index 855788a9..28aa8773 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.7 \ No newline at end of file +dashboard_version: 4.3.8 \ 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 63e36e59..dbcaf2df 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.7 +indexer_version: 4.3.8 single_node: false indexer_node_name: node-1 From ab30fcfd324e46c7cf74c9e22bfcce713f8b1dac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Fri, 16 Sep 2022 11:20:09 -0300 Subject: [PATCH 07/11] Win agent md5 updated --- roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index fd758977..70a872d5 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -54,7 +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: d7c1d0fecff396094dd1d3b54e6c4d2b + md5: 7669d1a162217bb3da2592f941dcd6bd wazuh_dir: "/var/ossec" From d3019269f2a6d5671a3a6b609b0849b70a417ad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Mon, 19 Sep 2022 09:18:37 -0300 Subject: [PATCH 08/11] Change to make v4.3.8 latest --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 8ff6c514..a0026e5d 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-ANSIBLE_VERSION="v4.3.8" -REVISION="40321" +REVISION="40321" \ No newline at end of file From e40dba9b89cc59802fb465054c45888fea929e77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Mon, 26 Sep 2022 12:24:17 -0300 Subject: [PATCH 09/11] Ansible variables changed for Windows agent --- .../templates/var-ossec-etc-ossec-agent.conf.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/wazuh/ansible-wazuh-agent/templates/var-ossec-etc-ossec-agent.conf.j2 b/roles/wazuh/ansible-wazuh-agent/templates/var-ossec-etc-ossec-agent.conf.j2 index 4a9c8b72..8eef3d1d 100644 --- a/roles/wazuh/ansible-wazuh-agent/templates/var-ossec-etc-ossec-agent.conf.j2 +++ b/roles/wazuh/ansible-wazuh-agent/templates/var-ossec-etc-ossec-agent.conf.j2 @@ -260,7 +260,7 @@ {% endif %} - {% if wazuh_agent_config.syscheck.win_directories is defined and ansible_system == "Windows" %} + {% if wazuh_agent_config.syscheck.win_directories is defined and ansible_os_family == "Windows" %} {% for directory in wazuh_agent_config.syscheck.win_directories %} {{ directory.dirs }} {% endfor %} @@ -280,7 +280,7 @@ {% endfor %} {% endif %} - {% if wazuh_agent_config.syscheck.ignore is defined and ansible_system == "Windows" %} + {% if wazuh_agent_config.syscheck.ignore is defined and ansible_os_family == "Windows" %} {% for ignore in wazuh_agent_config.syscheck.ignore_win %} {{ ignore }} {% endfor %} From 034d502b4642962a8426044d628f6404fc2b5091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Tue, 27 Sep 2022 14:52:05 -0300 Subject: [PATCH 10/11] Bump to 4.3.9 --- CHANGELOG.md | 6 ++++++ README.md | 2 ++ 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 | 4 ++-- roles/wazuh/ansible-wazuh-manager/defaults/main.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 +- 12 files changed, 25 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03cda9e7..d23b5bf8 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.9] + +### Added + +- Update to [Wazuh v4.3.9](https://github.com/wazuh/wazuh/blob/v4.3.9/CHANGELOG.md#v439) + ## [v4.3.8] ### Added diff --git a/README.md b/README.md index bdf5a837..fb3f4917 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,8 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb | Wazuh version | Elastic | ODFE | |---------------|---------|--------| +| v4.3.9 | | | +| v4.3.8 | | | | v4.3.7 | | | | v4.3.6 | | | | v4.3.5 | | | diff --git a/VERSION b/VERSION index a0026e5d..a9d14855 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-ANSIBLE_VERSION="v4.3.8" -REVISION="40321" \ No newline at end of file +WAZUH-ANSIBLE_VERSION="v4.3.9" +REVISION="40322" \ No newline at end of file diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index 47b73fee..44fe6f68 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.8" + return "4.3.9" diff --git a/molecule/distributed-wazuh/group_vars/all.yml b/molecule/distributed-wazuh/group_vars/all.yml index 29dfc36f..520874ae 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.8 +indexer_version: 4.3.9 filebeat_version: 7.10.2 -wazuh_version: 4.3.8 +wazuh_version: 4.3.9 # Debian packages need the ${VERSION}-1 -wazuh_manager_version: 4.3.8 -wazuh_agent_version: 4.3.8 +wazuh_manager_version: 4.3.9 +wazuh_agent_version: 4.3.9 diff --git a/molecule/distributed-wazuh/tests/test_default.py b/molecule/distributed-wazuh/tests/test_default.py index ef1b6c14..528a3093 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.8" + return "4.3.9" def test_wazuh_packages_are_installed(host): diff --git a/pyproject.toml b/pyproject.toml index f6e2278d..d28bc085 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "wazuh-ansible" -version = "4.3.8" +version = "4.3.9" description = "" authors = ["neonmei "] diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 70a872d5..6a882ed3 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.8 +wazuh_agent_version: 4.3.9 # Custom packages installation @@ -12,7 +12,7 @@ wazuh_custom_packages_installation_agent_rpm_url: "" wazuh_agent_sources_installation: enabled: false - branch: "v4.3.8" + branch: "v4.3.9" user_language: "y" user_no_stop: "y" user_install_type: "agent" diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index b9e93fb4..39abedc3 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.8 +wazuh_manager_version: 4.3.9 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.8" + branch: "v4.3.9" user_language: "en" user_no_stop: "y" user_install_type: "server" diff --git a/roles/wazuh/wazuh-dashboard/defaults/main.yml b/roles/wazuh/wazuh-dashboard/defaults/main.yml index 41c9aae0..58b78e6f 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.8 +wazuh_version: 4.3.9 indexer_cluster_nodes: - 127.0.0.1 # The Wazuh dashboard package repository -dashboard_version: "4.3.8" +dashboard_version: "4.3.9" # API credentials wazuh_api_credentials: diff --git a/roles/wazuh/wazuh-dashboard/vars/debian.yml b/roles/wazuh/wazuh-dashboard/vars/debian.yml index 28aa8773..877a6345 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.8 \ No newline at end of file +dashboard_version: 4.3.9 \ 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 dbcaf2df..236d84bf 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.8 +indexer_version: 4.3.9 single_node: false indexer_node_name: node-1 From 8fa4306957c5cc5e9a020505091d5e73ff33c2a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Thu, 6 Oct 2022 11:27:04 -0300 Subject: [PATCH 11/11] Windows agent md5 update --- roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 6a882ed3..652387c9 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -54,7 +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: 7669d1a162217bb3da2592f941dcd6bd + md5: eee54087d25a42ceb27ecf8ad562143f wazuh_dir: "/var/ossec"