From 035bf984c83df1838e72edaa1ae1d29c919b7ea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Wed, 20 Sep 2023 11:08:28 +0200 Subject: [PATCH 1/9] Bump version to 4.7.1 --- CHANGELOG.md | 6 ++++++ README.md | 1 + VERSION | 4 ++-- roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 4 ++-- roles/wazuh/ansible-wazuh-manager/defaults/main.yml | 4 ++-- roles/wazuh/check-packages/defaults/main.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 +- 9 files changed, 18 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7354128..dc04e09b 100644 --- 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.7.1] + +### Added + +- Update to [Wazuh v4.7.1](https://github.com/wazuh/wazuh/blob/v4.7.1/CHANGELOG.md#v471) + ## [v4.7.0] ### Added diff --git a/README.md b/README.md index 51f451b4..c684a4b2 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb | Wazuh version | Elastic | ODFE | |---------------|---------|--------| +| v4.7.1 | | | | v4.7.0 | | | | v4.6.0 | | | | v4.5.3 | | | diff --git a/VERSION b/VERSION index c9470816..b4586bf4 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-ANSIBLE_VERSION="v4.7.0" -REVISION="40700" +WAZUH-ANSIBLE_VERSION="v4.7.1" +REVISION="40705" diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 6899f8d6..3e2fb01a 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.7.0 +wazuh_agent_version: 4.7.1 # Custom packages installation @@ -11,7 +11,7 @@ wazuh_custom_packages_installation_agent_rpm_url: "" wazuh_agent_sources_installation: enabled: false - branch: "v4.7.0" + branch: "v4.7.1" 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 822920a7..803522ac 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.7.0 +wazuh_manager_version: 4.7.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.7.0" + branch: "v4.7.1" user_language: "en" user_no_stop: "y" user_install_type: "server" diff --git a/roles/wazuh/check-packages/defaults/main.yml b/roles/wazuh/check-packages/defaults/main.yml index b56d15f1..d32a289e 100644 --- a/roles/wazuh/check-packages/defaults/main.yml +++ b/roles/wazuh/check-packages/defaults/main.yml @@ -1,2 +1,2 @@ --- -wazuh_version: 4.7.0 +wazuh_version: 4.7.1 diff --git a/roles/wazuh/wazuh-dashboard/defaults/main.yml b/roles/wazuh/wazuh-dashboard/defaults/main.yml index 00833b2f..be6c0dd3 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.7.0 +wazuh_version: 4.7.1 indexer_cluster_nodes: - 127.0.0.1 # The Wazuh dashboard package repository -dashboard_version: "4.7.0" +dashboard_version: "4.7.1" # API credentials wazuh_api_credentials: diff --git a/roles/wazuh/wazuh-dashboard/vars/debian.yml b/roles/wazuh/wazuh-dashboard/vars/debian.yml index 4df73543..898cc251 100644 --- a/roles/wazuh/wazuh-dashboard/vars/debian.yml +++ b/roles/wazuh/wazuh-dashboard/vars/debian.yml @@ -1,2 +1,2 @@ --- -dashboard_version: 4.7.0 +dashboard_version: 4.7.1 diff --git a/roles/wazuh/wazuh-indexer/defaults/main.yml b/roles/wazuh/wazuh-indexer/defaults/main.yml index 0777babb..c035776e 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.7.0 +indexer_version: 4.7.1 single_node: false indexer_node_name: node-1 From 8a6d1a4e8d0f80a4a8858f0f9e8115c3f754256c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Fri, 22 Sep 2023 12:12:19 +0200 Subject: [PATCH 2/9] Updated wazuh_template_branch variable --- 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 9e63b980..a6b61517 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.7.0 +wazuh_template_branch: v4.7.1 filebeat_node_name: node-1 From 0465d10b5d32d4944ddc3369ffcef4c9585a0299 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 10 Oct 2023 09:28:18 -0300 Subject: [PATCH 3/9] Added apt update to Debian --- roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml b/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml index 1c9af638..0a93def2 100644 --- a/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml +++ b/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml @@ -1,4 +1,7 @@ --- +- name: Update apt-get repo and cache + apt: update_cache=yes force_apt_get=yes cache_valid_time=3600 + - name: Debian/Ubuntu | Install ca-certificates and gnupg apt: name: From df3aae738004044e5f3d47f0d449ac9b85ca399e Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 10 Oct 2023 12:31:47 -0300 Subject: [PATCH 4/9] Reorder apt update --- roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml b/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml index 0a93def2..ac49a71c 100644 --- a/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml +++ b/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml @@ -1,6 +1,9 @@ --- - name: Update apt-get repo and cache - apt: update_cache=yes force_apt_get=yes cache_valid_time=3600 + apt: + update_cache: yes + force_apt_get: yes + cache_valid_time: 3600 - name: Debian/Ubuntu | Install ca-certificates and gnupg apt: From b032f30ee4529f8f67526c5f008b1fb168dfb05a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Wed, 25 Oct 2023 16:05:06 +0200 Subject: [PATCH 5/9] Updated wazuh-kibana-app references --- 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 030c7506..5755a366 100644 --- a/roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2 +++ b/roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2 @@ -16,7 +16,7 @@ # https://documentation.wazuh.com/current/installation-guide/index.html # # Also, you can check our repository: -# https://github.com/wazuh/wazuh-dashboard +# https://github.com/wazuh/wazuh-dashboard-plugins # # ------------------------------- Index patterns ------------------------------- # From bcce084cdb048d35c402a5bbed01f700c1a66f12 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 14 Nov 2023 04:26:21 -0300 Subject: [PATCH 6/9] resolving conflicts --- VERSION | 5 ----- 1 file changed, 5 deletions(-) diff --git a/VERSION b/VERSION index fe299427..b4586bf4 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,2 @@ -<<<<<<< HEAD -WAZUH-ANSIBLE_VERSION="v4.7.0" -REVISION="40703" -======= WAZUH-ANSIBLE_VERSION="v4.7.1" REVISION="40705" ->>>>>>> 018da92c8c21f9d194729532c6b042bc1be4dee7 From fc8c920e3ce5aa14e93e3ef3d9aa66a1f80badff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Wed, 15 Nov 2023 16:50:40 +0100 Subject: [PATCH 7/9] Updated Filebeat module URL --- 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 a6b61517..58b6c785 100644 --- a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml +++ b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml @@ -8,7 +8,7 @@ filebeat_node_name: node-1 filebeat_output_indexer_hosts: - "localhost:9200" -filebeat_module_package_url: https://packages.wazuh.com/4.x/filebeat +filebeat_module_package_url: https://packages-dev.wazuh.com/pre-release/filebeat filebeat_module_package_name: wazuh-filebeat-0.2.tar.gz filebeat_module_package_path: /tmp/ filebeat_module_destination: /usr/share/filebeat/module From aeacd07e0f0e232b3c7ea32eab2da46d2b6a18eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Wed, 15 Nov 2023 18:13:16 +0100 Subject: [PATCH 8/9] Filebeat module URL adapted to repository --- roles/wazuh/ansible-filebeat-oss/defaults/main.yml | 1 - roles/wazuh/ansible-filebeat-oss/tasks/main.yml | 8 ++++++++ roles/wazuh/vars/repo.yml | 1 + roles/wazuh/vars/repo_pre-release.yml | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml index 58b6c785..b16722b0 100644 --- a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml +++ b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml @@ -8,7 +8,6 @@ filebeat_node_name: node-1 filebeat_output_indexer_hosts: - "localhost:9200" -filebeat_module_package_url: https://packages-dev.wazuh.com/pre-release/filebeat filebeat_module_package_name: wazuh-filebeat-0.2.tar.gz filebeat_module_package_path: /tmp/ filebeat_module_destination: /usr/share/filebeat/module diff --git a/roles/wazuh/ansible-filebeat-oss/tasks/main.yml b/roles/wazuh/ansible-filebeat-oss/tasks/main.yml index f39f6e73..0e47cb3b 100644 --- a/roles/wazuh/ansible-filebeat-oss/tasks/main.yml +++ b/roles/wazuh/ansible-filebeat-oss/tasks/main.yml @@ -1,4 +1,12 @@ --- +- include_vars: ../../vars/repo_vars.yml + +- include_vars: ../../vars/repo.yml + when: packages_repository == 'production' + +- include_vars: ../../vars/repo_pre-release.yml + when: packages_repository == 'pre-release' + - include_tasks: RedHat.yml when: ansible_os_family == 'RedHat' diff --git a/roles/wazuh/vars/repo.yml b/roles/wazuh/vars/repo.yml index d762ba3f..4da3bf7b 100644 --- a/roles/wazuh/vars/repo.yml +++ b/roles/wazuh/vars/repo.yml @@ -6,6 +6,7 @@ wazuh_repo: 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_sha512_url: "https://packages.wazuh.com/4.x/checksums/wazuh/{{ wazuh_agent_version }}/wazuh-agent-{{ wazuh_agent_version }}-1.msi.sha512" +filebeat_module_package_url: https://packages.wazuh.com/4.x/filebeat certs_gen_tool_version: 4.7 diff --git a/roles/wazuh/vars/repo_pre-release.yml b/roles/wazuh/vars/repo_pre-release.yml index 59048f21..8d54624e 100644 --- a/roles/wazuh/vars/repo_pre-release.yml +++ b/roles/wazuh/vars/repo_pre-release.yml @@ -6,6 +6,7 @@ wazuh_repo: 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_sha512_url: "https://packages-dev.wazuh.com/pre-release/checksums/wazuh/{{ wazuh_agent_version }}/wazuh-agent-{{ wazuh_agent_version }}-1.msi.sha512" +filebeat_module_package_url: https://packages-dev.wazuh.com/pre-release/filebeat certs_gen_tool_version: 4.7 From 2a6279c59603bdb613d6b02d886a0e28312af52c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 16 Nov 2023 17:35:43 +0100 Subject: [PATCH 9/9] Updated 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 b16722b0..3b4da325 100644 --- a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml +++ b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml @@ -8,7 +8,7 @@ filebeat_node_name: node-1 filebeat_output_indexer_hosts: - "localhost:9200" -filebeat_module_package_name: wazuh-filebeat-0.2.tar.gz +filebeat_module_package_name: wazuh-filebeat-0.3.tar.gz filebeat_module_package_path: /tmp/ filebeat_module_destination: /usr/share/filebeat/module filebeat_module_folder: /usr/share/filebeat/module/wazuh