From 2f92495865e77d1ea973e0695426734be7c700fd Mon Sep 17 00:00:00 2001 From: c-bordon Date: Fri, 20 Oct 2023 15:57:41 -0300 Subject: [PATCH 01/12] Added firewalld validation --- unattended_installer/install_functions/checks.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index 6fb8881595..4a7d5f0eb9 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -330,6 +330,8 @@ function checks_ports() { used_port=0 ports=("$@") + checks_firewalld + if command -v lsof > /dev/null; then port_command="lsof -sTCP:LISTEN -i:" else @@ -376,3 +378,17 @@ function checks_available_port() { done fi } + +function checks_firewalld(){ + if [ "${sys_type}" == "yum" ]; then + if yum list installed 2>/dev/null | grep -q -E ^"firewalld"\\.;then + common_logger -e "The system has a firewall installed, remember to open the necessary ports for component communication." + exit 1 + fi + elif [ "${sys_type}" == "apt-get" ]; then + if apt list --installed 2>/dev/null | grep -q -E ^"firewalld"\/; then + common_logger -e "The system has a firewall installed, remember to open the necessary ports for component communication." + exit 1 + fi + fi +} From 9cd9397238e143be7c7bf75c9044b454ffedf14a Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 23 Oct 2023 12:00:05 -0300 Subject: [PATCH 02/12] Added message for firewalld --- unattended_installer/install_functions/checks.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index 4a7d5f0eb9..f182246252 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -330,7 +330,7 @@ function checks_ports() { used_port=0 ports=("$@") - checks_firewalld + checks_firewalld "${ports}" if command -v lsof > /dev/null; then port_command="lsof -sTCP:LISTEN -i:" @@ -380,15 +380,15 @@ function checks_available_port() { } function checks_firewalld(){ + ports=("$@") + if [ "${sys_type}" == "yum" ]; then if yum list installed 2>/dev/null | grep -q -E ^"firewalld"\\.;then - common_logger -e "The system has a firewall installed, remember to open the necessary ports for component communication." - exit 1 + common_logger -w "The system has a firewalld installed. Consider that traffic should be allowed in these ports: ${ports}." fi elif [ "${sys_type}" == "apt-get" ]; then if apt list --installed 2>/dev/null | grep -q -E ^"firewalld"\/; then - common_logger -e "The system has a firewall installed, remember to open the necessary ports for component communication." - exit 1 + common_logger -w "The system has a firewalld installed. Consider that traffic should be allowed in these ports: ${ports}." fi fi } From 4081d6e246950cb5843d915071031f9b330a4a81 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 23 Oct 2023 16:36:24 -0300 Subject: [PATCH 03/12] Added validations --- .../install_functions/checks.sh | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index f182246252..9fe54e5daa 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -330,7 +330,7 @@ function checks_ports() { used_port=0 ports=("$@") - checks_firewalld "${ports}" + checks_firewalld "${ports[@]}" if command -v lsof > /dev/null; then port_command="lsof -sTCP:LISTEN -i:" @@ -380,15 +380,29 @@ function checks_available_port() { } function checks_firewalld(){ - ports=("$@") + ports_list=("$@") + f_ports="" + f_message="" + + if [ -n "${AIO}" ]; then + f_message="Please ensure that traffic is allowed on these ports: 1515 1514 ${http_port}" + elif [ -n "${dashboard}" ]; then + f_message="Please ensure that traffic is allowed on this port: ${http_port}" + else + for port in "${ports_list[@]}"; do + f_ports="${f_ports} ${port}" + done + f_message="Please ensure that traffic is allowed on these ports: ${f_ports}" + fi + if [ "${sys_type}" == "yum" ]; then if yum list installed 2>/dev/null | grep -q -E ^"firewalld"\\.;then - common_logger -w "The system has a firewalld installed. Consider that traffic should be allowed in these ports: ${ports}." + common_logger -w "The system has Firewalld installed. ${f_message}." fi elif [ "${sys_type}" == "apt-get" ]; then if apt list --installed 2>/dev/null | grep -q -E ^"firewalld"\/; then - common_logger -w "The system has a firewalld installed. Consider that traffic should be allowed in these ports: ${ports}." + common_logger -w "The system has Firewalld installed. ${f_message}." fi fi } From 246403a306207aefc0e4a9415cbb70eb8ca04c4f Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 24 Oct 2023 11:57:18 -0300 Subject: [PATCH 04/12] Added validation for UFW --- .../install_functions/checks.sh | 41 +++++++++++++++---- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index 9fe54e5daa..ebd55d274f 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -330,7 +330,7 @@ function checks_ports() { used_port=0 ports=("$@") - checks_firewalld "${ports[@]}" + checks_firewall "${ports[@]}" if command -v lsof > /dev/null; then port_command="lsof -sTCP:LISTEN -i:" @@ -379,30 +379,53 @@ function checks_available_port() { fi } -function checks_firewalld(){ +function checks_firewall(){ ports_list=("$@") f_ports="" - f_message="" + f_message="The system has firewall installed. Please ensure that traffic is allowed on " + firewalld_installed=0 + ufw_installed=0 + + # Record of the ports that must be exposed according to the installation if [ -n "${AIO}" ]; then - f_message="Please ensure that traffic is allowed on these ports: 1515 1514 ${http_port}" + f_message+="these ports: 1515 1514 ${http_port}" elif [ -n "${dashboard}" ]; then - f_message="Please ensure that traffic is allowed on this port: ${http_port}" + f_message+="this port: ${http_port}" else for port in "${ports_list[@]}"; do f_ports="${f_ports} ${port}" done - f_message="Please ensure that traffic is allowed on these ports: ${f_ports}" + f_message+="these ports: ${f_ports}" fi - + # Check if the firewall is installed if [ "${sys_type}" == "yum" ]; then if yum list installed 2>/dev/null | grep -q -E ^"firewalld"\\.;then - common_logger -w "The system has Firewalld installed. ${f_message}." + firewalld_installed=1 + fi + if yum list installed 2>/dev/null | grep -q -E ^"ufw"\\.;then + ufw_installed=1 fi elif [ "${sys_type}" == "apt-get" ]; then if apt list --installed 2>/dev/null | grep -q -E ^"firewalld"\/; then - common_logger -w "The system has Firewalld installed. ${f_message}." + firewalld_installed=1 + fi + if apt list --installed 2>/dev/null | grep -q -E ^"ufw"\/; then + ufw_installed=1 + fi + fi + + # Check if the firewall is running + if [ "${firewalld_installed}" == "1" ]; then + if firewall-cmd --state 2>/dev/null | grep -q -w "running"; then + common_logger -w "${f_message/firewall/Firewalld}." fi fi + if [ "${ufw_installed}" == "1" ]; then + if ufw status 2>/dev/null | grep -q -w "active"; then + common_logger -w "${f_message/firewall/UFW}." + fi + fi + } From aef7feb8a5ac3e213eb381743c4afac3009ae266 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 24 Oct 2023 15:01:19 -0300 Subject: [PATCH 05/12] Fixed double space in Warning message --- unattended_installer/install_functions/checks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index ebd55d274f..baa07cf5f4 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -396,7 +396,7 @@ function checks_firewall(){ for port in "${ports_list[@]}"; do f_ports="${f_ports} ${port}" done - f_message+="these ports: ${f_ports}" + f_message+="these ports:${f_ports}" fi # Check if the firewall is installed From 26c79cd8323eb02e345ea7f6d9c161eb41869eaf Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 24 Oct 2023 15:02:23 -0300 Subject: [PATCH 06/12] Changed installed for enabled --- unattended_installer/install_functions/checks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index baa07cf5f4..20d88c602d 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -382,7 +382,7 @@ function checks_available_port() { function checks_firewall(){ ports_list=("$@") f_ports="" - f_message="The system has firewall installed. Please ensure that traffic is allowed on " + f_message="The system has firewall enabled. Please ensure that traffic is allowed on " firewalld_installed=0 ufw_installed=0 From 8cfccde822fc01c208254be5b9311dc454eccc76 Mon Sep 17 00:00:00 2001 From: Carlos Bordon <64099752+c-bordon@users.noreply.github.com> Date: Wed, 25 Oct 2023 08:26:47 -0300 Subject: [PATCH 07/12] Update unattended_installer/install_functions/checks.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: David Correa Rodríguez <72193239+davidcr01@users.noreply.github.com> --- unattended_installer/install_functions/checks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index 20d88c602d..3c5dbd7b5e 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -389,7 +389,7 @@ function checks_firewall(){ # Record of the ports that must be exposed according to the installation if [ -n "${AIO}" ]; then - f_message+="these ports: 1515 1514 ${http_port}" + f_message+="these ports: 1515, 1514, ${http_port}" elif [ -n "${dashboard}" ]; then f_message+="this port: ${http_port}" else From d7db0a9a9122827c4defa6ea667ae2b22fb1bbed Mon Sep 17 00:00:00 2001 From: Carlos Bordon <64099752+c-bordon@users.noreply.github.com> Date: Wed, 25 Oct 2023 08:26:59 -0300 Subject: [PATCH 08/12] Update unattended_installer/install_functions/checks.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: David Correa Rodríguez <72193239+davidcr01@users.noreply.github.com> --- unattended_installer/install_functions/checks.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index 3c5dbd7b5e..ca1aba2ce2 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -393,10 +393,13 @@ function checks_firewall(){ elif [ -n "${dashboard}" ]; then f_message+="this port: ${http_port}" else + f_message+="these ports:" for port in "${ports_list[@]}"; do - f_ports="${f_ports} ${port}" + f_message+=" ${port}," done - f_message+="these ports:${f_ports}" + + # Deletes last comma + f_message="${f_message%,}" fi # Check if the firewall is installed From 95dcbcea3c93937ca5039b48779705d9664761f5 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Tue, 24 Oct 2023 18:14:16 +0200 Subject: [PATCH 09/12] Separate sign and notarize steps --- macos/generate_wazuh_packages.sh | 36 +++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/macos/generate_wazuh_packages.sh b/macos/generate_wazuh_packages.sh index ab4ad5bf1b..27779a102a 100755 --- a/macos/generate_wazuh_packages.sh +++ b/macos/generate_wazuh_packages.sh @@ -32,6 +32,7 @@ NOTARIZE="no" # Notarize the package for macOS Catalina. DEVELOPER_ID="" # Apple Developer ID. ALTOOL_PASS="" # Temporary Application password for altool. pkg_name="" +notarization_path="" trap ctrl_c INT @@ -55,8 +56,8 @@ function notarize_pkg() { build_timestamp="$(date +"%m%d%Y%H%M%S")" if [ "${NOTARIZE}" = "yes" ]; then if sudo xcrun altool --notarize-app --primary-bundle-id "com.wazuh.agent.${VERSION}.${REVISION}.${build_timestamp}" \ - --username "${DEVELOPER_ID}" --password "${ALTOOL_PASS}" --file ${DESTINATION}/${pkg_name} > request_info.txt ; then - echo "The package ${DESTINATION}/${pkg_name} was successfully upload for notarization." + --username "${DEVELOPER_ID}" --password "${ALTOOL_PASS}" --file ${1} > request_info.txt ; then + echo "The package ${1} was successfully upload for notarization." echo "Waiting ${sleep_time}s to get the results" sleep ${sleep_time} @@ -76,8 +77,9 @@ function notarize_pkg() { if grep "Status: success" request_result.txt > /dev/null 2>&1 ; then echo "Package is notarized and ready to go." echo "Adding the ticket to the package." - if xcrun stapler staple -v ${DESTINATION}/${pkg_name} ; then + if xcrun stapler staple -v ${1} ; then echo "Ticket added. Ready to release the package." + mkdir -p "${DESTINATION}" && cp -f "${1}" "${DESTINATION}/" return 0 else echo "Something went wrong while adding the package." @@ -153,7 +155,6 @@ function build_package() { echo "The wazuh agent package for macOS has been successfully built." pkg_name="wazuh-agent-${VERSION}-${REVISION}.${ARCH}.pkg" sign_pkg - notarize_pkg if [[ "${CHECKSUM}" == "yes" ]]; then mkdir -p ${CHECKSUMDIR} cd ${DESTINATION} && shasum -a512 "${pkg_name}" > "${CHECKSUMDIR}/${pkg_name}.sha512" @@ -186,7 +187,8 @@ function help() { echo " --keychain-password [Optional] Password of the keychain." echo " --application-certificate [Optional] Apple Developer ID certificate name to sign Apps and binaries." echo " --installer-certificate [Optional] Apple Developer ID certificate name to sign pkg." - echo " --notarize [Optional] Notarize the package for its distribution on macOS Catalina ." + echo " --notarize [Optional] Notarize the package for its distribution on macOS." + echo " --notarize-path [Optional] Path of the package to be notarized." echo " --developer-id [Optional] Your Apple Developer ID." echo " --altool-password [Optional] Temporary password to use altool from Xcode." echo @@ -368,6 +370,14 @@ function main() { NOTARIZE="yes" shift 1 ;; + "--notarize-path") + if [ -n "$2" ]; then + notarization_path="$2" + shift 2 + else + help 1 + fi + ;; "--developer-id") if [ -n "$2" ]; then DEVELOPER_ID="$2" @@ -410,8 +420,20 @@ function main() { AGENT_PKG_FILE="${CURRENT_PATH}/package_files/wazuh-agent-${ARCH}.pkgproj" build_package "${CURRENT_PATH}/uninstall.sh" - else - echo "The branch has not been specified. No package will be generated." + fi + if [ "${NOTARIZE}" = "yes" ]; then + if [ "${BUILD}" = "yes" ]; then + pkg_name="wazuh-agent-${VERSION}-${REVISION}.${ARCH}.pkg" + notarization_path="${DESTINATION}/${pkg_name}" + fi + if [ -z "${notarization_path}" ]; then + echo "The path of the package to be notarized has not been specified." + help 1 + fi + notarize_pkg "${notarization_path}" + fi + if [ "${BUILD}" = "no" ] && [ "${NOTARIZE}" = "no" ]; then + echo "The branch has not been specified and notarization has not been selected." help 1 fi From 2df1940cdc1cce342002b97ca9937b1a881ebfb9 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Fri, 27 Oct 2023 21:40:16 +0200 Subject: [PATCH 10/12] Add notarytool command --- macos/generate_wazuh_packages.sh | 56 ++++++++++++-------------------- 1 file changed, 21 insertions(+), 35 deletions(-) diff --git a/macos/generate_wazuh_packages.sh b/macos/generate_wazuh_packages.sh index 27779a102a..597cf17825 100755 --- a/macos/generate_wazuh_packages.sh +++ b/macos/generate_wazuh_packages.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -x # Program to build and package OSX wazuh-agent # Wazuh package generator # Copyright (C) 2015, Wazuh Inc. @@ -31,6 +32,7 @@ KC_PASS="" # Password of the keychain. NOTARIZE="no" # Notarize the package for macOS Catalina. DEVELOPER_ID="" # Apple Developer ID. ALTOOL_PASS="" # Temporary Application password for altool. +TEAM_ID="" # Team ID of the Apple Developer ID. pkg_name="" notarization_path="" @@ -55,45 +57,20 @@ function notarize_pkg() { sleep_time="120" build_timestamp="$(date +"%m%d%Y%H%M%S")" if [ "${NOTARIZE}" = "yes" ]; then - if sudo xcrun altool --notarize-app --primary-bundle-id "com.wazuh.agent.${VERSION}.${REVISION}.${build_timestamp}" \ - --username "${DEVELOPER_ID}" --password "${ALTOOL_PASS}" --file ${1} > request_info.txt ; then - echo "The package ${1} was successfully upload for notarization." - echo "Waiting ${sleep_time}s to get the results" - sleep ${sleep_time} - - uuid="$(grep -i requestuuid request_info.txt | cut -d' ' -f 3)" - - # Check notarization status - xcrun altool --notarization-info ${uuid} -u "${DEVELOPER_ID}" --password "${ALTOOL_PASS}" > request_result.txt - until ! grep -qi "in progress" request_result.txt ; do - echo "Package is not notarized yet. Waiting ${sleep_time}s" - sleep ${sleep_time} - xcrun altool --notarization-info ${uuid} -u "${DEVELOPER_ID}" --password "${ALTOOL_PASS}" > request_result.txt - done - - echo "Notarization ticket:" - cat request_result.txt - - if grep "Status: success" request_result.txt > /dev/null 2>&1 ; then - echo "Package is notarized and ready to go." - echo "Adding the ticket to the package." - if xcrun stapler staple -v ${1} ; then - echo "Ticket added. Ready to release the package." - mkdir -p "${DESTINATION}" && cp -f "${1}" "${DESTINATION}/" - return 0 - else - echo "Something went wrong while adding the package." - clean_and_exit 1 - fi + + if sudo xcrun notarytool submit ${1} --apple-id "${DEVELOPER_ID}" --team-id "${TEAM_ID}" --password "${ALTOOL_PASS}" --wait ; then + echo "Package is notarized and ready to go." + echo "Adding the ticket to the package." + if xcrun stapler staple -v "${1}" ; then + echo "Ticket added. Ready to release the package." + mkdir -p "${DESTINATION}" && cp "${1}" "${DESTINATION}/" + return 0 else - - echo "The package couldn't be notarized." - echo "Check notarization ticket for more info." + echo "Something went wrong while adding the package." clean_and_exit 1 fi - else - echo "Error while uploading the app to be notarized." + echo "Error notarizing the package." clean_and_exit 1 fi fi @@ -190,6 +167,7 @@ function help() { echo " --notarize [Optional] Notarize the package for its distribution on macOS." echo " --notarize-path [Optional] Path of the package to be notarized." echo " --developer-id [Optional] Your Apple Developer ID." + echo " --team-id [Optional] Your Apple Team ID." echo " --altool-password [Optional] Temporary password to use altool from Xcode." echo exit "$1" @@ -386,6 +364,14 @@ function main() { help 1 fi ;; + "--team-id") + if [ -n "$2" ]; then + TEAM_ID="$2" + shift 2 + else + help 1 + fi + ;; "--altool-password") if [ -n "$2" ]; then ALTOOL_PASS="$2" From 0e1896f97cdc0fac3a7b5807667b4f9c200d6e69 Mon Sep 17 00:00:00 2001 From: rafabailon Date: Tue, 31 Oct 2023 14:35:03 +0100 Subject: [PATCH 11/12] Rename Kibana as Dashboard --- wazuhapp/kibana/Docker/build.sh | 8 ++++---- wazuhapp/opensearch-dashboards/Docker/build.sh | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/wazuhapp/kibana/Docker/build.sh b/wazuhapp/kibana/Docker/build.sh index 14bcb5dde9..3da77df88c 100755 --- a/wazuhapp/kibana/Docker/build.sh +++ b/wazuhapp/kibana/Docker/build.sh @@ -16,8 +16,8 @@ checksum_dir="/var/local/checksum" git_clone_tmp_dir="/tmp/wazuh-app" # Repositories URLs -wazuh_app_clone_repo_url="https://github.com/wazuh/wazuh-kibana-app.git" -wazuh_app_raw_repo_url="https://raw.githubusercontent.com/wazuh/wazuh-kibana-app" +wazuh_app_clone_repo_url="https://github.com/wazuh/wazuh-dashboard-plugins.git" +wazuh_app_raw_repo_url="https://raw.githubusercontent.com/wazuh/wazuh-dashboard-plugins" kibana_app_repo_url="https://github.com/elastic/kibana.git" kibana_app_raw_repo_url="https://raw.githubusercontent.com/elastic/kibana" wazuh_app_package_json_url="${wazuh_app_raw_repo_url}/${wazuh_branch}/plugins/main/package.json" @@ -47,7 +47,7 @@ change_node_version () { prepare_env() { - echo "Downloading package.json from wazuh-kibana app repository" + echo "Downloading package.json from wazuh-dashboard-plugins repository" if ! curl $wazuh_app_package_json_url -o "/tmp/package.json" ; then echo "Error downloading package.json from GitHub." exit 1 @@ -105,7 +105,7 @@ install_dependencies () { download_wazuh_app_sources() { if ! git clone $wazuh_app_clone_repo_url --branch ${wazuh_branch} --depth=1 ${git_clone_tmp_dir} ; then - echo "Error downloading the source code from wazuh-kibana-app GitHub repository." + echo "Error downloading the source code from wazuh-dashboard-plugins GitHub repository." exit 1 fi diff --git a/wazuhapp/opensearch-dashboards/Docker/build.sh b/wazuhapp/opensearch-dashboards/Docker/build.sh index 776a767672..090c37eb42 100755 --- a/wazuhapp/opensearch-dashboards/Docker/build.sh +++ b/wazuhapp/opensearch-dashboards/Docker/build.sh @@ -16,8 +16,8 @@ checksum_dir="/var/local/checksum" git_clone_tmp_dir="/tmp/wazuh-app" # Repositories URLs -wazuh_app_clone_repo_url="https://github.com/wazuh/wazuh-kibana-app.git" -wazuh_app_raw_repo_url="https://raw.githubusercontent.com/wazuh/wazuh-kibana-app" +wazuh_app_clone_repo_url="https://github.com/wazuh/wazuh-dashboard-plugins.git" +wazuh_app_raw_repo_url="https://raw.githubusercontent.com/wazuh/wazuh-dashboard-plugins" plugin_platform_app_repo_url="https://github.com/opensearch-project/OpenSearch-Dashboards.git" plugin_platform_app_raw_repo_url="https://raw.githubusercontent.com/opensearch-project/OpenSearch-Dashboards" wazuh_app_package_json_url="${wazuh_app_raw_repo_url}/${wazuh_branch}/plugins/main/package.json" @@ -47,7 +47,7 @@ change_node_version () { prepare_env() { - echo "Downloading package.json and .nvmrc from wazuh-kibana-app repository" + echo "Downloading package.json and .nvmrc from wazuh-dashboard-plugins repository" if ! curl $wazuh_app_package_json_url -o "/tmp/package.json" ; then echo "Error downloading package.json from GitHub." exit 1 From b76f1d01f77597b134500eae3100753739d8805b Mon Sep 17 00:00:00 2001 From: Tomas Turina Date: Thu, 2 Nov 2023 17:16:12 +0000 Subject: [PATCH 12/12] Change ETA for v4.7.0 --- aix/SPECS/wazuh-agent-aix.spec | 2 +- debs/SPECS/wazuh-agent/debian/changelog | 4 ++-- debs/SPECS/wazuh-manager/debian/changelog | 2 +- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- solaris/solaris10/pkginfo | 2 +- stack/dashboard/deb/debian/changelog | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- stack/indexer/deb/debian/changelog | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index f118c30fe2..46a0d98d84 100644 --- a/aix/SPECS/wazuh-agent-aix.spec +++ b/aix/SPECS/wazuh-agent-aix.spec @@ -290,7 +290,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog -* Wed Nov 08 2023 support - 4.7.0 +* Tue Nov 21 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 4c5132e898..05485a304a 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,14 +2,14 @@ wazuh-agent (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Wed, 08 Nov 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 21 Nov 2023 00:00:00 +0000 wazuh-agent (4.6.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html -- Wazuh, Inc Tue, 31 Oct 2023 00:00:00 +0000 - + wazuh-agent (4.5.4-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index f452433317..77b04053ac 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,7 +2,7 @@ wazuh-manager (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Wed, 08 Nov 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 21 Nov 2023 00:00:00 +0000 wazuh-manager (4.6.0-RELEASE) stable; urgency=low diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 03ab0a239a..799390018d 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -599,7 +599,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Wed Nov 08 2023 support - 4.7.0 +* Tue Nov 21 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 917cedc0b5..3e8b9f2603 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -822,7 +822,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Wed Nov 08 2023 support - 4.7.0 +* Tue Nov 21 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index 92281a3863..17626f8d90 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -5,7 +5,7 @@ ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="24Oct2023" +PSTAMP="21Nov2023" EMAIL="info@wazuh.com" ISTATES="S s 1 2 3" RSTATES="S s 1 2 3" diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index ade74ea8f9..3ff3b3d95b 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-dashboard (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Wed, 08 Nov 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 21 Nov 2023 00:00:00 +0000 wazuh-dashboard (4.6.0-RELEASE) stable; urgency=low diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index fc4d5cf4ea..95c7be89a7 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -408,7 +408,7 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog -* Wed Nov 08 2023 support - 4.7.0 +* Tue Nov 21 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 471b47b9bd..0538fd0cd8 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-indexer (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Wed, 08 Nov 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 21 Nov 2023 00:00:00 +0000 wazuh-indexer (4.6.0-RELEASE) stable; urgency=low diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 29663c527d..ccd96707d7 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1444,7 +1444,7 @@ rm -fr %{buildroot} %changelog -* Wed Nov 08 2023 support - 4.7.0 +* Tue Nov 21 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html