From 627d1284f8e897eeb642c35d3e6749386fe9be35 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Thu, 30 Dec 2021 16:05:10 -0300 Subject: [PATCH 1/6] Fix sca template issue for day, wday and time parameters --- .../templates/var-ossec-etc-ossec-server.conf.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2 b/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2 index 39050d09..5d023a26 100644 --- a/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2 +++ b/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2 @@ -248,13 +248,13 @@ yes {% endif %} {% if wazuh_manager_config.sca.day | length > 0 %} - yes + {{ wazuh_manager_config.sca.day }} {% endif %} {% if wazuh_manager_config.sca.wday | length > 0 %} - yes + {{ wazuh_manager_config.sca.wday }} {% endif %} {% if wazuh_manager_config.sca.time | length > 0 %} - + {% endif %} From c3c87f747099d24fabb75a0991f24a030674365f Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 17 Jan 2022 09:23:09 -0300 Subject: [PATCH 2/6] Fix agent sca template --- .../templates/var-ossec-etc-ossec-agent.conf.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 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 b7d492b5..4a9c8b72 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 @@ -233,13 +233,13 @@ yes {% endif %} {% if wazuh_agent_config.sca.day | length > 0 %} - yes + {{ wazuh_agent_config.sca.day }} {% endif %} {% if wazuh_agent_config.sca.wday | length > 0 %} - yes + {{ wazuh_agent_config.sca.wday }} {% endif %} {% if wazuh_agent_config.sca.time | length > 0 %} - + {% endif %} From 8fac3db151e0e2f953f75d92bedb59c7a06818a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Thu, 10 Feb 2022 15:31:07 -0300 Subject: [PATCH 3/6] Windows agent checksum 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 9d879c4b..575959f6 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: 8ffa75d13280f1aa6ffca54f4273df4d + md5: 14eccab85be5be193f277e2c73532a5d wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.2.5-1.msi wazuh_winagent_package_name: wazuh-agent-4.2.5-1.msi From d2fd3c0bf6dadeac52e8a133a021c67773b63351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Thu, 17 Feb 2022 10:26:24 -0300 Subject: [PATCH 4/6] Windows agent checksum 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 9d879c4b..575959f6 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: 8ffa75d13280f1aa6ffca54f4273df4d + md5: 14eccab85be5be193f277e2c73532a5d wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.2.5-1.msi wazuh_winagent_package_name: wazuh-agent-4.2.5-1.msi From 3b8730d9b1c6d6703fb5f4472d619afc8e014cbf Mon Sep 17 00:00:00 2001 From: c-bordon Date: Fri, 25 Mar 2022 10:23:05 -0300 Subject: [PATCH 5/6] 4.2.6 Bump --- CHANGELOG.md | 5 +++++ README.md | 1 + VERSION | 4 ++-- 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 ++-- 10 files changed, 19 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26666b2d..e2892277 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log All notable changes to this project will be documented in this file. +## [v4.2.6] + +### Added + +- Update to [Wazuh v4.2.6](https://github.com/wazuh/wazuh/blob/v4.2.6/CHANGELOG.md#v425) ## [v4.2.5] diff --git a/README.md b/README.md index 8ae5b5e7..f1342652 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ These playbooks install and configure Wazuh agent, manager and Elastic Stack. | Wazuh version | Elastic | ODFE | |---------------|---------|--------| +| v4.2.6 | 7.10.2 | 1.13.2 | | v4.2.5 | 7.10.2 | 1.13.2 | | v4.2.4 | 7.10.2 | 1.13.2 | | v4.2.3 | 7.10.2 | 1.13.2 | diff --git a/VERSION b/VERSION index 933b3613..f38e079d 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-ANSIBLE_VERSION="v4.2.5" -REVISION="40220" +WAZUH-ANSIBLE_VERSION="v4.2.6" +REVISION="40221" diff --git a/pyproject.toml b/pyproject.toml index 2a4b8980..12fbe9e9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "wazuh-ansible" -version = "4.2.5" +version = "4.2.6" description = "" authors = ["neonmei "] diff --git a/roles/elastic-stack/ansible-kibana/defaults/main.yml b/roles/elastic-stack/ansible-kibana/defaults/main.yml index 5a8c2571..4b13d9ac 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.10.2 -wazuh_version: 4.2.5 +wazuh_version: 4.2.6 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 03528c55..0dfc917c 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.10.2 -wazuh_version: 4.2.5 +wazuh_version: 4.2.6 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 b8752551..93dd996f 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: v4.2.5 +wazuh_template_branch: v4.2.6 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 76d3bed3..59d5b9b9 100644 --- a/roles/wazuh/ansible-filebeat/defaults/main.yml +++ b/roles/wazuh/ansible-filebeat/defaults/main.yml @@ -1,7 +1,7 @@ --- filebeat_version: 7.10.2 -wazuh_template_branch: v4.2.5 +wazuh_template_branch: v4.2.6 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 575959f6..810d5934 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.2.5-1 +wazuh_agent_version: 4.2.6-1 # Custom packages installation @@ -12,7 +12,7 @@ wazuh_custom_packages_installation_agent_rpm_url: "" wazuh_agent_sources_installation: enabled: false - branch: "v4.2.5" + branch: "v4.2.6" 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: 14eccab85be5be193f277e2c73532a5d -wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.2.5-1.msi -wazuh_winagent_package_name: wazuh-agent-4.2.5-1.msi +wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.2.6-1.msi +wazuh_winagent_package_name: wazuh-agent-4.2.6-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 2a12e38e..e7abcd06 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.2.5-1 +wazuh_manager_version: 4.2.6-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.2.5" + branch: "v4.2.6" user_language: "en" user_no_stop: "y" user_install_type: "server" From bfd7e8bafc77701980c297a1fe7dbb6e70148e01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Rodr=C3=ADguez?= Date: Mon, 28 Mar 2022 16:59:51 +0200 Subject: [PATCH 6/6] Update CHANGELOG.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: José Fernández Aguilera --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b61de7ea..673b793d 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ All notable changes to this project will be documented in this file. ### Added -- Update to [Wazuh v4.2.6](https://github.com/wazuh/wazuh/blob/v4.2.6/CHANGELOG.md#v425) +- Update to [Wazuh v4.2.6](https://github.com/wazuh/wazuh/blob/v4.2.6/CHANGELOG.md#v426) ## [v4.2.5]