From 9ff6ad6f006978719c37fc0ce9da50da633bb0ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Anguita=20L=C3=B3pez?= Date: Fri, 18 Oct 2024 11:11:03 +0200 Subject: [PATCH 1/9] change source branch --- builder.sh | 2 +- install_functions/installVariables.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builder.sh b/builder.sh index 6b551bd..5d43dfa 100755 --- a/builder.sh +++ b/builder.sh @@ -16,7 +16,7 @@ readonly resources_certs="${base_path_builder}/cert_tool" readonly resources_passwords="${base_path_builder}/passwords_tool" readonly resources_common="${base_path_builder}/common_functions" readonly resources_download="${base_path_builder}/downloader" -source_branch="v4.10.0" +source_branch="v4.10.0-alpha2" function getHelp() { diff --git a/install_functions/installVariables.sh b/install_functions/installVariables.sh index 2f1b7ab..8c5cb3a 100644 --- a/install_functions/installVariables.sh +++ b/install_functions/installVariables.sh @@ -11,7 +11,7 @@ readonly wazuh_major="4.10" readonly wazuh_version="4.10.0" readonly filebeat_version="7.10.2" readonly wazuh_install_vesion="0.1" -source_branch="v${wazuh_version}" +source_branch="v${wazuh_version}-alpha2" repogpg="https://packages.wazuh.com/key/GPG-KEY-WAZUH" repobaseurl="https://packages.wazuh.com/4.x" From 96cbf83e05c946bdc1fdde2f20af6f7c858b8c90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Anguita=20L=C3=B3pez?= Date: Fri, 18 Oct 2024 11:22:39 +0200 Subject: [PATCH 2/9] revert source branch to v4.10.0 --- builder.sh | 2 +- install_functions/installVariables.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builder.sh b/builder.sh index 5d43dfa..6b551bd 100755 --- a/builder.sh +++ b/builder.sh @@ -16,7 +16,7 @@ readonly resources_certs="${base_path_builder}/cert_tool" readonly resources_passwords="${base_path_builder}/passwords_tool" readonly resources_common="${base_path_builder}/common_functions" readonly resources_download="${base_path_builder}/downloader" -source_branch="v4.10.0-alpha2" +source_branch="v4.10.0" function getHelp() { diff --git a/install_functions/installVariables.sh b/install_functions/installVariables.sh index 8c5cb3a..2f1b7ab 100644 --- a/install_functions/installVariables.sh +++ b/install_functions/installVariables.sh @@ -11,7 +11,7 @@ readonly wazuh_major="4.10" readonly wazuh_version="4.10.0" readonly filebeat_version="7.10.2" readonly wazuh_install_vesion="0.1" -source_branch="v${wazuh_version}-alpha2" +source_branch="v${wazuh_version}" repogpg="https://packages.wazuh.com/key/GPG-KEY-WAZUH" repobaseurl="https://packages.wazuh.com/4.x" From c70391595d6136448e47a22fa9b3d4c170564fbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Anguita=20L=C3=B3pez?= Date: Wed, 23 Oct 2024 18:42:31 +0200 Subject: [PATCH 3/9] fixed offline pre-release package download process --- install_functions/installVariables.sh | 14 +++++++------- install_functions/wazuh-offline-download.sh | 13 +++++++++++++ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/install_functions/installVariables.sh b/install_functions/installVariables.sh index 2f1b7ab..b3f606a 100644 --- a/install_functions/installVariables.sh +++ b/install_functions/installVariables.sh @@ -42,18 +42,18 @@ readonly apt_lockfile="/var/lib/dpkg/lock" ## Offline Installation vars readonly base_dest_folder="wazuh-offline" -readonly manager_deb_base_url="${base_url}/apt/pool/main/w/wazuh-manager" +manager_deb_base_url="${base_url}/apt/pool/main/w/wazuh-manager" readonly filebeat_deb_base_url="${base_url}/apt/pool/main/f/filebeat" readonly filebeat_deb_package="filebeat-oss-${filebeat_version}-amd64.deb" -readonly indexer_deb_base_url="${base_url}/apt/pool/main/w/wazuh-indexer" -readonly dashboard_deb_base_url="${base_url}/apt/pool/main/w/wazuh-dashboard" -readonly manager_rpm_base_url="${base_url}/yum" +indexer_deb_base_url="${base_url}/apt/pool/main/w/wazuh-indexer" +dashboard_deb_base_url="${base_url}/apt/pool/main/w/wazuh-dashboard" +manager_rpm_base_url="${base_url}/yum" readonly filebeat_rpm_base_url="${base_url}/yum" readonly filebeat_rpm_package="filebeat-oss-${filebeat_version}-x86_64.rpm" -readonly indexer_rpm_base_url="${base_url}/yum" -readonly dashboard_rpm_base_url="${base_url}/yum" +indexer_rpm_base_url="${base_url}/yum" +dashboard_rpm_base_url="${base_url}/yum" readonly wazuh_gpg_key="https://${bucket}/key/GPG-KEY-WAZUH" -readonly filebeat_config_file="${resources}/tpl/wazuh/filebeat/filebeat.yml" +filebeat_config_file="${resources}/tpl/wazuh/filebeat/filebeat.yml" adminUser="wazuh" adminPassword="wazuh" diff --git a/install_functions/wazuh-offline-download.sh b/install_functions/wazuh-offline-download.sh index cd81f19..36e10c9 100755 --- a/install_functions/wazuh-offline-download.sh +++ b/install_functions/wazuh-offline-download.sh @@ -27,6 +27,19 @@ function offline_download() { indexer_revision="1" dashboard_revision="1" + if [ -n "${development}" ]; then + filebeat_config_file="https://${bucket}/${wazuh_major}/tpl/wazuh/filebeat/filebeat.yml" + if [ "${package_type}" == "rpm" ]; then + manager_rpm_base_url="${repobaseurl}/yum" + indexer_rpm_base_url="${repobaseurl}/yum" + dashboard_rpm_base_url="${repobaseurl}/yum" + elif [ "${package_type}" == "deb" ]; then + manager_deb_base_url="${repobaseurl}/apt/pool/main/w/wazuh-manager" + indexer_deb_base_url="${repobaseurl}/apt/pool/main/w/wazuh-indexer" + dashboard_deb_base_url="${repobaseurl}/apt/pool/main/w/wazuh-dashboard" + fi + fi + if [ "${package_type}" == "rpm" ]; then manager_rpm_package="wazuh-manager-${wazuh_version}-${manager_revision}.x86_64.${package_type}" indexer_rpm_package="wazuh-indexer-${wazuh_version}-${indexer_revision}.x86_64.${package_type}" From bc71aeafd4b48088b271550cef718829f0b0175d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Anguita=20L=C3=B3pez?= Date: Thu, 24 Oct 2024 14:58:17 +0200 Subject: [PATCH 4/9] updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c1e559..b61bb71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file. ### Fixed +- Fixed offline pre-release package download process ([#121](https://github.com/wazuh/wazuh-installation-assistant/pull/121)) - Changed GitHub Runner version to fix Python error ([#110](https://github.com/wazuh/wazuh-installation-assistant/pull/110)) - Fixed Wazuh API validation ([#29](https://github.com/wazuh/wazuh-installation-assistant/pull/29)) - Fixed token variable empty in Wazuh manager check ([#45](https://github.com/wazuh/wazuh-installation-assistant/pull/45)) From 6b52e979d6de2aa006db9d27768220e048177205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Anguita=20L=C3=B3pez?= Date: Fri, 25 Oct 2024 17:29:29 +0200 Subject: [PATCH 5/9] added fail case when trying to download a filebeat template that does not exists --- install_functions/indexer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_functions/indexer.sh b/install_functions/indexer.sh index d224e5e..091e5e5 100644 --- a/install_functions/indexer.sh +++ b/install_functions/indexer.sh @@ -207,7 +207,7 @@ function indexer_startCluster() { filebeat_wazuh_template="file://${offline_files_path}/wazuh-template.json" fi http_status=$(eval "common_curl --silent '${filebeat_wazuh_template}' --max-time 300 --retry 5 --retry-delay 5" | eval "common_curl -X PUT 'https://${indexer_node_ips[pos]}:9200/_template/wazuh' -H \'Content-Type: application/json\' -d @- -uadmin:admin -k --max-time 300 --silent --retry 5 --retry-delay 5 -w "%{http_code}" -o /dev/null") - if [ "${http_status}" -ne 200 ]; then + if [ "${http_status}" -ne 200 ] || [ -z "${http_status}" ]; then common_logger -e "The wazuh-alerts template could not be inserted into the Wazuh indexer cluster." exit 1 else From ff98d4171668475b9029dcac5e75cfb43f7d483a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Anguita=20L=C3=B3pez?= Date: Mon, 28 Oct 2024 11:18:05 +0100 Subject: [PATCH 6/9] fixed condition order to show the correct message --- install_functions/indexer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_functions/indexer.sh b/install_functions/indexer.sh index 091e5e5..c920b75 100644 --- a/install_functions/indexer.sh +++ b/install_functions/indexer.sh @@ -207,7 +207,7 @@ function indexer_startCluster() { filebeat_wazuh_template="file://${offline_files_path}/wazuh-template.json" fi http_status=$(eval "common_curl --silent '${filebeat_wazuh_template}' --max-time 300 --retry 5 --retry-delay 5" | eval "common_curl -X PUT 'https://${indexer_node_ips[pos]}:9200/_template/wazuh' -H \'Content-Type: application/json\' -d @- -uadmin:admin -k --max-time 300 --silent --retry 5 --retry-delay 5 -w "%{http_code}" -o /dev/null") - if [ "${http_status}" -ne 200 ] || [ -z "${http_status}" ]; then + if [ -z "${http_status}" ] || [ "${http_status}" -ne 200 ]; then common_logger -e "The wazuh-alerts template could not be inserted into the Wazuh indexer cluster." exit 1 else From 8930ac9b0ea25794b6c63f4f1d19f6deb81bda4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Anguita=20L=C3=B3pez?= Date: Mon, 28 Oct 2024 12:06:49 +0100 Subject: [PATCH 7/9] updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b61bb71..95b41d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file. ### Fixed +- Fixed bug when trying to download nonexistent filebeat_wazuh_template ([#124](https://github.com/wazuh/wazuh-installation-assistant/pull/124)) - Fixed offline pre-release package download process ([#121](https://github.com/wazuh/wazuh-installation-assistant/pull/121)) - Changed GitHub Runner version to fix Python error ([#110](https://github.com/wazuh/wazuh-installation-assistant/pull/110)) - Fixed Wazuh API validation ([#29](https://github.com/wazuh/wazuh-installation-assistant/pull/29)) From b94b3945e83a3b81a4181ff771a3b3971faf2297 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 4 Nov 2024 16:23:29 -0300 Subject: [PATCH 8/9] Updated changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95b41d2..401a6d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,10 @@ All notable changes to this project will be documented in this file. - Fixed manager check in distributed deployment ([#52](https://github.com/wazuh/wazuh-installation-assistant/pull/52)) - Changed command order execution to get the TOKEN ([#57](https://github.com/wazuh/wazuh-installation-assistant/pull/57)) +## [4.9.2] + +- https://github.com/wazuh/wazuh-packages/releases/tag/v4.9.2 + ## [4.9.1] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.9.1 From b2a5e56fdc81679ee48e22ac86ac9542fea2b375 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 4 Nov 2024 16:32:42 -0300 Subject: [PATCH 9/9] Updated changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95b41d2..693ec55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,10 @@ All notable changes to this project will be documented in this file. - Fixed manager check in distributed deployment ([#52](https://github.com/wazuh/wazuh-installation-assistant/pull/52)) - Changed command order execution to get the TOKEN ([#57](https://github.com/wazuh/wazuh-installation-assistant/pull/57)) +## [4.9.2] + +- https://github.com/wazuh/wazuh-packages/releases/tag/v4.9.2 + ## [4.9.1] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.9.1 @@ -32,6 +36,10 @@ All notable changes to this project will be documented in this file. - https://github.com/wazuh/wazuh-packages/releases/tag/v4.9.0 +## [4.8.2] + +- https://github.com/wazuh/wazuh-packages/releases/tag/v4.8.2 + ## [4.8.1] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.8.1