From bb07e95b66b8ba0e023713577382f31b5c1b8683 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 14 Nov 2023 12:37:22 -0300 Subject: [PATCH 1/8] Updated Filebeat module version to 0.3 --- 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 9e63b9804..2d637ef3c 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.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 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 2/8] 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 3/8] 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 4/8] 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 From f49521aeea7c12995e0c8ff5cb64c87ad854c6bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Tue, 21 Nov 2023 13:57:17 -0300 Subject: [PATCH 5/8] Reporting dependencies removed --- roles/wazuh/wazuh-dashboard/tasks/Debian.yml | 7 ------- roles/wazuh/wazuh-dashboard/tasks/RedHat.yml | 8 -------- 2 files changed, 15 deletions(-) diff --git a/roles/wazuh/wazuh-dashboard/tasks/Debian.yml b/roles/wazuh/wazuh-dashboard/tasks/Debian.yml index e80b605f3..7525a10c7 100644 --- a/roles/wazuh/wazuh-dashboard/tasks/Debian.yml +++ b/roles/wazuh/wazuh-dashboard/tasks/Debian.yml @@ -13,13 +13,6 @@ state: present update_cache: yes - - name: Install Wazuh dashboard dependencies - apt: - name: [ - 'libnss3-dev', 'fonts-liberation', 'libfontconfig1' - ] - state: present - - name: Install Wazuh dashboard apt: name: "wazuh-dashboard={{ dashboard_version }}-*" diff --git a/roles/wazuh/wazuh-dashboard/tasks/RedHat.yml b/roles/wazuh/wazuh-dashboard/tasks/RedHat.yml index 7ba367047..39900d43e 100644 --- a/roles/wazuh/wazuh-dashboard/tasks/RedHat.yml +++ b/roles/wazuh/wazuh-dashboard/tasks/RedHat.yml @@ -10,14 +10,6 @@ gpgkey: "{{ wazuh_repo.gpg }}" gpgcheck: true - - name: Install Wazuh dashboard dependencies - yum: - name: [ - 'libnss3.so', 'xorg-x11-fonts-100dpi', 'xorg-x11-fonts-75dpi', 'xorg-x11-utils', 'xorg-x11-fonts-cyrillic', 'xorg-x11-fonts-Type1', 'xorg-x11-fonts-misc', 'fontconfig', 'freetype' - ] - state: present - ignore_errors: yes - - name: Install Wazuh dashboard package: name: "wazuh-dashboard-{{ dashboard_version }}" From 6161578840f7f453a8d02baebac9e650aed43fb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 23 Nov 2023 11:56:18 +0100 Subject: [PATCH 6/8] Bump revision to 40704 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index ad92b38dc..e3c0e48d2 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-ANSIBLE_VERSION="v4.7.0" -REVISION="40703" +REVISION="40704" From 588aced3139d7b4c2981aaf33c2a7891c294880f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Thu, 23 Nov 2023 12:11:28 -0300 Subject: [PATCH 7/8] Staging variables added --- roles/wazuh/vars/repo_staging.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/wazuh/vars/repo_staging.yml b/roles/wazuh/vars/repo_staging.yml index 0bba2c4bb..6fe182e05 100644 --- a/roles/wazuh/vars/repo_staging.yml +++ b/roles/wazuh/vars/repo_staging.yml @@ -5,6 +5,9 @@ wazuh_repo: key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145' wazuh_winagent_config_url: "https://packages-dev.wazuh.com/staging/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/staging/checksums/wazuh/{{ wazuh_agent_version }}/wazuh-agent-{{ wazuh_agent_version }}-1.msi.sha512" +check_sha512: False +filebeat_module_package_url: https://packages-dev.wazuh.com/staging/filebeat wazuh_macos_intel_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.intel64.pkg" wazuh_macos_arm_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.arm64.pkg" From ec1787ceb64142377faff9764336d951a9a8c59a Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 27 Nov 2023 09:24:07 -0300 Subject: [PATCH 8/8] bump revision number --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index b4586bf47..91a967af0 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-ANSIBLE_VERSION="v4.7.1" -REVISION="40705" +REVISION="40706"