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 1/3] 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 a6b615179..58b6c7855 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 2/3] 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 58b6c7855..b16722b03 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 f39f6e73a..0e47cb3ba 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 d762ba3f8..4da3bf7bd 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 59048f215..8d54624e7 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 3/3] 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 b16722b03..3b4da3252 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