From 405d0de18e95a9e102715143fd9c9c199e581cba Mon Sep 17 00:00:00 2001 From: dfolcha Date: Fri, 5 Aug 2022 14:47:01 +0200 Subject: [PATCH 001/316] Add necessary functions to allow upgrade using installation assistant --- .../install_functions/checks.sh | 4 +- .../install_functions/dashboard.sh | 4 +- .../install_functions/indexer.sh | 4 +- .../install_functions/installMain.sh | 16 +++ .../install_functions/manager.sh | 4 +- .../install_functions/upgrade.sh | 105 ++++++++++++++++++ 6 files changed, 132 insertions(+), 5 deletions(-) create mode 100644 unattended_installer/install_functions/upgrade.sh diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index 09d5ed8116..56c367d4d4 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -154,8 +154,8 @@ function checks_arguments() { # -------------- Global ----------------------------------------- - if [ -z "${AIO}" ] && [ -z "${indexer}" ] && [ -z "${dashboard}" ] && [ -z "${wazuh}" ] && [ -z "${start_indexer_cluster}" ] && [ -z "${configurations}" ] && [ -z "${uninstall}" ] && [ -z "${download}" ]; then - common_logger -e "At least one of these arguments is necessary -a|--all-in-one, -g|--generate-config-files, -wi|--wazuh-indexer, -wd|--wazuh-dashboard, -s|--start-cluster, -ws|--wazuh-server, -u|--uninstall, -dw|--download-wazuh." + if [ -z "${AIO}" ] && [ -z "${indexer}" ] && [ -z "${dashboard}" ] && [ -z "${wazuh}" ] && [ -z "${start_indexer_cluster}" ] && [ -z "${configurations}" ] && [ -z "${uninstall}" ] && [ -z "${download}" ] && [ -z "${upgrade}" ]; then + common_logger -e "At least one of these arguments is necessary -a|--all-in-one, -g|--generate-config-files, , -up|--upgrade, -wi|--wazuh-indexer, -wd|--wazuh-dashboard, -s|--start-cluster, -ws|--wazuh-server, -u|--uninstall, -dw|--download-wazuh." exit 1 fi diff --git a/unattended_installer/install_functions/dashboard.sh b/unattended_installer/install_functions/dashboard.sh index bff659ff3a..495f860595 100644 --- a/unattended_installer/install_functions/dashboard.sh +++ b/unattended_installer/install_functions/dashboard.sh @@ -191,7 +191,9 @@ function dashboard_install() { common_checkInstalled if [ "$install_result" != 0 ] || [ -z "${dashboard_installed}" ]; then common_logger -e "Wazuh dashboard installation failed." - installCommon_rollBack + if [ -z ${upgrade} ]; then + installCommon_rollBack + fi exit 1 else common_logger "Wazuh dashboard installation finished." diff --git a/unattended_installer/install_functions/indexer.sh b/unattended_installer/install_functions/indexer.sh index 1c2fb882f6..a1e744a399 100644 --- a/unattended_installer/install_functions/indexer.sh +++ b/unattended_installer/install_functions/indexer.sh @@ -148,7 +148,9 @@ function indexer_install() { common_checkInstalled if [ "$install_result" != 0 ] || [ -z "${indexer_installed}" ]; then common_logger -e "Wazuh indexer installation failed." - installCommon_rollBack + if [ -z ${upgrade} ]; then + installCommon_rollBack + fi exit 1 else common_logger "Wazuh indexer installation finished." diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index bc1c6d6a24..ce79675f2a 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -49,6 +49,9 @@ function getHelp() { echo -e " -u, --uninstall" echo -e " Uninstalls all Wazuh components. This will erase all the existing configuration and data." echo -e "" + echo -e " -up, --upgrade" + echo -e " Upgrades installed Wazuh components." + echo -e "" echo -e " -v, --verbose" echo -e " Shows the complete installation output." echo -e "" @@ -129,6 +132,10 @@ function main() { uninstall=1 shift 1 ;; + "-up"|"--upgrade") + upgrade=1 + shift 1 + ;; "-v"|"--verbose") debugEnabled=1 debug="2>&1 | tee -a ${logfile}" @@ -209,11 +216,20 @@ function main() { common_checkSystem common_checkInstalled checks_arguments +# -------------- Uninstall case ------------------------------------ + if [ -n "${uninstall}" ]; then installCommon_rollBack exit 0 fi +# -------------- Upgrade case ------------------------------------ + + if [ -n "${upgrade}" ]; then + upgrade_upgradeInstalled + exit 0 + fi + # -------------- Preliminary checks -------------------------------- if [ -z "${configurations}" ] && [ -z "${AIO}" ] && [ -z "${download}" ]; then diff --git a/unattended_installer/install_functions/manager.sh b/unattended_installer/install_functions/manager.sh index 61f687b41d..0f5b3a505b 100644 --- a/unattended_installer/install_functions/manager.sh +++ b/unattended_installer/install_functions/manager.sh @@ -54,7 +54,9 @@ function manager_install() { common_checkInstalled if [ "$install_result" != 0 ] || [ -z "${wazuh_installed}" ]; then common_logger -e "Wazuh installation failed." - installCommon_rollBack + if [ -z ${upgrade} ]; then + installCommon_rollBack + fi exit 1 else common_logger "Wazuh manager installation finished." diff --git a/unattended_installer/install_functions/upgrade.sh b/unattended_installer/install_functions/upgrade.sh new file mode 100644 index 0000000000..fd7f658d7f --- /dev/null +++ b/unattended_installer/install_functions/upgrade.sh @@ -0,0 +1,105 @@ +# Wazuh installer - common.sh functions. +# Copyright (C) 2015, Wazuh Inc. +# +# This program is a free software; you can redistribute it +# and/or modify it under the terms of the GNU General Public +# License (version 2) as published by the FSF - Free Software +# Foundation. + + +function upgrade_getUpgradable { + + if [ -n "${wazuh_installed}" ]; then + if [ "${sys_type}" == "yum" ]; then + manager_upgradable=$(yum check-update wazuh-manager | grep wazuh-manager | sed 's/ */ /g'| cut -d' ' -f2 | sed "s/-.*//g") + elif [ "${sys_type}" == "apt-get" ]; then + manager_upgradable=$(apt list wazuh-manager -a 2>/dev/null | grep "upgradable from" | cut -d' ' -f2 | sed -e "s/-.*//") + fi + fi + + if [ -n "${filebeat_installed}" ]; then + if [ "${sys_type}" == "yum" ]; then + filebeat_upgradable=$(yum check-update filebeat | grep filebeat | sed 's/ */ /g'| cut -d' ' -f2 | sed "s/-.*//g") + elif [ "${sys_type}" == "apt-get" ]; then + filebeat_upgradable=$(apt list filebeat -a 2>/dev/null | grep "upgradable from" | cut -d' ' -f2 | sed -e "s/-.*//") + fi + fi + + if [ -n "${indexer_installed}" ]; then + if [ "${sys_type}" == "yum" ]; then + indexer_upgradable=$(yum check-update wazuh-indexer | grep wazuh-indexer | sed 's/ */ /g'| cut -d' ' -f2 | sed "s/-.*//g") + elif [ "${sys_type}" == "apt-get" ]; then + indexer_upgradable=$(apt list wazuh-indexer -a 2>/dev/null | grep "upgradable from" | cut -d' ' -f2 | sed -e "s/-.*//") + fi + fi + + if [ -n "${dashboard_installed}" ]; then + if [ "${sys_type}" == "yum" ]; then + dashboard_upgradable=$(yum check-update wazuh-dashboard | grep wazuh-dashboard | sed 's/ */ /g'| cut -d' ' -f2 | sed "s/-.*//g") + elif [ "${sys_type}" == "apt-get" ]; then + dashboard_upgradable=$(apt list wazuh-dashboard -a 2>/dev/null | grep "upgradable from" | cut -d' ' -f2 | sed -e "s/-.*//") + fi + fi + +} + + +function upgrade_upgradeInstalled(){ + + common_logger "--- Upgrading existing Wazuh installation ---" + + upgrade_getUpgradable + + if [ -n "${wazuh_installed}" ]; then + if [ -n "${manager_upgradable}" ]; then + if [ "${manager_upgradable}" == "${wazuh_version}" ]; then + common_logger "Upgrading Wazuh Manager to ${manager_upgradable}" + eval "manager_install ${debug}" + else + common_logger -w "Wazuh manager can be upgraded but version does not match with the installation assistant version" + fi + else + common_logger -w "Wazuh manager is already installed and is up to date." + fi + fi + + if [ -n "${filebeat_installed}" ]; then + if [ -n "${filebeat_upgradable}" ]; then + if [ "${filebeat_upgradable}" == "${filebeat_version}" ]; then + common_logger "Upgrading Filebeat to ${filebeat_upgradable}" + eval "filebeat_install ${debug}" + else + common_logger -w "Filebeat can be upgraded but version does not match with the installation assistant version" + fi + else + common_logger -w "Filebeat is already installed and is up to date." + fi + fi + + if [ -n "${indexer_installed}" ]; then + if [ -n "${indexer_upgradable}" ]; then + if [ "${indexer_upgradable}" == "${wazuh_version}" ]; then + common_logger "Upgrading Wazuh Indexer to ${indexer_upgradable}" + eval "indexer_install ${debug}" + else + common_logger -w "Wazuh Indexer can be upgraded but version does not match with the installation assistant version" + fi + else + common_logger -w "Wazuh Indexer is already installed and is up to date." + fi + fi + + if [ -n "${dashboard_installed}" ]; then + if [ -n "${dashboard_upgradable}" ]; then + if [ "${dashboard_upgradable}" == "${wazuh_version}" ]; then + common_logger "Upgrading Wazuh Dashboard to ${dashboard_upgradable}" + eval "dashboard_install ${debug}" + else + common_logger -w "Wazuh Dashboard can be upgraded but version does not match with the installation assistant version" + fi + else + common_logger -w "Wazuh Dashboard is already installed and is up to date." + fi + fi + +} From f91b010d1f1823ed7f3f95d2adaec82752e1d914 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Fri, 18 Nov 2022 14:01:06 +0100 Subject: [PATCH 002/316] Bump to 4.3.11 --- CHANGELOG.md | 4 ++++ VERSION | 2 +- aix/SPECS/wazuh-agent-aix.spec | 4 +++- debs/SPECS/wazuh-agent/debian/changelog | 6 ++++++ debs/SPECS/wazuh-manager/debian/changelog | 6 ++++++ macos/specs/wazuh-agent.pkgproj | 4 ++-- rpms/SPECS/wazuh-agent.spec | 4 +++- rpms/SPECS/wazuh-manager.spec | 4 +++- tests/unattended/install/test_unattended.py | 4 ++-- tests/unattended/unit/suites/test-common.sh | 4 ++-- tests/unattended/unit/suites/test-dashboard.sh | 2 +- unattended_installer/install_functions/installVariables.sh | 2 +- 12 files changed, 34 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f6f017e67..91acc55b0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log All notable changes to this project will be documented in this file. +## [v4.3.11] + +- https://github.com/wazuh/wazuh-packages/releases/tag/v4.3.11 + ## [v4.3.10] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.3.10 diff --git a/VERSION b/VERSION index 5d72fe47eb..4d827cd0be 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.3.10 +4.3.11 diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 592368e3d1..6e850ce3b3 100644 --- a/aix/SPECS/wazuh-agent-aix.spec +++ b/aix/SPECS/wazuh-agent-aix.spec @@ -1,6 +1,6 @@ # Spec file for AIX systems Name: wazuh-agent -Version: 4.3.10 +Version: 4.3.11 Release: 1 License: GPL URL: https://www.wazuh.com/ @@ -290,6 +290,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog +* Thu Dic 08 2022 support - 4.3.11 +- More info: https://documentation.wazuh.com/current/release-notes/ * Thu Nov 10 2022 support - 4.3.10 - More info: https://documentation.wazuh.com/current/release-notes/ * Mon Oct 03 2022 support - 4.3.9 diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 2c6b936564..59f75852b3 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -1,3 +1,9 @@ +wazuh-agent (4.3.11-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/ + + -- Wazuh, Inc Thu, 08 Dic 2022 15:00:00 +0000 + wazuh-agent (4.3.10-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index ca500b4364..bbc4ed2dc8 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -1,3 +1,9 @@ +wazuh-manager (4.3.11-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/ + + -- Wazuh, Inc Thu, 08 Dic 2022 15:00:00 +0000 + wazuh-manager (4.3.10-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ diff --git a/macos/specs/wazuh-agent.pkgproj b/macos/specs/wazuh-agent.pkgproj index cb718bd9ba..2ea53fa4ff 100644 --- a/macos/specs/wazuh-agent.pkgproj +++ b/macos/specs/wazuh-agent.pkgproj @@ -812,7 +812,7 @@ USE_HFS+_COMPRESSION VERSION - 4.3.10-1 + 4.3.11-1 TYPE 0 @@ -1239,7 +1239,7 @@ NAME - wazuh-agent-4.3.10-1 + wazuh-agent-4.3.11-1 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 140ced8003..e7038bd2a2 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -1,6 +1,6 @@ Summary: Wazuh helps you to gain security visibility into your infrastructure by monitoring hosts at an operating system and application level. It provides the following capabilities: log analysis, file integrity monitoring, intrusions detection and policy and compliance monitoring Name: wazuh-agent -Version: 4.3.10 +Version: 4.3.11 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -617,6 +617,8 @@ rm -fr %{buildroot} %changelog +* Thu Dic 08 2022 support - 4.3.11 +- More info: https://documentation.wazuh.com/current/release-notes/ * Thu Nov 10 2022 support - 4.3.10 - More info: https://documentation.wazuh.com/current/release-notes/ * Mon Oct 03 2022 support - 4.3.9 diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 3cba506681..c90396f5bb 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -1,6 +1,6 @@ Summary: Wazuh helps you to gain security visibility into your infrastructure by monitoring hosts at an operating system and application level. It provides the following capabilities: log analysis, file integrity monitoring, intrusions detection and policy and compliance monitoring Name: wazuh-manager -Version: 4.3.10 +Version: 4.3.11 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -833,6 +833,8 @@ rm -fr %{buildroot} %changelog +* Thu Dic 08 2022 support - 4.3.11 +- More info: https://documentation.wazuh.com/current/release-notes/ * Thu Nov 10 2022 support - 4.3.10 - More info: https://documentation.wazuh.com/current/release-notes/ * Mon Oct 03 2022 support - 4.3.9 diff --git a/tests/unattended/install/test_unattended.py b/tests/unattended/install/test_unattended.py index 793d4547c0..53f068c7cc 100644 --- a/tests/unattended/install/test_unattended.py +++ b/tests/unattended/install/test_unattended.py @@ -212,7 +212,7 @@ def test_check_log_errors(): for line in f.readlines(): if 'ERROR' in line: found_error = True - if get_wazuh_version() == 'v4.3.10': + if get_wazuh_version() == 'v4.3.11': if 'ERROR: Cluster error detected' in line or 'agent-upgrade: ERROR: (8123): There has been an error executing the request in the tasks manager.' in line: found_error = False else: @@ -236,7 +236,7 @@ def test_check_cluster_log_errors(): for line in f.readlines(): if 'ERROR' in line: found_error = True - if get_wazuh_version() == 'v4.3.10': + if get_wazuh_version() == 'v4.3.11': if 'Could not connect to master' in line or 'Worker node is not connected to master' in line or 'Connection reset by peer' in line: found_error = False else: diff --git a/tests/unattended/unit/suites/test-common.sh b/tests/unattended/unit/suites/test-common.sh index 9c33b793b6..ad7139bf45 100644 --- a/tests/unattended/unit/suites/test-common.sh +++ b/tests/unattended/unit/suites/test-common.sh @@ -61,7 +61,7 @@ test-04-common_checkInstalled-all-installed-yum() { @mocktrue yum list installed - @mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.3.10-1 @wazuh + @mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.3.11-1 @wazuh @mkdir /var/ossec @mock grep wazuh-indexer === @echo wazuh-indexer.x86_64 1.13.2-1 @wazuh @@ -105,7 +105,7 @@ test-04-common_checkInstalled-all-installed-yum() { } test-04-common_checkInstalled-all-installed-yum-assert() { - @echo "wazuh-manager.x86_64 4.3.10-1 @wazuh" + @echo "wazuh-manager.x86_64 4.3.11-1 @wazuh" @echo 1 @echo "wazuh-indexer.x86_64 1.13.2-1 @wazuh" diff --git a/tests/unattended/unit/suites/test-dashboard.sh b/tests/unattended/unit/suites/test-dashboard.sh index 46c1bc6d8b..5370898e24 100644 --- a/tests/unattended/unit/suites/test-dashboard.sh +++ b/tests/unattended/unit/suites/test-dashboard.sh @@ -6,7 +6,7 @@ source "${base_dir}"/bach.sh @setup-test { @ignore common_logger k_certs_path="/etc/wazuh-dashboard/certs/" - wazuh_version="4.3.10" + wazuh_version="4.3.11" elasticsearch_oss_version="7.10.2" wazuh_kibana_plugin_revision="1" repobaseurl="https://packages.wazuh.com/4.x" diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index 7450683519..f96c01415e 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -8,7 +8,7 @@ ## Package vars readonly wazuh_major="4.3" -readonly wazuh_version="4.3.10" +readonly wazuh_version="4.3.11" readonly filebeat_version="7.10.2" readonly wazuh_install_vesion="0.1" From 3dd6aa559bc2b43886af26ab12cb144b89332f35 Mon Sep 17 00:00:00 2001 From: verdx Date: Wed, 23 Nov 2022 19:04:04 +0100 Subject: [PATCH 003/316] 1934-issue-upgrading-on-fips-enabled-rl8 --- stack/dashboard/rpm/build_package.sh | 2 ++ stack/dashboard/rpm/builder.sh | 3 +-- stack/dashboard/rpm/docker/x86_64/Dockerfile | 5 ++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stack/dashboard/rpm/build_package.sh b/stack/dashboard/rpm/build_package.sh index 6cd0cbac60..247c415693 100755 --- a/stack/dashboard/rpm/build_package.sh +++ b/stack/dashboard/rpm/build_package.sh @@ -8,6 +8,8 @@ # License (version 2) as published by the FSF - Free Software # Foundation. +set -e + current_path="$( cd $(dirname $0) ; pwd -P )" architecture="x86_64" outdir="${current_path}/output" diff --git a/stack/dashboard/rpm/builder.sh b/stack/dashboard/rpm/builder.sh index bca723d755..8bac6900b3 100755 --- a/stack/dashboard/rpm/builder.sh +++ b/stack/dashboard/rpm/builder.sh @@ -9,6 +9,7 @@ # Foundation. set -ex + # Script parameters to build the package target="wazuh-dashboard" architecture=$1 @@ -44,7 +45,6 @@ mkdir -p ${rpm_build_dir}/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} pkg_name=${target}-${version} mkdir ${build_dir}/${pkg_name} - # Including spec file if [ "${reference}" ];then curl -sL https://github.com/wazuh/wazuh-packages/tarball/${reference} | tar zx @@ -54,7 +54,6 @@ else cp /root/stack/dashboard/rpm/${target}.spec ${rpm_build_dir}/SPECS/${pkg_name}.spec fi - # Generating source tar.gz cd ${build_dir} && tar czf "${rpm_build_dir}/SOURCES/${pkg_name}.tar.gz" "${pkg_name}" diff --git a/stack/dashboard/rpm/docker/x86_64/Dockerfile b/stack/dashboard/rpm/docker/x86_64/Dockerfile index 169d380032..400816866b 100644 --- a/stack/dashboard/rpm/docker/x86_64/Dockerfile +++ b/stack/dashboard/rpm/docker/x86_64/Dockerfile @@ -1,12 +1,11 @@ -FROM centos:7 +FROM rockylinux:9 # Install all the necessary tools to build the packages RUN yum clean all && yum update -y RUN yum install -y openssh-clients sudo gnupg \ yum-utils epel-release redhat-rpm-config rpm-devel \ zlib zlib-devel rpm-build autoconf automake \ - glibc-devel libtool perl - + glibc-devel libtool perl # Add the scripts to build the RPM package ADD builder.sh /usr/local/bin/builder From bc56726444f959d250bef74f7219b05b63edc9be Mon Sep 17 00:00:00 2001 From: verdx Date: Thu, 24 Nov 2022 18:11:53 +0100 Subject: [PATCH 004/316] Specified shebang for error files --- stack/dashboard/base/builder.sh | 20 ++++++++++++++++++++ stack/dashboard/rpm/docker/x86_64/Dockerfile | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh index 8c3fd288c7..98b829692d 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -110,6 +110,26 @@ sed -i 's|If you have forgotten your username or password, please ask your syste sed -i 's|setShouldShowTenantPopup(shouldShowTenantPopup)|setShouldShowTenantPopup(false)|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js gzip -c ./plugins/securityDashboards/target/public/securityDashboards.plugin.js > ./plugins/securityDashboards/target/public/securityDashboards.plugin.js.gz brotli -c ./plugins/securityDashboards/target/public/securityDashboards.plugin.js > ./plugins/securityDashboards/target/public/securityDashboards.plugin.js.br +# Change the python version used, so rmpbuild 4.14 doesn't give an error +sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/pylib/gyp/MSVSSettings_test.py +sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/pylib/gyp/__init__.py +sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/pylib/gyp/flock_tool.py +sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py +sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/pylib/gyp/generator/msvs_test.py +sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/pylib/gyp/easy_xml_test.py +sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/pylib/gyp/common_test.py +sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/pylib/gyp/input_test.py +sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/pylib/gyp/win_tool.py +sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/test_gyp.py +sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/tools/pretty_vcproj.py +sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/tools/pretty_sln.py +sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/tools/graphviz.py +sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/tools/pretty_gyp.py +sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/gyp_main.py +sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/setup.py +sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' ./node_modules/re2/vendor/re2/make_unicode_groups.py +sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' ./node_modules/re2/vendor/re2/make_unicode_casefold.py + # Generate compressed files gzip -c ./plugins/securityDashboards/target/public/securityDashboards.chunk.5.js > ./plugins/securityDashboards/target/public/securityDashboards.chunk.5.js.gz brotli -c ./plugins/securityDashboards/target/public/securityDashboards.chunk.5.js > ./plugins/securityDashboards/target/public/securityDashboards.chunk.5.js.br diff --git a/stack/dashboard/rpm/docker/x86_64/Dockerfile b/stack/dashboard/rpm/docker/x86_64/Dockerfile index 400816866b..5f26e12a38 100644 --- a/stack/dashboard/rpm/docker/x86_64/Dockerfile +++ b/stack/dashboard/rpm/docker/x86_64/Dockerfile @@ -5,7 +5,7 @@ RUN yum clean all && yum update -y RUN yum install -y openssh-clients sudo gnupg \ yum-utils epel-release redhat-rpm-config rpm-devel \ zlib zlib-devel rpm-build autoconf automake \ - glibc-devel libtool perl + glibc-devel libtool perl # Add the scripts to build the RPM package ADD builder.sh /usr/local/bin/builder From 4f727e583502a041dba06ef7ccb3bc1fc8b921a4 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Wed, 23 Nov 2022 17:38:55 +0100 Subject: [PATCH 005/316] Add tasks to upgrade filebeat module --- unattended_installer/builder.sh | 3 ++- .../install_functions/upgrade.sh | 21 +++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index a52204932e..d7742ed8d6 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -70,7 +70,8 @@ function buildInstaller() { echo 'readonly repogpg="https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH"' >> "${output_script_path}" echo 'readonly repobaseurl="https://packages-dev.wazuh.com/'${devrepo}'"' >> "${output_script_path}" echo 'readonly reporelease="unstable"' >> "${output_script_path}" - echo 'readonly filebeat_wazuh_module="${repobaseurl}/filebeat/wazuh-filebeat-0.2.tar.gz"' >> "${output_script_path}" + echo 'readonly filebeat_wazuh_module_version="0.2"' >> "${output_script_path}" + echo 'readonly filebeat_wazuh_module="${repobaseurl}/filebeat/wazuh-filebeat-${filebeat_wazuh_module_version}.tar.gz"' >> "${output_script_path}" echo 'readonly bucket="packages-dev.wazuh.com"' >> "${output_script_path}" echo 'readonly repository="'"${devrepo}"'"' >> "${output_script_path}" else diff --git a/unattended_installer/install_functions/upgrade.sh b/unattended_installer/install_functions/upgrade.sh index fd7f658d7f..3e6d00ebff 100644 --- a/unattended_installer/install_functions/upgrade.sh +++ b/unattended_installer/install_functions/upgrade.sh @@ -23,6 +23,14 @@ function upgrade_getUpgradable { elif [ "${sys_type}" == "apt-get" ]; then filebeat_upgradable=$(apt list filebeat -a 2>/dev/null | grep "upgradable from" | cut -d' ' -f2 | sed -e "s/-.*//") fi + installed_module_version=$(cat /usr/share/filebeat/module/wazuh/alerts/manifest.yml | grep "module_version" | cut -d" " -f2) + installed_module_version_major=$(echo ${installed_module_version} | cut -d"." -f1) + installed_module_version_minor=$(echo ${installed_module_version} | cut -d"." -f2) + filebeat_wazuh_module_major=$(echo ${filebeat_wazuh_module_version} | cut -d"." -f1) + filebeat_wazuh_module_minor=$(echo ${filebeat_wazuh_module_version} | cut -d"." -f2) + if [ "${installed_module_version_major}" -lt "${filebeat_wazuh_module_major}" ] || ([ "${installed_module_version_major}" -eq "${filebeat_wazuh_module_major}" ] && [ "${installed_module_version_minor}" -lt "${filebeat_wazuh_module_minor}" ]); then + module_upgradable="${filebeat_wazuh_module_version}" + fi fi if [ -n "${indexer_installed}" ]; then @@ -56,7 +64,7 @@ function upgrade_upgradeInstalled(){ common_logger "Upgrading Wazuh Manager to ${manager_upgradable}" eval "manager_install ${debug}" else - common_logger -w "Wazuh manager can be upgraded but version does not match with the installation assistant version" + common_logger -w "Wazuh manager can be upgraded but the version does not match the installation assistant version" fi else common_logger -w "Wazuh manager is already installed and is up to date." @@ -69,11 +77,16 @@ function upgrade_upgradeInstalled(){ common_logger "Upgrading Filebeat to ${filebeat_upgradable}" eval "filebeat_install ${debug}" else - common_logger -w "Filebeat can be upgraded but version does not match with the installation assistant version" + common_logger -w "Filebeat can be upgraded but the version does not match the installation assistant version" fi else common_logger -w "Filebeat is already installed and is up to date." fi + + if [ -n ${module_upgradable} ];then + common_logger "Upgrading Filebeat module to ${filebeat_wazuh_module_version}" + eval "curl -s ${filebeat_wazuh_module} --max-time 300 | tar -xvz -C /usr/share/filebeat/module ${debug}" + fi fi if [ -n "${indexer_installed}" ]; then @@ -82,7 +95,7 @@ function upgrade_upgradeInstalled(){ common_logger "Upgrading Wazuh Indexer to ${indexer_upgradable}" eval "indexer_install ${debug}" else - common_logger -w "Wazuh Indexer can be upgraded but version does not match with the installation assistant version" + common_logger -w "Wazuh Indexer can be upgraded but the version does not match the installation assistant version" fi else common_logger -w "Wazuh Indexer is already installed and is up to date." @@ -95,7 +108,7 @@ function upgrade_upgradeInstalled(){ common_logger "Upgrading Wazuh Dashboard to ${dashboard_upgradable}" eval "dashboard_install ${debug}" else - common_logger -w "Wazuh Dashboard can be upgraded but version does not match with the installation assistant version" + common_logger -w "Wazuh Dashboard can be upgraded but the version does not match the installation assistant version" fi else common_logger -w "Wazuh Dashboard is already installed and is up to date." From 12ae8476bfad7c1c319955164e7e468316896d8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Fri, 25 Nov 2022 11:38:08 +0100 Subject: [PATCH 006/316] Update wazuh-agent.spec --- rpms/SPECS/wazuh-agent.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 62b3390d57..da1c6af446 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -623,7 +623,9 @@ rm -fr %{buildroot} %changelog * Fri May 05 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/ -* Thu Nov 03 2022 support - 4.4.0 +* Wed Jan 18 2023 support - 4.4.0 +- More info: https://documentation.wazuh.com/current/release-notes/ +* Thu Nov 10 2022 support - 4.3.10 - More info: https://documentation.wazuh.com/current/release-notes/ * Mon Oct 03 2022 support - 4.3.9 - More info: https://documentation.wazuh.com/current/release-notes/ From 7579fa1969caea3cc3f228790d7f92fb46c0065f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Fri, 25 Nov 2022 11:38:42 +0100 Subject: [PATCH 007/316] Update wazuh-manager.spec --- rpms/SPECS/wazuh-manager.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index bf9a14ff43..2ce132b254 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -843,7 +843,9 @@ rm -fr %{buildroot} %changelog * Fri May 05 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/ -* Thu Nov 03 2022 support - 4.4.0 +* Wed Jan 18 2023 support - 4.4.0 +- More info: https://documentation.wazuh.com/current/release-notes/ +* Thu Nov 10 2022 support - 4.3.10 - More info: https://documentation.wazuh.com/current/release-notes/ * Mon Oct 03 2022 support - 4.3.9 - More info: https://documentation.wazuh.com/current/release-notes/ From 8ad4303de51b5a1e91f2fd00b52a5d98cf0a5b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Fri, 25 Nov 2022 11:39:25 +0100 Subject: [PATCH 008/316] Update wazuh-agent-aix.spec --- aix/SPECS/wazuh-agent-aix.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 15f740f039..db705a698e 100644 --- a/aix/SPECS/wazuh-agent-aix.spec +++ b/aix/SPECS/wazuh-agent-aix.spec @@ -292,7 +292,9 @@ rm -fr %{buildroot} %changelog * Fri May 05 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/ -* Thu Nov 03 2022 support - 4.4.0 +* Wed Jan 18 2023 support - 4.4.0 +- More info: https://documentation.wazuh.com/current/release-notes/ +* Thu Nov 10 2022 support - 4.3.10 - More info: https://documentation.wazuh.com/current/release-notes/ * Mon Oct 03 2022 support - 4.3.9 - More info: https://documentation.wazuh.com/current/release-notes/ From b2291429f02cb983e1c1b071602f62d7b76974bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Fri, 25 Nov 2022 11:56:07 +0100 Subject: [PATCH 009/316] Update changelog --- stack/dashboard/deb/debian/changelog | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 4bbab9becd..6dcc308516 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -1,3 +1,9 @@ +wazuh-dashboard (VERSION-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/ + + -- Wazuh, Inc Wed, 18 Jan 2023 12:31:50 +0000 + wazuh-dashboard (4.4.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ @@ -69,3 +75,9 @@ wazuh-dashboard (4.3.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Thu, 05 May 2022 12:15:57 +0000 + +wazuh-dashboard (4.2.5-1) UNRELEASED; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/ + + -- Wazuh, Inc Mon, 15 Nov 2021 16:47:07 +0000 From 970be0e0311d30d08457b37b5fe527ee6c0fe610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Fri, 25 Nov 2022 11:56:57 +0100 Subject: [PATCH 010/316] Update CHANGELOG.md --- CHANGELOG.md | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b3c93884e..d65d9891c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,5 @@ # Change Log All notable changes to this project will be documented in this file. -## [v4.3.10] - -- https://github.com/wazuh/wazuh-packages/releases/tag/v4.3.10 - -## [v4.3.9] - -- https://github.com/wazuh/wazuh-packages/releases/tag/v4.3.9 - ## [v4.5.0] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.0 @@ -16,6 +8,10 @@ All notable changes to this project will be documented in this file. - https://github.com/wazuh/wazuh-packages/releases/tag/v4.4.0 +## [v4.3.10] + +- https://github.com/wazuh/wazuh-packages/releases/tag/v4.3.10 + ## [v4.3.9] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.3.9 From 1feaf33cf71360f401a2863f9570c07536ba9ea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Fri, 25 Nov 2022 11:57:20 +0100 Subject: [PATCH 011/316] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d65d9891c6..225322024d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log All notable changes to this project will be documented in this file. + ## [v4.5.0] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.0 From 0754bf1059df85af57ab2282f957e849af875302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Fri, 25 Nov 2022 12:00:22 +0100 Subject: [PATCH 012/316] Update changelog --- stack/dashboard/deb/debian/changelog | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 6dcc308516..09ac58db75 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -1,76 +1,76 @@ -wazuh-dashboard (VERSION-RELEASE) stable; urgency=low +wazuh-dashboard (VERSION-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Wed, 18 Jan 2023 12:31:50 +0000 -wazuh-dashboard (4.4.0-RELEASE) stable; urgency=low +wazuh-dashboard (4.4.0-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Wed, 18 Jan 2023 12:31:50 +0000 -wazuh-dashboard (4.3.10-RELEASE) stable; urgency=low +wazuh-dashboard (4.3.10-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Thu, 10 Nov 2022 15:00:00 +0000 -wazuh-dashboard (4.3.9-RELEASE) stable; urgency=low +wazuh-dashboard (4.3.9-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Mon, 03 Oct 2022 15:00:00 +0000 -wazuh-dashboard (4.3.8-RELEASE) stable; urgency=low +wazuh-dashboard (4.3.8-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Mon, 19 Sep 2022 15:00:00 +0000 -wazuh-dashboard (4.3.7-RELEASE) stable; urgency=low +wazuh-dashboard (4.3.7-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Mon, 08 Aug 2022 15:00:00 +0000 -wazuh-dashboard (4.3.6-RELEASE) stable; urgency=low +wazuh-dashboard (4.3.6-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Thu, 07 Jul 2022 15:00:00 +0000 -wazuh-dashboard (4.3.5-RELEASE) stable; urgency=low +wazuh-dashboard (4.3.5-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Wed, 29 Jun 2022 15:00:00 +0000 -wazuh-dashboard (4.3.4-RELEASE) stable; urgency=low +wazuh-dashboard (4.3.4-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Tue, 07 Jun 2022 15:41:39 +0000 -wazuh-dashboard (4.3.3-RELEASE) stable; urgency=low +wazuh-dashboard (4.3.3-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Tue, 31 May 2022 15:41:39 +0000 -wazuh-dashboard (4.3.2-RELEASE) stable; urgency=low +wazuh-dashboard (4.3.2-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Mon, 30 May 2022 15:41:39 +0000 -wazuh-dashboard (4.3.1-RELEASE) stable; urgency=low +wazuh-dashboard (4.3.1-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Wed, 18 May 2022 12:14:41 +0000 -wazuh-dashboard (4.3.0-RELEASE) stable; urgency=low +wazuh-dashboard (4.3.0-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ From 6b66a544e0047cf4e9d7cf5bee400381f3fe22a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Fri, 25 Nov 2022 12:02:24 +0100 Subject: [PATCH 013/316] Update changelog --- stack/dashboard/deb/debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 09ac58db75..cbe3bc2e45 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-dashboard (VERSION-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ - -- Wazuh, Inc Wed, 18 Jan 2023 12:31:50 +0000 + -- Wazuh, Inc Fri, 05 May 2023 12:31:50 +0000 wazuh-dashboard (4.4.0-RELEASE) unstable; urgency=low From 51997182043922582dac0cf94e52bcf3c7f3a0ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Fri, 25 Nov 2022 12:04:30 +0100 Subject: [PATCH 014/316] Update wazuh-dashboard.spec --- stack/dashboard/rpm/wazuh-dashboard.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 2354e67c73..362c09fe3a 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -408,6 +408,8 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog +* Fri May 05 2023 support - %{version} +- More info: https://documentation.wazuh.com/current/release-notes/ * Wed Jan 18 2023 support - 4.4.0 - More info: https://documentation.wazuh.com/current/release-notes/ * Thu Nov 10 2022 support - 4.3.10 From 2d41ecf7d481aa7f2a81f9ed54383627aa5404b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Fri, 25 Nov 2022 12:07:02 +0100 Subject: [PATCH 015/316] Update changelog --- stack/indexer/deb/debian/changelog | 36 ++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index d8f43a0fbc..2b9d0ae8b2 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -1,71 +1,83 @@ -wazuh-indexer (4.4.0-RELEASE) stable; urgency=low +wazuh-dashboard (VERSION-RELEASE) unstable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/ + + -- Wazuh, Inc Fri, 05 May 2023 12:31:50 +0000 + +wazuh-indexer (4.4.0-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Wed, 18 Jan 2023 12:31:50 +0000 -wazuh-indexer (4.3.10-RELEASE) stable; urgency=low +wazuh-indexer (4.3.10-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Thu, 10 Nov 2022 15:00:00 +0000 -wazuh-indexer (4.3.9-RELEASE) stable; urgency=low +wazuh-indexer (4.3.9-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Mon, 03 Oct 2022 15:00:00 +0000 -wazuh-indexer (4.3.8-RELEASE) stable; urgency=low +wazuh-indexer (4.3.8-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Mon, 19 Sep 2022 15:00:00 +0000 -wazuh-indexer (4.3.7-RELEASE) stable; urgency=low +wazuh-indexer (4.3.7-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Mon, 08 Aug 2022 15:00:00 +0000 -wazuh-indexer (4.3.6-RELEASE) stable; urgency=low +wazuh-indexer (4.3.6-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Thu, 07 Jul 2022 15:00:00 +0000 -wazuh-indexer (4.3.5-RELEASE) stable; urgency=low +wazuh-indexer (4.3.5-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Wed, 29 Jun 2022 15:00:00 +0000 -wazuh-indexer (4.3.4-RELEASE) stable; urgency=low +wazuh-indexer (4.3.4-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Tue, 07 Jun 2022 15:41:39 +0000 -wazuh-indexer (4.3.3-RELEASE) stable; urgency=low +wazuh-indexer (4.3.3-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Tue, 31 May 2022 15:41:39 +0000 -wazuh-indexer (4.3.2-RELEASE) stable; urgency=low +wazuh-indexer (4.3.2-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Mon, 30 May 2022 15:41:39 +0000 -wazuh-indexer (4.3.1-RELEASE) stable; urgency=low +wazuh-indexer (4.3.1-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Wed, 18 May 2022 12:14:41 +0000 -wazuh-indexer (4.3.0-RELEASE) stable; urgency=low +wazuh-indexer (4.3.0-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Thu, 05 May 2022 12:15:57 +0000 + + wazuh-indexer (4.2.5-1) UNRELEASED; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/ + + -- Wazuh, Inc Mon, 15 Nov 2021 16:47:07 +0000 From 763383ad745fa95856b53b6304bf3397b4d660b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Fri, 25 Nov 2022 12:07:25 +0100 Subject: [PATCH 016/316] Update changelog --- stack/indexer/deb/debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 2b9d0ae8b2..002106a0c5 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -1,4 +1,4 @@ -wazuh-dashboard (VERSION-RELEASE) unstable; urgency=low +wazuh-indexer (VERSION-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ From 6a3528b40e64c438103dcc0837ebe227e7f605ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Fri, 25 Nov 2022 12:08:50 +0100 Subject: [PATCH 017/316] Update wazuh-indexer.spec --- stack/indexer/rpm/wazuh-indexer.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 3d20fdc411..683853438f 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1312,6 +1312,8 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/blocked.certs %changelog +* Fri May 05 2023 support - %{version} +- More info: https://documentation.wazuh.com/current/release-notes/ * Wed Jan 18 2023 support - 4.4.0 - More info: https://documentation.wazuh.com/current/release-notes/ * Thu Nov 10 2022 support - 4.3.10 From cb3d0b6378a479eb7dfef38e0e4ae183e0318625 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Fri, 25 Nov 2022 14:13:09 +0100 Subject: [PATCH 018/316] Fix typo: OpenSearch --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 101e95c1b6..a858d80661 100644 --- a/README.md +++ b/README.md @@ -32,14 +32,14 @@ The following table shows the references for the versions of each component. ### Dashboard -| Wazuh dashboard | Opensearch dashboards | +| Wazuh dashboard | OpenSearch Dashboards | |-----------------|-----------------------| | 4.3.x | 1.2.0 | | 4.4.x | 2.3.0 | ### Indexer -| Wazuh indexer | Opensearch | +| Wazuh indexer | OpenSearch | |-----------------|-----------------------| | 4.3.x | 1.2.4 | | 4.4.x | 2.3.0 | From ac1f60ca1ea705c9f3a8e30e7ef2d5451e081e4a Mon Sep 17 00:00:00 2001 From: DFolchA Date: Fri, 18 Nov 2022 14:25:53 +0100 Subject: [PATCH 019/316] Remove grep from getent command --- debs/SPECS/wazuh-agent/debian/postrm | 4 ++-- solaris/solaris10/postremove.sh | 4 ++-- solaris/solaris10/preinstall.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debs/SPECS/wazuh-agent/debian/postrm b/debs/SPECS/wazuh-agent/debian/postrm index 58532c35f8..ee822e0e52 100644 --- a/debs/SPECS/wazuh-agent/debian/postrm +++ b/debs/SPECS/wazuh-agent/debian/postrm @@ -40,10 +40,10 @@ case "$1" in purge) - if getent passwd | grep -q "^wazuh" ; then + if getent passwd wazuh ; then deluser wazuh > /dev/null 2>&1 fi - if getent group | grep -q "^wazuh" ; then + if getent group wazuh ; then delgroup wazuh > /dev/null 2>&1 fi rm -rf ${DIR}/* diff --git a/solaris/solaris10/postremove.sh b/solaris/solaris10/postremove.sh index e979162c36..0ce350c735 100755 --- a/solaris/solaris10/postremove.sh +++ b/solaris/solaris10/postremove.sh @@ -2,10 +2,10 @@ # postremove script for wazuh-agent # Wazuh, Inc 2015 -if getent passwd | grep "^wazuh"; then +if getent passwd wazuh; then userdel wazuh fi -if getent group | grep "^wazuh"; then +if getent group wazuh; then groupdel wazuh fi diff --git a/solaris/solaris10/preinstall.sh b/solaris/solaris10/preinstall.sh index 9d2fbcf2b4..9b5e7d17f0 100755 --- a/solaris/solaris10/preinstall.sh +++ b/solaris/solaris10/preinstall.sh @@ -39,7 +39,7 @@ if [ "$?" -eq 1 ]; then groupadd ${GROUP} fi -getent passwd | grep "^wazuh" +getent passwd wazuh if [ "$?" -eq 1 ]; then useradd -d ${DIR} -s ${OSMYSHELL} -g ${GROUP} ${USER} > /dev/null 2>&1 fi From 6051b427a6633c4e511f8094391bf2a853597ff3 Mon Sep 17 00:00:00 2001 From: verdx Date: Mon, 28 Nov 2022 17:15:07 +0100 Subject: [PATCH 020/316] Call pathfix.py to fix shebangs --- stack/dashboard/base/builder.sh | 22 +++------------------- stack/dashboard/base/docker/Dockerfile | 6 +++--- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh index 98b829692d..89b6b3b4e6 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -43,6 +43,9 @@ cd /tmp/output curl -sL https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/"${opensearch_version}"/opensearch-dashboards-"${opensearch_version}"-linux-x64.tar.gz | tar xz +pip3 install pathfix.py +/usr/bin/pathfix.py -pni "/usr/bin/python3 -s" opensearch-dashboards-"${opensearch_version}"-linux-x64 + # Remove unnecessary files and set up configuration mv opensearch-dashboards-* "${base_dir}" cd "${base_dir}" @@ -110,25 +113,6 @@ sed -i 's|If you have forgotten your username or password, please ask your syste sed -i 's|setShouldShowTenantPopup(shouldShowTenantPopup)|setShouldShowTenantPopup(false)|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js gzip -c ./plugins/securityDashboards/target/public/securityDashboards.plugin.js > ./plugins/securityDashboards/target/public/securityDashboards.plugin.js.gz brotli -c ./plugins/securityDashboards/target/public/securityDashboards.plugin.js > ./plugins/securityDashboards/target/public/securityDashboards.plugin.js.br -# Change the python version used, so rmpbuild 4.14 doesn't give an error -sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/pylib/gyp/MSVSSettings_test.py -sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/pylib/gyp/__init__.py -sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/pylib/gyp/flock_tool.py -sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py -sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/pylib/gyp/generator/msvs_test.py -sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/pylib/gyp/easy_xml_test.py -sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/pylib/gyp/common_test.py -sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/pylib/gyp/input_test.py -sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/pylib/gyp/win_tool.py -sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/test_gyp.py -sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/tools/pretty_vcproj.py -sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/tools/pretty_sln.py -sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/tools/graphviz.py -sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/tools/pretty_gyp.py -sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/gyp_main.py -sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ./node_modules/node-gyp/gyp/setup.py -sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' ./node_modules/re2/vendor/re2/make_unicode_groups.py -sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' ./node_modules/re2/vendor/re2/make_unicode_casefold.py # Generate compressed files gzip -c ./plugins/securityDashboards/target/public/securityDashboards.chunk.5.js > ./plugins/securityDashboards/target/public/securityDashboards.chunk.5.js.gz diff --git a/stack/dashboard/base/docker/Dockerfile b/stack/dashboard/base/docker/Dockerfile index 58595a0296..382987b125 100644 --- a/stack/dashboard/base/docker/Dockerfile +++ b/stack/dashboard/base/docker/Dockerfile @@ -15,15 +15,15 @@ RUN yum install -y \ gzip \ autoconf \ automake \ - libtool + libtool \ + python3-devel \ + python3-pip RUN git clone https://github.com/google/brotli.git RUN cd brotli && ./bootstrap && ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/sbin --libexecdir=/usr/lib64/brotli --libdir=/usr/lib64/brotli --datarootdir=/usr/share --mandir=/usr/share/man/man1 --docdir=/usr/share/doc \ && make && make install - - # Add the scripts to build the RPM package ADD builder.sh /usr/local/bin/builder RUN chmod +x /usr/local/bin/builder From 343a83510ad0658bb470f9e715a0b4c2572a9c5a Mon Sep 17 00:00:00 2001 From: DFolchA Date: Wed, 30 Nov 2022 17:35:04 +0100 Subject: [PATCH 021/316] Set repository before upgrading --- unattended_installer/install_functions/installMain.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index ce79675f2a..d747b7377e 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -226,6 +226,7 @@ function main() { # -------------- Upgrade case ------------------------------------ if [ -n "${upgrade}" ]; then + installCommon_addWazuhRepo upgrade_upgradeInstalled exit 0 fi From c2f13343eaba2687cbf4356b33b590987a5a02db Mon Sep 17 00:00:00 2001 From: DFolchA Date: Wed, 30 Nov 2022 17:36:20 +0100 Subject: [PATCH 022/316] Get version when checking if componets are installed --- unattended_installer/common_functions/common.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/unattended_installer/common_functions/common.sh b/unattended_installer/common_functions/common.sh index b38315b781..b0aa687940 100644 --- a/unattended_installer/common_functions/common.sh +++ b/unattended_installer/common_functions/common.sh @@ -68,9 +68,9 @@ function common_checkInstalled() { dashboard_installed="" if [ "${sys_type}" == "yum" ]; then - wazuh_installed=$(yum list installed 2>/dev/null | grep wazuh-manager) + wazuh_installed=$(yum list installed 2>/dev/null | grep wazuh-manager | sed 's/ */ /g'| cut -d' ' -f2 | sed "s/-.*//g") elif [ "${sys_type}" == "apt-get" ]; then - wazuh_installed=$(apt list --installed 2>/dev/null | grep wazuh-manager) + wazuh_installed=$(apt list --installed 2>/dev/null | grep wazuh-manager | cut -d' ' -f2 | sed -e "s/-.*//") fi if [ -d "/var/ossec" ]; then @@ -78,9 +78,9 @@ function common_checkInstalled() { fi if [ "${sys_type}" == "yum" ]; then - indexer_installed=$(yum list installed 2>/dev/null | grep wazuh-indexer) + indexer_installed=$(yum list installed 2>/dev/null | grep wazuh-indexer | sed 's/ */ /g'| cut -d' ' -f2 | sed "s/-.*//g") elif [ "${sys_type}" == "apt-get" ]; then - indexer_installed=$(apt list --installed 2>/dev/null | grep wazuh-indexer) + indexer_installed=$(apt list --installed 2>/dev/null | grep wazuh-indexer | cut -d' ' -f2 | sed -e "s/-.*//") fi if [ -d "/var/lib/wazuh-indexer/" ] || [ -d "/usr/share/wazuh-indexer" ] || [ -d "/etc/wazuh-indexer" ] || [ -f "${base_path}/search-guard-tlstool*" ]; then @@ -88,9 +88,9 @@ function common_checkInstalled() { fi if [ "${sys_type}" == "yum" ]; then - filebeat_installed=$(yum list installed 2>/dev/null | grep filebeat) + filebeat_installed=$(yum list installed 2>/dev/null | grep filebeat | sed 's/ */ /g'| cut -d' ' -f2 | sed "s/-.*//g") elif [ "${sys_type}" == "apt-get" ]; then - filebeat_installed=$(apt list --installed 2>/dev/null | grep filebeat) + filebeat_installed=$(apt list --installed 2>/dev/null | grep filebeat | cut -d' ' -f2 | sed -e "s/-.*//") fi if [ -d "/var/lib/filebeat/" ] || [ -d "/usr/share/filebeat" ] || [ -d "/etc/filebeat" ]; then @@ -98,9 +98,9 @@ function common_checkInstalled() { fi if [ "${sys_type}" == "yum" ]; then - dashboard_installed=$(yum list installed 2>/dev/null | grep wazuh-dashboard) + dashboard_installed=$(yum list installed 2>/dev/null | grep wazuh-dashboard | sed 's/ */ /g'| cut -d' ' -f2 | sed "s/-.*//g") elif [ "${sys_type}" == "apt-get" ]; then - dashboard_installed=$(apt list --installed 2>/dev/null | grep wazuh-dashboard) + dashboard_installed=$(apt list --installed 2>/dev/null | grep wazuh-dashboard | cut -d' ' -f2 | sed -e "s/-.*//") fi if [ -d "/var/lib/wazuh-dashboard/" ] || [ -d "/usr/share/wazuh-dashboard" ] || [ -d "/etc/wazuh-dashboard" ] || [ -d "/run/wazuh-dashboard/" ]; then From 75c04718436ceb16a76f872a3c62a197811d937e Mon Sep 17 00:00:00 2001 From: DFolchA Date: Wed, 30 Nov 2022 17:36:44 +0100 Subject: [PATCH 023/316] Improve upgrade_getUpgradable function --- .../install_functions/upgrade.sh | 60 ++++++++----------- 1 file changed, 24 insertions(+), 36 deletions(-) diff --git a/unattended_installer/install_functions/upgrade.sh b/unattended_installer/install_functions/upgrade.sh index 3e6d00ebff..dd2e7b7006 100644 --- a/unattended_installer/install_functions/upgrade.sh +++ b/unattended_installer/install_functions/upgrade.sh @@ -11,17 +11,17 @@ function upgrade_getUpgradable { if [ -n "${wazuh_installed}" ]; then if [ "${sys_type}" == "yum" ]; then - manager_upgradable=$(yum check-update wazuh-manager | grep wazuh-manager | sed 's/ */ /g'| cut -d' ' -f2 | sed "s/-.*//g") + manager_upgradable=$(yum list wazuh-manager --show-duplicates | tail -n +8 | grep -A 5000 ${wazuh_installed} | grep ${wazuh_version} | tail -n +2) elif [ "${sys_type}" == "apt-get" ]; then - manager_upgradable=$(apt list wazuh-manager -a 2>/dev/null | grep "upgradable from" | cut -d' ' -f2 | sed -e "s/-.*//") + manager_upgradable=$(apt-get install wazuh-manager=${wazuh_version}-* --dry-run |grep "The following packages will be upgraded:") fi fi if [ -n "${filebeat_installed}" ]; then if [ "${sys_type}" == "yum" ]; then - filebeat_upgradable=$(yum check-update filebeat | grep filebeat | sed 's/ */ /g'| cut -d' ' -f2 | sed "s/-.*//g") + filebeat_upgradable=$(yum list filebeat --show-duplicates | tail -n +8 | grep -A 5000 ${filebeat_installed} | grep ${filebeat_version} | tail -n +2) elif [ "${sys_type}" == "apt-get" ]; then - filebeat_upgradable=$(apt list filebeat -a 2>/dev/null | grep "upgradable from" | cut -d' ' -f2 | sed -e "s/-.*//") + filebeat_upgradable=$(apt-get install filebeat=${filebeat_version} --dry-run |grep "The following packages will be upgraded:") fi installed_module_version=$(cat /usr/share/filebeat/module/wazuh/alerts/manifest.yml | grep "module_version" | cut -d" " -f2) installed_module_version_major=$(echo ${installed_module_version} | cut -d"." -f1) @@ -35,17 +35,17 @@ function upgrade_getUpgradable { if [ -n "${indexer_installed}" ]; then if [ "${sys_type}" == "yum" ]; then - indexer_upgradable=$(yum check-update wazuh-indexer | grep wazuh-indexer | sed 's/ */ /g'| cut -d' ' -f2 | sed "s/-.*//g") + indexer_upgradable=$(yum list wazuh-indexer --show-duplicates | tail -n +8 | grep -A 5000 ${wazuh_installed} | grep ${wazuh_version} | tail -n +2) elif [ "${sys_type}" == "apt-get" ]; then - indexer_upgradable=$(apt list wazuh-indexer -a 2>/dev/null | grep "upgradable from" | cut -d' ' -f2 | sed -e "s/-.*//") + indexer_upgradable=$(apt-get install wazuh-indexer=${wazuh_version}-* --dry-run |grep "The following packages will be upgraded:") fi fi if [ -n "${dashboard_installed}" ]; then if [ "${sys_type}" == "yum" ]; then - dashboard_upgradable=$(yum check-update wazuh-dashboard | grep wazuh-dashboard | sed 's/ */ /g'| cut -d' ' -f2 | sed "s/-.*//g") + dashboard_upgradable=$(yum list wazuh-dashboard --show-duplicates | tail -n +8 | grep -A 5000 ${wazuh_installed} | grep ${wazuh_version} | tail -n +2) elif [ "${sys_type}" == "apt-get" ]; then - dashboard_upgradable=$(apt list wazuh-dashboard -a 2>/dev/null | grep "upgradable from" | cut -d' ' -f2 | sed -e "s/-.*//") + dashboard_upgradable=$(apt-get install wazuh-dashboard=${wazuh_version}-* --dry-run |grep "The following packages will be upgraded:") fi fi @@ -60,27 +60,21 @@ function upgrade_upgradeInstalled(){ if [ -n "${wazuh_installed}" ]; then if [ -n "${manager_upgradable}" ]; then - if [ "${manager_upgradable}" == "${wazuh_version}" ]; then - common_logger "Upgrading Wazuh Manager to ${manager_upgradable}" - eval "manager_install ${debug}" - else - common_logger -w "Wazuh manager can be upgraded but the version does not match the installation assistant version" - fi + common_logger "Upgrading Wazuh Manager to ${wazuh_version}" + eval "manager_install ${debug}" + installCommon_startService "wazuh-manager" else - common_logger -w "Wazuh manager is already installed and is up to date." + common_logger -w "Wazuh manager is already installed and the version is equal or greater than ${wazuh_version}." fi fi if [ -n "${filebeat_installed}" ]; then if [ -n "${filebeat_upgradable}" ]; then - if [ "${filebeat_upgradable}" == "${filebeat_version}" ]; then - common_logger "Upgrading Filebeat to ${filebeat_upgradable}" - eval "filebeat_install ${debug}" - else - common_logger -w "Filebeat can be upgraded but the version does not match the installation assistant version" - fi + common_logger "Upgrading Filebeat to ${filebeat_version}" + eval "filebeat_install ${debug}" + installCommon_startService "filebeat" else - common_logger -w "Filebeat is already installed and is up to date." + common_logger -w "Filebeat is already installed and the version is equal or greater than ${filebeat_version}." fi if [ -n ${module_upgradable} ];then @@ -91,27 +85,21 @@ function upgrade_upgradeInstalled(){ if [ -n "${indexer_installed}" ]; then if [ -n "${indexer_upgradable}" ]; then - if [ "${indexer_upgradable}" == "${wazuh_version}" ]; then - common_logger "Upgrading Wazuh Indexer to ${indexer_upgradable}" - eval "indexer_install ${debug}" - else - common_logger -w "Wazuh Indexer can be upgraded but the version does not match the installation assistant version" - fi + common_logger "Upgrading Wazuh Indexer to ${wazuh_version}" + eval "indexer_install ${debug}" + installCommon_startService "wazuh-indexer" else - common_logger -w "Wazuh Indexer is already installed and is up to date." + common_logger -w "Wazuh Indexer is already installed and the version is equal or greater than ${wazuh_version}." fi fi if [ -n "${dashboard_installed}" ]; then if [ -n "${dashboard_upgradable}" ]; then - if [ "${dashboard_upgradable}" == "${wazuh_version}" ]; then - common_logger "Upgrading Wazuh Dashboard to ${dashboard_upgradable}" - eval "dashboard_install ${debug}" - else - common_logger -w "Wazuh Dashboard can be upgraded but the version does not match the installation assistant version" - fi + common_logger "Upgrading Wazuh Dashboard to ${wazuh_version}" + eval "dashboard_install ${debug}" + installCommon_startService "wazuh-dashboard" else - common_logger -w "Wazuh Dashboard is already installed and is up to date." + common_logger -w "Wazuh Dashboard is already installed and the version is equal or greater than ${wazuh_version}." fi fi From c32120bbbe56fc8c26a39616fe2d02e573a81565 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Thu, 1 Dec 2022 09:12:15 +0100 Subject: [PATCH 024/316] Remove -e from sed and use tail after grep --- unattended_installer/common_functions/common.sh | 8 ++++---- unattended_installer/install_functions/upgrade.sh | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/unattended_installer/common_functions/common.sh b/unattended_installer/common_functions/common.sh index b0aa687940..cecd6b542d 100644 --- a/unattended_installer/common_functions/common.sh +++ b/unattended_installer/common_functions/common.sh @@ -70,7 +70,7 @@ function common_checkInstalled() { if [ "${sys_type}" == "yum" ]; then wazuh_installed=$(yum list installed 2>/dev/null | grep wazuh-manager | sed 's/ */ /g'| cut -d' ' -f2 | sed "s/-.*//g") elif [ "${sys_type}" == "apt-get" ]; then - wazuh_installed=$(apt list --installed 2>/dev/null | grep wazuh-manager | cut -d' ' -f2 | sed -e "s/-.*//") + wazuh_installed=$(apt list --installed 2>/dev/null | grep wazuh-manager | cut -d' ' -f2 | sed "s/-.*//") fi if [ -d "/var/ossec" ]; then @@ -80,7 +80,7 @@ function common_checkInstalled() { if [ "${sys_type}" == "yum" ]; then indexer_installed=$(yum list installed 2>/dev/null | grep wazuh-indexer | sed 's/ */ /g'| cut -d' ' -f2 | sed "s/-.*//g") elif [ "${sys_type}" == "apt-get" ]; then - indexer_installed=$(apt list --installed 2>/dev/null | grep wazuh-indexer | cut -d' ' -f2 | sed -e "s/-.*//") + indexer_installed=$(apt list --installed 2>/dev/null | grep wazuh-indexer | cut -d' ' -f2 | sed "s/-.*//") fi if [ -d "/var/lib/wazuh-indexer/" ] || [ -d "/usr/share/wazuh-indexer" ] || [ -d "/etc/wazuh-indexer" ] || [ -f "${base_path}/search-guard-tlstool*" ]; then @@ -90,7 +90,7 @@ function common_checkInstalled() { if [ "${sys_type}" == "yum" ]; then filebeat_installed=$(yum list installed 2>/dev/null | grep filebeat | sed 's/ */ /g'| cut -d' ' -f2 | sed "s/-.*//g") elif [ "${sys_type}" == "apt-get" ]; then - filebeat_installed=$(apt list --installed 2>/dev/null | grep filebeat | cut -d' ' -f2 | sed -e "s/-.*//") + filebeat_installed=$(apt list --installed 2>/dev/null | grep filebeat | cut -d' ' -f2 | sed "s/-.*//") fi if [ -d "/var/lib/filebeat/" ] || [ -d "/usr/share/filebeat" ] || [ -d "/etc/filebeat" ]; then @@ -100,7 +100,7 @@ function common_checkInstalled() { if [ "${sys_type}" == "yum" ]; then dashboard_installed=$(yum list installed 2>/dev/null | grep wazuh-dashboard | sed 's/ */ /g'| cut -d' ' -f2 | sed "s/-.*//g") elif [ "${sys_type}" == "apt-get" ]; then - dashboard_installed=$(apt list --installed 2>/dev/null | grep wazuh-dashboard | cut -d' ' -f2 | sed -e "s/-.*//") + dashboard_installed=$(apt list --installed 2>/dev/null | grep wazuh-dashboard | cut -d' ' -f2 | sed "s/-.*//") fi if [ -d "/var/lib/wazuh-dashboard/" ] || [ -d "/usr/share/wazuh-dashboard" ] || [ -d "/etc/wazuh-dashboard" ] || [ -d "/run/wazuh-dashboard/" ]; then diff --git a/unattended_installer/install_functions/upgrade.sh b/unattended_installer/install_functions/upgrade.sh index dd2e7b7006..55f9d47a83 100644 --- a/unattended_installer/install_functions/upgrade.sh +++ b/unattended_installer/install_functions/upgrade.sh @@ -11,7 +11,7 @@ function upgrade_getUpgradable { if [ -n "${wazuh_installed}" ]; then if [ "${sys_type}" == "yum" ]; then - manager_upgradable=$(yum list wazuh-manager --show-duplicates | tail -n +8 | grep -A 5000 ${wazuh_installed} | grep ${wazuh_version} | tail -n +2) + manager_upgradable=$(yum list wazuh-manager --show-duplicates | tail -n +8 | grep -A 5000 ${wazuh_installed} | tail -n +2 | grep ${wazuh_version}) elif [ "${sys_type}" == "apt-get" ]; then manager_upgradable=$(apt-get install wazuh-manager=${wazuh_version}-* --dry-run |grep "The following packages will be upgraded:") fi @@ -19,7 +19,7 @@ function upgrade_getUpgradable { if [ -n "${filebeat_installed}" ]; then if [ "${sys_type}" == "yum" ]; then - filebeat_upgradable=$(yum list filebeat --show-duplicates | tail -n +8 | grep -A 5000 ${filebeat_installed} | grep ${filebeat_version} | tail -n +2) + filebeat_upgradable=$(yum list filebeat --show-duplicates | tail -n +8 | grep -A 5000 ${filebeat_installed} | tail -n +2 | grep ${filebeat_version}) elif [ "${sys_type}" == "apt-get" ]; then filebeat_upgradable=$(apt-get install filebeat=${filebeat_version} --dry-run |grep "The following packages will be upgraded:") fi @@ -35,7 +35,7 @@ function upgrade_getUpgradable { if [ -n "${indexer_installed}" ]; then if [ "${sys_type}" == "yum" ]; then - indexer_upgradable=$(yum list wazuh-indexer --show-duplicates | tail -n +8 | grep -A 5000 ${wazuh_installed} | grep ${wazuh_version} | tail -n +2) + indexer_upgradable=$(yum list wazuh-indexer --show-duplicates | tail -n +8 | grep -A 5000 ${wazuh_installed} | tail -n +2 | grep ${wazuh_version}) elif [ "${sys_type}" == "apt-get" ]; then indexer_upgradable=$(apt-get install wazuh-indexer=${wazuh_version}-* --dry-run |grep "The following packages will be upgraded:") fi @@ -43,7 +43,7 @@ function upgrade_getUpgradable { if [ -n "${dashboard_installed}" ]; then if [ "${sys_type}" == "yum" ]; then - dashboard_upgradable=$(yum list wazuh-dashboard --show-duplicates | tail -n +8 | grep -A 5000 ${wazuh_installed} | grep ${wazuh_version} | tail -n +2) + dashboard_upgradable=$(yum list wazuh-dashboard --show-duplicates | tail -n +8 | grep -A 5000 ${wazuh_installed} | tail -n +2 | grep ${wazuh_version}) elif [ "${sys_type}" == "apt-get" ]; then dashboard_upgradable=$(apt-get install wazuh-dashboard=${wazuh_version}-* --dry-run |grep "The following packages will be upgraded:") fi From 629dc9f5910f31524917dd2c04beebe4a5b4a8bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Wed, 7 Dec 2022 16:18:02 +0100 Subject: [PATCH 025/316] Update wazuh-manager.spec --- rpms/SPECS/wazuh-manager.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index c90396f5bb..a1214465fa 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -833,7 +833,7 @@ rm -fr %{buildroot} %changelog -* Thu Dic 08 2022 support - 4.3.11 +* Thu Dec 08 2022 support - 4.3.11 - More info: https://documentation.wazuh.com/current/release-notes/ * Thu Nov 10 2022 support - 4.3.10 - More info: https://documentation.wazuh.com/current/release-notes/ From b495b898c6e322d5deea7d23601965097f42b704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Wed, 7 Dec 2022 16:18:24 +0100 Subject: [PATCH 026/316] Update wazuh-agent.spec --- rpms/SPECS/wazuh-agent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index e7038bd2a2..3d48266403 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -617,7 +617,7 @@ rm -fr %{buildroot} %changelog -* Thu Dic 08 2022 support - 4.3.11 +* Thu Dec 08 2022 support - 4.3.11 - More info: https://documentation.wazuh.com/current/release-notes/ * Thu Nov 10 2022 support - 4.3.10 - More info: https://documentation.wazuh.com/current/release-notes/ From 633c6ca995650e698888b1a3c7bd9c4acdc4f16c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Wed, 7 Dec 2022 16:18:53 +0100 Subject: [PATCH 027/316] Update changelog --- debs/SPECS/wazuh-agent/debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 59f75852b3..dc6fbd4b59 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,7 +2,7 @@ wazuh-agent (4.3.11-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ - -- Wazuh, Inc Thu, 08 Dic 2022 15:00:00 +0000 + -- Wazuh, Inc Thu, 08 Dec 2022 15:00:00 +0000 wazuh-agent (4.3.10-RELEASE) stable; urgency=low From cfb386917011c409a7272b91f0ad13df205e2564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Wed, 7 Dec 2022 16:19:08 +0100 Subject: [PATCH 028/316] Update changelog --- debs/SPECS/wazuh-manager/debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index bbc4ed2dc8..d09eb8a733 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,7 +2,7 @@ wazuh-manager (4.3.11-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ - -- Wazuh, Inc Thu, 08 Dic 2022 15:00:00 +0000 + -- Wazuh, Inc Thu, 08 Dec 2022 15:00:00 +0000 wazuh-manager (4.3.10-RELEASE) stable; urgency=low From 43401303fc3b3024dac01ea9c20d38e80875e458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Wed, 7 Dec 2022 16:19:37 +0100 Subject: [PATCH 029/316] Update wazuh-agent-aix.spec --- aix/SPECS/wazuh-agent-aix.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 6e850ce3b3..fed874180c 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 -* Thu Dic 08 2022 support - 4.3.11 +* Thu Dec 08 2022 support - 4.3.11 - More info: https://documentation.wazuh.com/current/release-notes/ * Thu Nov 10 2022 support - 4.3.10 - More info: https://documentation.wazuh.com/current/release-notes/ From cf6fd202ffff0c76155e59d5adf7559858e7636a Mon Sep 17 00:00:00 2001 From: c-bordon Date: Wed, 14 Dec 2022 16:06:41 -0300 Subject: [PATCH 030/316] Removed init.d service for Wazuh dashboard rpm --- stack/dashboard/rpm/wazuh-dashboard.spec | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 362c09fe3a..e0cabf49a9 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -75,9 +75,7 @@ mkdir -p %{buildroot}%{INSTALL_DIR}/config cp %{buildroot}%{INSTALL_DIR}/etc/services/wazuh-dashboard.service %{buildroot}/etc/systemd/system/wazuh-dashboard.service cp %{buildroot}%{INSTALL_DIR}/etc/services/default %{buildroot}/etc/default/wazuh-dashboard -cp %{buildroot}%{INSTALL_DIR}/etc/services/wazuh-dashboard %{buildroot}%{_initrddir}/wazuh-dashboard -chmod 750 %{buildroot}%{_initrddir}/wazuh-dashboard chmod 640 %{buildroot}/etc/systemd/system/wazuh-dashboard.service chmod 640 %{buildroot}/etc/default/wazuh-dashboard @@ -87,7 +85,6 @@ find %{buildroot}%{INSTALL_DIR} -exec chown %{USER}:%{GROUP} {} \; find %{buildroot}%{CONFIG_DIR} -exec chown %{USER}:%{GROUP} {} \; chown root:root %{buildroot}/etc/systemd/system/wazuh-dashboard.service -chown root:root %{buildroot}%{_initrddir}/wazuh-dashboard if [ "%{version}" = "99.99.0" ];then runuser %{USER} --shell="/bin/bash" --command="%{buildroot}%{INSTALL_DIR}/bin/opensearch-dashboards-plugin install https://packages-dev.wazuh.com/futures/ui/dashboard/wazuh-99.99.0-%{release}.zip" @@ -139,13 +136,6 @@ if [ ! -f %{INSTALLATION_DIR}/config/opensearch_dashboards.keystore ]; then runuser %{USER} --shell="/bin/bash" --command="echo kibanaserver | %{INSTALL_DIR}/bin/opensearch-dashboards-keystore add opensearch.password --stdin" > /dev/null 2>&1 fi -if [ -f /etc/os-release ]; then - source /etc/os-release - if [ "${NAME}" = "Red Hat Enterprise Linux" ] && [ "$((${VERSION_ID:0:1}))" -ge 9 ]; then - rm -f %{_initrddir}/wazuh-dashboard - fi -fi - # ----------------------------------------------------------------------------- %preun @@ -214,7 +204,6 @@ rm -fr %{buildroot} %defattr(-,%{USER},%{GROUP}) %dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR} -%config(missingok) "%{_initrddir}/wazuh-dashboard" %attr(0750, %{USER}, %{GROUP}) "/etc/default/wazuh-dashboard" %config(noreplace) %attr(0640, %{USER}, %{GROUP}) "%{CONFIG_DIR}/opensearch_dashboards.yml" %attr(440, %{USER}, %{GROUP}) %{INSTALL_DIR}/VERSION From 41857f494253ae7db8ed88d233aa49ca7f91dcb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 15 Dec 2022 13:39:27 +0100 Subject: [PATCH 031/316] Add double-quotes around ips in Yaml files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- documentation-templates/wazuh/config.yml | 14 +++++++------- .../config/certificate/config.yml | 18 +++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/documentation-templates/wazuh/config.yml b/documentation-templates/wazuh/config.yml index 73b1f5d559..13cfe54586 100644 --- a/documentation-templates/wazuh/config.yml +++ b/documentation-templates/wazuh/config.yml @@ -2,27 +2,27 @@ nodes: # Wazuh indexer nodes indexer: - name: node-1 - ip: + ip: "" #- name: node-2 - # ip: + # ip: "" #- name: node-3 - # ip: + # ip: "" # Wazuh server nodes # If there is more than one Wazuh server # node, each one must have a node_type server: - name: wazuh-1 - ip: + ip: "" # node_type: master #- name: wazuh-2 - # ip: + # ip: "" # node_type: worker #- name: wazuh-3 - # ip: + # ip: "" # node_type: worker # Wazuh dashboard nodes dashboard: - name: dashboard - ip: \ No newline at end of file + ip: "" \ No newline at end of file diff --git a/unattended_installer/config/certificate/config.yml b/unattended_installer/config/certificate/config.yml index e350770c95..3cbdccf5db 100644 --- a/unattended_installer/config/certificate/config.yml +++ b/unattended_installer/config/certificate/config.yml @@ -2,25 +2,25 @@ nodes: # Wazuh indexer nodes indexer: - name: indexer-1 - ip: + ip: "" - name: indexer-2 - ip: + ip: "" - name: indexer-3 - ip: + ip: "" server: - name: server-1 - ip: + ip: "" node_type: master - name: server-2 - ip: + ip: "" node_type: worker - name: server-3 - ip: + ip: "" node_type: worker dashboard: - name: dashboard-1 - ip: + ip: "" - name: dashboard-2 - ip: + ip: "" - name: dashboard-3 - ip: \ No newline at end of file + ip: "" \ No newline at end of file From a03393836a14545a398909ac8d6fa10b4449409c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 15 Dec 2022 13:39:52 +0100 Subject: [PATCH 032/316] Add invalid IP error for the ones in config.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- unattended_installer/cert_tool/certFunctions.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/unattended_installer/cert_tool/certFunctions.sh b/unattended_installer/cert_tool/certFunctions.sh index 9066aa6351..7f722fc616 100644 --- a/unattended_installer/cert_tool/certFunctions.sh +++ b/unattended_installer/cert_tool/certFunctions.sh @@ -323,6 +323,13 @@ function cert_readConfig() { eval "number_server_ips=( $(cert_parseYaml "${config_file}" | grep -o -E 'nodes_server_[0-9]_ip' | sort -u | wc -l) )" fi + for ip in $(echo "${indexer_node_ips[@]}" "${server_node_ips[@]}" "${dashboard_node_ips[@]}"); do + if ! [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then + common_logger -e "Invalid IP address: ${ip}" + exit 1 + fi + done + for i in $(seq 1 "${number_server_ips}"); do nodes_server=nodes__server__"${i}"__ip eval "server_node_ip_$i=( $( cert_parseYaml "${config_file}" | grep "${nodes_server}" | sed '/\./!d' | cut -d = -f 2 | sed -r 's/\s+//g') )" From b280ee2ff21b7f9111c91fc4cf4ea98838434010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 15 Dec 2022 13:48:32 +0100 Subject: [PATCH 033/316] Revert "Add invalid IP error for the ones in config.yml" This reverts commit a03393836a14545a398909ac8d6fa10b4449409c. --- unattended_installer/cert_tool/certFunctions.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/unattended_installer/cert_tool/certFunctions.sh b/unattended_installer/cert_tool/certFunctions.sh index 7f722fc616..9066aa6351 100644 --- a/unattended_installer/cert_tool/certFunctions.sh +++ b/unattended_installer/cert_tool/certFunctions.sh @@ -323,13 +323,6 @@ function cert_readConfig() { eval "number_server_ips=( $(cert_parseYaml "${config_file}" | grep -o -E 'nodes_server_[0-9]_ip' | sort -u | wc -l) )" fi - for ip in $(echo "${indexer_node_ips[@]}" "${server_node_ips[@]}" "${dashboard_node_ips[@]}"); do - if ! [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then - common_logger -e "Invalid IP address: ${ip}" - exit 1 - fi - done - for i in $(seq 1 "${number_server_ips}"); do nodes_server=nodes__server__"${i}"__ip eval "server_node_ip_$i=( $( cert_parseYaml "${config_file}" | grep "${nodes_server}" | sed '/\./!d' | cut -d = -f 2 | sed -r 's/\s+//g') )" From 04ad2e613d4b0ee31450c9a222585130b1a0b88c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 15 Dec 2022 14:16:03 +0100 Subject: [PATCH 034/316] Remove line that removes necessary files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- macos/generate_wazuh_packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macos/generate_wazuh_packages.sh b/macos/generate_wazuh_packages.sh index af9ef12b49..fb035d845f 100755 --- a/macos/generate_wazuh_packages.sh +++ b/macos/generate_wazuh_packages.sh @@ -37,8 +37,8 @@ trap ctrl_c INT function clean_and_exit() { exit_code=$1 - rm -f ${AGENT_PKG_FILE} ${CURRENT_PATH}/package_files/*.sh rm -rf "${SOURCES_DIRECTORY}" + rm "${CURRENT_PATH}"/specs/wazuh-agent.pkgproj-e ${CURRENT_PATH}/uninstall.sh exit ${exit_code} } From a960f51a27af5f44bd9b702ddac1824f8b58d2d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 15 Dec 2022 14:16:17 +0100 Subject: [PATCH 035/316] Fixes in macos uninstall.sh file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- macos/uninstall.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/macos/uninstall.sh b/macos/uninstall.sh index 169ed9fce6..9e65547359 100755 --- a/macos/uninstall.sh +++ b/macos/uninstall.sh @@ -1,29 +1,29 @@ -#/bin/sh +#!/bin/sh ## Stop and remove application -sudo /Library/Ossec/bin/ossec-control stop -sudo /bin/rm -r /Library/Ossec* +/Library/Ossec/bin/ossec-control stop +/bin/rm -r /Library/Ossec* ## stop and unload dispatcher -#sudo /bin/launchctl unload /Library/LaunchDaemons/com.wazuh.agent.plist +/bin/launchctl unload /Library/LaunchDaemons/com.wazuh.agent.plist # remove launchdaemons -sudo /bin/rm -f /Library/LaunchDaemons/com.wazuh.agent.plist +/bin/rm -f /Library/LaunchDaemons/com.wazuh.agent.plist ## remove StartupItems -sudo /bin/rm -rf /Library/StartupItems/WAZUH +/bin/rm -rf /Library/StartupItems/WAZUH ## Remove User and Groups -sudo /usr/bin/dscl . -delete "/Users/wazuh" -sudo /usr/bin/dscl . -delete "/Groups/wazuh" +/usr/bin/dscl . -delete "/Users/wazuh" +/usr/bin/dscl . -delete "/Groups/wazuh" -sudo /usr/sbin/pkgutil --forget com.wazuh.pkg.wazuh-agent -sudo /usr/sbin/pkgutil --forget com.wazuh.pkg.wazuh-agent-etc +/usr/sbin/pkgutil --forget com.wazuh.pkg.wazuh-agent +/usr/sbin/pkgutil --forget com.wazuh.pkg.wazuh-agent-etc # In case it was installed via Puppet pkgdmg provider if [ -e /var/db/.puppet_pkgdmg_installed_wazuh-agent ]; then - sudo rm -f /var/db/.puppet_pkgdmg_installed_wazuh-agent + rm -f /var/db/.puppet_pkgdmg_installed_wazuh-agent fi echo From bd43adf1e8629e2c5004c5183f7afb5563f91ffd Mon Sep 17 00:00:00 2001 From: DFolchA Date: Thu, 15 Dec 2022 17:59:09 +0100 Subject: [PATCH 036/316] Update --show-duplicates to --showduplicates --- unattended_installer/install_functions/upgrade.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/unattended_installer/install_functions/upgrade.sh b/unattended_installer/install_functions/upgrade.sh index 55f9d47a83..987d61b599 100644 --- a/unattended_installer/install_functions/upgrade.sh +++ b/unattended_installer/install_functions/upgrade.sh @@ -11,7 +11,7 @@ function upgrade_getUpgradable { if [ -n "${wazuh_installed}" ]; then if [ "${sys_type}" == "yum" ]; then - manager_upgradable=$(yum list wazuh-manager --show-duplicates | tail -n +8 | grep -A 5000 ${wazuh_installed} | tail -n +2 | grep ${wazuh_version}) + manager_upgradable=$(yum list wazuh-manager --showduplicates | tail -n +8 | grep -A 5000 ${wazuh_installed} | tail -n +2 | grep ${wazuh_version}) elif [ "${sys_type}" == "apt-get" ]; then manager_upgradable=$(apt-get install wazuh-manager=${wazuh_version}-* --dry-run |grep "The following packages will be upgraded:") fi @@ -19,7 +19,7 @@ function upgrade_getUpgradable { if [ -n "${filebeat_installed}" ]; then if [ "${sys_type}" == "yum" ]; then - filebeat_upgradable=$(yum list filebeat --show-duplicates | tail -n +8 | grep -A 5000 ${filebeat_installed} | tail -n +2 | grep ${filebeat_version}) + filebeat_upgradable=$(yum list filebeat --showduplicates | tail -n +8 | grep -A 5000 ${filebeat_installed} | tail -n +2 | grep ${filebeat_version}) elif [ "${sys_type}" == "apt-get" ]; then filebeat_upgradable=$(apt-get install filebeat=${filebeat_version} --dry-run |grep "The following packages will be upgraded:") fi @@ -35,7 +35,7 @@ function upgrade_getUpgradable { if [ -n "${indexer_installed}" ]; then if [ "${sys_type}" == "yum" ]; then - indexer_upgradable=$(yum list wazuh-indexer --show-duplicates | tail -n +8 | grep -A 5000 ${wazuh_installed} | tail -n +2 | grep ${wazuh_version}) + indexer_upgradable=$(yum list wazuh-indexer --showduplicates | tail -n +8 | grep -A 5000 ${wazuh_installed} | tail -n +2 | grep ${wazuh_version}) elif [ "${sys_type}" == "apt-get" ]; then indexer_upgradable=$(apt-get install wazuh-indexer=${wazuh_version}-* --dry-run |grep "The following packages will be upgraded:") fi @@ -43,7 +43,7 @@ function upgrade_getUpgradable { if [ -n "${dashboard_installed}" ]; then if [ "${sys_type}" == "yum" ]; then - dashboard_upgradable=$(yum list wazuh-dashboard --show-duplicates | tail -n +8 | grep -A 5000 ${wazuh_installed} | tail -n +2 | grep ${wazuh_version}) + dashboard_upgradable=$(yum list wazuh-dashboard --showduplicates | tail -n +8 | grep -A 5000 ${wazuh_installed} | tail -n +2 | grep ${wazuh_version}) elif [ "${sys_type}" == "apt-get" ]; then dashboard_upgradable=$(apt-get install wazuh-dashboard=${wazuh_version}-* --dry-run |grep "The following packages will be upgraded:") fi From b94dbb3db1b1cdc22f0692f89b9304aaa599d796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 19 Dec 2022 11:54:22 +0100 Subject: [PATCH 037/316] Changed building machine to rocky 8.5 and added source payload --- stack/dashboard/rpm/docker/x86_64/Dockerfile | 6 +++--- stack/dashboard/rpm/wazuh-dashboard.spec | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/stack/dashboard/rpm/docker/x86_64/Dockerfile b/stack/dashboard/rpm/docker/x86_64/Dockerfile index 5f26e12a38..b2cc8ad5d5 100644 --- a/stack/dashboard/rpm/docker/x86_64/Dockerfile +++ b/stack/dashboard/rpm/docker/x86_64/Dockerfile @@ -1,7 +1,7 @@ -FROM rockylinux:9 +FROM rockylinux:8.5 # Install all the necessary tools to build the packages -RUN yum clean all && yum update -y +RUN yum clean all RUN yum install -y openssh-clients sudo gnupg \ yum-utils epel-release redhat-rpm-config rpm-devel \ zlib zlib-devel rpm-build autoconf automake \ @@ -12,4 +12,4 @@ ADD builder.sh /usr/local/bin/builder RUN chmod +x /usr/local/bin/builder # Set the entrypoint -ENTRYPOINT ["/usr/local/bin/builder"] \ No newline at end of file +ENTRYPOINT ["/usr/local/bin/builder"] diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index eb737d281b..1e800c5863 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -31,6 +31,8 @@ ExclusiveOS: linux %global PID_DIR /run/%{name} %global INSTALL_DIR /usr/share/%{name} %global DASHBOARD_FILE wazuh-dashboard-base-%{version}-%{release}-linux-x64.tar.xz +%define _source_payload gzdio +%define _binary_payload gzdio # ----------------------------------------------------------------------------- @@ -404,4 +406,4 @@ rm -fr %{buildroot} %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/bin/opensearch-dashboards-keystore" %dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/config" %attr(640, %{USER}, %{GROUP}) "%{CONFIG_DIR}/node.options" -%attr(640, %{USER}, %{GROUP}) "/etc/systemd/system/wazuh-dashboard.service" \ No newline at end of file +%attr(640, %{USER}, %{GROUP}) "/etc/systemd/system/wazuh-dashboard.service" From 174f792d66064a3f4546c83af300a7d4cc88de43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 19 Dec 2022 13:03:09 +0100 Subject: [PATCH 038/316] Remove change on Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- stack/dashboard/rpm/docker/x86_64/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/dashboard/rpm/docker/x86_64/Dockerfile b/stack/dashboard/rpm/docker/x86_64/Dockerfile index b2cc8ad5d5..b4ece5ba32 100644 --- a/stack/dashboard/rpm/docker/x86_64/Dockerfile +++ b/stack/dashboard/rpm/docker/x86_64/Dockerfile @@ -1,7 +1,7 @@ FROM rockylinux:8.5 # Install all the necessary tools to build the packages -RUN yum clean all +RUN yum clean all && yum update -y RUN yum install -y openssh-clients sudo gnupg \ yum-utils epel-release redhat-rpm-config rpm-devel \ zlib zlib-devel rpm-build autoconf automake \ From 139f5b88bd2ed7115b3ddfa4d150fa5053c518cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 19 Dec 2022 13:58:07 +0100 Subject: [PATCH 039/316] Fix call to pathfix.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- stack/dashboard/base/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh index e28bb9af03..93b5de7b25 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -49,7 +49,7 @@ cd /opt curl -sL https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/"${opensearch_version}"/opensearch-dashboards-"${opensearch_version}"-linux-${architecture}.tar.gz | tar xz pip3 install pathfix.py -/usr/bin/pathfix.py -pni "/usr/bin/python3 -s" opensearch-dashboards-"${opensearch_version}"-linux-x64 +/usr/bin/pathfix.py -pni "/usr/bin/python3 -s" opensearch-dashboards-"${opensearch_version}"-linux-"${architecture}" # Remove unnecessary files and set up configuration mv opensearch-dashboards-* "${base_dir}" From fa6ad44db143209dd8617a4d0bd3c912b94dfd4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 19 Dec 2022 17:56:18 +0100 Subject: [PATCH 040/316] Make the call to pathfix silent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- stack/dashboard/base/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh index 93b5de7b25..794c5b2612 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -49,7 +49,7 @@ cd /opt curl -sL https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/"${opensearch_version}"/opensearch-dashboards-"${opensearch_version}"-linux-${architecture}.tar.gz | tar xz pip3 install pathfix.py -/usr/bin/pathfix.py -pni "/usr/bin/python3 -s" opensearch-dashboards-"${opensearch_version}"-linux-"${architecture}" +/usr/bin/pathfix.py -pni "/usr/bin/python3 -s" opensearch-dashboards-"${opensearch_version}" > /dev/null 2>&1 # Remove unnecessary files and set up configuration mv opensearch-dashboards-* "${base_dir}" From ed62d4cf5d96525d5156a02b9ed0296b63892b43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 19 Dec 2022 17:56:45 +0100 Subject: [PATCH 041/316] Set the compression to the highest level MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- stack/dashboard/rpm/wazuh-dashboard.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 66fa6b4134..b408336f5a 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -31,8 +31,8 @@ ExclusiveOS: linux %global PID_DIR /run/%{name} %global INSTALL_DIR /usr/share/%{name} %global DASHBOARD_FILE wazuh-dashboard-base-%{version}-%{release}-linux-x64.tar.xz -%define _source_payload gzdio -%define _binary_payload gzdio +%define _source_payload w9.gzdio +%define _binary_payload w9.gzdio # ----------------------------------------------------------------------------- From c6c1cfd4ee1b88e6eab42536085fb5561090cbc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 20 Dec 2022 10:27:16 +0100 Subject: [PATCH 042/316] Remove debug lines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- stack/dashboard/rpm/build_package.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/stack/dashboard/rpm/build_package.sh b/stack/dashboard/rpm/build_package.sh index 8b9aff8a10..71cbcc9ff0 100755 --- a/stack/dashboard/rpm/build_package.sh +++ b/stack/dashboard/rpm/build_package.sh @@ -8,8 +8,6 @@ # License (version 2) as published by the FSF - Free Software # Foundation. -set -e - current_path="$( cd $(dirname $0) ; pwd -P )" architecture="x86_64" outdir="${current_path}/output" From 5d9d5953d2e9a32b945b1b3aa2e740acea13ce57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Fri, 25 Nov 2022 11:56:07 +0100 Subject: [PATCH 043/316] Update changelog --- stack/dashboard/deb/debian/changelog | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 4bbab9becd..6dcc308516 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -1,3 +1,9 @@ +wazuh-dashboard (VERSION-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/ + + -- Wazuh, Inc Wed, 18 Jan 2023 12:31:50 +0000 + wazuh-dashboard (4.4.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ @@ -69,3 +75,9 @@ wazuh-dashboard (4.3.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Thu, 05 May 2022 12:15:57 +0000 + +wazuh-dashboard (4.2.5-1) UNRELEASED; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/ + + -- Wazuh, Inc Mon, 15 Nov 2021 16:47:07 +0000 From 7f60537b4051254a18e8034392eb8b6064d86711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Fri, 25 Nov 2022 11:56:57 +0100 Subject: [PATCH 044/316] Update CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a53a793b2..53f99eb035 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log All notable changes to this project will be documented in this file. +<<<<<<< HEAD +======= +## [v4.5.0] + +- https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.0 + +>>>>>>> 970be0e0 (Update CHANGELOG.md) ## [v4.4.0] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.4.0 From 970f82741e7a3ebdac41f223e0b8f14e93caf4d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Fri, 25 Nov 2022 11:57:20 +0100 Subject: [PATCH 045/316] Update CHANGELOG.md --- CHANGELOG.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53f99eb035..225322024d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,10 @@ # Change Log All notable changes to this project will be documented in this file. -<<<<<<< HEAD -======= + ## [v4.5.0] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.0 ->>>>>>> 970be0e0 (Update CHANGELOG.md) ## [v4.4.0] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.4.0 From a45a96f1a2a7e3727b73732d03dc93f537e25f34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Fri, 25 Nov 2022 12:00:22 +0100 Subject: [PATCH 046/316] Update changelog --- stack/dashboard/deb/debian/changelog | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 6dcc308516..09ac58db75 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -1,76 +1,76 @@ -wazuh-dashboard (VERSION-RELEASE) stable; urgency=low +wazuh-dashboard (VERSION-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Wed, 18 Jan 2023 12:31:50 +0000 -wazuh-dashboard (4.4.0-RELEASE) stable; urgency=low +wazuh-dashboard (4.4.0-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Wed, 18 Jan 2023 12:31:50 +0000 -wazuh-dashboard (4.3.10-RELEASE) stable; urgency=low +wazuh-dashboard (4.3.10-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Thu, 10 Nov 2022 15:00:00 +0000 -wazuh-dashboard (4.3.9-RELEASE) stable; urgency=low +wazuh-dashboard (4.3.9-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Mon, 03 Oct 2022 15:00:00 +0000 -wazuh-dashboard (4.3.8-RELEASE) stable; urgency=low +wazuh-dashboard (4.3.8-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Mon, 19 Sep 2022 15:00:00 +0000 -wazuh-dashboard (4.3.7-RELEASE) stable; urgency=low +wazuh-dashboard (4.3.7-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Mon, 08 Aug 2022 15:00:00 +0000 -wazuh-dashboard (4.3.6-RELEASE) stable; urgency=low +wazuh-dashboard (4.3.6-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Thu, 07 Jul 2022 15:00:00 +0000 -wazuh-dashboard (4.3.5-RELEASE) stable; urgency=low +wazuh-dashboard (4.3.5-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Wed, 29 Jun 2022 15:00:00 +0000 -wazuh-dashboard (4.3.4-RELEASE) stable; urgency=low +wazuh-dashboard (4.3.4-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Tue, 07 Jun 2022 15:41:39 +0000 -wazuh-dashboard (4.3.3-RELEASE) stable; urgency=low +wazuh-dashboard (4.3.3-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Tue, 31 May 2022 15:41:39 +0000 -wazuh-dashboard (4.3.2-RELEASE) stable; urgency=low +wazuh-dashboard (4.3.2-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Mon, 30 May 2022 15:41:39 +0000 -wazuh-dashboard (4.3.1-RELEASE) stable; urgency=low +wazuh-dashboard (4.3.1-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Wed, 18 May 2022 12:14:41 +0000 -wazuh-dashboard (4.3.0-RELEASE) stable; urgency=low +wazuh-dashboard (4.3.0-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ From 9939e08030a1b20dca81d9b85b00a9860de23d43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Fri, 25 Nov 2022 12:02:24 +0100 Subject: [PATCH 047/316] Update changelog --- stack/dashboard/deb/debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 09ac58db75..cbe3bc2e45 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-dashboard (VERSION-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ - -- Wazuh, Inc Wed, 18 Jan 2023 12:31:50 +0000 + -- Wazuh, Inc Fri, 05 May 2023 12:31:50 +0000 wazuh-dashboard (4.4.0-RELEASE) unstable; urgency=low From 244cbc0421814bff54cda706583ed25947a176e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Fri, 25 Nov 2022 12:04:30 +0100 Subject: [PATCH 048/316] Update wazuh-dashboard.spec --- stack/dashboard/rpm/wazuh-dashboard.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index b408336f5a..cd570df4d2 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -399,6 +399,8 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog +* Fri May 05 2023 support - %{version} +- More info: https://documentation.wazuh.com/current/release-notes/ * Wed Jan 18 2023 support - 4.4.0 - More info: https://documentation.wazuh.com/current/release-notes/ * Thu Nov 10 2022 support - 4.3.10 From cf34c80679f8601f4d547c2396902872681d7848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Fri, 25 Nov 2022 12:07:02 +0100 Subject: [PATCH 049/316] Update changelog --- stack/indexer/deb/debian/changelog | 36 ++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index d8f43a0fbc..2b9d0ae8b2 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -1,71 +1,83 @@ -wazuh-indexer (4.4.0-RELEASE) stable; urgency=low +wazuh-dashboard (VERSION-RELEASE) unstable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/ + + -- Wazuh, Inc Fri, 05 May 2023 12:31:50 +0000 + +wazuh-indexer (4.4.0-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Wed, 18 Jan 2023 12:31:50 +0000 -wazuh-indexer (4.3.10-RELEASE) stable; urgency=low +wazuh-indexer (4.3.10-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Thu, 10 Nov 2022 15:00:00 +0000 -wazuh-indexer (4.3.9-RELEASE) stable; urgency=low +wazuh-indexer (4.3.9-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Mon, 03 Oct 2022 15:00:00 +0000 -wazuh-indexer (4.3.8-RELEASE) stable; urgency=low +wazuh-indexer (4.3.8-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Mon, 19 Sep 2022 15:00:00 +0000 -wazuh-indexer (4.3.7-RELEASE) stable; urgency=low +wazuh-indexer (4.3.7-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Mon, 08 Aug 2022 15:00:00 +0000 -wazuh-indexer (4.3.6-RELEASE) stable; urgency=low +wazuh-indexer (4.3.6-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Thu, 07 Jul 2022 15:00:00 +0000 -wazuh-indexer (4.3.5-RELEASE) stable; urgency=low +wazuh-indexer (4.3.5-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Wed, 29 Jun 2022 15:00:00 +0000 -wazuh-indexer (4.3.4-RELEASE) stable; urgency=low +wazuh-indexer (4.3.4-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Tue, 07 Jun 2022 15:41:39 +0000 -wazuh-indexer (4.3.3-RELEASE) stable; urgency=low +wazuh-indexer (4.3.3-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Tue, 31 May 2022 15:41:39 +0000 -wazuh-indexer (4.3.2-RELEASE) stable; urgency=low +wazuh-indexer (4.3.2-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Mon, 30 May 2022 15:41:39 +0000 -wazuh-indexer (4.3.1-RELEASE) stable; urgency=low +wazuh-indexer (4.3.1-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Wed, 18 May 2022 12:14:41 +0000 -wazuh-indexer (4.3.0-RELEASE) stable; urgency=low +wazuh-indexer (4.3.0-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Thu, 05 May 2022 12:15:57 +0000 + + wazuh-indexer (4.2.5-1) UNRELEASED; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/ + + -- Wazuh, Inc Mon, 15 Nov 2021 16:47:07 +0000 From 8f2d4588bf6a3dfd7289c0f1d6aea640606802b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Fri, 25 Nov 2022 12:07:25 +0100 Subject: [PATCH 050/316] Update changelog --- stack/indexer/deb/debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 2b9d0ae8b2..002106a0c5 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -1,4 +1,4 @@ -wazuh-dashboard (VERSION-RELEASE) unstable; urgency=low +wazuh-indexer (VERSION-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ From 0d50cd10e81e15b00aa4cf7312cd975498a11506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Fri, 25 Nov 2022 12:08:50 +0100 Subject: [PATCH 051/316] Update wazuh-indexer.spec --- stack/indexer/rpm/wazuh-indexer.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 3d20fdc411..683853438f 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1312,6 +1312,8 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/blocked.certs %changelog +* Fri May 05 2023 support - %{version} +- More info: https://documentation.wazuh.com/current/release-notes/ * Wed Jan 18 2023 support - 4.4.0 - More info: https://documentation.wazuh.com/current/release-notes/ * Thu Nov 10 2022 support - 4.3.10 From 7a09ee584f82e1f22a32274e281d5a78a309b985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 15 Dec 2022 14:16:03 +0100 Subject: [PATCH 052/316] Remove line that removes necessary files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- macos/generate_wazuh_packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macos/generate_wazuh_packages.sh b/macos/generate_wazuh_packages.sh index af9ef12b49..fb035d845f 100755 --- a/macos/generate_wazuh_packages.sh +++ b/macos/generate_wazuh_packages.sh @@ -37,8 +37,8 @@ trap ctrl_c INT function clean_and_exit() { exit_code=$1 - rm -f ${AGENT_PKG_FILE} ${CURRENT_PATH}/package_files/*.sh rm -rf "${SOURCES_DIRECTORY}" + rm "${CURRENT_PATH}"/specs/wazuh-agent.pkgproj-e ${CURRENT_PATH}/uninstall.sh exit ${exit_code} } From 6bcdfcc36fc670c61019128220169f943311c9cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 15 Dec 2022 14:16:17 +0100 Subject: [PATCH 053/316] Fixes in macos uninstall.sh file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- macos/uninstall.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/macos/uninstall.sh b/macos/uninstall.sh index 169ed9fce6..9e65547359 100755 --- a/macos/uninstall.sh +++ b/macos/uninstall.sh @@ -1,29 +1,29 @@ -#/bin/sh +#!/bin/sh ## Stop and remove application -sudo /Library/Ossec/bin/ossec-control stop -sudo /bin/rm -r /Library/Ossec* +/Library/Ossec/bin/ossec-control stop +/bin/rm -r /Library/Ossec* ## stop and unload dispatcher -#sudo /bin/launchctl unload /Library/LaunchDaemons/com.wazuh.agent.plist +/bin/launchctl unload /Library/LaunchDaemons/com.wazuh.agent.plist # remove launchdaemons -sudo /bin/rm -f /Library/LaunchDaemons/com.wazuh.agent.plist +/bin/rm -f /Library/LaunchDaemons/com.wazuh.agent.plist ## remove StartupItems -sudo /bin/rm -rf /Library/StartupItems/WAZUH +/bin/rm -rf /Library/StartupItems/WAZUH ## Remove User and Groups -sudo /usr/bin/dscl . -delete "/Users/wazuh" -sudo /usr/bin/dscl . -delete "/Groups/wazuh" +/usr/bin/dscl . -delete "/Users/wazuh" +/usr/bin/dscl . -delete "/Groups/wazuh" -sudo /usr/sbin/pkgutil --forget com.wazuh.pkg.wazuh-agent -sudo /usr/sbin/pkgutil --forget com.wazuh.pkg.wazuh-agent-etc +/usr/sbin/pkgutil --forget com.wazuh.pkg.wazuh-agent +/usr/sbin/pkgutil --forget com.wazuh.pkg.wazuh-agent-etc # In case it was installed via Puppet pkgdmg provider if [ -e /var/db/.puppet_pkgdmg_installed_wazuh-agent ]; then - sudo rm -f /var/db/.puppet_pkgdmg_installed_wazuh-agent + rm -f /var/db/.puppet_pkgdmg_installed_wazuh-agent fi echo From 4e52191c9cb50c50642085da1c2e6cc02580e8e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 20 Dec 2022 11:34:30 +0100 Subject: [PATCH 054/316] Fix problems with merge of 4.5 --- hp-ux/depothelper-2.10-hppa_32-11.31.depot | Bin 0 -> 92160 bytes hp-ux/generate_wazuh_packages.sh | 79 ++++-------------- .../base/files/etc/opensearch_dashboards.yml | 2 +- unattended_installer/cert_tool/certMain.sh | 35 ++++---- .../common_functions/common.sh | 4 +- .../config/dashboard/dashboard.yml | 2 +- .../config/dashboard/dashboard_all_in_one.yml | 2 +- .../config/dashboard/dashboard_unattended.yml | 2 +- .../dashboard_unattended_distributed.yml | 2 +- .../install_functions/checks.sh | 8 +- .../install_functions/installCommon.sh | 10 +-- 11 files changed, 52 insertions(+), 94 deletions(-) create mode 100644 hp-ux/depothelper-2.10-hppa_32-11.31.depot diff --git a/hp-ux/depothelper-2.10-hppa_32-11.31.depot b/hp-ux/depothelper-2.10-hppa_32-11.31.depot new file mode 100644 index 0000000000000000000000000000000000000000..d41efd2181c1eb79d865ac4b15fd5d95823de0d0 GIT binary patch literal 92160 zcmeIbe_vZilJ7tNe)TBMD&95DB0zxc$q#3i*f`;i16;t9$t%fq1PH8+kXT8?W;gTP zzwb{~b)P;$*v=#~JNK@6%{U;P(_LL%zpJ|Xq&Mpg$LFg%yHB?N{JX!+&sukF?ZM{e z@7DY${=1R>?r!j1ccZ(xx&E;GVEqA~^Vj;r->v;^z-f+pHJ$Y)OgR~kXU%V#e@(Ba z%@5}OYA){Y0{R>Tf7PF-gXwHCIKG+<#-rA-cRjwEz4)m=neu1VU0G|LLLVa>43p1tf3FZ+|*0UwOmaSZ|d-PXx? zG@FcvFHQ%O{>f}Sxo!+nEV;YZnhj>de$_5!Y5$VN^(H4T2Qy~5n)ItL_dC!3{NnSK z)!%DzJ-!)%j_b>Q^Kr`Zty+WW3q3aL9kZUZ-f-G)O|OniOdec~v}J~#{%Fw{ zG5S2-HNkI!dmCsv_|Jaz@P7CHN52Ho?C-2!^?vFNhFW3kuVRezusKmRsr z;4SihZDXxFFaI|;9^8K~|Njm&_-T&S1N~6DU zY-dUk>(~6=&F0; z;e*>%_vUY*|I;Av_5ZKk$iMRaMf_jr0Yzbcbx`1~{C|IAPXDj3ZFaE_{>nA|qSyY1 z$A904@qQ7t{6F{byYc_8GX&nk|J?`Z`ey!TeT@Xrd;b4BP}>{zfA?YcH_-oU-8TdP z3Im`HLDY$i)#Jfvwa`Z`OOc$pd9uE_zOm6d`Eh!6QLR6C*d@vMfXtLfEFO|qQHpA< zb?l(;95$xzu0ME?rY2wdQTL;@kKS?W_0~Hr`Pt6n?cKxe#;hCnyPFSV+U`dmZESWQ zZYI<4Een3fSr4|io_y7ubbaIDM=|Hd!;Q`LZg=e=Q7DT?{Wg;x?LFCRtnTo=?a)D{}Y;ZwB`?OkThdcc9kk`MS3}(bUs^jbG zU~uxXH#x2TxKceEj;~LvPbdD#%20p)8@fj$4`SeH8h7PneDN7W9lab(tLgY`_Nqt5 zoZr9LfA-TxXE-?NkETr9sV+S)KJE7_^8QtbuFB+GtN;3PJegJdTSs3$5(R&p7wW&6 z>Kh!}S9kQ3Y6;Gjd4JUY;h228CE@R^{m^cmT@8oDm!#a&cdK{O=k3;bGC05NO?ns8 zN9{Wwwp%TV6-cfx-D53#SF_8jS=FnCB>JoIS>@kV)4};@TD=+&c;~zR=$v21JVEMy z%9?s3TNs$X7>s&D9z31BZ2ecOs;d6U%W>6y^pE+|u70jgSa0WKy>sVeJe;=v0y-v> z@x-w4WH7y?*rc*gsteZIJ11j5I<5Mz2Q$!hr&~R$w)K4a))zfEtG=!73`Q?r_Isy; z(RtPB|3}rWz86BEfRX;ok0V!qoDFJRZ66%$9ek{@J5}!(+UTFQtIz&r-JW1x%0Yng zq&J$q5N!-bSAB!_sdD52>&xD>I_X`B{H7<9!R4%)jjPi^Kla2RZa?mg?#`+-Mop(P z%1e6Zy}_s&QlT(uYdR`4UW})db2yodhS&9rF$0S}9lsh4$G+q=TM!fcBFl$+pY$NAinB$f9Buyje9{xUvC}k?(BZ?adqg!R+_|W zRD>>A4?RJF3{aoiHoY1Q!3g^`9<>AKhIsqODKr1Q(Vfn!t*dh+tt7?oSE@Zxb#GQt zT-0B#FmWmd@A!0pwb89EdnZ3a65@>E@U1f(_knNN7jS2j@rAL>%h~Mmp~C?SO?r*e9RVt24;%RSUoU5JdXkAC4!J>*b1y zs)Rp#K{&h`d9{u$*ttDN?yC7ey%qg!0>u&eAyZHf9emVgf*aqKq9sfJDns& zrRDYA288(7vCf|deMD6UkGl5x^y=gUZo!0*Vt4v% z?5z<`^@&#Id=>l4=Nq=4`HM96BWS*OJ`t0NqRYW=f+DYp0q65nA}|K?-< z1FWsyFT?cf>lfx!HJ4ZuZ`$ZimJM&>bu0yy6d*9OIuX5E^_@K6f^#lI-9c$I)W( z!Phs?v;efHTRYFTp8($Oc!tYhK}fkuCzHl*OfIUGf#Vd;OyJBeyXzkp{;-yfOPuM({*u1g3HZ;xlSo1ldfJYe9?Hjzb^CUWOk1fgzi079yGG9Ee-H6R71H|LyjcQq;uPzLn&Xr~*1~#szo(GVJM~Z#1$V_a| z*kE)rys{8aZ)AsZ@l{&pTW~BAQB(@Or1*-WEF0Z9io2{nm6`IfG--2Wv|;JyK;#o3$jedK zse!&ud^hRiWV75%mrl$UL7aj5CB?L}fN^F1G%I;zPrzDxqWfmajLArkU%?%;h; z9TJlUS+Dwc*_d;fqvwL@)G6KLU*rB%s~z=4q5U(WDx3p5mn8WBX=ZUo0^k>YMT8Z3 zoW9EQtWIC~uAlPT$@ud6E@N1X#RN^njx-cdd|SyN%kM6B*o4#2b?50y8HR|7dyMve+jeG{^g^!PpZG@JBy6-Uly?BU){s6R-9$2{m;|R zKTp3KwU_U7m+!3KOOZWUC~26B-i#RBowen*#F+xP1Z%-75!+t%`PJxj*l+ubf4N(I zRwGCj%3w6$=wxr=@%|nD8uVClzv8oj&Y?-6O9Byh%#mX_+6hJiL0$~0hx99X2Ub!j zy+3!nq1f)kJ_Er!t?QX+Gnx+(H|KKUX+UZk)61-=`>pG zK~)SFgWX{&A6P@7u`q!p;uSW3G@D!zZb=`bEyoue-;i9M`|1J{Z9t+d9T}b4_cndl zc#k;dp>-J7x9>dOd-nXR-NVv9FPL1(oJYU6y(?^c`?P*lqXpkLq{gH6D%`NzJH0?? zt;SbVFEBKS41|9&Y1Me~M#w6n?Vf3|kWww((zvj#B-K(=a=Bh`uObY(S{ZmaTjmn^ zHWT1vTEf20n$T?;HwE*o$-4-JQQP}Pz>uIt$07vN*(u(T5Kh*~ETs9-OpwhdZa(Y~ zoHsey{y%rRciN>$PnnAHiOzy2QY1g~VbXuL^yfKdZE|XU<#UV7S`qUnk5?_>t6dE_ z91i}HlC7|8G~xxyY&44$1^eUyPvI;_;Ee?CWZ7iS{>=>E0%sBj^6{nK9x zKCHKRn!LA|7%9#t%!k@B&jklL61S%vyn7ZRR@PI9HFVRWht~a}4=Tb1%EPnOulm(1 z(x{5JYroY@AoI~l(nPZMMH9g>)vK^SKEO~Kl3O~jMJ@W*cwt@s{e_&o&}Qx{XEF9lW@4S8^VyBm>UyvCsqYMFyMldentfhIf z{;HnMpyXwl*`xdfagLK89Y1;sPtw4>#TwOjMsdFdg(=vSqc?N3Z9Gtj^2NmSG-5(N zic8N}YeRtSIL8~_ZV1jdh>sWx{3a(xcE~DHuK$`8qPBw4fGMJ*q%#l%(iJV?|7!g( zsR<*fYl=~o_JVhl3m@~z73Q_;+Qmu&5Gistm`qiS(8%}1i>P;5b4vQCoddr%(>;sx zJRVc}EhOAx$(De-Rj&Oq8MZiix|l$=<{hDVihC<;h0g@Hj|z=~I7nMqhd(OYS+f{@ zql|r*tN>sb4Ft{|ImmFQcA~NjLBKPaO z`6APV$MVWE9`7{vVs4-E<25Rq&!^7~yQT4w*u_kbW24YJ-HxQ8puHLyF|N)oE?0{L ztvy$*od2icpK=$=;LeFud#E<}6&Z*pZ&=xpph;hUMlPk;DWh$@?w{Tg5?CxQc3e*s zrikxB?GK^8%?~nXAZEDxA#Qih4SAxi-1NU%dHduanA!@=qW}_>yhVivq{)Eed zMe;)iV{F_R^6L{e^io*&D<#L{Xy4W4qvSB?`l z{CsK8Vh|UZKcb2x$~@@vOfhUJs~aSwfHt|ZE>Q%^t1t%H+_?a0GL9%pkccgH-f|F! ziC&jn1Zl?>NpwS_E_n0=#J)e39W)`6o=zQW;ZO!6+Lh(l>-U!e@lLF&fol|GG>P)n zOE0e>|0Z5R%GTRfihgaO=Xyy$fTPfqc(L)?&q=%Rq{MLbX%So#@bjrvp`uT$R_{vz z-TCm=nZt`tPp2wKAC-UIt6mIVdg

2$$dDJ$&&uzlHz(b43VoSarIMQbH|9m4A7( zLiIQ)tHfZc@?}yeIqKPYdiUqM)m^=Ib~U1M8o!F{>}2Mpc>XK>-0ta#6bdC=|7g9d z5M6{pKb%(W<@FAqFV}BaG_(;yEe5{R&C$})Bhp!e+0vbj<=!$Lcm4u;SsK~I#oYW# zVV)r9Zl-vvfM@fTjvsYDIsWv~=#%4r{nzwf^Hu)RsJ#BKKFVj06lW?PzVSRCq;(SM zz4u9p9$2q{fhTRb{MUcdd;e_s>2`d|<=(f)-!qPYc;p`ygQOAuVu}Ae^)3`#PnHHY zfV4Bjjw4>C{}|;5{}D#cLRplJiNe-SXBM0Jf{f?wiHUd|hdA{;Gc;Q`^u?Ws^mXo7 zP}F6{vGL-g^kV1Ee<^hOmlt>bE1v#KJdQmfu>J9QW5PZ)ii{Gzs*V<~-tjr8X1r}| zNNC>|YSPS*VWMYI1ymt?8u34s@R(e|=eu>Lq|L*WvH6y7L@K2o<+u)TJ&aw+5ANE3soN|aL|9Taw)uZDyC_?6Dr4jSDu(xv*G92 zi;H}`OC^sM)8lt&`>amC%LhbGrP4ZQ5k&MYWz$sKVJo~7zx-=q_PKzFHCLT;PHtr9 zL&%snoV5op5Z;g4)zS|xj;rt5|Gc(-x~hKwCe1>^*)jP;%GnE|8>VbMU}3ko;`SA! zdS+Z)3uC2)uVxgOD_7+|5s~X0lyNwVL4B!ax1M4~aN4C|;NMuPKfh5%%^f2Cz40)g zHBP%oHszmkIX4gx25vHc>vc4SD1eU_Vg;6f{;h$`04HP0x!o$q;<%8fcjE9-d^T@D zJJ31OP-3z`U{Fyz742IAzp~3&pC#LyPafxj{Ty_e*E|cy>sXoo+eb~phN*VkueRYG zA+>2=ADbfafgD6_vVkUv3^7(67eX&VFE>N#)t_^Z15u`v8D6c%$*81yJpfw@Ge}O^ z038-;7VH#JRSVvw@ny-6Czm?+CNHTj@CrE1)aTO#w{PA%1n}bhTV)fBYN5m%f@v-x zQk&&2BOO>z78h{2U^Y@BDCao7O_nDa8*8#9#w)>1r7PuQx*V3^iv2P(QTt*G=vyFC zUrX@Bz)RK7oqON48@Vax_JXecgP3GNq_Y@rQOttZZw$s~A<)yVJ(9Rhf0Tl~oIU8E zv?cs&|98P#fjfO3b9r<1*Yk`vxIxH%; z6xNYa*10|B5s|bN!wqIK6dIgDmfDVnM$t(fqBQQ(SCKVML)wlL@@@Q`Cr1*Ac$lKp z@!vs=8tMj>Z#1IS@z&c2mdA`(0sjIP=e0!~L(v zuii3!p}(B#z-iS^CMqmyEb;?~pPUPB$bk$&A&zd^SPldK-U0^SycrQZFo%nqpOg>q z`#gD-6C{ho0(XqW&ke{}v9DeNBK>Z{fxkjF_^Wy1roa(Iei)uO9fjQrYNf_bf70@WC)b1&4gJ>@Z_wDo?wNcl)i_&^ zl4*p0Xy*gcgN2Mj#QPYCwb%iZQYJIsBBRo~Hv|<@>P_#vj7o3cBB%-}<;?G5d`>qu zsbE1Yg8~gaI?5O^6r)t8h`cu$G- zrk59pvgR@wRm|Z^I4kFxf10b}>09uUh?ENJs{N*9HbZ2d@n4K{G-K>d8p`OsX209i zX?{GYkML~y66112FBSSWe) zjlHvXB7u_4`V7`3rPkDv#xa^_%uq&2-V_a~2M%uh+lNE0{`-R=?;OUsqL%%)4q{x5 zeq{(FvvU@piz5^_XlYR}z!|?;c@&yfDa-|-fE!$XOQa(6;!XWkLndx`Ck2*Y`G?Y6 zHT(Q>-IWBX)R!vkQy4CB{vCOVIbVsm{p6F{ut0aszdx_9>UYa1b1}+I-Ia#?rRocL zCJmN>rLoG?3qEhvVhe;lqdZn6o=Qd_OO=>}w_T5%$|FtAD*h4rg<6LMeBf-rK|s2&b^N@U4@X^%drz92TXP+2z9 za7kCEB$2;d7f5oH%z^{Ts>H$06>|bUsGg1|97~a=RWVPs^mB&;FLasG0atP*N|sx6 z;A0;%v~`N#`G>gy2Ek~BCDh30T$f$N)5^fO$@_uMA*g{Dqf2UP-bqn7Kq14Fmq=SB zAnqBQWt3HOrUfUInJr{bdU`CIl{slNZ(8QRRfxP^3KxwZrj`%pmerjo@@iXMwq>Ja z11(OVBzB9MImP}u=@pI7PmbY-M|m5h>p!e!?yY}|_+oNjkyZ_ z7-9a}4Q^_};NpbWS|G(p0A36hPlwC+mTIBqL=04ij)f2V@#NdK7!lnB#$$w`a55V(f&NRmVx5mOt^Gi(_MUINIfv9h9jfhLQ#y@2DF6 zSnhsEvY&ih^kZoZ69p+&jZzf;oDPLI0iVOvz5_qhJ@ovUAJ|C_VS59BuOzlh`aX5j7X6ZZXruA8T{3Pd`_*T}l$zI;gb;)p5V z@R+0|yBSCI9DBa#Z&9qxylh@~m;rp7;|HDZ{_u0><-N*i$xnZK{{lR4?^qCLlv7wj z{$~zzc6zB9mwHiA&GK?^HY>h9zE`C)T;vZIJ#j*eH2H*3W1BYq&Yx z8RnqkoRqrPAP(=DqG)_Jy2nA>kUfnr#&!R+h2UQ5xF!vrtV2xJ5t9BMfc>~Wlmfx& z#~;^G>RTRfWR`DWaB>gC>+o~~%&U8~xzPBcqn)%psE#?Z^<#ktOs55#{5i3ICqRxi zV5y}O_{AoxkZf+S!f3MToV%cT{c`c6@$F@^sgu4j$@JE4PuUK9)Q|)zX4h9R#lm3I zm6=x?GxTkTrZsIL)EZ?ue#vL1KQ;N7JKvGd;$`UXn9;GgVOo9qvpyD{f=l|&YMbEB z`b=s1ma1uJ+CEoBNvC*Zg;3;phSW>XW_AfInCvd9js+?|f-@tkE7pf>@Xx*KvbVCG?-(e5?mIm{-c0tB+>S=uhQQtLAV`t#m<%p zHbf_UHD{2uRbaR7t!}fO6io-NRy7JLQ@0#u} z9l%J`5b$ZdX0_MXc2a||e!n;2Eo<0<;q_osZ<|;|gxjII3y#7kQs=mj9mYG(&Dnfd z#`mAv&0^>n?7Ba*?ju}gtojzt@|oT9O0@|3%#J4J$Cnf6b0c$xk&dU9JUF%2rn3P_ zU90)>HJdXx8oyepzF|~2nNzQt?PBnH4l8p*%hd~58@OF&*%M~D8XAt+J+{dE!CKSU z!SRG%07)6`h(6OnK0Gf@yy_4GhV+~lrPVQ_!@!N zXbvU)%m`LPJ_nW@3J#a57Yi^$4b)`)M9AgbKOhPMKLDtA@1WmDYC=u1kMYzGTr|X-dMD^qAtI;D#uunhYgIY!_wT}{0|k?y3&M3PLU||X0oO6@lONVAr7wzUEbq@aQS2y#L-b>O2tC3y?(Jw+3oV4xoNXRmY)AdG?~O?+}SQJpIQ zSj$2`gXdr~z!KFgM8vHSKXE`ZyS;jqW2tn8@}LkZ0BC(V-T-ktI#B>jA6@kRohat) zT0zBxkI+C0(Je4n@2wP#Gs5I%uz1O8XNgeA{)+{Tbw@z5Etr$WVczyowkHb2;OHD% zLm@Oo0G5n-I$_Ru{(|%ZTRFN$r700M`e{70HtlXZq59ZY6iqrfZGG$<7g)Thv0l}4 zNX@R(X|y;_0tndJc7*Yk#{RsQ%7SkgU2<2{t=szQF0ue`0bTf?vjo#>{|d zU}#r+D0X*!Wlfy@5sdw`e>}O83#W@(Ze#6^u=;fHT7!eg-qmc}xr&^H6gXPl%rZHq zG+c!Sk0;|F;WH?+%UmmfZzj$~zejU)1I6qm101Q09A5r4yBo!?6lHAIaa0R!5(YGkZnX}aq{l4wT0UO1=uf>XvB!BC z)Cf)&F2N=a(hfHuWFMej$5Q|7Ok80h2DkqMGue+~Sj!x+ol4>de-xI#;`M|QutIgj ztw9TtJ-jbbR=9nci&EU*Qcu$c>a>jgXk3M1JG{C;wVAt+GNQRdp9$$5-!1`b4|C`X zA{^89?Y#PTMf!@sUWEr>$z1W2CL$NltwAEUuQ}7Cv%vB{aue4@u+TP=9$VTvHMSp$ zDVDf3s868#dFpKwpxC->;GikN)XVrq5ExD!z4-3oVbm1J*n#!Lg5H!RsJ)VsH&$cN z0sCnxIKJfFq+60AD99BXf!;epgOXbO28wm^QTUp$7z6!J1VhvUo>pxrtK+M4-g?c_ zO}re-1n8x9x6+?5I-?*m1T51Fd$ffH$5Pfcy1l`arO}`(*N^hNnbX8er&`DTe0P}| ztss*~acaUlB0ff+K$}?Ue<{64{TtyV>`0151}E)EP$XldFtMN~ybi}Gs~?*p5m3A; zlff89{;ffA#9N+xTQrGiO?ZnQm@@R($LRSyJ_CcP=cLP16ZUfZ;3yI*lgR)>ag>+K z`$RhvJhsFjJE1>7PMwyy(TiO@XUkyTzG^Q}U(C4FUpZe9Sy=F(m%@ap+Cd;s`U5(` zf+{Qrp(QD0*)uYh7)2_KcC3iNt4k@<3>42Km}+_t(aFN{a|yvxt7g14F(8B?(w9Pzz?@iTL-! z>T8t+$VwGtB>+Y_N(2^nNHx?Ig)dj+jS2b>8^j z|LuYWenI@Fyq@;$Fux`Kv%c|Qy}18baiaD68{O{v_|Mx>`>UVWcemEW*2hHOLshs` zZvBZuF1hs-e;)TI`d;y()?R8;f#!HQ*5|+Os?R*$^MhvfN1nWXt zn-@fP!w4Th(=_0p90E_y%qTRZL_;TR*spzR?F&tBdww85P2`$wV4%}$I6j!75YOhGgC(te_tVA?{XB;jqt zA+G1-akV5hVg{3pDvj)MI*g~>Mr%Z7!Nj}iNCssbT>+^86b=WTb10iyr>uCOBE=-E zvwj`UY%NO7uC$&IR!PR>sp0!8IHS9%u&Dwo4_miJRu;!n-}-5*b(C*2AaH$@XXW05y8EToLDS`A(7NvQ0oy(RCO3D>MDy9R!zZy?|%o+AH zV!aDDZB+B-mRrgT;iE)Ooqej>DT>fev>>y6e1)oa5?awk3Y0egI`&PobXwp4&r|Vl z)DZ=pG=$v2^W9n+tuVeD^?!}Rzu9kv8pywz zHrw9aKG=Fz?LYsV%}zIKV`MMn3S_z38J(Rc#YZxRw)w_#s5brQ;C-*S#mE zJBSd@CIh0n)*1Ym@hfz5Z5iopw#V}##e@wxsf zzSP3S#)tdVe_n9if}T1;l)b?QVB8*Af<7^HK|JhJ#G9Z&skQPQ=kj$u2*B~AQ(PV{ zkU`ce-s6+RTYi;@6-q65_i}=>CvV8aItoVS)IbNqh9@d#macdRPP4scuc? zk|yqJ=PRIamsYwoAgHR(y%K3clzdqQ18-R|fg^c}7L7P3`=HQre||>pb(@<}&L7(? zv(wg3j7QPd-bJSafTsAS>bT8zd0I^U-1_|*hh~4sgTz}^IR)kiP2H`{_Zvtr!ZEEk z?4kxXl(Q?sTf+P&g2f|^?6ayg=tL}k-FH$O2&i7e=PFdFr|Lrxx&q7OiBp0MIKn`N$I35+Rg3M@_0i%@vCCGs!A192r_8y>G8Wsd zK*k7(YD60~>dm$Sw3g>_poD^i3QlweyaAu(Ktx~@?tB;dLrWJ5$1o(G`Sc|L{WOKl zg}&ti!8idP>%q@H2vM>~#I*Ke%ZvJ8>invnDabf&m*NQ8ZG?le9$-&{;Ny^}Fg(`y z79-^0epIqRAi5>X7k!J~g5TiJu}D>6FQ;-7d+Zt;m24yh6_tiI%7{jU#7M8TM?$EN z=`UKmgY%94m39ES$Ds8y9_+59stD&OrGS?WJZ(zrq(4#E7W7RoVWh$FfTo?gA~4Xr zaF>|9AR^E-I1>dz^hEDPk{{n353n?c7OmG4A&5oz8|D+eK4mN-P#4@nv;0N~EcKQ- z9@Ke2rv?Ad5TXoY++CeXlp1Ktpy*(SMSDHT1j!88T&2!zMLL}laOsmM0u91C4bHP0 z2Ifedx2a`<=@fG`GHd}sB0U?srb@=yf?P6ClufKKxhhFb+SnNaes3rXCI8>_l& zswG6;-LxDA71yFqSmFtCQuVRG{C>5^+B1%ukSHnBJRAaXl~ z{9OFoq^&&Z6y;Y>7fIc~x53Z#h_wPDm2uIV{K!YWY0HHPH%8blI#_HVOph7B=2{+0 z1_W<$hSKekQ>)V)^{qG$7G#);MqsR(b z=DfIfDo0hT9@ZBLqL7B7BvZt9vv?2X?`YhZh6OVM}19i75;keXm;sbs;HpQpk&LU;~`dZAy$@dsB+;>`J?v zK({zdzz!|s)POI;w3)sw1iS5}b9k!vgu`{1*bOzIc=i&&{1h=ED_aWa#^%W+$ks|k zue1(l{Dx%oOQW*=ja0V>v^F#h+=Pk=Q6lm)QDW3^R@;7vCo5R!4Lg?}wnA22kU~eK zy1CE#9U&%HP7&>>XBizLlip8bN_e$g3y&c8PL1U0&O#EbDP`81hT{d?QS;HeD8ZJE zpXZdsFjpygcDjYkZMDHPg^bzzZ6ccK5mRZjcVNr4vw+aXerWSlJFvtp$hIZz+Nhxj z%2LX(axLS47hjpOvj4PQ%LZxNRWgG(Y*Cx#DjcT9?c>$nX^*RMDE9JOEBvw=O5-0dtZd4%Pb$ z6O{vA=;C(3)RKKLfG6!00q?)Hb=p{=@U}5<`IOPjR@FXHRRYiGO|WQXYLRjj&tHwQ z;@l5ORu6BZw?KfNjIV86c)2a^?w!M~H}OolNiHI>aH?sA9)61cqV}X!n^t^g7w4G( zks;|79SBa~nA(vFv;%(*?LJX)F`IKH56{Zdg5XR(oftjVdjvD&JCMBdxX=zT;`vq* zlA6dVM&HU1=a3396^+B5v2I(Z2*K}XMpo%No?dQcdr)6fbA$oLaIs7umY{@$3JzWn zMxFMDJ3(#h(y}KiIkH<adFaXE2c1r{LUYVRQK%HJe}ILCiI{E{Z*Qp* zkG;}XJu`cKcT50CSExH$-8zsxg4Js7t}fSR)tVlRjpQyF&KXEIUyf8PAR7YQw9ZiF zvKZ`b`4@R+4_D;5YjQ(jF~4skenxA?CP^5_B5Wl7y3ME$NxBr5b_H#ii4%(mFF-`0 zKm}l9?pbN4jU90^zLl_atZI4_`GsIk+Q=a_myMd|0VO29F)nm!t;P25oLTV8Hpcb= zO*=J3UH3$^ol>3yGKRF+=}S|*wXW&4Fk-HlR-ik^*%-w^T*O#C#6_Px8DL8=QdCYM z=2-PqDsv@(Y5|eQROUMMgWLAB_DACu85fSJB-hLWD9?H@Py`+_)gEfeCA z3~}L}4oRgV6*xN-71IJ*JTP20SK;Na-D;$NG4pOWduOR+a^TC zc2r1SV9&<>Am?<#Ux4Y=gBIwxdDg+DA zcnJqVc_&B&^oQ9#?(epAK@{A?lV}ukRkd&PRDpkwzhFeG={cTg(M-7o;Z~YkZ*=I- z!9_LOf(JMdiN(K8!JvsTkv%nqK2~kG;)Yg??t-QvPC#ZkrV&*jiLz>eUE(@w&6vo2 zvl*ls5sOd|#)KsYn3$$BhaI_ueu@Q%+8D~M6p8d$suR2@+RtZ7Y+=`6IE;rprb^q| zZeZ)b9KVv+3MjahW9U|do_H<|dw1HJXIDe&ypu_c5cS5c#21K%nh@odX>TM}kRGnnBVvYR z2B~4tdfdvC&|^FbqflwI*-IUNi5N=>q@3oOP^V_wYeY+P5tCqNN=(3(e5<1Mm%ZWHayUr#k;fo# zJVi4l!S6(ed_#} zlbF+`s~})8T77KPCcJrcP2)SspA06{b;u7;-UMtLzgwkj}2sHgf;53V8>lW=jzRqDuqPsm>PDm-8W(ZI{6GK#LQ-#yc~^( z<8!H3e9N8{Nz^zhf9xdtZK`YkAn*9U3OKd6%t%IA@zA-E0K}r)Pc$} zMV1@~kPeDV;g&W_!bw6Ohs7KhR@xs)x&k57oGXLmsVO~)iEFlr;ZRXz=`kGbh=kn@ zWX8&X!m)W{(+Ket6qvDTJh8cgdnqj;9Q~<3IfmRWR2rs$n&KJXNHo=f8qng8WXWNA z6uy!T%~7J#y>R8yN?|&k5JJ9+3}BYQ6$wsAFBue}x}c)zC4H7WDT`oh!5=A%g`_a2 zk(>}n*4+|D`V6T=LVBuT2V?}nu1{J&_U%HPnWEfcS^pepv0=1w6O|1sK_V4Mk@BNX zGEbmkm#icPATX`vNUZ8 z321Gq30byCh`C{(mIr2GPY%7|8oK!CJw;oP>72`9Jj zxr9=&QL&e&c8)#AH{Hms!uC@Xrq8Y^YXDXjp&FNx~jAIVW~cR^CiPnqiCKm z)%&((=R{!%1DH`8B~DBU7UC?23aSKm)_n4MWJlTiNyx#q%w6KrC^iJQ8+24jM$W#D z(AXd}E9ngfB1BK!7K284n-wOe^Z3Z~P!2kw8C!aKPo)>yM4MPgKrA3)F{1fY3#Puw zE4Q9K?P8E@75bo&c=?3x5-Gmq(}YmKKWWSq3t~SM77y; z%usKd#It( zk*A5waLV<&LUB3IvdQ=62mr>>E127?Bm_hX>p&w2cT6E{NUBAx)=DP8vK&UFK4jFZ z=v+fRx35TTY6;luJFw>^ShB5?DF9uj6!WOn?wxZbhUaa=RWDH_5hU`*YKts&Z2^nm zL9|RK3rD(XrnN>@767;v8irG-;9`8t7!L{^_Yn!KU4FGjsPpv$~#; z67}{8Au>?Xit3o=Nsnn5xL`@pDj{KYLz>Zc-EyBf=#&RC+IdjwRBku#ggSl7<}9?} znz0NSF=Y(b_B6@JFn8p;hq#(nn?`x}Z&ifh1pqsam`;dsB%DGhOP(~sWl8VPP3E$$ z#)#7sa@n^Dd?9=&rZm<4Y6=x>Ud!u7_AwuCWe4KzZ1Q^dxGjB)M(WMMzgY+axIog zJ}<}%@rY{wZ(Xwvpwp*;q$mClyF$)#xiYEm)?Vt0tU5Ce6;SPgzXKB$kGSS6;!i#d zL1oug7TqNpVVFU*BqLLpNkNUgeb{|U@4z@xXH1o~c&P5MG)n4-Or{m&`X->&gTlb> z%^Zs_4W%odEH+1f+WNf_C zB5DNdO~+P70YsQcFj1mG`BG(0BkURHUs;yodP`axC#fVk1SqJMxXo){j4*{#)K|hP zEIb2=FTm~LylpN>&@&cX&~qVOo8D!)b*6_(@5k}qphpn{8zRqAKrY=nk9f=X-^IHIDJ&^tI(O|9q{hY%TXp}>MZGkeTNvB$&8$ySY~zX87M(9As2 z59UYOFt$JynT9+0;5ZP4U33fMLuAH><_~!3v3We|38S+`7N-~2TCdxyZb+PM-*cWa%tI%RSbAf*t()KDkkVE%fYa!V9puQ-g;ZvYix;f$YQN z^S%?^6&Cj#?xm&O;B!dA!$_pu*d|fI9PJ`vZXqRGja*`N*OA#%cT}>(J8fezm)CUMq=dr^Pc3*NR zN@AS$Y*dbNNN8Zt!GT((jk0KyLE!;bS?y++WfY4fk!vL}x4-VeKu;{B;3ha>W}>>e zjH&iQi$tvu#yLSnH~4Rzx1NfUIROLIm9!B8m~Z78%r!>4?Dr=eUn9n&h@{HD zBEwc=*w7&?Q_&}r*DZ0qpq#PcZjQ?(CmQ&(A;L0qL&lvO>AT~;OIsAFBSUl+*=i4W zow(fe&Gqn2_}Yb-@I#SXNLsY0TN|_~kcAx+7CTQ$$kOg**aMQcyaS#*XL1nUw~@OC zFdNBtq+n)TIx0mX+ahGOKGApu42A#`ZPb50hlUiKkyf{s)1`)1c_{RO$W3+|r6BI6 zL}>$YI+6?LDv6U)lgb0Iw0fnw zmvxv1OkKxv%A4oOVbGa~UsyNyy5Z&s?O*}IMi{6Hk{vcD0f8+4p4w|jFOE?0OtKzK z?94Bg^3Czp@r=9x4id45I_rS@Lu*io2HAT?g*;x@nOhz>TFm#9Ps$3abh@E-y3riv z1LpQDSM3I(8g-6r_C}zoKP)bAWaSJ={N}a)?^nbz<7%JYMDczQ4~2(;NX(|R;~Q>H9k6r1eJ zbGy)Dci8|)1)7u%s}}iem~vyhFN#zBmJ4yW;XJh&4aS=JAcdN&4cP_v&Y2LzG?9t{ zB9bu}nm0scgjX$EkZi;7ay6Zd^j4!PM-oZI;;wIrU9(wjjXs?%+D~qAmQHLYJY%3p z9V+Ywmp3@kA}4yLh>l9eA%B}S%2m@OG@i{Yk7;n ztd^Q`B*L3b2=Tg5j=)R8p2AZ*tK6p?a)CSN>t^3l^Z^JHQZ1CIbAq+6-*R6cwu0A( z5vMD74AT3Yh6T1ag$+_idMu`+KL4XoY}#w2tlU+-7Fj)oLuJN!Y`kYjgZVxmBdpI4 zmWq_!5ivI~zNFpH0*Gm3unERahR454L;CtXQBTCy4RQ=&uE~Ie(vDG`3EL710#Zc%c z-|MJ3t*x~*5euZbDnGOO9ECU$K>wSmU*fZYd1I#T+Y`9O4j7jyyu3T#K zAHop{=YnC571limG)wrdHhWN?gtW;+nSxj)(7%akw3z_oqIIQ35Ph;ydR9*huEWzZ zY>~a%s`D~ON(S2J?c!6!R;tM3Xp7t^J?2XmjYqw-p!aV~Jl4m~M6*$k<0mSRwQQ*D zZzZFE$RawtCA9}9MRCkZYcUW$vjCCE!E%sE9O#Rj*uLjL-Hb#UAVhT_)DF2}3&e3_ z%w~Bur73S49SJiFxM@{hivfqR$NUXd^Onc@T(%Z)sH)AJ@FLw+AW)fp*upFyiHgue znk8VC3CBG4O>iJ8hf>wJ@fO-j0$nv&#n_&%GJriZn6QvKm7FVJ=f@XV4Ah!3gCb5! zpu!wXxLmvfBag2o3`$*YMCBSag#{&y-5b_2SQ5`;z1vX~#HU)5nrc`)jnjvrLiFll z&f;xK>O0z6b}nS;7AgtkrKlO$PFw?u$QRMo*uj8#VCB@a!u=1Ec3PlGJM+EWnY&k) zi&%&SS(nqA#a<{#lB&xPI+i36>h8HjOmhv{`zI${vfhpj$ngswF+`^}w60oj|cI+jTQ4NzkN`(wK z?_yh*#*UjO{a}SCv>_-Obm(8z$&V*dkYwIuYQ6w=Ea#;UbsSN(lDeo#aXmx;9G2XB z3n=8-a*C&WU;3r$K5$#E=7mpWW7;) zJC*k-0D%`{BIRchl?3`5IM2V~15dU}5>YAkoczSGJR!1YAL z(I_J%kYO{CY*D@WTveSe(bn=*R%lQloHebEiaM>?HQNRSqC7qB&ShAFhM#FYFBjX^ zl!jB?zi^K@5nH_y(QNb*Nn2)~5nCaao%^M;nOtSQ^3U24nnwjhDJb8yZSBE{io1yrw7HR|=+ago1=y2vg_DK(z z-O#hfyTU`*CV^2-tAv@F;UgfCk`@JKtXG{W94s^nrw~S7qs&TKS=3f0yQDV#YCsk$ zmdt}ybLF8Ql$1BfeZCsnI&SUXi=7uit&>$&!%pP=CuP1&Qr!l>5mdw|3|u#J=hd|& z^=-a^t+!<+x>*Og2rn0~g;j5dnJ^5D3S2GPV*8~%;e=}#aI?|)O$-sQi_Q``DYGc2 zjP~#tFAzHqr({RNP}ZuPcWTSUW&*2xr?WR;ilLhvr9<>o_C=G-6_bb(r08|z;P9lFJ3k|SfDY@No zVg%U3Y-<`?F|!m9aZ|{f3k&69dUWQqRzkEE5UmKKJjbSPn&f50hKUkYVkfqpx@uw<63}e7A}k7Q^-x=v6b~0- ztLveU`p{tn;>et1gCj!S{SMovlspzt_Cz~p=Der0nO2RE`n&-sPne4^6iE`Pa46W( zoRZ8s;$e|t=`*@342FO&@tka1wT!AOSeIc1d zzoJ?}ewT>`nXSJ7iOBSf#9~c1mP9&7cDIQF>WvL8v6fc7wYRNBd(4LMKa-<&^$ivB zMxy47)XFVX7ig-7HJtJCvsjsh<)r>(pWaIb9tZyN4g|QqUqU+#wM4);)fNU49cKJ) zl=$_Ql%{LNkiN4Hl!=H!KImJ<=B$UGdr6!Eq)DCUgSRzT0z{&7GZdx5g-}(@nqQXn zJgc!|MR@{a3$5lRH@ns?p|PS9-1G`K_3;6~_gk4`H z>MG8ssr_I!{Tv5r`B*dZbUq>kVmVZ7JdtYV?4T!~|RB1vAYv%t=m(4jOV+@3^CjH{;*n7b5rUATE}Tyjpoq z7I6+M!t5@elLV->9^v_NZ$a!gV7}&s=ys~6HE>Qo_QYlp^&J@2KtDs&C!C7-a`23y zVrx{j70blAEizPAHqgvj<(!kSDUPv)p_b>ieUT*+N!UyjLSqV^svGZ=O+#Q=k`u2Gfp5`t@2h8#xTHip zEo#@lWs3{*neu2z&)Jg6ip-&_s>O*q|IWxeX-gY_5lk{?%xErQwxWL2VT265F|j2a z3bTbXgVf42%cUj3!{3(VS>QrJ8=m!vV}`-@{dD}>q#L}++00%GLoZUT>)i+t0}RcJ*EAL zHKs7Cr`r*UrH&ti6jIdyj9N%L7Afb?j+BzdrCOAJamEfttHPnTO;nKxXAHqW64(~8 z^DGF~ugbFM#^hBq@SWn8nwu@6FM_)1Ft0F!^})v?)=-d!Y0Xm?KE3<&SO3Zp{1GFaxmdWRYE1GQ!vnvLT$}I3Cl{1Ak<5=t7#$TiR4@3;}(j?Nj2o8 zdi|L^Zh)Y=E5FDq-Q3bUv3?(-@|Ij{H}%t}GM|Z@dhqxlg z+H3w01;7xVsSDzO0D?YJT5KLE%Prj?5C&n&OdH`va&7@gmUxn(q{a!Qp_F*vRG|eD z*xHax3pT_#ntpk9J5R(^S&%izvSVJ9SOuCPz0~zZyPd_O$qqbL^K4PEK^<0oqIO3@ zns$83Q5v>6Y09}!fu$O1RMv(>33XwFDPS_{ zp4&YzV6b0{s|&rwsnos)UUH}@*}^h#F)GtLJ|BfgiopB06gk;p*2L6_&jb*+n5(UA z+xEHbVZJ<6+Cf0;S>=x^!t9dhe64`ML$EJi?TvLM(kKtJn=RppZ&o=$!KL}CHY)4} z_7@>RD@_Ii^Pu`EH8IP=YKGEafbxZ&x{g4WCyEGrPR@1#S5cFS5>12T20?#RSzl;7lj zw?q&^mD%&!JkH~*TZ9|@e6h5FdiNPDikl>o3C_1jBp8aaa zOs0+*;d1%G!Gz%QO*;fwzv1B=U}s;j98?BWdv9|6-0VOuqf&cd?}*;tt}LWoF389BM( zCt)L|3Y$>=L>R1FNs=diWU4k9ZkmmnO5rYP6p~$#l4CK+%+YR=UY3ZQvO1G)t__*m zdS-$e%YJ)Qvv3(~Q%O;QCa>I(P3X$fEd%SPVk4F`8@m4m_} z-?-Cb;yQ0p162{pG2<27gc~fyo(V*9dptr=3&-g1UUR|+qOk_0fxAk9rbWS!3n(t}KGXIz%n+NSmt%CQY; z9*mI#<#;wdodT~eNt{1CPFxbP`^iJS};ghSRjxxi$bnC7y=Jzf_zfmEqQ^V?6GZc zx%Qk$5p3+8#mVeYMi8iJNE2(44EAA@(>ZFKvq?zMl+{@OJ)Ks$1JUkGGXcAchL`*? zC~AAVKB)nWg!NQtZuvF!dDQbvn@V*knQ?v81(MXj{8#)s1O;1_ksdWwO>9TmxbV<}OC zXj;ZY6ecB%29ke>K0sNil3XEf$gi*;Yhdp=+O>sLgXkU!F=;V{QGAV26Ur1bd4D?` z6;+sM-c-``hIbJ&J7IqMwGB*Twe}6|gdor!Ne_{y($O+{Wf7bsW#%o3n2lYz(U}VZ z$ae{t&tm*46v~_@QUL{)uZ4P%yD6BnyQ#&b@J|4UjfMxv@yiMUwIyayHggnelNu69Ei&X-u#>fXOjea7ed6fTs88i7D>~drw&GjC zhwVWVb_=^i3>`5TeK{E2Eh@eaf)PGEq^vE~{7}vjA2!^X9KfkN&Z19Kt#zYT!4=lqH-~nysf=jD>Vc>@^|C$5ZBOtpcX(Z-^ZZn~ z7ZDWD23{<~EH;*N?es#UvjZ+}Qnm1(9Qil=I(txPlEmXs(T!^`#h6}%P6INI{@7@c zwJz9FhB0Bd4kVW~v2(9D0?p+iLi8slhvs?bjD`d|>6qtSZ7-qPl<%@Qmz zvpY9}(u)YCkT`LObI1#-o>5(gO@T_qU6gNYHnGs{;cv?`CGup$72226BV!3_y5c?_ z5mkD^uOD~O3Kg`1N0WIijU@vN85h^y`3vkq8lfPOU|jCCZrsz|21YTL4nc4l!gr52 zCi^ba1O%#xEODtwwB?o5Vy-gAlNdmf2zpOyEF5kF1XvS)v0riHoHOBEeUDiNF2zL*Kmw;~Sz}a(2Buc{-fjXgdbuYX4yG zi-WDNmaC&Z`+NJ(N87tc)joGg?HnC#KdCYUVFNzi+yCZZ=Zi0oT3_xxd$N6CH&m@M zyS-TLZyg-%Y#$1aKkYo(E@7(LTZe$%uD;$m`f~3%^9As&y{BAr^-cB1o!uwP)i&R5 z9{|(-!S>-H05JB>S3tbYmpi+UpFMv9EX&pBjIg_R#0AQ%jK_}lmRrI=Jex)rFpU4z z_QB&X!PM60JI{8&m#)=%x^uM46o$Jkhy3yLXIlrY{pSb!dxzU#MgxMs9T0x7bNI)K z6$E1c_w%hh5ZDF(Uv2F^-qu`tDfXeoHfg!lH+#<+?vQmq1JwEfL)3QlWc%s%>8y*g}_qTRH{{h#89UN$s zyEpL^#}T_NVP{4sG)SZNhU+vRj|; z2{E5Tt~*AxY=N*Ont!tO)z%l=hXrK_nAR8DcFFc~b-2I%cxUUGeGffC0M8s%yN9e* zTgwMANVUZti_S%yzK^ZvFap!;>?XotZhcm6;Zml`1w>gr+XJy|;FGPREe&P={d`;V z9Bl8xL7rIj!g6nN-n;+U`i05(rQ`SUTsCg}27ZZhjC=JRz2(8l7~e2kQHuJ>io9^)<6a-2kiiW0h?LP!SeBi1 zc3e5Fq1j5-Dbofw8Ff!b0M(vY{zcIP9?_R>dze?wD-^iMtK~cOuv0``o~xCCMqX?% z^DC)S+%U``8D7?aOjZu1GpW;|%(HxTdkTTtE!A4B(eP2!h_Q+pjf(x!*V=rAEJ;6^ zxohzHlFF#3q?F=}r=vym{X$5I>KAnwZlG z2U6Xn7fhb9Nb|V(?c2ex?|y~t`}63=oLZ;aDA z1Cg?4-_+GbS(%qEI~BPhLSh7o zBT6^u6AB%3l7TXdp@i(1)LzaoW&gOABf zWofEKuxngRCc?wYTDgqz`jjXWwB(2Nfa%AP)lXwycb)`NXtSY-dHgqJH%QpuehK-CeO=vEd|RN`9_YhrBdeHfbJ-sD=zj=nEj{ z<`mJWBMG0B)17dqHpEra)e+qL^7>MNdQb?unZj=&Oz_!;`5(L;^k=a1jvEOiA<$u# z0jhoN#qrLn+Edbryf0+|#_)lCWM-PWb)f?Q(vjJ(b^P_JFP`r>L8$w&2OB(KE2W8Y zYhy6MzQ^O&UVw(SP9R&Y={cpAHY?|YhU069PzR*>!~&8E&Y=oiiD9pCw;DBF@^29w zJcmp|7ZZf10}>C`sziaPu<^XJkx&!k*m)MrA%a}G&6x;H%BeRQM|A5O9xUV*nlyBH z)f&{8dmqamCT+cyNj<=NyFjQzJ{CnrXV=ZbFc{1I@y=naiOsfqsnhzRmbiRYiV4=d zIwmx#Bm<18YrQ}oPf=r~khGuc6pxyuWB=4k4CDqR3S`S@EoT%)qSDQ|%`|!p?gGrX zpXp7_+P?O@yg*lXn`IS9e8zsT{kKH-bclz_7#FDw7wU>R)KZ7*qNd16`e^7lmP%+A zZpG!x0jBhr-lnUsUS4+)Qk~)X<#6TY>|%%r{oVhKKh*6=Rt(vt)#CTg!SmhKtLbFb z9Ew#Asg~ca9&B$t`D*)J*SpqTTYIp%`MWj$iT`e-zc=r9H-6XM=x%PVKkPnO*K_Ne zYxnQ}ZtYzs_%+YbysI~1%E@>}-}vx9&X>iWSL-X?H8WWsyT9k2 zF=-Ie6gY}F$6_42OpUB`cdf%e4_jYHlV+@fgMsSXPOCo>(m@)ZR-aD%lNFlXUZ4IO zQo{U5SpW=c?x#jwK~rE4o6bzOuVl^_`_F#b;4*hRuy>-(?bFf;FGRi!-)kwKG-Zqvu@bYiIiOjo0f zIS){MEyZZb0y`Uzs69sc%jvPJVpTVw3pg&g@Fcqi{<5cHJXFp+_0>KXXxm)Zr-Ohb zO^F;>6*YrVXGhr{m)BBPFMLo?GQri>{f<SP0uOLLWFUxcNE_-5sk$^fIP!73SUZiDQq zbRurWZ8{zNmRL7?VGbN_h-6KCi2H+rgVI4p-gEZNlzsB#&2J|V)0mbe#|`9PQu~3` zBf_LYOpQm)Pt4p^fQ!XwQD!!0Wf}Jx#w)Kz-YZ^uhPl zw*hDU(aOro_i#b`%?r$+6%HizS$pEc5F>c(M>^qnK(8LX+^gUz2` zUS4v5xN}^6dOVn^uxb9?_*mGph2>qHQpLIc^MlQ0K0oWhKGg=dfp<=-PfwUmbdS>m z$z9KnIQO+%xj`yymXT_!gI_~A^I&rQLMMP3gB|qDnt`HTC&zsZWOl@+3zVq_nwP4j z1k^_x0Hrh@R}cne*GpIp8o`<~H&TYVD4TzTG7ga5SS`$IL4%UW9L}ryAL;0&bu#sO}K$dCJhJW;rqpK|IB@4O)|!&OeS( z_X{8?Hm|hs-(vqC?LFCh_etJj|986&9u)RJcK_P?#)AhB-`oH1j^e-i$q%b7S!gbj zoQcIbY7YQMJfm3awHuk^V_HL8(XRy|WfI=~fU_Q@I_d>uDFTn({5w9CqCJv=8Z1e^ z)llkY_8KQsWxCvT(fgN>#vo1f}Q7(nflf&`&M>BvFL%|9eUXNZY@cl~BFJv>; zCXNMyQ6keS=9P+4wGLZFV$)jkfoF!297JObSOx?1(up3K$`;@yMHv-~IS^Kf%s{%;ZwdN2Rq6~VvaxfQB@3L2=oRlD6~RoZsd zcOCSB;-pDj$sIR)RYEA6o^yefQmAHeYCZt553W_5a$2!vGai1kySIP1bI4zxmoT+f z4nD8GtvY}B8PDqb^jGh@rl*>}IR36m?r8q(1H#hX_%sb9K^ zUvJEQ8$^cbC)(rgf6jVIQewVA^vd zEZjsSKZ6Y>BB$*6rBeW5bEilgU2F37C$+zy94lAjE$eW#L8f6unY{{Q!;x2-+2-=? zuIqo(`(~0fwIWV`%j-*J^`L?e{n~Qfx>a(94Ke+Z3+aREEt}yc1DevRKd7}-)Fq+= z*?f^Fj{1zI*O`AJC?SyJQAesKX+=Qs_*!knu@QWNiYSG9J*B6=(puTyZ|y|zC9F7f zcUW;cIP2b+X?AKyoeh}Povy+ki*v%-`|M!JI;(4lOSe~KYA6?h7OUiXo*o(Yu+KdB z;RPI+g>N^IY)D+XmRXVu{jSb*c1?s-u|D^{gn_S8d^QLWTgg_8c+!8BNi;gl5de=B z@mOFx``E2;2P1_EAB-rT-w{)QS9PfN=t_g2p?n!id62{hR9h(mb%m|O23ypV%&bm3 z+oAm=PTAyw6!`0>0WnD`yvoXw3n0ti7UMz|bi($l(1gjB7f zV_FGaS5{b8ExYv$!6agr#F4nz#xKwI9$wQ|xo5cX7%qC^eC6%tLJf_`DcujHQ}#^c zP(#Tqb?ns;`*EF>o`&1J& z0JCWodx_@U4V2VkIKho`RLc%%B-6nnlvxB2=Ax1;ScZ6F5Z)4!rW9=VREf?lq*j

@P7Lv8+fnYAC5JgU;=Yw96xGsIbyTM)#WR6ipq?J`VXsY1IRi04y?FTjeu zd*fOVP6)j-Ii(w2NNKN>IH>JL zQVg<)N|<#&MNUGrp47mF)K+g zRq~iqcfnhLLu4Gvi*O5^lhhZ1e;>}CA&PRtN?NIpw_xmG=rB%BE?AI9G}arcg?*7+ z<+Ft6+K>`nxEWR*f0}nXX-mmgTLm|`CK=TG%iIv;3HnP9WUeOffc4A8! zi?H!a0T%geV|lESxzk9Qf7l0%f7K-MJSc0qyr#0Op^WEamNl9X3^gs= zLHI}(Xow|+-pH_u0ZBpeY_OrAZs^-p5>QThaq3>L(^60&xmrcjPU&cH`7td3sE^bT zPNuaO%Aq^65_g{-GN+$-Pxc3%%#pYec2P2(eHWo5C7(*Q}f$` zm!@udBs}oNMJOQ|JM(XIdNL));SKBp!;ZJ>w1eA@BTH2>l!uim>rR>;*yeMCi7HhD z_(~O^xvVSOqH@awSf;-3*pS-cZWtIh_^~u75{e+Pj31a2;%k_IMMCj6FaQ_l-QH^N zRW%eV5=5o7SAX@7Ve4JKInE*QMRA!@>k75PE?t~gyxpN~WD*0NH+bE*ITWr0clLm| zv5?Je4B{zYn0C$yPUSu3p{bG^-;utMUW6k1(aVcW21fNQB(=aPj+}BcVTlcmh>?JM zci*@w?5jzO@QTwjSaxN-I0fyjW=5#``lxn@8@E)|;<8AVSF%wOqkEJB%oWNn;V|P}a!^rWYT+?dJ6*I1wH~r@q zTcm%_l_!uEX?i4oH)1yMnjKj4TJ#DR8KWWPm*a{SUBDQL zEShTR=uUxZGBRpUU&)?nTb-ad$rNKvT=pPttJ5#{2fJgD+!!y1$ll%3weGRCq9A*5 z|I5dFFE)PP-TWw-3S1D1lZW3&$)axT<3zRhN$?UG8GDj-sR}XlOz2lgOCXx0kcXo~ zaV!gyRo2FpN+?uVhGRSFQ&neSB99<~N2@}N@oW|FdInspZW#Blp~WZ6)u?6bCE;4k z1|#W)(UL}rT1lHHwme)vd3A*3%5ThNj?y?>Aw^p?xEo?-;>m|cIFkxyh1A5$bg>+? zted2d4Jly{c`DhEudC<`e5*%y&mOGlHXW6_fg=;aPApr`Ioy5FnlD)W|9(-y>aR$< zynppQ2Hs=fJqF%m;5`Q3W8ggo-ecfB2Hs=fJqF%m;5`Q3W8ggo-ecfB2L3J>`2PW# C3`b=E literal 0 HcmV?d00001 diff --git a/hp-ux/generate_wazuh_packages.sh b/hp-ux/generate_wazuh_packages.sh index af5d3944ee..478b6f846e 100755 --- a/hp-ux/generate_wazuh_packages.sh +++ b/hp-ux/generate_wazuh_packages.sh @@ -37,34 +37,28 @@ build_environment() { depot="" if [ -z "${depot_path}" ] then - depot=$current_path/depothelper-2.20-ia64_64-11.31.depot + depot=$current_path/depothelper-2.10-hppa_32-11.31.depot else depot=$depot_path fi - if [ -n "${ftp_ip}" ] && [ -n "${ftp_port}" ] && [ -n "${ftp_user}" ] && [ -n "${ftp_pass}" ] - then - fpt_connection="-b 64 -p ${ftp_ip}:${ftp_port}:${ftp_user}:${ftp_pass}" - fi - - echo "fpt_connection: $fpt_connection" - #Install dependencies swinstall -s $depot \* - /usr/local/bin/depothelper $fpt_connection -f curl - /usr/local/bin/depothelper $fpt_connection -f unzip - /usr/local/bin/depothelper $fpt_connection -f gcc - /usr/local/bin/depothelper $fpt_connection -f make - /usr/local/bin/depothelper $fpt_connection -f bash - /usr/local/bin/depothelper $fpt_connection -f gzip - /usr/local/bin/depothelper $fpt_connection -f automake - /usr/local/bin/depothelper $fpt_connection -f autoconf - /usr/local/bin/depothelper $fpt_connection -f libtool - /usr/local/bin/depothelper $fpt_connection -f coreutils - /usr/local/bin/depothelper $fpt_connection -f gdb - /usr/local/bin/depothelper $fpt_connection -f perl - /usr/local/bin/depothelper $fpt_connection -f regex - /usr/local/bin/depothelper $fpt_connection -f python + /usr/local/bin/depothelper -f curl + /usr/local/bin/depothelper -f unzip + /usr/local/bin/depothelper -f gcc + /usr/local/bin/depothelper -f make + /usr/local/bin/depothelper -f bash + /usr/local/bin/depothelper -f gzip + /usr/local/bin/depothelper -f automake + /usr/local/bin/depothelper -f autoconf + /usr/local/bin/depothelper -f libtool + /usr/local/bin/depothelper -f coreutils + /usr/local/bin/depothelper -f gdb + /usr/local/bin/depothelper -f perl-5.10.1 + /usr/local/bin/depothelper -f regex + cp /usr/bin/perl /tmp/perl + cp /usr/local/bin/perl5.10.1 /usr/bin/perl } config() { @@ -226,44 +220,8 @@ main() { exit 0 ;; "-e") - build_env="yes" - shift 1 - ;; - "--ftp_port") - if [ -n "$2" ] - then - ftp_port="$2" - shift 2 - else - show_help 1 - fi - ;; - "--ftp_ip") - if [ -n "$2" ] - then - ftp_ip="$2" - shift 2 - else - show_help 1 - fi - ;; - "--ftp_user") - if [ -n "$2" ] - then - ftp_user="$2" - shift 2 - else - show_help 1 - fi - ;; - "--ftp_pass") - if [ -n "$2" ] - then - ftp_pass="$2" - shift 2 - else - show_help 1 - fi + build_environment + exit 0 ;; "-p") if [ -n "$2" ] @@ -309,7 +267,6 @@ main() { if [[ "${build_env}" = "yes" ]]; then build_environment || exit 1 - exit 0 fi if [ -z "${checksum_dir}" ]; then diff --git a/stack/dashboard/base/files/etc/opensearch_dashboards.yml b/stack/dashboard/base/files/etc/opensearch_dashboards.yml index ccdac621c6..5d7c2d0bdd 100644 --- a/stack/dashboard/base/files/etc/opensearch_dashboards.yml +++ b/stack/dashboard/base/files/etc/opensearch_dashboards.yml @@ -4,7 +4,7 @@ opensearch.hosts: https://localhost:9200 opensearch.ssl.verificationMode: certificate #opensearch.username: #opensearch.password: -opensearch.requestHeadersAllowlist: ["securitytenant","Authorization"] +opensearch.requestHeadersWhitelist: ["securitytenant","Authorization"] opensearch_security.multitenancy.enabled: false opensearch_security.readonly_mode.roles: ["kibana_read_only"] server.ssl.enabled: true diff --git a/unattended_installer/cert_tool/certMain.sh b/unattended_installer/cert_tool/certMain.sh index 62186cb039..f10d5a5ac0 100644 --- a/unattended_installer/cert_tool/certMain.sh +++ b/unattended_installer/cert_tool/certMain.sh @@ -20,7 +20,7 @@ function getHelp() { echo -e " Creates the admin certificates, add root-ca.pem and root-ca.key." echo -e "" echo -e " -A, --all " - echo -e " Creates certificates specified in config.yml and admin certificates. Add a root-ca.pem and root-ca.key or leave it empty so a new one will be created." + echo -e " Creates Wazuh server, Wazuh indexer, Wazuh dashboard, and admin certificates. Add a root-ca.pem and root-ca.key or leave it empty so a new one will be created." echo -e "" echo -e " -ca, --root-ca-certificates" echo -e " Creates the root-ca certificates." @@ -186,21 +186,26 @@ function main() { fi if [[ -n "${all}" ]]; then - cert_checkRootCA - cert_generateAdmincertificate - common_logger "Admin certificates created." - if cert_generateIndexercertificates; then - common_logger "Wazuh indexer certificates created." - fi - if cert_generateFilebeatcertificates; then - common_logger "Wazuh server certificates created." - fi - if cert_generateDashboardcertificates; then - common_logger "Wazuh dashboard certificates created." + if [[ ${#indexer_node_names[@]} -gt 0 ]] && [[ ${#server_node_names[@]} -gt 0 ]] && [[ ${#dashboard_node_names[@]} -gt 0 ]]; then + cert_checkRootCA + cert_generateAdmincertificate + common_logger "Admin certificates created." + if cert_generateIndexercertificates; then + common_logger "Wazuh indexer certificates created." + fi + if cert_generateFilebeatcertificates; then + common_logger "Wazuh server certificates created." + fi + if cert_generateDashboardcertificates; then + common_logger "Wazuh dashboard certificates created." + fi + cert_cleanFiles + cert_setpermisions + eval "mv ${cert_tmp_path} ${base_path}/wazuh-certificates ${debug}" + else + common_logger -e "You must specify at least one indexer, one server and one dashboard node." + exit 1 fi - cert_cleanFiles - cert_setpermisions - eval "mv ${cert_tmp_path} ${base_path}/wazuh-certificates ${debug}" fi if [[ -n "${ca}" ]]; then diff --git a/unattended_installer/common_functions/common.sh b/unattended_installer/common_functions/common.sh index 26b5556afd..b38315b781 100644 --- a/unattended_installer/common_functions/common.sh +++ b/unattended_installer/common_functions/common.sh @@ -141,14 +141,14 @@ function common_remove_gpg_key() { key=$(rpm -q gpg-pubkey --qf '%{NAME}-%{VERSION}-%{RELEASE}\t%{SUMMARY}\n' | grep "Wazuh Signing Key" | awk '{print $1}' ) rpm -e "${key}" else - common_logger "Wazuh GPG key was not found in the system." + common_logger "Wazuh GPG key not found in the system" return 1 fi elif [ "${sys_type}" == "apt-get" ]; then if [ -f "/usr/share/keyrings/wazuh.gpg" ]; then rm -rf "/usr/share/keyrings/wazuh.gpg" else - common_logger "Wazuh GPG key was not found in the system" + common_logger "Wazuh GPG key not found in the system" return 1 fi fi diff --git a/unattended_installer/config/dashboard/dashboard.yml b/unattended_installer/config/dashboard/dashboard.yml index 30994d2ef5..0df1afc25e 100644 --- a/unattended_installer/config/dashboard/dashboard.yml +++ b/unattended_installer/config/dashboard/dashboard.yml @@ -4,7 +4,7 @@ server.port: 443 opensearch.ssl.verificationMode: certificate # opensearch.username: kibanaserver # opensearch.password: kibanaserver -opensearch.requestHeadersAllowlist: ["securitytenant","Authorization"] +opensearch.requestHeadersWhitelist: ["securitytenant","Authorization"] opensearch_security.multitenancy.enabled: false opensearch_security.readonly_mode.roles: ["kibana_read_only"] server.ssl.enabled: true diff --git a/unattended_installer/config/dashboard/dashboard_all_in_one.yml b/unattended_installer/config/dashboard/dashboard_all_in_one.yml index 8165c78cb1..b84717408b 100644 --- a/unattended_installer/config/dashboard/dashboard_all_in_one.yml +++ b/unattended_installer/config/dashboard/dashboard_all_in_one.yml @@ -4,7 +4,7 @@ opensearch.hosts: https://localhost:9200 opensearch.ssl.verificationMode: certificate # opensearch.username: kibanaserver # opensearch.password: kibanaserver -opensearch.requestHeadersAllowlist: ["securitytenant","Authorization"] +opensearch.requestHeadersWhitelist: ["securitytenant","Authorization"] opensearch_security.multitenancy.enabled: false opensearch_security.readonly_mode.roles: ["kibana_read_only"] server.ssl.enabled: true diff --git a/unattended_installer/config/dashboard/dashboard_unattended.yml b/unattended_installer/config/dashboard/dashboard_unattended.yml index 68ea04dcf8..8700bcb7da 100644 --- a/unattended_installer/config/dashboard/dashboard_unattended.yml +++ b/unattended_installer/config/dashboard/dashboard_unattended.yml @@ -4,7 +4,7 @@ server.port: 443 opensearch.ssl.verificationMode: certificate # opensearch.username: kibanaserver # opensearch.password: kibanaserver -opensearch.requestHeadersAllowlist: ["securitytenant","Authorization"] +opensearch.requestHeadersWhitelist: ["securitytenant","Authorization"] opensearch_security.multitenancy.enabled: false opensearch_security.readonly_mode.roles: ["kibana_read_only"] server.ssl.enabled: true diff --git a/unattended_installer/config/dashboard/dashboard_unattended_distributed.yml b/unattended_installer/config/dashboard/dashboard_unattended_distributed.yml index c0cc8d2cbf..afaafa893a 100644 --- a/unattended_installer/config/dashboard/dashboard_unattended_distributed.yml +++ b/unattended_installer/config/dashboard/dashboard_unattended_distributed.yml @@ -2,7 +2,7 @@ server.port: 443 opensearch.ssl.verificationMode: certificate # opensearch.username: kibanaserver # opensearch.password: kibanaserver -opensearch.requestHeadersAllowlist: ["securitytenant","Authorization"] +opensearch.requestHeadersWhitelist: ["securitytenant","Authorization"] opensearch_security.multitenancy.enabled: false opensearch_security.readonly_mode.roles: ["kibana_read_only"] server.ssl.enabled: true diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index 288ef6b47c..09d5ed8116 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -52,19 +52,19 @@ function checks_arguments() { fi if [ -z "${wazuh_installed}" ] && [ -z "${wazuh_remaining_files}" ]; then - common_logger "Wazuh manager was not found in the system so it was not uninstalled." + common_logger "Wazuh manager not found in the system so it was not uninstalled." fi if [ -z "${filebeat_installed}" ] && [ -z "${filebeat_remaining_files}" ]; then - common_logger "Filebeat was not found in the system so it was not uninstalled." + common_logger "Filebeat not found in the system so it was not uninstalled." fi if [ -z "${indexer_installed}" ] && [ -z "${indexer_remaining_files}" ]; then - common_logger "Wazuh indexer was not found in the system so it was not uninstalled." + common_logger "Wazuh indexer not found in the system so it was not uninstalled." fi if [ -z "${dashboard_installed}" ] && [ -z "${dashboard_remaining_files}" ]; then - common_logger "Wazuh dashboard was not found in the system so it was not uninstalled." + common_logger "Wazuh dashboard not found in the system so it was not uninstalled." fi fi diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index e99194a522..50ded1d4fe 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -487,13 +487,9 @@ function installCommon_rollBack() { fi if [[ ( -n "${indexer_remaining_files}" || -n "${indexer_installed}" ) && ( -n "${indexer}" || -n "${AIO}" || -n "${uninstall}" ) ]]; then - common_logger "Removing Wazuh indexer." - if [ "${sys_type}" == "yum" ]; then - eval "yum remove wazuh-indexer -y ${debug}" - elif [ "${sys_type}" == "apt-get" ]; then - eval "apt-get remove --purge wazuh-indexer -y ${debug}" - fi - common_logger "Wazuh indexer removed." + eval "rm -rf /var/lib/wazuh-indexer/ ${debug}" + eval "rm -rf /usr/share/wazuh-indexer/ ${debug}" + eval "rm -rf /etc/wazuh-indexer/ ${debug}" fi if [[ -n "${filebeat_installed}" && ( -n "${wazuh}" || -n "${AIO}" || -n "${uninstall}" ) ]]; then From 5bce8268af0b90d737d4635c80249f649123df27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 20 Dec 2022 11:35:32 +0100 Subject: [PATCH 055/316] Fix problems with merge of 4.5 --- hp-ux/depothelper-2.20-ia64_64-11.31.depot | Bin 102400 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 hp-ux/depothelper-2.20-ia64_64-11.31.depot diff --git a/hp-ux/depothelper-2.20-ia64_64-11.31.depot b/hp-ux/depothelper-2.20-ia64_64-11.31.depot deleted file mode 100644 index 49fcf2923a52659ff8981a89bca15a1218a66bb7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102400 zcmeFadtX~emhYXv^(yu#o-s}%K!EMe#pxk7PB`t@9KfBZmvC4acXeAN`Jh*7$Sx?(L8Gr+fGITKTWO z(w~pIn;V;VHoJE=);B&{>uz+rcRs3a|Bh?QLtjj1y-8JlbaK=?IT`dPgZxeNhqry- zeEOf}x1+%S&f^E$fBl_SEd<}$+$`~)=s;g}H~0>eZ*H#N?cQ0xBmCd(u6y@YaK%$&(6lj{o%7o|K-3wUtif= zYh7Fnj;q7FYu(;aceC@ywc|UTZnuB8^J#yr+YzJpHaAYz)<3=5;_YX%!CAlR-dGx*+D<7ZtX3w9U^Nre?Fc)?+?%Wlj|2g7{T!xg7tS>N8{0KG9ErV9!&a2 zv+?AzF-WoH?pkX$m<{_?yO^c@KAY=Jj-C%@%yKd5SKsV*p8oaOS1YT3)aH78GXfl! z=l$xF)_D3%d-rGb+oV72_on^oPb=N-%AfwEj}nePY1J!Vy_il`hvTE(u+kSI4mK#cQF#m3_ShOqA_ChdAMtW-vstH z&~)%${p#-R?(I+C2hiYm)~|XmdxN2N*lO_mhhG{HNbfhWJkdS{r{eOFNqx(Vs zHxTtZ{jv!E1ucjRe>FY4H~!bxHrGDbf4>vPo5Q{f{&yZfeA0aD{eBbvH{W3Y-MM?W zY5%Qv*Y0k7u>al<%D?RCWdBH=w`6`*<_WY+^LFocrFZ+4(APSfH{xV+`O}L=dH5s- zS?m7s?W6E?y@cA3Sv?$#RttI5G85^NgfocRW5Sr(3=Myf-@SKN_DlCf@iX=4s5^-B|zQr#LPNQaC!l!Mxw> zKK<*;jx5#TurYOa{mz{9__jIe`o`T)W6q7c8=LE0qykiE*!^uLJ$UlqNn@XPHrCRN zYj^*+@#)%T7s`2;8Ly$Iv)*Wx|GOnot#q4nZr;h0etKI$kj>lgxXq1UZ`!__{Qq^a zfw##2we{N@^YS11`XK**nM8lTw?4RW?+35{zdgN(|Idvmezn=3LG|ADe-~wr{r4gM zn?d-y{qP3-|5~#@ulcR=zq{U)|J}PAcRs{_GyHzf9~N2eXnQxXH|{1Q@7LJ>pT3*< z|9kH8!`RnB;EnwM>&(79<=goG_FeLSjrdk`FRfiznRTfu2%SeL;inl{fhmE`2QgP zOA!8UKflrbBeogQuLbtshNXVrA^!U&`!5Yb`1g0);)j9X0D&v~{~OtS<&h-(vFj$N$|sYqvk}|8D{Nw~g^O{98Hc zucU(a#{c@7N`gN4|8GOyZ}9!Q;a_DjzkIUy$3JHQKFI%H4)FJQ^WE`ZKKULK@aX&F zf8*}$5B&drK>meKmsl-+&idcw|9n}TS8KiNl*0cT;(wdBN%q(IAI=G_Z{FGX;QzlX zcz@M%1@s-PNmuz&H9s3e^%{}hjv0}T0I(^afao%T3_p~b@=OU z>$}NdHtUb7!^>)KaP+)4Ij;V^Qau`uFORD)CjQCFP`~~=!A6Zch+(H`)Rm+0*_W-> z!SlhinvPFquX>!2;peY+AHCe@3Jren_T%*L(b@vG5r+&iv% zqvOibX2W6CV~73o-b5!<4EEEN>N|dQ#pqqhqF-UQTEIv({K2P5NhJ z-pSyxmzQ~R#yCg3$2_M!O(W2pv6!PC`_(U()vNKv@VGVM@D%G4JbIH;{yiIW%t!F( zzn)Ec2F598ptSm`cVwU>4`^eY0bkXl_It<6j0ti|%9$Qb2IsTt6}$73T|D&aIk>N= zUmd@iR+BLp04AgHsAK5wK?X1TLylW5gi->0)w`ID&w8@~hnj|$%YgA{cyT-!owkIX zt7s76#5RvtDkG?Lc#30A?5eq(i&5Z3&;v0BjEr;e#*8P``FJ`VKu+3te=uoI%a&jD zheN>gO@GqADRO`cFD4U?O@YACjMHpq{pl1cg6wAJ;0sPE50O=!Keaz=wf61V&l+(3 zVSKKGdDFioc>K_bgI|BEeu#C}AFZsc{0%PfSD zoD9@b_zXVaRWM@H1<0Uxy;LowMSZ%#qE0l)5zv_1!fMdSbh+xkM9@JIy&>lpk89%X zAE$@<$F0uuYKhf${&b7&P0u-0DF92fHK?K08D4|KYRI9?X+k;lHJ~j2D(S6MJ15m> z+^Q-bop4|fVJ)dSy*NJ~4*Jk8)Sd(nFstbrc*M%I+z}J-V1lj@uz>*JL9HV=Hz1&| z&TQJwg=R9A%F}5fJTQ`cVFQ^Mpn=S`$igPu-jb|Aa2A}Xaco6=oR?W4F`u(Pge??e)XMLlBnhhjX zk`b?j=E=nf@p;;^-T0|nqm9s>cBGYE_ot(qGuNNJ;CHDyGX$8C`9W+e*#yfKN08yx zk(6~4#zF<3uz%1|ErA`Ej<+xjAX2HR9_N6?Y0nXSzOi04n_Tn@OfB_SPFJdv*|{Um zwG^*tDF`IneJiYjTMeq)M|&PKG^$xt#}J>bu9~*#!>%j;oC(YVc?;uzi|zmNc*@(& z&$rnB>l=5<`cK*ach>H%f5`v69kRdviCs5vD;+rh48dEuaEe3pe~C^2u2c2Be1z7M z$>4M_>S4`Z%$|=YeE#b!|2*E)y+^)?=QHE3=jRu%aSlvatc)k8D;F*Dq5 z{^hiHeAYZ5)>&U!TU%|p5X-}{@VAY4bUNthu-UXP=KoVD%X|NZQa!uZV2#!zcSwAt z0$KI-Ei_%4_*%x0;;OP-88L=USd`bR|8d80P-y zo!6WzTlh|E_hNzp-2W`C7h~KM#c{2m{3E9sv(%DT<%$liFf);!RG{p%X$uRjHc1fc zh~Ig2wIs7m!j|vOY~&&S$V9r~mZ<_hAE7(!oE#rq%IL6XO$lKFOZOyeEo;{~&p_Hj zR*V3S3D~-`2_*n~NIdm}K)gS&rUL5W@Unkw@ctG!bT_N5i&MG7cU!H_Z~F(2c$`dv zYKcWkOW(p(I2HY*Z|tcVgwS}Tkn2@v*!n^G{;YSIb-r5@m%yyhjbX)P9czYX=e#9d zdWvanx|N?_jVCWm)k{|=E2752)e%nylj&@^g{OqRlwXPWEId{1q=?&z7Nm&fo(Bo7 zRQqs8>sPXGnx)hF+drq8{`G?Xnh^>*X$U!;`_Jt}R_Eh?`B>~Vqc%T&i~hgMY0@J8 zN1rIVzibfy{ZRkYgyZk=o5lP(Rd)jy6G28dB$s8^NU~PzlWOZ&!KOlBRv|EV=&Li} zEOtY1R!h(BY$B_S-HqDJd6&I$3tfa%Q}{&xZmdfI*CLlUH`cFtbEVos@Vu%zhm7HF z07_*@a8Vxr>{TEC#KuD^O3tK!OgQ|mJbc*f{THkqM#pW+*wu^FZb3lKr4x z2cwtc;Yf^ik}Ko=RKg1G_@D zfJlZgb9@S8KkOe)F2q=h+Fxs>h#(#gUTbh6fxv6$;{0^dqyNLv_?YOY`^pOP9`=qE zeVL43z-LeW@3VeyB>sQ`j9F|U4Q{eHJ6k2dLzLY@IlLT`9al?@=xD){ z?doiB`W(Va@t3h*?HKT&KQG;%=0`( zjLlvmtc>Y0(^j(}BvKOsh#lnsjKOe0$Y#k+a3DNq>ne0C zpPYy*JV!8?(#R_ylLKiCYf)X$8BxWt8kN;SVzx0vazvb}A>75pyf1;EC}T*V%tb)d zGaCKZ1BG@#b^@KYu{#-`lIJ1WK?dv0Vpxol^Ewa8l*Udp@nEs`Fi~XW;`o(z^B+>T zW3pBu6)PIo5j*9B(3hSt5V?J)h?_@UbHLR=I=>e3KIEU!Hi*yBDNS8aZ?BYAx>Y?* z*^XF>?aKxZn$ntx(bW(%-gEFG$X^b|7t=sw8H`X?xXQfsnys67Ig|;| zOObHtPgc$-hz#*G(+iW{@i4r`l%F}X6qp5?lYZ>eBab;vymYE{l<&LC)Sb~_HXtw% zBG9P`zw7Av7{A(q#pW;)6v-ILjniIoE+yFx5&^}l8q^p@L0?10LFT>!?LAKSurhn(jQEx7c3adL10PN zgzOm^ON=5F)`JNqlZ$gH(*z_1y3?9!dJoYFwDWVJiv>}}99_wg#5!f5$>~1Sr0Hcb z8FZKowHS)U_6TAt#o?HMu%t)?|}X6832`$69NZ z%Yu>8;u+i(Sb&M&%LIlYdrOwXF(#diaTaAzCo$SHi@hZ4x?N{s82k8XLS6&NF&o3p zmO*eQiFAfel3F&n;ahG&Ov1(?2&e@!@JRgoN%fslU9wWOGJ{I84n#Rh)D(tjLtRx% z(~DC|0VrRPr8bzcr9P4bj8XMKmnfFWhE3*497+D95mPeWUK)+5N8tGhql6cg^s}ul zZN1z%KR5Gc;u%DI)|Vl2>pkXC%w6ce#%6+>Udbv0CP64mgO&b@nNVhz=67V)Cn3&W zq@tKl+XG~E<%1*lQbuejtUN-9745MW$2HMJNUo-E%NPbYsLu zOoZLiH+=AH`5Q{rPAxx_Ir{eSBD(fAHZj>cCEV)92&^ zWTFz}w>l#?YcYsXaSdIx>O#SFkx4g9RHQa89A*Q4F)?PwsmljyA>i*&jg#i+q2pC% zW%4Y27@=s!$Z|-sL`6qo_{7`{qi4<3)DH1S z2&N-sa0KM&0y0%INsU)+rJUPE6ug;pR@lolv^i50YUI^Y3kDF~VnBgVR%bDo;duPQ zlOKc83yiJd<>)oR^y-yj^2j=ZTLjQhld>s7R+E?G7pcDN;b~G;EFiU|hZrD7qm&TA zY>%S3@Oh;=!;cpfeMFuiByi?NHbY!j64yT?9QP7qe2Ij~k-`L8VE^>=7F9|gV(`D1 zUw`Wtf0_J`!pnDD%p2u@mxl0H>woX6|HFs)|2qQsS3EYC3btP@o4x&bdvEJewfpod zkew=RVfclA{t|Tp8_U)Dr`7+uz+POZ=Xa|`De?Iw)dB?VR9LJJtB2&fsVI&z--pzo z60t;wELS_DqZLZ7JokSxJyDu_^~+YZjXi%U!G=5{L_!5}gg}oN-2_WM#@v_ff5>=e z_;=^jHn!Zk=gp`iM%o^sI!1UB@>ItJ;xmG!DK1u9BWt|h8Z^9u9 z-aVhFx|WJrf7wi6f+&Mi-1rtsV5aPG?-h?i)xi-0{{Mu$Vy(Rs^>M`Omc$k2Ha2RT)$0 zY_$jgi5frYLTsa&=&R@^3nf#lNh zf_g7RB!WO*4}p3`J(OxE2m_QX$tmm)F%kc<}Rqsg#gJ$ z$m9V~vVO$0_G0T5^u@2mt9qs&Xk3iuqI27iu4stS8Jm7CbZTmu_nn93NVf*7Mslp(@}?TC?G3P%E{kLfR(zdJ<^ z*jEBAbWa3TCj@w|@~1%J0b^MT&}%1!l-5yyqOcv{o1W`f!Qo&?5R&Z%m=|J6qb4XV zYx=>7C=fYA^j0MK+12q_mgdl=^?D)%u?WAze4^Kfj70?EjH45n@Q&z(E3ni{=6FEo z4t)!g6C+(qGVZQUBuZ^*ilCq449N0kEm{L4GXS}|wZwKrMA{Gw^@lmDH-oS^C19L) zrh(>2oVPi00MjYvWMrtL7>V?3?3yYWXA5%4i<&-%TzJM(nj#eR7G*}Z#LJcu6Wqwi#EX&MQgN7w_LC`Gwh$DNKET;3c{hRfvMv7)IO;ar) z@@}T>nCjPq9QUb?kdqVSA4$<61RQ5^_*Noc>RG`%>5@w$1zWXoZ6aLoAaXl|{9OFo zq^&&Z6y+x&;nPJ@FW_zKmqV5nkYy+*FZif8ZAF-G*|BKpP0Q1{+oU>u)Q$`Y-s;W# zS|#2@24lN;>O`8sY9>waq!@Fa&)~MN^Fsg)5q(t(OIrB8bV5ftD5yUCWbp@%yIMBs zSVyr9*ik!9FwzU8g!CB-p*O^}yEwHY2C%^B;zaq?3GvC0bkng(8NknfCoop@t-_>2M5~az5P&9ucDfY%vo+ENyB!)F+s*ZhWpoS4=9_IOi@?&QL5 zph`5ZI?Px*w2(u?z75l6`nC}4hD+yg6#?s57937>0eetvKp>tyS6GDHu^(&GRsc6P zPbNW7D-pfY+ShGONJeOIcwF1xNOgNadqcy(O{ka z1arl>gd@Yt0XqmH54|H&!FWH$2*4aL(J3JgYZh``(wzrGendr&pC7Yf7kWbn+k4;c zS6h!CRQI1eez0?}^W^cqblKVp>g;5o+$S^I`|Se}XXuzVyFmAt{7PK3k@@KHb@kLf z(EX&@+HP=r$w}6C92v#K8TL4MXqa=88o)JutCo2-h;tQuK>1U0jsg-=M9Qo;4abXh zN6x=@RxVpMexB3rQZrjWd^FWZyRF8F(%3Y(-=?BDIe(_oddJ70T$p7EZB%ZXr`qvC zf65L)NxL>`D1xz+BCK4?IM$1=Oj*%?AvY7eA+xrtWCn3RBx-XIzd+FKPhRaE_c*;N z&x>CuJHbG8nV|hpUM)KJI4?-k8B&S#yz|01z-okhj9=X1fEV;E!}UfjOG4Ru;sIdF zzICFO2Mll!hmLs)60z_?iM3-*E!hX$)9J5h@%~f$(EO|MsBH{fK4mnsRke?lm1cBJ z1{AGKDN;_X8gymFxf_zK9^OW8g&h@N+qeR zcV}RkIDKnU6%>zN_AlqqAU;(*MHG}!r7f6j=#K=c7#f*7F*k|T7#7$-nEu))OMr5} zHJd?a*tHPGv90#Z#$n8fY^j#Y3j(GbpclnC#$~}0LK#hEcZ)3yet1P5dh+!HPN!Lc zIp)C!mg4mfu+T6O)8W$gmJYLlE1~L<+3SzTm`?}~3->_VW*x{LQTmtv67n=X5F5!| zGMF=DF^^-T2VYO?T4~!UDM-6)6oUfYUvJf5TiJV z3r@?2pY?Tpr(zNpc8S`#>A88Iwru& zCIqzl^@59Cys7)OoW08(0 z@RWnnN`-JoGRDyKxo$$61_xsMqYK(12puwFRegj7F(Pt#3LPu>tmV=B8+NB&(3~(7 z6$MbbcQ*U&f}~!xxnZ_6M2#a(tqISM28R=*xfHx<$B@dk84*01)ko-7h!4PslMJ&6 zKw$lR?A-~NaH)4o!X(}{A*zR|kUPVk4g4VI)Yn1_?N#5ZWSv0$8IdCB*zM%(EXnk& zO#&vc$6LkY64gtGx6n|Wfri?n(9Q*`gjPvqE-Vd{SLS6EaQZ-DBDe6XtAt}z?Tf>r z$j_Qu(Z1&uO63Yg_$Zje-~dH$wc2y5Xb0Ia6jEb`$U#?`rO<;p1Sr{R=9uw7fULFj zLVZ$(67eHa&*8$lP$A@l#!D~=$~!_Lpg&9rN0*N!0%LF!Poh!GRTbV`SJza5e~-Ul zM62m(d}7f|xdq`?npvY4vf;Je0P4RX#e+G>i@22>Qa8^t@mv~~EcraU8c^q*Ok#wn zH?R_4ARcN$lv^g;c-}l{7oBC`FN{v03QY)@;>-CZD_Pa5Uv9Fc1A$#V6oIBl>mocN z1;cL3;?QNP`Dxx)14m>!M(irdX0}aW)0%FGbqvK0c0l|aLhLkho;`oy4 zIB(_BqRd%gHNSV-L1XeifnLmKw~uywLo=Gtm^-IPtyjn%S%$R?Wgbw)jL zII%29+{{JaoQi=z(-9#9a@>9GYtVk&%9PLpr?rC246+EW9^w~P5)Eau-?k--fCwU@ zd(uyAFjshK*?PVjJHB}>LO?ho3*??4YXaD6wS`6-ZGENssyF3a%C0i37VCAl zeG9)ZQWC%j`B8ed$$&B|EPbu{g-3*p1p;fk(5&w4OgsC_ej6ZhUUDV5!idS1vmwyy zOejW9u?sy;uM>#93@1SKG(9=uhIUvFt3knbTquOxC`y$IM@s@E$(Divcb!LVWQ2}4 z>oKhGupMiXr&Rlp0%ZCf0yH}<{C3xZNOXb0M_R6ks#6C;*3aaUsap0$LFtSDmGpQT z%y2TdKNL0zD4b(;qteb=DNRKBuSXui6fKq}Ga>`vkC(ln&4G!KLCP{~WZ)AT=D)|) zl$k7#hg1hbS6sk5?$kDx<)mX716*6^U3Q znu;+%G?tT0tMPH?CyyA8hp+@(nutL%9_&*nlk}I1Pi!o6;hMHA9>wrt>c>h%rmV{( zdO%3Ow@l_?rKX&jo=X(qVp#}64QH?#i}Nb0#d;yGj1g->QXCLM1Y$|V!ESwbW`Mz7 zl3TcMW}k)f*J#ITm?eALMOVh0QK+9C(D8?ev6PFH(_9nk)NFf=XlX7G2WCo0z?OWg zqUGnk;mLA1NcNG(AaFcLXjbpVkA-kj4{S~FH9|A2Ly^KRKhN#ZC8 zL6GE)!y_prp`2KsQ;N(z_4@l0&v~8_yhgsGzEhQ{-__-gM6+Sj5+)qq7!K`3kNRi^9i=V zjTIdaQrui4JeAnL8BY10>R_f6Apo8&v{mQ6Em;|1g%KVFJ3dx)u120zDI`Kp>6k+i zz${tg=#m^_1{p`sN8{o6RO%JqvS&pSHH?a&5NuBlV2C!iBUR)b2E?ue?F3UfL-_sO zZc=~W?d(3O@urRyJrZ!eW87L6#M;-_i1r@!&km72To8OmJjESyX9KxZOlTs=NJLN( zKSfAizdGg;7~o-P^|S}qL3T<>1nhh>Co4S{{Hmuy0TEo}EJ2!i6!7oi03FhRwiJ5_ zGgtV)XuK*P&;ifh5vZ8x6Y@#gNr+?zdqW?XOp#S>neuT^VU1;1h1wy( zl_OH0XSNd=X-*xeEK_93aRBImxD;*)SrSf)CF8J|d z2WkMzArzTPxYEYpD;a52;Fj)%D;Js@dZCC)K#;E@1DJ*5=!?blXnKyr?@3t%TMPb3 zVJswtIgR9m0CHdPdWkHCRBcXrs$d6X1i`M)TQBS^BgFYoR;M zkT5+XMi4=GeM0IrzaBM|EK_r#ymz zEJ)5w1c9*RH}f!A2Kgc@M>Dmjhw@9{PQSB03yPIgn?yt(z6lc{X_w7K6l-;5iU%5H zIYP0YYDGp{80F`P{v0r+$pBOKN0dugYBqw53yIRe9iXyd#6>|BqFjaAhW(cq|MIRp z;8<0}e15@P3O}p(ys|MZX_J6am`K4H#RgF~;s<{=U}eMHO|C$3LOT$JiWUOOFThC# zv_b@0Nc$SjZ5vHaV1#+Vots~w>&ZV(#8N*VZzK_l;9$OnQML&!xgGN?ewmV0szg+$IdjOBUbLx z!{UcY%EoRanJ_z4qiCM64jc$&rvzEamzYr-B~DBU6yltg3aSo@Jg*5B*-`d>5^`*m zxl33Y#fIQ^gN`c6$l2Es8XJUW6}{m=gy^Z;V$diqv%Z zw29RMO1jokI#*IHnEEEK++j<&)W2UL~sNQ&D2X|RvRF$UL5iXawY~OD~r)9hpo4Buq*%k6P{CDW`WlZyT<92_lIgkv~>j zWT~^~VgwJMWja|n(oHjwQ&eTKxQ5~661zkJW{eqLt;0SdfxRm?rxEJBzR_lKWZow;m?g&R}H1M|Q*ntw6z_*t6YiQe8lqP&&bF{>Uhngs<2 zhSX|ZlFtkBLOi0{|6BL01IQe3i`MdH1uj=6_1)Sdv4*=Qeo^K7CDk5iUzn(P#5HFT ze*(Emx=&GO(pDDTB^qIn(dTssK!$}EOY~v)DZK;ZD2T^YS&N724ojn?jwmg$f?P*} zyoeA4i;*cq7NskmERdt$ZGc#jFHfQ@!URSn1vR@|oTmpH!f7IQ{SNf79M-j4?xDr& z1{oNR^5uKev6WG0Z<9l4n0A8Zb^ib*jIQ$#*C}IF1Dm$?E7cDSs zA%i?+wj>GBzR(Z20?!I6fhu4`MJu6qV5pi}(J?7?WWbpM3;GP15S=^i@vw5TRU>-2 zvV7N}GAN;X_leDqw8gkDNs(!|lXngSP}oJ+Fg`?PLzxKk(qr>@)DuK!i!4qruC-JNQ#qX66J$;E^hU~{Ji_fWH) z6pn%H!{qb66WtXS_Z;k{rQP83m4t_pNV$O~QNbMTB4XIyB2sehWy=Ht&FrZ=>R93( z=JAxWD-C&ck|vCoqB)m3c&xTJKqrJ9fvlV;Fm@Ai>&SPZf6YUr_E@J%Y#1xl$H)S7 z9y=Ui_a%p-B*tma!aiPV4RopBz+?)EwrHn-aIfKJm}L~3R1>TD5QA}q5|Gv*dZ-+8Be zV><_i=q$3;sYasa8t0beYZqd|4@GVvX;GkVZP1S{{8kNFERd9trQOT02PAKK2RwPs zmEkai7lesmR1#O~@`p>7(kb*NR@U?bhrG{2{ zDD;8IO^TmV5O-6ew1GGs$%Rup>VQ&{$}<~}p9zNhqwLQsZII*H&PorXOG$qt&2@~3 z+Rtg9x*Z~|p1kt14%2|CU^J(^d7d1G_h4e*V>&WRx{{Q!@Bt!NRgh4cISB}4R1NVS zksh=IOe6`C^p4w_rMst)8nA@{lwHttH)K#};mqcfQE<;NVBJTi}<~89(c--R;u_GPND#H?@ z0mWP|tjDx|t5;`}o9h_fKN6LVIrbJj+9H_icTKPYN0Iky#8aXeQ{=3WzVj51xB!oZ z0iCS`c4ZA@Q8a06ZsiGCwh$*&3m6o~LCCizyFg0)81vOKhpa|*czFU}F4=FzYRneU zC(IY+ik5*eYeLGK^Fq`n5IDfj6`Xn2!42$u9mYiM9q(r6F@znHRQ7W!4|-a#Sfn2m zk|JOKe0)4z7Hu5$F-!$YKL`~S>(z_?rGwW)5H1CMp3u@J!=rG>f(Tw4m4dRM0CzaY z9R%yzJr<6Qb{Y$m1fo*cgSz$m+PNJ6MREz09zam#@)Q-KhD4=`2;=?~CH(s$tOao7-@n+KdKM&3uqTP1c6$ zj2@nbKTH#;7*<3w21BeA*B%Hm^}N;i(lI_bG?GS~3@4W+@ARYN14(6Rdsx zmizidc@SR1h|?832I+m3+U%7P?OeTPF`X99!6+1)aE+7&(N>)jSv`eAWyX1Iyk|#) zEfkb^EAvC4%w=;5oDGOC3H!O+Okby9DnTuky7*3j0I=VC@~zr^IscUF2T_Ox^P{fY zdL7LQt)~)%A`hnd*yOxzy%=2#j1X%(23{=YVDj-_>Rh>XVQ*c_>p5s|5NtF^x9U!de$2rA3hU zvQc_gPYbN&4a!&(H;}#Bs`D}jN(S2J?c!6!R;tM3Xp39{J?2{$jYqw-7|_2l^w!7D zM6*$k<0mSx96_k;ZzZExkwtWPOKJ~JisG1+*5XC@%vy*<4wi$;_5ys76WjG%y_=Cp z1B9p!gpyR!y3=uE%w{_S;x(xzCd&M{1>CeNuf>4F4AIfm&trWqTZ?t5s?D76BHdL0 zP?>(%!Ym(&iqJ!vCDtqxj(O~x;6PLkrK)jnBeazSx@xeBu{~X73--)lf5b#%vromNqq-f%g%)?T|*@Syc9J9+KFob5&0sz+WInJ9#}c`tZ@Is zq@6Zs(oXuzwadz_y2`*pEXcZ?)-0EgluOlR2p!8E!v-3Wg*2_hWvh>KA3zUS`cQm| zh2-(xBF`saxM@<)W+-_)o(YZU3HV1L1mNVxtVy+$w<+=N(bcp}El#^xus~b4;Ay7> ztb>3ZdkJM!uSp)ILI#|7G1R58IiB$bL6IvHO-PyysgoZMq993oN(xjm!*X8wP{$Ef zD@lja)a4ltOYXfzC9+t`DW2|a>6fZ|$8`~sJF?`T%f_^qNJ8vcp|>V6w`Ia<#0WNo z6$&pE;b%{|r4k3mQNYXnjNFmIWFO?#0FU-#pY^Y1TWt`Kiv>adQ_uby3rBiRmIvmP z7CD&Jt0&|P`{$ZB1bFtn@+L&oTo=JX9ESotnh<8DwwCWaqtSiE$tWqE9rN$fn=%<{Xg2Io~@6i`wCl@R&;HpxHPcaN_LmhA}kLcb5nH_z(QMJdLnyIH(_W-%Vf?zrL!Oq~Ncj=n4w`N3 z0*yA%V0OzrJCT+A45AMpjL1~n>&jMZh6|-z7^AW}jOvj-#dD!K0o8Tm=EKGqNYZNr zmo$zSJTC-*Nxd!dRW9Ween=uwIkH+TJNL_8U~;?T7}{({XdV^d-5tc3ZQFZrqT+5M z1R*!_6kXa1qyT$Tu28cCCooW_D2SfgB_J&Eo3y(=3N}>~#sx&PF3$tPg@R`1wNPr* z*qD*!+{hDHpq^tWH&UzJ(6h$7fBAST%PZhNSlfK`PC!wvJmn9K_CxRxRJuYS@Xqzf|VSB-M56 zH-d^7g)P_3+%{V-cXrcRG6mq!_x%Q93kl{-9!; zCfseg@=U}c>WvM(^A*ZB*<67)V~BVScB!3!&&_M?9b%V;qA^fF)n+9}908?a>;2-Em?h2{>dS)QN~=xfUAmnWcb;n?l}PCm|Qp&Tf}sl1I)R z@{3_(bpb;Bxty_cBY?J?&EsBbQKs0Ly12NXY4vi5>-q|D<6UhaS`kKFvoTK7BrhvA zOq8e+J2Ar4RTJAvEC;%kX;WaUhuS))c(@Q-T@QWKhYlkUN9G(!i3oM~J8YX$@>oFG zk7saZ&Si#~R*jJQya6aMa1nyyFCrBV1v{8il37PQEHW&8Mt6n5P_zWDl5OjDq_D)K zeyWOS0J%G*qiY~G5B50Fbrx83-19a9aG;0U^Wd!*oMTIB3Sh^G)L>4gxAR~D4)m!t zfhcSk%g3;vxT1=CEA6K5`Z^p8HKpu=M8D-a57D5B2AQqz0Yqea24bJ`GkiBn_x%$i@8LBVdUd?Qa_Y@yv;0K(M)V#@re5Q`rqZNtJ zn++(j$|Or=URZk_w?a|Y^6d(CFekzURaUQ%_caFO!G&EB3d@HV3>O4K#CBIp-wk%E{0vb3`BQDaw{yZh|%1 z`bqEO*{R11&*L(tXRNQ6hFdfS6$;k4qZ~Xs31&)yzO{lx$=>w_bBj9Wi2K4MS9cd> z?h?5s*o1&qv3nE3!L82fbwQ(l4QegYEn2__s+n zGzD|}x%a{*tz`oe=%E-QwT6(q!fZF!EX`kYth(z?#+Otqdf3+`YZL_;WBHLstz~{4 z2|@MTwUv<^1?vhZ6I@M+{p@M0G`A~DEOq=Cq=2dhVAMj|u}C?8cBGUvuI}?8<|kG$ zS``evZ6b|ib%v5vB!O+2JI{h({i-YrvEo%T@STbzH4M9JO*uGktSHD}ec0$ZJz$X5 zJayqyoGRgt)M}S)rMfU{IfpzL(7Izh3DGfcgBeeGM2U#5oe9W3MeW9moy9Prq-_mO zuTV!_ypq0V+jfl26_2z3>^ZyFrx;YL+LrB$b3pdW?Wntu|Ol^8*& zmta@ZLd+A%x5mdU6pxc?$Vv73GkM%tg6giKXlV%l(BHIoWF>c^@|Ij{H}%t}Qc1)p zym=nM&j!ZLdB7Lp8q096btK$#?In!@;5p)e@Pa;4T5KLD%Prj?5C&n&OdH|Jl3%7}kO!gdyq zCOhz0&9g0l(ivYvpZF}yX;1o0w$x5 zl>sWy0k+4J;jy}EWvOGWOw+=WA(13YgH|BdYiLl$g&oruw==YG8H{dbwR5?%xEcN? z<-9A!#pqg-#Ag?e3*?b6ohJ-~!H&yqZ=mWzM28i!x>5-gy(1m^u}K#aNS6qYw1_3> z)IY#CIY?i!nSNVN=gYwNNd4m&g_wub32M*n9vCp#uf^4M-X}+D-vcjKY+)I=7?tTA zpN~WNiopB06gk;p*2L6_&$J+Ju~u8#wvklZ!+d$Dgh7_pv&tV;gxMv*`C0)jPsf)Q z?)J*Q5^0o&+0B-4z&ER$px`sEZ4$l}{aI`3WO$WrT*(-ZMrcTuznRty-{iYkOP*t7SIp)nH zoDrl~sQV~z8s@A^u0wi2pAeSwUlZOEK?qc4&kK3cfX@wnzF68oz55In#Z3~)1m{~M zl8;)0QteIVasNZ33>t$4D)?HB_-%NP=LM#Hl|Ko-nes0Yo=CO&VQc zZmrJDf}l|&KJpaqxVWU2m@iP047B*tF3T~klGm0LhHATgWz3sOCHbWGl*)m{?^FyW;v=sjNy{4P?#lk*@(n-Mp0nHK^2i4GhTsBxWQ6PE{9AJ z2OZZz1O*f@_OR9=cmaf43OLT}HR|;dPe?W$>PsD#>XH*Xv3=gV)C{RjLXtm+ti*yIko}KgE4ZT9L}bvQ{dGliSviYiAy5(2s2BO zLDM9kd4X@;Nv}!;2*^UY$=a3)Lbf|BR)xXPMSbXz$&|ClO09@IB z)YRl`5)w3JHP-(~r&SK++MQ`8U>~F5C4Y>_YQnBhYOqGadMY%x{95XV$+W3dhq8H+ zWD14xP-1$%ciREifg@7*63CULHH_kI)e0BXCNd^Lwg>dQw(m?=l;Wk0Mq{fkEe0Qt zX|YAEw6(^E(w+cNb;x>%fy5mZ$$n!iQG;k&#zPb)C5#4=e~3OnS*em-A#TX8upjHi z-g2-Dg;ay+9tp={p28@;hNuZ;ikZB>9gd1BOf+wf4He6qdl#c&C(KX3wt+{X-#P7s zAP|nEhsaau_ECCe5u77s<}Hbs4Xj-0%mo4Dy9CTiR zsm-MDPb?4_j|@YdxMNv|ijqteXtiRuR*fXm={f<&ZC#=fmK=0Eq-#PF*zB4gFH!MziOU;M%25GkA_705Qp+Nr zGX8xb^}0kBF|!e3mu7BHS)@sPeW}~wwiGHFS6^e;PKbN#nr)tPZ;4U$#`_fl3MFPx zD);2=Hw7HENtHY!fUOo8ax5D1$JZ9+>%q~-QJ;zwwW7m~WGlXP`LI26CL0Z*m-=#8 z5Z+)bkH#ok@bHkbP%2F$7myDd?o7J*f^}l4@G3-#7pYmS!hjz%kaTUtvEV~}(h#y1 zXVIsr);cmml1|y^dF$?I7n{n6Hmn|qic>G!licSKb4Q#CP zrW*_Ggylf@Bm-vt1w;Fa1T@Cc{#2oz+V#O8G)JTLg1sf=fMyAnpeJ{3v`Q}`ltSXf zAg$gnMUHGaeLfz2H6`5mkC(bfLzAE?S|2 zR`6&tucfhMfFa}J+B<&%ETj?KrYY~}Y&99TYO_W$mkvR28p5$h9230DGy#ArB1>E< z5^Z@UwV11n@gxQiw?OYnjfKN)3t_Ekg{{0oe22T=U zwaxA}4oWEPE2a;*@P)fv>o6&Y5tozQ-&Bm*OG@RsyGLTVg+G-U%D)rNI_1>}a(2AWFj(fjX(aGcRf8 zwPFX~Z0~JXJNwn+C)IabdwW}t55BJ+KH01IqT1bi^7Y=GP}K4?QZQI>}>CA9e>$*uwAaH zYH#hc>~{6t&cQcNo-$u7zV+lG*Ia#H{dwo{gXLyiXTz$m|kDnZHfigSev4bbeEkPijO`~fujQ{QS-u-WY)Yex!k9L5UuGMORXO;Ky6nKwjXZaKiK)p_OhO2n*FEWI`Hm4**{>= z*4Cp()#L5^taoeg`)YrC?=L&|4Gw$TyIVVee~)Xz_VzT&lgCa*^p>*Xa#yF2(W7*n zz`h5uP|)^YL?2HdKN2MNw*U82_9`l=npC3kx4z!nHb56N(fV$Og$a9^Fe)dEWqXA$ zYQp#)5_?j8`{cpSL!kv6h;X>w>@VBj?;G+0Y=U!5vRhw05n#T8Tz8CWL4lwont!nM z?bg@Z`vqlaF|Dt+?UL=~YJYe8{?67T`yP6P03JE09`CbPp_UI~kZKDYi_S%yj>pzh z7=dYa9w)+KZhcmwa4A#e0-~%QJpr&F@WIx>mWHx_zuMM3d)trUAVA9S_wPU5gWvRo z-T*xNPvO9w$Bqr{m#+@K+1Y#0N=(KFTh+s@okvfh&nDrCOrHQk4QT`@6a^++MC{*M zZVCC-&O@fU|4pDxvy>S722^~t&0|{+{(@A19fQDGhgQknw7Y=ywVo^rWh3Z$qk<& zo$o1&;q2EiItxdAb4X!SCdZ}Bu3jcesr!lajk&&`u$0A&Ofm z0Ucs`ZFeM02?VGeES>Yn!dv5HH$P;f6H8K!PCCD_n6APSin@pKjFg1y*}7YGMIrLkuv%T3)9lsapkmz29@knrVVZ~>Yk1O zsy(s%i=qcSqA%U{aIf}I1upVx`A$9T6j7JwYGt627aPp{O6n9h40A|^mmM*Yp+uQV z>U1dc45O0@IFd3c1ZuZbYqv(j2T>!&E@m_;_Df%D^A)lr{bc5@t=G4VPS~-^>S^yp zThog3+ZGGg!}z;?rr&yH7G?I@p;2OPS5DQpRVEuyA`|Samx#!l65B{BwTH;#Wjr)UMHfNLaVa9mrf_u>78Y>y|&q#9m-24k0Nc+Cd zhNnP`z((yKRU3)yAEm4%xg0Ux5=b&@(w!tSdGnr40Dc|-H8ESbR;zig^n%GVHfi3t zTlS#SyV5GzmdrJ2kYuubZqX5)tA%4cG@pW>iOyKRt#{t?LWW&ucvZFGwXcvEo}hO8 zCO@3fEbZoQvU8&6BTBlC_&VWRByKGkuOHavZS*3miAg-mS-de$>y%Y~@q9Kr|7>;j z)vH%4r=yD%ss~rYBbly#2`;vVib);|=m=g4mQ5FqRA(S2QsjmRi4i1@DBYlsD0Jk4 z9b<~~9-b0`i^0&a8eU!^Ys(!;d+GFmLQE;xq7yA#)CyMpiWD{uJSH=hrHM!F8dsBv z@UXI0E@QktCCUUX`C)xj`f+6Si@!3vzBw5sf;M@Oe4i z5qE0KU$pRx=;}cHa(S*mJsru7-Z{1@I1`m?o**UU&D34so?3{dTBFOGLs z)e|M1$oo$GI6H9e)&(q`p+&~SVS5$b?6pIAUr!8ufcD>3Xf?pC9wOa3i_gXfS*=wgEK zbU@<4T9sH9%WXXGY$VXcICh=|bBG|9ZgVCAlXB`!#u42*!h?m}LX(CLuUdl|bMIpL z!=$aZGN}hxuNMe)$j73{=#7zSgBAMYH-o3B;>@%SrIkB zI+PTp92L)DeXYCJ;jg>A{$2F!#z@>7sNC_m`ZEzel=E@*#l$~Zq4)9S@xP-qEUX}d zkbx~4p>bC*9KK{Iv!RkNBpvki?xU9*oiJOEt4@;GGH|6#i5G7ZF|)(jEv}nai9Qk2 zgKzFhf_;`Z>OV2P>UQm`8+uAdWa(pk*1y;ON%c17u-#busoj#}SbRyVg!J9&jr4h& z`i{XViOk;F^j`bMCv8@sLxR(#TkPeD-zKPIQRq*+K>yB6kFYfPu0J}}t?AOR%Aw)& zxYv@6XR4&RS?=#L5V>xNdfR*dGyk-!pE*-Ht2#&Pof~Q&*7^tFm`uhKg9dp6PUquB z=o1Q5F{SLbpkvAoFn>R;Zgi`A)pq%)^z6CnTrnp){r{}G)!zgVD8O4* z02>3mK0F!Ju-e|+d$RYL#_kaOf;Rfc?dr>aTel~ex9Vz@#8hU_L>o#}+iD+jp(uel zTa8ZoSivkc2$ad`pdS&HK|gR}&$RFNMmPQ1K1+6II-Ox`_j!(z3HoDXU=zePR!G^=P&LGbMk5r4x zB|72nK0m*BjXW_yBd2%e;>9W@Ma0_(w@r~=D_2K1bil#@?DNm--Py`;A%v{?Z$AN$ zj{AK&L1GvyBoXkl7X(ADZg%L3?tJ7voi7s=XjMi8`v_Tyv$)#Am#fRJIHa9Wy`?S0 zXZSq5JDc)to}Zs{(%;0xJko#I8T^gO%+%lJ-^r1`)NsR#XrBF>6?EhyHcuMgFG64) zA&|efbNG--@%={iFZZf;TP&!^MX$QQSBMEipg%A#AJRgfCB8Cz3e_$zOw6=zthZx= zYu}GW@%p;aQStf>t{+za1(v*6Na1*mW+zqq$H~8+<$sSIz8YV*ouh(iZ)o3Lo+XsC&&N>7ZOJB1#n}%d1WcbM+rOtGwXUD^PYZil1Hwy$% zTE%j8uWO%E9i&)+ykQi((`TkXO=!eZeXgB3Uj=^oe8cdWzer=>gXW9pGZEU;c~ye0 z5pw6ax{+RehV61iT^`Ln5Hjyj7`a!NLfxO@8<+6*J^IxCwYl?*)A+RN^r{=^5`uYR zf;FF-#|mYgUTXhjR|Bk69XGCQ*s618=h6Sr{izKS*tqc`@9?KN2p_n4u#oZWg@rHi z;T5r_iRc$Ex;r9E(oehdQ3?jj!!8)2e4haWcK(JlNq##aty@2opWui1)VCMUz8#>8 zC6Lc~1#}D64+tLAcE`#}sVc94V8Q!yFE>DtcgJ!<+8Sp+6Fa^Grk83!F@n=0;ULv; zjYpSfRMA%1GXHlAV(8|GCJus%iArD$5QuW~4LZpd5My~whvGk}V# z8`@0uC64vW)sb>f>tFs`f#EAKymnJJ{_eoh4*yZ5-_&sSABz@_vvbXs;B=O^=pEba z-;L)Mj``NT*61_HzrK8ChGcWgH7zH+ce1E>6JwwL7q(}TDGh*T;5HEGobsnR9&y}V zA^o(JH}T8$uky_T+AnxVCiQu@@g#Qh4~K!JQmEvu>q6AxLO>f zUpyb<$e$wG{%m?lw(9jWGs(@Q*!HyLAt7M@PS&!Dh)HLIpZJX2quf$y{A>Krr4Th) zw#c0f+)5_+_FOvb+ah>C`rB064{p><|CaolACjf|*c2J&B*qjc5*bSbcFgnCVc{{5bKk%qa^UWeaG^ z3C{JO?`$sf`ALt{4b{f_t>&ml)fXA9_&1z4n;(7dYqO}5EhBdi3uW3IlUyf}pTXqv znYw~89#Y(^ZEcC_e|p%*B%#DynmwUH=c0M3T1t!kbYpI@D)YsVF<%&ZPpg=&2IZ6O zu{1NXrx$$-(lh6TJXB0fcZ@D+n1BQ(-{XLt><;CAV9q#&e- zD#6ECd|*aLZbnDcGE?!S#BgIwSk)p|x;RFzsx=GdkdS-lnYHV&MR~E}`7P0qLbd*B z?~)`=82}!4khDpX75eJTmeb+hBXUg2LFcLG7buB@kEcy$VuQx~K%#pHl%y9MH7`M> z0?84ZTPd4P)dYDf6%7HmJ5eyFP5Z*EpUYoy+*7uC(Lw!fx?`0s)& z{Za3&eO~=T-&u@|f7$bre?`+u3zjUk|8?5=*XfU=_VSJH@{RRdDFi4BB@IJ;48gh^ zYs=hX<&j>_l>t|(7ki|XM_iHJ_80$gv-+|IkSr8+KYI3(8%vFjcKD6{Ih^w0@>1$9 zI4~oHE(rv08j6@2 zCbCq3;_vr#Vz~ZT1tZ)&JX7WB+*dlFI-o}4SrEw7zBg!u4R~*3-B{QJN&Ciq3a7q( z%u$LuZc_*WWrgnj(QsSX{`P78st^%!p&?c7wO8Sm)!y+LLTxp^nyzv*WBaeRB3r`0 zm^5p=cqR4~VS7*6SOBV)era6TT9Rz3DcM|axYrQ|U#%>Rw;#kkd?w&2pqbZ{Zu6+# zq)@lX`v`?n`vXPfQEd_|pfH_rZ6EfO^=L2)YJRkZ$$(EfMEOmQw*SwK?u~XS@>9yA ze4?}9iIft^e46y5ZT)G|_%6rhcRshttTi!@@_5x!6sKXr)i}ZOkz_nW+0k`qaX8gI zG9!T-S$0`0;A*OHfwPH&x&LBtevV}E#jNONu>V}SRd}}MH|M3^OHrL#tp(N2J!j%0PVj;+;akQ)=A)yespJiaCW2#B@NM?V z#~4y}D`qWfb(ldlUhDGztxzoqGgMSTW~Km=d@jW2jkM3@$vyj-*RKTl^fHAIcs*vK zB4EvqQy#(&HrO41OE>WO@H9w(;`EUIG^5X7)n;mnPunuHNTxN$;n53+kDgMw8Z%yJ zt?E0YxZi@p6pPByojKYz9w9V6bOwN!NYNDjSNTgm0-OtA?at}I1@9&oKj!merZjrUE?5$P zND-?q<{hPZihJwY z3ZDvY=kC~q3Yk7hO4Q*IzfIgMN=KBj?~+v#sH?k}msTMCSNueCnYhBhO>|Ul2oSN^ z`P(I+(UzzP8Mr{;+XzU`kNIJNyL!def=e=76ByS zWwfo={nKkg28+eTj_ZlS6mcS{{UOx1`9bCk#0)n-!7b0JBhSl~NdLvk+b93n?2&*x z3LsI*TU2omb zM0!_U_UEneax^G8&XM41PL9x3uCWp#yw6!0dO)+LIdGj-O` zaxQ?Hj3Y`IBw|aQw;aS_q8I+N5<8TeR^Wz4T{-DVtX+R9J7@yt-o>b6MHyuKVO2V0=fo+fkQ!;F;OE5*{Ap5?0HH&sdSB}2#wXX#90hgh=~PVVqw=@=)SjoFUtW6Y=TuLZ-{L(y@i)JP z_x*Ea{dGFsMn$5wqXNP_TA_HHkX4UBQ+*0?FY1_R=i$wtZ&o+;TDpBh!#ZyA3(e*wKLjcnp#ZhoY`Pb=tdrf94d5Av1{?{z;v{Nmo|^TR*}`k(Zk!>8NvDVKXc9R7`Qw1|8D zQ87pw;U7kwdFsbda6MTX*cK$r5Lu3Bnf@vHk05gv$)ar79Mn!{7Mb~)eCYLQi+G%D zN$U1%V76fCvl|iT>)f!AsY{GQBldgg#mHXE**HPyZtx$C}Wx{qcEI!ag;M zj7q?&jwP?&@Hr@oyl!krXxBGtvdn;CqGwToLm_+`(La^Im|P*AaP3SYQ=_B)c90#=O}q96UpK-)mP(Ke;%rer*5i+WPUT{$ep{mg+`~`cum2Yeh}d zgAeKf3%kV?x1I-XNf_P`L{{_0>z~Y#tMV6!$aT)!_&SS0eXC}*9(z4{!@R$;Reye? zjG6n2`1{JkeAYNLBiWSyl-s!ifG}^9@muesF+{QWcp*$~OHcpSi_8m7#*}lr)s@Am zBTw$c8K(Gb-hB2&=Qu+N$pU~uMeS7kZ|4A%d(QeSS>AkdKiB=|kjuR0SvX$Ds{P+S zY7#a~wc}p34etP{P5b)v6=@ITAZil?nj|v7SnXU0y|j8o(4=1dIrldZWjf&DwQL-) zN~+hxuca`9|NOk#FtkX<=K27U(~Aq3IE#vUNjBgBz%+`FT|<8nPo+n2ViFlZz)bT$;j2h|+m2Wg+)$!Kb2$si;SmW^p#9FxCJk<2O&F!{Vv18tB zGVs*TMz|@(?RdihfAjlpaPUmS0&aNXO*dSqHqG1~kS_s%T&EMB^XRLn#i}Ttdj`77em0iQY@JScF$~TQQ7Mt;x zGAsG7S9Zw9i>7bD&tJV}`a*v>*8$V2olI0%)L7&v&QLiQT#*BL1%)^&gMvPL{`;C` z@co+s!2@%!xcW)?06))@S2;mxk@(uKEQ}5N<|QA}&n6rAEkuLAn&)lGJAt+#Sj<4U z&l!J`;?^iWDgERmmC`QNOuKe&jN_UzuPJJ(3KeKUkI;d20K{Zj%I@TpisojAp_AA^xoA>n-trVj*|kTQ|^77>-+y&|U&Qg3?SMO1qG8aY)6 zDd&Bc;&ZC8Nd*f+8D!0I=%{hTPK-L4BJAGe&!oh%D6~y15QI)f{GA~lSV-@G!lM8CYvEL&-f3uX<(DRqv$0@+<$NG*`_& z@2|U(AeH)3`F)DQCCb0KN>aYc(o>A_r2v5}_5T&Y1!qu)vPL+`+dKLT#?LwJDT72VJXIK!04cT;b z*4}IZ2qS4+vmR>Y#R?WEw;H;9-=(j~d}|L@M>sLUDB+!61GmOl;QN}fioIQhR}&MB z5exMHCb}~7XChxxnN0_Hk@S_*!@^{e{*6*Ne9*OR7*d1I159kDxG~LQKC$_g$6$J zF+*3U;GKV%n`jV;mX)q%K&PD8%n=K+N^bCetRo2AvaAC!$-bWyH3QTzOqqh5Ra(R? z^Hj%aZ6(>3ilS@4 zHQAHIZc#3$z+Wf5qVf5Y1Nh-iUboWqpH?&X);~pXKg~l&igP-Ur%UhhT4Sz4J4TGZ z_JNyvFt|9uwH8P*5(_T|i>Je1d`qEFb0P++9;fvxy1fayq%6%7cbPC;RW>-bKBM5&I&*O&{(K1@jFGFb2lz;LlZTQ zcCpq{LIDzwl(B3b5ka}od75TAt;@li#YyRl7Z8-v$j>OeR!)%$G6nQYQYmn1W1!dXo=aykM-$+R#OZ@kv&|U?gVR4K~AdN z>m?3vnWAWXHoC z@kUxX9{00-A=jIuM;P1(Povw>zlD!)<~+IHn8y!YtK*<#39*Y?wK39wPDgZN80Mma ze(yyAWel?gB=nWqB3nNR&P-qjrt|j&38_YHZm_~6v+107;VAuZ_QIsXd9&@5zA?G? z)_zpk%DmT*GbtX}SD?m1Y}1vQmoW=&Zz!8BL}sJn=LiTh3tv+^IpGQxDD}85WQ}BL$m^FP%IW`=VkEeEuM^*@Pj%Uc!^lVygf`Vy=qMTVv z<&V~x9>MAOBtEV+VX2FZTk8_dLJ2J(nQwKVDV@B>uC&`Y%!&-W)Q1*r%`s7YY0G7^ z>X6DZjU?J$QC50$d=f44eg7FbO6Udt^Yt+tQWgCc-X3>j?lSl2Mnw$vM1 z?sx-9Zy?ISJe84QFe9I=bGo;jXaXoyiy>A$CT;b_JdLe_8E-ndc#pBBqQmCyR)@>5 z?xVoe@JeYs^|Fv16PL=+=kJoXGaZ(Zs3Fz|%)-b^txvzRBOsIxa9;~=$>Nb&cV|;? zn^;6a*l9hx%qEE-ZW>T)hQr(=&WB}u|5H103>|}A_Gi}iL=EkUNb$N^Rm~>%`SInn z^tq8a97#`BOHBBML{qMOc;QC0@7Y|%(fHMht~rwM=k8q1b~boD2bH;@ENij4TcdV%@;1NN)k) zf|MNGb4cAU`q>6d5*6e4mMv#-U!k8xO>PtT%L)8v{$`YSX>dC?cQNrBM{fXM#V_fs z#5?u5wO)E5Qx+~>Xci4RWz>2QsLF90yzJ4EdX^|5*h|`(GpG5K7bCl9I!$6fT9P6*=HagS(BgOkUh^zi!OZ^a)i;mVyuqYM$j_TWsMM zT|e;O{gTn%TkrqC!~MT}|Htk15BGok-=K|m$3HaC{bfX8_kY}dpZj0dH`eZa!2kb1 z{1@c1(tX$U3IBICxz}ak{V%%fXY-@(2LG<#?cQ03PS!W?cH#dI_rJU=gn#*SE8O~A zAe9pk^yXUG|E7Ap_3bvt$coEge(Z4Ji|)xvrVBTrd6~G*$mBS67}auC)p9-DBr}K@ z&AU)$SB(p|23!VeGwy%?_{r}6&OX0=Rj#SEviFr5(7 zYNAzteEy?li#!&o)^49Ec~plc>nGK~J)m$AKVF&rx)m9uA8ha6-`m;M9o(&zod&Fl zQi5Z%e&qxxhJ-P?0Ox)|q|DrmdHbkUpKMBotsY{q!9?Vg+mLzyUz0S>XsuLRqf4w< zZ0JO1ShuP6->`VxT2iH7-N;VlWF2Pnk!VM^b)&FMO?qD@yexbCyc62JjEHV96!-h+ zZVg$3bVuFiRwHw7)ws643(1C1tw5rBEivE@yxbFRDfSTc?&&%2qN=+vPW`&wv@c(z zaYitb167mg8X8&nhnJpmhzST?r(mt@e4N`Moi|rnE4#a`o#v4{zL#~2Io!)PiP%Xq z&f+;6ut2hGy3z?>C@y$jHbYzJsygRsDy=1XZ~U0AVc>F50)axWV(01=8@oL0w|X22 zj3!R*llTR`Y>8f1>N(dg##!pGoUVxcjoclJqw%cu9||mU~WOI3o?VLnJnLBb(<#%1#bSXxe|w*Z@95ZN90 zU_{T*o$#;Z7kX#h20=slawqd3c^O6(M;A2E1Hl%O!fR9vh5UQXT2Q7ynSKy z>$ZM&Nny)-J@agG%H~_ELBR*Y-bKQm5$>_4qG+kfe#vKvTnE#Z_d?AaY>& zK0Nc8`xOR17mam9G;>`D?3zrDJKG)Dx4;iN<%x-$eY>QzzH>U|)p`5o0zRGqyRZwSqFXYP(~r)5yK9aq1kRqC)GW6O|ac+arO0BR|{Lvq(swU(%B6R8K@$- zERwwH$+qI<|7suaaeZw0N{Yl}7jq=}-mw)_^c6n&ou z5G1GjleJ2Ub^K0vtvB^IcjAj>1@7Ls7uX)5ccKpA^AS(USvE2nx8jtyG?Us+qyZOf zBeR%cxfRkYGyzGs{x4Z1|ccy_REGN`?$c zR&PviEqU3vojR8|2bWz$VSI%&Y3K3ZoM>kL%aG7_~F20h~-J8iW<&Cbpz7eV1qgNHrCS^Fzi(n|Hs_?7gN zsSXSs#z__qAH@OC-jF_9)7;;}7%0KH)}GqXnZ8?wJx;lV((Y3M&a3DL#?`@Z&xYP3_A2d^!nhWHBkSFtfFtR>cRPE)wjJDi^Wi#Rg{(Z z_~AZtwtT?Q<7NlKjj#*iS$G$rBqg8r$G%x$(7lZ0R=Xt94qedg2^)H8>ZV761FxQi z5|Xhq|8`quiCX!uh&Qkc3_2G^D~AkNTbMzZ-j+rlWGo0cg6nLaB2kQ7WT{gNg>~Yo zC;>D-k5t#|(BIEQFOG?|uI;s_=VpY}LzL@*;syH#8V zdbrM^ZMdzWORw;{Q(Y}EN_e*bd1Da2as#HFbAoeGvph8Jav0+~u2hi&MKbkK#jvHx zz&dlaz$uP9J?4DlmY7Ha?%jRkDsck7)1*as#o3D`xU#NqD8yI{-cGD$@a3F&nGSZ9 zDa$L_D2dTMN&%J%<(K@^%#W<%qUCqvT~P!o8$a_)bu&X7HPoocD$cypR_T?R;gEdJ z;?@z3Ft6Tbb0q1r9h?Q-&1ge`pt6{mBj z?T#SFCtml}jXP$T8xA^#Lyu@K=B0PgzSu*C09Q|=W`ncVu^fa~+>F-z4RtC-Lz^2X z2u}8dZsj9(7SYs;iHe6n(M_x2yZj)9u}KHZKqJ8c7}`tszl|>Mov_NNjGZQ9nSi=aGQ|+-LQt` zE4CFg@V$bFEsbZxrFx8!|J1uNJO8Ul{h}my{)?r|&%=@D4VH%0R-Q2r#4N-s{ZP0= zv|2HASwlnnozYGDV}lZDnKyhH{5P~zHO!RwCtnrn zFMgy@|NFNtx>5v0KmYKmYKmYKm Date: Wed, 21 Dec 2022 09:42:57 +0100 Subject: [PATCH 056/316] Added new function checkFilebeatURL --- unattended_installer/builder.sh | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index a52204932e..c04948968b 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -47,6 +47,9 @@ function getHelp() { } function buildInstaller() { + + checkFilebeatURL + output_script_path="${base_path}/wazuh-install.sh" ## Create installer script @@ -84,7 +87,7 @@ function buildInstaller() { echo >> "${output_script_path}" grep -Ev '^#|^\s*$' ${resources_installer}/installVariables.sh >> "${output_script_path}" echo >> "${output_script_path}" - + ## Configuration files as variables configuration_files=($(find "${resources_config}" -type f)) config_file_name=($(eval "echo "${configuration_files[@]}" | sed 's|${resources_config}||g;s|/|_|g;s|.yml||g'")) @@ -265,4 +268,26 @@ function builder_main() { fi } +function checkFilebeatURL() { + + # Import variables + . ${resources_installer}/installVariables.sh + new_filebeat_url="https://raw.githubusercontent.com/wazuh/wazuh/master/extensions/elasticsearch/7.x/wazuh-template.json" + + # Get the response of the URL and check it + response=$(curl --write-out '%{http_code}' --silent --output /dev/null $filebeat_wazuh_template) + if [ $response != "200" ]; then + response=$(curl --write-out '%{http_code}' --silent --output /dev/null $new_filebeat_url) + + # Display error if both URLs do not get the resource + if [ $response != "200" ]; then + echo -e "Error: Could not get the Filebeat Wazuh template. " + # If matches, replace the variable of installVariables to the new one + else + echo -e "Changing Filebeat URL..." + sed -i -E "s/http.+\\$\\{wazuh_major\\}.+wazuh-template.json/https:\/\/raw.githubusercontent.com\/wazuh\/wazuh\/master\/extensions\/elasticsearch\/7.x\/wazuh-template.json/" ${resources_installer}/installVariables.sh + fi + fi +} + builder_main "$@" From a14ea4328f9d3e8ad4d4bfa41f625f8a7c7215d2 Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Wed, 21 Dec 2022 10:04:29 -0300 Subject: [PATCH 057/316] Add changes to master about fix hp-ux packages generation --- ...t => depothelper-2.20-ia64_64-11.31.depot} | Bin 92160 -> 102400 bytes hp-ux/generate_wazuh_packages.sh | 79 ++++++++++++++---- 2 files changed, 61 insertions(+), 18 deletions(-) rename hp-ux/{depothelper-2.10-hppa_32-11.31.depot => depothelper-2.20-ia64_64-11.31.depot} (84%) diff --git a/hp-ux/depothelper-2.10-hppa_32-11.31.depot b/hp-ux/depothelper-2.20-ia64_64-11.31.depot similarity index 84% rename from hp-ux/depothelper-2.10-hppa_32-11.31.depot rename to hp-ux/depothelper-2.20-ia64_64-11.31.depot index d41efd2181c1eb79d865ac4b15fd5d95823de0d0..49fcf2923a52659ff8981a89bca15a1218a66bb7 100644 GIT binary patch delta 2941 zcmbVOL2DC17|q5QH)#x68>7ZnhY&(7ZFgsPc1EL74~q68?V;eI(xz!rQ;G>m3YBf4 z1P>x!HdES5QRzXinw8>FFCN94-upvzCWTlq3p+cP*$mL?iJbTbc0@yNL`a z5PK?XD|f|dbPZ`D5~a&rAN0RI)Jmsi9cskzF3`b9sFQLBOmRR+kaxiD#boeIy;5B( zH&t7i7MBBJ0$Bo{E9RVg^iftX#K0o;l1v6^GCu37aGXP$nt;OHL?jqK)`J!8oDV^e zf!Po6EJ(B`$bkN#78isCFA{w$5~Pvvyh}?`E6gDwVg>BAClBOc2gH~bkNs%Dd`CbF zFk&kYeb8XSYu>Zu0NBbsA2bAOrU*^WR&I;a=o(8$fTlfeD|sI@kb9DM(c0KnrhL#C z#1zP8cT95YhdpadV*ZA(AyB=C;}VWiyra5y#16y68qvLXM0Xd5>DAE)z0=OQ!nPT# zX&NkbuZ`AyffIWeNp7L;S*VvkVh6cr&_gWcLUiLwg5rHQU~27iT?w}>&%wUQy$UT= zpRq&3XYC0TMF*6xvon;i+X|Zo++<8*vO}nMlff8bmWZYsL}#}F&-r9t>N9@^>&Euq94_%aA_G- zT6OlAjIESgY(o!`ze_rQ)bA2~pe5+*+F9oaP7jTOo8TW@A(QE^IiPc`@H^q0dh}(O z&MjPaeiaKcJ->RNzAasHTC1DU*^{3x_VUQ;U=x(qTVQfI4<;+dVkQdu<9ItqE@TF7 zN6t~pitXkl-{xYnj`HfrjE5DH>BC)gL*z2Xc--A3-|H>{1)SjhEotJz%$yYa3k*jc Am;e9( delta 1416 zcmbW1K}+L67>4`BDz+Q7)gnc!1SwHLa5720h^)9RdMO@uFCt4>P^{>|7EB9@7Z091 z2+bfpDg~E4S0rBcKkOd7_$L(4qE4b76z4F_Wirg<$&;6Na&Xpl@UPQTN`nR=Xju{R za=nfw+gFCViD4Sli4c~9b+zVJS9kdGPNh<)Ho?B0j^u2#B*!rgxjYU~ZFAC9m zfVNDurP0j^#Tyelr$aEcsWiBijVUaa37xIa;>ZMObZ8ss(EyzmqeE-7oi>slN-0d8 zO0aByE=c=R^L}nliDj7bp`_mMsu-_^cwQ7~e6u&|-IZpzw?oLs0=~{|huTJj_t3Ja zV<6>~A(X$27gn~F_ZYwU@vy0Y#*UxT?EmB6m%F~za;3btU8%X>vhG&3#BLrBFAH!E zp!v4|8(;id4_qe{P4f$*a5Vs0BRLMk{s@J+Za(=r3yXZ~=`5VYeQy!UD*FyiuOO~z zA&AU!Y?S|qB}_2PPYaJ$K0w>1VaTHwu#4fE7`+x+Q_@C{*7YN{n;2wYaZ+fGA)eUs qKZVu|#u*mH=EVSQBDQhBe(BMMz6|pM?Z*Bxgx Date: Thu, 22 Dec 2022 10:50:44 +0100 Subject: [PATCH 058/316] Changed tab by spaces --- unattended_installer/builder.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index c04948968b..8e80ccd963 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -270,21 +270,21 @@ function builder_main() { function checkFilebeatURL() { - # Import variables - . ${resources_installer}/installVariables.sh - new_filebeat_url="https://raw.githubusercontent.com/wazuh/wazuh/master/extensions/elasticsearch/7.x/wazuh-template.json" + # Import variables + . ${resources_installer}/installVariables.sh + new_filebeat_url="https://raw.githubusercontent.com/wazuh/wazuh/master/extensions/elasticsearch/7.x/wazuh-template.json" - # Get the response of the URL and check it - response=$(curl --write-out '%{http_code}' --silent --output /dev/null $filebeat_wazuh_template) - if [ $response != "200" ]; then + # Get the response of the URL and check it + response=$(curl --write-out '%{http_code}' --silent --output /dev/null $filebeat_wazuh_template) + if [ $response != "200" ]; then response=$(curl --write-out '%{http_code}' --silent --output /dev/null $new_filebeat_url) # Display error if both URLs do not get the resource if [ $response != "200" ]; then - echo -e "Error: Could not get the Filebeat Wazuh template. " + echo -e "Error: Could not get the Filebeat Wazuh template. " # If matches, replace the variable of installVariables to the new one else - echo -e "Changing Filebeat URL..." + echo -e "Changing Filebeat URL..." sed -i -E "s/http.+\\$\\{wazuh_major\\}.+wazuh-template.json/https:\/\/raw.githubusercontent.com\/wazuh\/wazuh\/master\/extensions\/elasticsearch\/7.x\/wazuh-template.json/" ${resources_installer}/installVariables.sh fi fi From db4e373c1a2667c327665e449002a7b4a87e4bc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez?= Date: Mon, 5 Dec 2022 12:31:43 +0100 Subject: [PATCH 059/316] Bump indexer RPM to 2.4.0 --- stack/indexer/base/builder.sh | 4 +- stack/indexer/rpm/build_package.sh | 2 +- stack/indexer/rpm/builder.sh | 2 + stack/indexer/rpm/wazuh-indexer.spec | 481 +++++++++++++++------------ 4 files changed, 277 insertions(+), 212 deletions(-) diff --git a/stack/indexer/base/builder.sh b/stack/indexer/base/builder.sh index 51de7840fc..91dbf357f9 100644 --- a/stack/indexer/base/builder.sh +++ b/stack/indexer/base/builder.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -x + # Wazuh-indexer base builder # Copyright (C) 2022, Wazuh Inc. # @@ -14,7 +16,7 @@ architecture="$1" revision="$2" future="$3" reference="$4" -opensearch_version="2.3.0" +opensearch_version="2.4.0" base_dir=/opt/wazuh-indexer-base # ----------------------------------------------------------------------------- diff --git a/stack/indexer/rpm/build_package.sh b/stack/indexer/rpm/build_package.sh index 3f0e740d94..2ef8076c31 100755 --- a/stack/indexer/rpm/build_package.sh +++ b/stack/indexer/rpm/build_package.sh @@ -8,7 +8,7 @@ # License (version 2) as published by the FSF - Free Software # Foundation. -set -e +set -ex current_path="$( cd $(dirname $0) ; pwd -P )" architecture="x86_64" diff --git a/stack/indexer/rpm/builder.sh b/stack/indexer/rpm/builder.sh index 6dbcfe5386..412befe003 100755 --- a/stack/indexer/rpm/builder.sh +++ b/stack/indexer/rpm/builder.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -x + # Wazuh package builder # Copyright (C) 2021, Wazuh Inc. # diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 683853438f..babbf89f60 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -322,40 +322,44 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/commons-io-2.7.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jooq-3.10.8.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/failureaccess-1.0.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/animal-sniffer-annotations-1.19.jar +#%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/animal-sniffer-annotations-1.19.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/bcpkix-jdk15on-1.70.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/bcprov-jdk15on-1.70.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/bcutil-jdk15on-1.70.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/checker-compat-qual-2.5.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/checker-qual-3.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/error_prone_annotations-2.9.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-api-1.44.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-context-1.44.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-core-1.44.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-netty-1.44.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-protobuf-1.44.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-protobuf-lite-1.44.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-stub-1.44.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/gson-2.8.9.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/guava-30.1.1-android.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jackson-annotations-2.13.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jackson-core-2.13.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jackson-databind-2.13.2.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-buffer-4.1.72.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-4.1.72.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-http-4.1.72.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-http2-4.1.72.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-socks-4.1.72.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-common-4.1.72.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-handler-4.1.72.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-handler-proxy-4.1.72.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-resolver-4.1.72.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-tcnative-classes-2.0.46.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-transport-4.1.72.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/perfmark-api-0.23.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/performance-analyzer-rca-2.3.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/protobuf-java-3.19.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/proto-google-common-protos-2.0.1.jar +#%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/checker-compat-qual-2.5.5.jar +#%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/checker-qual-3.5.0.jar +#%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/error_prone_annotations-2.9.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-api-1.49.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-context-1.49.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-core-1.49.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-netty-1.49.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-protobuf-1.49.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-protobuf-lite-1.49.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-stub-1.49.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/gson-2.9.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/guava-31.1-android.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jackson-annotations-2.13.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jackson-core-2.13.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jackson-databind-2.13.4.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-buffer-4.1.79.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-4.1.77.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-http-4.1.77.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-http2-4.1.77.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-socks-4.1.77.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-common-4.1.79.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-handler-4.1.77.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-handler-proxy-4.1.77.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-resolver-4.1.79.Final.jar +#%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-tcnative-classes-2.0.46.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-transport-4.1.79.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-transport-native-unix-common-4.1.79.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/perfmark-api-0.25.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/performance-analyzer-rca-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/protobuf-java-3.21.8.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/proto-google-common-protos-2.9.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/animal-sniffer-annotations-1.21.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/checker-qual-3.12.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/error_prone_annotations-2.14.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/agent-stats-metadata %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/log4j2.xml @@ -363,8 +367,10 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/performance-analyzer.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/plugin-stats-metadata %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/rca.conf -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/rca_idle_master.conf -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/rca_master.conf +#%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/rca_idle_master.conf +#%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/rca_master.conf +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/rca_cluster_manager.conf +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/rca_idle_cluster_manager.conf %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/supervisord.conf %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-shard @@ -384,9 +390,10 @@ rm -fr %{buildroot} %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/hppc-0.8.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/log4j-api-2.17.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/snakeyaml-1.31.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/snakeyaml-1.32.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jna-5.5.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/log4j-core-2.17.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/log4j-jul-2.17.1.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/plugin-cli %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/plugin-cli/bcpg-fips-1.0.5.1.jar @@ -395,43 +402,43 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jts-core-1.15.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/t-digest-3.2.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/spatial4j-0.7.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-core-2.13.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-cbor-2.13.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-smile-2.13.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-yaml-2.13.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/java-version-checker-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-core-2.14.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-cbor-2.14.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-smile-2.14.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-yaml-2.14.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/java-version-checker-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/joda-time-2.10.12.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jopt-simple-5.0.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-2.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-cli-2.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-core-2.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-geo-2.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-launchers-2.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-plugin-classloader-2.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-secure-sm-2.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-x-content-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-cli-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-core-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-geo-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-launchers-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-plugin-classloader-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-secure-sm-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-x-content-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/HdrHistogram-2.1.12.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-analysis-common-9.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-backward-codecs-9.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-core-9.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-grouping-9.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-highlighter-9.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-join-9.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-memory-9.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-misc-9.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-queries-9.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-queryparser-9.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-sandbox-9.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-spatial-extras-9.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-spatial3d-9.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-suggest-9.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/keystore-cli/keystore-cli-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-analysis-common-9.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-backward-codecs-9.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-core-9.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-grouping-9.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-highlighter-9.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-join-9.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-memory-9.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-misc-9.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-queries-9.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-queryparser-9.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-sandbox-9.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-spatial-extras-9.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-spatial3d-9.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-suggest-9.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/keystore-cli/keystore-cli-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/plugin-cli/bc-fips-1.0.2.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/plugin-cli/opensearch-plugin-cli-2.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-annotations-2.13.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-core-2.13.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-databind-2.13.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/opensearch-upgrade-cli-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/plugin-cli/opensearch-plugin-cli-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-annotations-2.14.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-core-2.14.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-databind-2.14.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/opensearch-upgrade-cli-2.4.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-observability %attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-observability/observability.yml %dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-reports-scheduler @@ -449,8 +456,10 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/performance-analyzer.properties %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/plugin-stats-metadata %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/rca.conf -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/rca_idle_master.conf -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/rca_master.conf +#%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/rca_idle_master.conf +#%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/rca_master.conf +%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/rca_cluster_manager.conf +%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/rca_idle_cluster_manager.conf %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/supervisord.conf %dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/action_groups.yml @@ -474,27 +483,27 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/kotlinx-coroutines-core-jvm-1.3.9.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/common-utils-2.3.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/common-utils-2.4.0.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/guava-31.0.1-jre.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/kotlin-stdlib-1.6.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/kotlin-stdlib-common-1.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/opensearch-observability-2.3.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/opensearch-observability-2.4.0.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/jsoup-1.14.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/jsoup-1.15.3.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/json-flattener-0.1.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/json-20180813.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/kotlinx-coroutines-core-jvm-1.3.9.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/common-utils-2.3.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/common-utils-2.4.0.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/gson-2.8.9.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/guava-31.0.1-jre.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/kotlin-stdlib-1.6.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/kotlin-stdlib-common-1.6.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/kotlin-test-1.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/opensearch-reports-scheduler-2.3.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/opensearch-reports-scheduler-2.4.0.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/geo-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/geo-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/resilience4j-core-1.5.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/httpcore-nio-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/httpasyncclient-4.1.5.jar @@ -524,43 +533,52 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/antlr-runtime-3.5.2.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/antlr4-4.7.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/checker-qual-3.12.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/common-2.3.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/core-2.3.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/common-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/core-2.4.0.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/error_prone_annotations-2.7.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/guava-31.0.1-jre.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/icu4j-58.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/jackson-annotations-2.13.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/jackson-databind-2.13.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/jackson-annotations-2.14.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/jackson-databind-2.14.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/javax.json-1.0.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/legacy-2.3.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-2.3.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-ml-client-2.3.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-rest-client-2.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-sql-2.3.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-ssl-config-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/legacy-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-ml-client-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-rest-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-sql-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-ssl-config-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/org.abego.treelayout.core-1.0.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/parent-join-client-2.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/ppl-2.3.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/protocol-2.3.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/reindex-client-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/parent-join-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/ppl-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/protocol-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/reindex-client-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/spring-aop-5.3.22.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/spring-beans-5.3.22.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/spring-context-5.3.22.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/spring-core-5.3.22.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/spring-expression-5.3.22.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/spring-jcl-5.3.22.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/sql-2.3.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/sql-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/annotations-13.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/kotlin-reflect-1.4.30.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/kotlin-stdlib-1.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/kotlin-stdlib-common-1.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/kotlin-stdlib-jdk7-1.4.30.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/okhttp-4.9.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/okhttp-aws-signer-1.0.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/okio-jvm-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/prometheus-2.4.0.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/ipaddress-5.3.3.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/annotations-13.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/common-utils-2.3.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/common-utils-2.4.0.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/kotlin-stdlib-1.6.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/kotlin-stdlib-common-1.6.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/kotlin-stdlib-jdk7-1.6.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/kotlin-stdlib-jdk8-1.6.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/kotlinx-coroutines-core-jvm-1.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/opensearch-cross-cluster-replication-2.3.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/opensearch-cross-cluster-replication-2.4.0.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/commons-lang-2.6.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/plugin-descriptor.properties @@ -574,22 +592,22 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/libopensearchknn_common.so %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/libopensearchknn_faiss.so %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/libopensearchknn_nmslib.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/opensearch-knn-2.3.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/opensearch-knn-2.4.0.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/ipaddress-5.3.3.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/annotations-13.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/kotlinx-coroutines-core-jvm-1.3.9.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/common-utils-2.3.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/common-utils-2.4.0.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/commons-codec-1.13.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/httpclient-4.5.13.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/httpcore-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/kotlin-stdlib-1.6.10.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/kotlin-stdlib-common-1.6.10.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/kotlin-stdlib-jdk7-1.6.10.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/opensearch-index-management-2.3.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/opensearch-index-management-spi-2.3.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/opensearch-index-management-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/opensearch-index-management-spi-2.4.0.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/sqlite-jdbc-3.32.3.2.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/j2objc-annotations-1.3.jar @@ -602,25 +620,25 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/commons-io-2.7.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jooq-3.10.8.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/failureaccess-1.0.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/animal-sniffer-annotations-1.19.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/animal-sniffer-annotations-1.21.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/bcpkix-jdk15on-1.70.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/bcprov-jdk15on-1.70.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/bcutil-jdk15on-1.70.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/checker-qual-3.5.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/commons-lang3-3.12.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/error_prone_annotations-2.9.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-api-1.44.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-context-1.44.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-core-1.44.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-netty-1.44.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-protobuf-1.44.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-protobuf-lite-1.44.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-stub-1.44.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/gson-2.8.9.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-api-1.49.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-context-1.49.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-core-1.49.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-netty-1.49.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-protobuf-1.49.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-protobuf-lite-1.49.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-stub-1.49.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/gson-2.9.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/guava-30.1-jre.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jackson-annotations-2.13.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jackson-databind-2.13.2.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jackson-module-paranamer-2.13.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jackson-annotations-2.13.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jackson-databind-2.13.4.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jackson-module-paranamer-2.13.4.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-buffer-4.1.79.Final.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-codec-4.1.79.Final.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-codec-http-4.1.79.Final.jar @@ -632,15 +650,15 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-resolver-4.1.79.Final.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-transport-4.1.79.Final.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-transport-native-unix-common-4.1.79.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/opensearch-performance-analyzer-2.3.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/perfmark-api-0.23.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/performanceanalyzer-rca-2.3.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/protobuf-java-3.19.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/proto-google-common-protos-2.0.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/opensearch-performance-analyzer-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/perfmark-api-0.25.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/performanceanalyzer-rca-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/protobuf-java-3.21.8.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/proto-google-common-protos-2.9.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/opensearch-job-scheduler-2.3.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/opensearch-job-scheduler-spi-2.3.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/opensearch-job-scheduler-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/opensearch-job-scheduler-spi-2.4.0.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-saml-api-3.4.5.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-codec-1.14.jar @@ -673,7 +691,7 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/lz4-java-1.7.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/ldaptive-1.2.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/woodstox-core-6.2.6.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/woodstox-core-6.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/eventbus-3.2.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/istack-commons-runtime-3.0.12.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/asm-9.1.jar @@ -703,10 +721,10 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jaxb-runtime-2.3.4.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-security-impl-3.4.5.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-collections-3.2.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-text-1.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-text-1.10.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jakarta.annotation-api-1.3.5.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-soap-api-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/aggs-matrix-stats-client-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/aggs-matrix-stats-client-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/checker-qual-3.5.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/compiler-0.9.10.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/cryptacular-1.2.4.jar @@ -714,37 +732,62 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/failureaccess-1.0.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/guava-30.0-jre.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/j2objc-annotations-1.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jackson-annotations-2.13.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jackson-annotations-2.14.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jjwt-api-0.10.8.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jjwt-impl-0.10.8.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jjwt-jackson-0.10.8.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/lang-mustache-client-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/lang-mustache-client-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/mapper-extras-client-2.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-buffer-4.1.79.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-codec-4.1.79.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-codec-http-4.1.79.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-common-4.1.79.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-handler-4.1.79.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-resolver-4.1.79.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-transport-4.1.79.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-transport-native-unix-common-4.1.79.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-rest-client-2.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-rest-high-level-client-2.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-security-2.3.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/parent-join-client-2.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/rank-eval-client-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/mapper-extras-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-buffer-4.1.84.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-codec-4.1.84.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-codec-http-4.1.84.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-common-4.1.84.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-handler-4.1.84.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-resolver-4.1.84.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-transport-4.1.84.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-transport-native-unix-common-4.1.84.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-rest-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-rest-high-level-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-security-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/parent-join-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/rank-eval-client-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/slf4j-api-1.7.30.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/snappy-java-1.1.8.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/transport-netty4-client-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/transport-netty4-client-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/zstd-jni-1.5.0-2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jackson-databind-2.13.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/kafka-clients-3.0.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jackson-databind-2.14.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/kafka-clients-3.0.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/bcpkix-jdk15on-1.70.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/antlr4-runtime-4.10.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/common-utils-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/commons-codec-1.15.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/commons-lang3-3.12.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/commons-logging-1.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/cron-utils-9.1.6.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/httpasyncclient-4.1.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/httpclient-4.5.13.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/httpcore-4.4.15.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/httpcore-nio-4.4.15.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/kotlin-stdlib-1.6.10.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/opensearch-rest-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/opensearch-security-analytics-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/plugin-security.policy +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/LICENSE.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/NOTICE.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/commons-lang3-3.10.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/opensearch-ml-client-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/opensearch-neural-search-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/plugin-security.policy %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/common-utils-2.3.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/opensearch-asynchronous-search-2.3.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/common-utils-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/opensearch-asynchronous-search-2.4.0.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/commons-lang3-3.12.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/commons-lang-2.6.jar @@ -763,13 +806,13 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/commons-math3-3.6.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/httpcore-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/failureaccess-1.0.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/common-utils-2.3.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/common-utils-2.4.0.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/guava-31.0.1-jre.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/jackson-annotations-2.13.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/jackson-databind-2.13.2.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/jackson-annotations-2.13.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/jackson-databind-2.13.4.2.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/javassist-3.28.0-GA.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/opensearch-anomaly-detection-2.3.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/opensearch-rest-client-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/opensearch-anomaly-detection-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/opensearch-rest-client-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/protostuff-api-1.8.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/protostuff-collectionschema-1.8.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/protostuff-core-1.8.0.jar @@ -782,8 +825,10 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/LICENSE.txt %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/NOTICE.txt %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/commons-lang3-3.12.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/opensearch-geospatial-2.3.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/opensearch-geospatial-2.4.0.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/geo-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/h3-2.4.0.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/error_prone_annotations-2.3.4.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/httpcore-nio-4.4.15.jar @@ -808,8 +853,8 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/commons-codec-1.13.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/httpcore-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/failureaccess-1.0.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/alerting-core-2.3.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/common-utils-2.3.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/alerting-core-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/common-utils-2.4.0.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/commons-beanutils-1.9.4.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/commons-collections-3.2.2.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/commons-digester-2.1.jar @@ -818,12 +863,12 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/kotlin-stdlib-common-1.6.10.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/kotlin-stdlib-jdk7-1.6.10.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/kotlin-stdlib-jdk8-1.6.10.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/opensearch-alerting-2.3.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/opensearch-rest-client-2.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/percolator-client-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/opensearch-alerting-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/opensearch-rest-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/percolator-client-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/commons-logging-1.2.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/common-utils-2.3.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/common-utils-2.4.0.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/commons-beanutils-1.9.4.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/commons-codec-1.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/commons-collections-3.2.2.jar @@ -832,18 +877,18 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/commons-lang3-3.10.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/commons-logging-1.2.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/commons-math3-3.6.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/commons-text-1.9.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/commons-text-1.10.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-classification-core-4.2.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-classification-sgd-4.2.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-common-tree-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/gson-2.9.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/gson-2.9.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/guava-31.0.1-jre.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/httpasyncclient-4.1.5.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/httpclient-4.5.13.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/httpcore-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/httpcore-nio-4.4.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jackson-annotations-2.13.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jackson-databind-2.13.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jackson-annotations-2.14.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jackson-databind-2.14.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jansi-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/javassist-3.26.0-GA.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jline-builtins-3.21.0.jar @@ -855,10 +900,10 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/olcut-config-protobuf-5.2.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/olcut-core-5.2.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opencsv-5.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-ml-2.3.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-ml-algorithms-2.3.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-ml-common-2.3.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-rest-client-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-ml-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-ml-algorithms-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-ml-common-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-rest-client-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/plugin-security.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/protobuf-java-3.19.4.jar @@ -884,6 +929,21 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-util-infotheory-4.2.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-util-onnx-4.2.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-util-tokenization-4.2.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/api-0.19.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/checker-qual-3.12.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/commons-compress-1.21.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/error_prone_annotations-2.7.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/failureaccess-1.0.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/j2objc-annotations-1.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jsr305-3.0.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/log4j-slf4j-impl-2.19.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/onnxruntime-1.12.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/onnxruntime-engine-0.19.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/pytorch-engine-0.19.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/pytorch-model-zoo-0.19.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/slf4j-api-1.7.36.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tokenizers-0.19.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/activation-1.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/aws-java-sdk-core-1.12.48.jar @@ -892,34 +952,34 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/aws-java-sdk-sts-1.12.48.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/httpclient-4.5.13.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/httpcore-4.4.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/jackson-annotations-2.13.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/jackson-databind-2.13.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/jackson-annotations-2.14.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/jackson-databind-2.14.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/javax.mail-1.6.2.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/kotlin-stdlib-1.6.10.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/kotlin-stdlib-common-1.6.10.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/opensearch-notifications-core-2.3.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/opensearch-notifications-core-spi-2.3.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/opensearch-notifications-core-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/opensearch-notifications-core-spi-2.4.0.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/commons-logging-1.2.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/plugin-security.policy %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/common-utils-2.3.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/common-utils-2.4.0.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/kotlin-stdlib-common-1.6.10.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/kotlinx-coroutines-core-jvm-1.4.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/opensearch-notifications-2.3.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/opensearch-notifications-2.4.0.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/plugin-security.policy %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/jcodings-1.0.44.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/ingest-common-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/ingest-common-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/joni-2.1.43.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/opensearch-dissect-2.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/opensearch-grok-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/opensearch-dissect-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/opensearch-grok-2.4.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/geo %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/geo/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/geo/geo-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/geo/geo-2.4.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/GeoLite2-Country.mmdb %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/GeoLite2-City.mmdb @@ -927,97 +987,97 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/GeoLite2-ASN.mmdb %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/plugin-security.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/geoip2-3.0.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/ingest-geoip-2.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/jackson-annotations-2.13.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/jackson-databind-2.13.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/ingest-geoip-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/jackson-annotations-2.14.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/jackson-databind-2.14.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/maxmind-db-2.0.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/percolator %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/percolator/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/percolator/percolator-client-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/percolator/percolator-client-2.4.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/analysis-common %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/analysis-common/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/analysis-common/analysis-common-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/analysis-common/analysis-common-2.4.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/aggs-matrix-stats %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/aggs-matrix-stats/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/aggs-matrix-stats/aggs-matrix-stats-client-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/aggs-matrix-stats/aggs-matrix-stats-client-2.4.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/repository-url-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/repository-url-2.4.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/plugin-security.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/compiler-0.9.10.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/lang-mustache-client-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/lang-mustache-client-2.4.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd/systemd-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd/systemd-2.4.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4 %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/transport-netty4-client-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/transport-netty4-client-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-buffer-4.1.79.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-codec-4.1.79.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-codec-http-4.1.79.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-common-4.1.79.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-handler-4.1.79.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-resolver-4.1.79.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-transport-4.1.79.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-transport-native-unix-common-4.1.79.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-buffer-4.1.84.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-codec-4.1.84.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-codec-http-4.1.84.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-common-4.1.84.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-handler-4.1.84.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-resolver-4.1.84.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-transport-4.1.84.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-transport-native-unix-common-4.1.84.Final.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/lang-expression-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/lang-expression-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/plugin-security.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/antlr4-runtime-4.9.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/asm-9.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/asm-commons-9.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/asm-tree-9.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/lucene-expressions-9.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/asm-9.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/asm-commons-9.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/asm-tree-9.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/lucene-expressions-9.4.1.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/lang-painless-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/lang-painless-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/opensearch-scripting-painless-spi-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/opensearch-scripting-painless-spi-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/antlr4-runtime-4.9.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/asm-9.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/asm-analysis-9.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/asm-commons-9.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/asm-tree-9.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/asm-util-9.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/asm-9.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/asm-analysis-9.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/asm-commons-9.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/asm-tree-9.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/asm-util-9.4.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/rank-eval %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/rank-eval/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/rank-eval/rank-eval-client-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/rank-eval/rank-eval-client-2.4.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/httpcore-nio-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/httpasyncclient-4.1.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/reindex-client-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/reindex-client-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/opensearch-rest-client-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/opensearch-rest-client-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/httpclient-4.5.13.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/opensearch-dashboards-2.3.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/opensearch-ssl-config-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/opensearch-dashboards-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/opensearch-ssl-config-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/commons-codec-1.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/httpcore-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/commons-logging-1.2.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-user-agent -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-user-agent/ingest-user-agent-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-user-agent/ingest-user-agent-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-user-agent/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/mapper-extras -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/mapper-extras/mapper-extras-client-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/mapper-extras/mapper-extras-client-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/mapper-extras/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/parent-join %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/parent-join/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/parent-join/parent-join-client-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/parent-join/parent-join-client-2.4.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/httpcore-nio-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/httpasyncclient-4.1.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/reindex-client-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/reindex-client-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/opensearch-rest-client-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/opensearch-rest-client-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/plugin-security.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/httpclient-4.5.13.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/opensearch-ssl-config-2.3.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/opensearch-ssl-config-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/commons-codec-1.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/httpcore-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/commons-logging-1.2.jar @@ -1204,6 +1264,7 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jrt-fs.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libattach.so %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/sizecalc.h %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/jvmti.h %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/classfile_constants.h %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/jdwpTransport.h From f1a7541feeaeac04c6a892759da76d049d19f065 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez?= Date: Mon, 5 Dec 2022 14:26:29 +0100 Subject: [PATCH 060/316] Bump Debian 4.4.0 indexer to 2.4.0 --- stack/indexer/deb/debian/rules | 483 ++++++++++++---------- stack/indexer/deb/docker/amd64/Dockerfile | 3 +- 2 files changed, 274 insertions(+), 212 deletions(-) diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index e908e45b32..f53bc051a2 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -153,7 +153,7 @@ override_dh_fixperms: chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/bin/performance-analyzer-rca chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/bin/performance-analyzer-agent chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/performance-analyzer-rca-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/performance-analyzer-rca-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/sqlite-jdbc-3.32.3.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/log4j-api-2.17.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/j2objc-annotations-1.3.jar @@ -166,39 +166,44 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/commons-io-2.7.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/jooq-3.10.8.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/failureaccess-1.0.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/animal-sniffer-annotations-1.19.jar +# chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/animal-sniffer-annotations-1.19.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/bcpkix-jdk15on-1.70.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/bcprov-jdk15on-1.70.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/bcutil-jdk15on-1.70.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/checker-compat-qual-2.5.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/checker-qual-3.5.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/error_prone_annotations-2.9.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-api-1.44.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-context-1.44.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-core-1.44.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-netty-1.44.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-protobuf-1.44.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-protobuf-lite-1.44.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-stub-1.44.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/gson-2.8.9.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/guava-30.1.1-android.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/jackson-annotations-2.13.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/jackson-core-2.13.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/jackson-databind-2.13.2.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-buffer-4.1.72.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-codec-4.1.72.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-codec-http-4.1.72.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-codec-http2-4.1.72.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-codec-socks-4.1.72.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-common-4.1.72.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-handler-4.1.72.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-handler-proxy-4.1.72.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-resolver-4.1.72.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-tcnative-classes-2.0.46.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-transport-4.1.72.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/perfmark-api-0.23.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/protobuf-java-3.19.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/proto-google-common-protos-2.0.1.jar +# chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/checker-compat-qual-2.5.5.jar +# chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/checker-qual-3.5.0.jar +# chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/error_prone_annotations-2.9.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-api-1.49.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-context-1.49.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-core-1.49.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-netty-1.49.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-protobuf-1.49.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-protobuf-lite-1.49.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-stub-1.49.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/gson-2.9.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/guava-31.1-android.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/jackson-annotations-2.13.4.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/jackson-core-2.13.4.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/jackson-databind-2.13.4.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-buffer-4.1.79.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-codec-4.1.77.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-codec-http-4.1.77.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-codec-http2-4.1.77.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-codec-socks-4.1.77.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-common-4.1.79.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-handler-4.1.77.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-handler-proxy-4.1.77.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-resolver-4.1.79.Final.jar +# chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-tcnative-classes-2.0.46.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-transport-4.1.79.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-transport-native-unix-common-4.1.79.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/perfmark-api-0.25.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/performance-analyzer-rca-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/protobuf-java-3.21.8.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/proto-google-common-protos-2.9.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/animal-sniffer-annotations-1.21.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/checker-qual-3.12.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/error_prone_annotations-2.14.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/agent-stats-metadata chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/log4j2.xml @@ -206,8 +211,10 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/performance-analyzer.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/plugin-stats-metadata chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/rca.conf - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/rca_idle_master.conf - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/rca_master.conf +# chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/rca_idle_master.conf +# chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/rca_master.conf + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/rca_cluster_manager.conf + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/rca_idle_cluster_manager.conf chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/supervisord.conf chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-shard @@ -226,55 +233,56 @@ override_dh_fixperms: chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-performance-analyzer/performance-analyzer-agent-cli chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/lib chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/hppc-0.8.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-geo-2.3.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-cli-2.3.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/java-version-checker-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-geo-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-cli-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/java-version-checker-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/log4j-api-2.17.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/snakeyaml-1.31.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-x-content-2.3.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-plugin-classloader-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/snakeyaml-1.32.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-x-content-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-plugin-classloader-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jna-5.5.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/log4j-core-2.17.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-launchers-2.3.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-secure-sm-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/log4j-jul-2.17.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-launchers-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-secure-sm-2.4.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/plugin-cli chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/plugin-cli/bcpg-fips-1.0.5.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/plugin-cli/opensearch-plugin-cli-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/plugin-cli/opensearch-plugin-cli-2.4.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/opensearch-upgrade-cli-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/opensearch-upgrade-cli-2.4.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/keystore-cli - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/keystore-cli/keystore-cli-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/keystore-cli/keystore-cli-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jts-core-1.15.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/t-digest-3.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-core-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-core-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/spatial4j-0.7.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-core-2.13.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-dataformat-cbor-2.13.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-dataformat-smile-2.13.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-dataformat-yaml-2.13.3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-core-2.14.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-dataformat-cbor-2.14.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-dataformat-smile-2.14.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-dataformat-yaml-2.14.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/joda-time-2.10.12.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jopt-simple-5.0.4.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/HdrHistogram-2.1.12.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-analysis-common-9.3.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-backward-codecs-9.3.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-core-9.3.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-grouping-9.3.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-highlighter-9.3.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-join-9.3.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-memory-9.3.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-misc-9.3.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-queries-9.3.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-queryparser-9.3.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-sandbox-9.3.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-spatial-extras-9.3.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-spatial3d-9.3.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-suggest-9.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-analysis-common-9.4.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-backward-codecs-9.4.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-core-9.4.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-grouping-9.4.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-highlighter-9.4.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-join-9.4.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-memory-9.4.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-misc-9.4.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-queries-9.4.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-queryparser-9.4.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-sandbox-9.4.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-spatial-extras-9.4.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-spatial3d-9.4.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-suggest-9.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/plugin-cli/bc-fips-1.0.2.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/jackson-annotations-2.13.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/jackson-core-2.13.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/jackson-databind-2.13.3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/jackson-annotations-2.14.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/jackson-core-2.14.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/jackson-databind-2.14.0.jar chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-observability chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-observability/observability.yml chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-reports-scheduler @@ -292,8 +300,10 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/performance-analyzer.properties chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/plugin-stats-metadata chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/rca.conf - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/rca_idle_master.conf - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/rca_master.conf +# chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/rca_idle_master.conf +# chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/rca_master.conf + chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/rca_cluster_manager.conf + chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/rca_idle_cluster_manager.conf chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/supervisord.conf chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/action_groups.yml @@ -314,8 +324,8 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/LICENSE.txt chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/opensearch-observability-2.3.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/common-utils-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/opensearch-observability-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/common-utils-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/kotlinx-coroutines-core-jvm-1.3.9.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/plugin-security.policy @@ -323,33 +333,33 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/kotlin-stdlib-1.6.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/kotlin-stdlib-common-1.6.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/jsoup-1.14.3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/jsoup-1.15.3.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/json-flattener-0.1.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/common-utils-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/common-utils-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/json-20180813.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/kotlinx-coroutines-core-jvm-1.3.9.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/opensearch-reports-scheduler-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/opensearch-reports-scheduler-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/gson-2.8.9.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/guava-31.0.1-jre.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/kotlin-stdlib-1.6.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/kotlin-stdlib-common-1.6.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/kotlin-test-1.6.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/geo-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/geo-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/httpcore-nio-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/resilience4j-core-1.5.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/core-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/core-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/httpcore-nio-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/httpasyncclient-4.1.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/protocol-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/protocol-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/slf4j-api-1.7.30.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/druid-1.0.15.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/sql-2.3.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/sql-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/commons-lang3-3.10.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/reindex-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/reindex-client-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/gson-2.8.9.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/j2objc-annotations-1.3.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/jsr305-3.0.2.jar @@ -361,21 +371,21 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/LICENSE.txt chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/vavr-match-0.10.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/parent-join-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/parent-join-client-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/vavr-0.10.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/presto-matching-0.240.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-rest-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-rest-client-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/plugin-security.policy chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/httpclient-4.5.13.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/legacy-2.3.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-ssl-config-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/legacy-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-ssl-config-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/commons-codec-1.13.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-sql-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-sql-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/commons-math3-3.6.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/ppl-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/ppl-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/httpcore-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/failureaccess-1.0.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/common-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/common-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/ST4-4.0.8.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/antlr-runtime-3.5.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/antlr4-4.7.1.jar @@ -383,10 +393,10 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/error_prone_annotations-2.7.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/guava-31.0.1-jre.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/icu4j-58.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/jackson-annotations-2.13.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/jackson-databind-2.13.3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/jackson-annotations-2.14.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/jackson-databind-2.14.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/javax.json-1.0.4.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-ml-client-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-ml-client-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/org.abego.treelayout.core-1.0.3.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/spring-aop-5.3.22.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/spring-beans-5.3.22.jar @@ -394,12 +404,22 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/spring-core-5.3.22.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/spring-expression-5.3.22.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/spring-jcl-5.3.22.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/sql-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/annotations-13.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/kotlin-reflect-1.4.30.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/kotlin-stdlib-1.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/kotlin-stdlib-common-1.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/kotlin-stdlib-jdk7-1.4.30.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/okhttp-4.9.3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/okhttp-aws-signer-1.0.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/okio-jvm-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/prometheus-2.4.0.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/ipaddress-5.3.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/common-utils-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/common-utils-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/annotations-13.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/opensearch-cross-cluster-replication-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/opensearch-cross-cluster-replication-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/kotlin-stdlib-1.6.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/kotlin-stdlib-common-1.6.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/kotlin-stdlib-jdk7-1.6.0.jar @@ -407,7 +427,7 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/kotlinx-coroutines-core-jvm-1.6.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/commons-lang-2.6.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/opensearch-knn-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/opensearch-knn-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/plugin-security.policy chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/failureaccess-1.0.1.jar @@ -421,11 +441,11 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/lib/libopensearchknn_nmslib.so chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/ipaddress-5.3.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/common-utils-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/common-utils-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/annotations-13.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/kotlinx-coroutines-core-jvm-1.3.9.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/opensearch-index-management-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/opensearch-index-management-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/plugin-security.policy chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/commons-codec-1.13.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/httpclient-4.5.13.jar @@ -433,13 +453,13 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/kotlin-stdlib-1.6.10.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/kotlin-stdlib-common-1.6.10.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/kotlin-stdlib-jdk7-1.6.10.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/opensearch-index-management-spi-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/opensearch-index-management-spi-2.4.0.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/sqlite-jdbc-3.32.3.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/j2objc-annotations-1.3.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/jsr305-3.0.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/opensearch-performance-analyzer-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/opensearch-performance-analyzer-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/annotations-4.1.1.4.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/plugin-security.policy @@ -447,25 +467,25 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/commons-io-2.7.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/jooq-3.10.8.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/failureaccess-1.0.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/animal-sniffer-annotations-1.19.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/animal-sniffer-annotations-1.21.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/bcpkix-jdk15on-1.70.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/bcprov-jdk15on-1.70.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/bcutil-jdk15on-1.70.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/checker-qual-3.5.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/commons-lang3-3.12.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/error_prone_annotations-2.9.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/grpc-api-1.44.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/grpc-context-1.44.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/grpc-core-1.44.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/grpc-netty-1.44.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/grpc-protobuf-1.44.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/grpc-protobuf-lite-1.44.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/grpc-stub-1.44.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/gson-2.8.9.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/grpc-api-1.49.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/grpc-context-1.49.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/grpc-core-1.49.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/grpc-netty-1.49.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/grpc-protobuf-1.49.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/grpc-protobuf-lite-1.49.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/grpc-stub-1.49.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/gson-2.9.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/guava-30.1-jre.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/jackson-annotations-2.13.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/jackson-databind-2.13.2.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/jackson-module-paranamer-2.13.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/jackson-annotations-2.13.4.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/jackson-databind-2.13.4.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/jackson-module-paranamer-2.13.4.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-buffer-4.1.79.Final.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-codec-4.1.79.Final.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-codec-http-4.1.79.Final.jar @@ -477,14 +497,14 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-resolver-4.1.79.Final.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-transport-4.1.79.Final.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-transport-native-unix-common-4.1.79.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/perfmark-api-0.23.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/performanceanalyzer-rca-2.3.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/protobuf-java-3.19.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/proto-google-common-protos-2.0.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/perfmark-api-0.25.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/performanceanalyzer-rca-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/protobuf-java-3.21.8.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/proto-google-common-protos-2.9.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler/opensearch-job-scheduler-spi-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler/opensearch-job-scheduler-spi-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler/opensearch-job-scheduler-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler/opensearch-job-scheduler-2.4.0.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-saml-api-3.4.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/commons-codec-1.14.jar @@ -494,10 +514,10 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jakarta.activation-1.2.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/commons-logging-1.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/json-path-2.4.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/aggs-matrix-stats-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/aggs-matrix-stats-client-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/httpcore-nio-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/httpasyncclient-4.1.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/lang-mustache-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/lang-mustache-client-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/bcprov-jdk15on-1.67.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/json-flattener-0.5.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/cxf-rt-rs-json-basic-3.4.5.jar @@ -510,7 +530,7 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-messaging-api-3.4.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-storage-api-3.4.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/commons-lang-2.4.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/mapper-extras-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/mapper-extras-client-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jakarta.xml.bind-api-2.3.3.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-saml-impl-3.4.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/java-saml-core-2.5.0.jar @@ -519,14 +539,14 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/commons-lang3-3.4.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/lz4-java-1.7.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/rank-eval-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/rank-eval-client-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/ldaptive-1.2.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensearch-security-2.3.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/woodstox-core-6.2.6.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensearch-security-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/woodstox-core-6.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/eventbus-3.2.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/istack-commons-runtime-3.0.12.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/asm-9.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/parent-join-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/parent-join-client-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/json-smart-2.4.7.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/xmlsec-2.2.3.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools @@ -539,14 +559,14 @@ override_dh_fixperms: chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/wazuh-passwords-tool.sh chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/xmlschema-core-2.2.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/httpclient-cache-4.5.13.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/transport-netty4-client-2.3.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensearch-rest-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/transport-netty4-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensearch-rest-client-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/plugin-security.policy chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-xmlsec-api-3.4.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/httpclient-4.5.13.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/zjsonpatch-0.4.4.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/accessors-smart-2.4.7.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensearch-rest-high-level-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensearch-rest-high-level-client-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/cxf-rt-security-3.4.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/java-support-7.5.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/stax2-api-4.2.1.jar @@ -555,7 +575,7 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jaxb-runtime-2.3.4.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-security-impl-3.4.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/commons-collections-3.2.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/commons-text-1.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/commons-text-1.10.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jakarta.annotation-api-1.3.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/httpcore-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-soap-api-3.4.5.jar @@ -566,27 +586,52 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/failureaccess-1.0.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/guava-30.0-jre.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/j2objc-annotations-1.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jackson-annotations-2.13.3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jackson-annotations-2.14.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jjwt-api-0.10.8.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jjwt-impl-0.10.8.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jjwt-jackson-0.10.8.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-buffer-4.1.79.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-codec-4.1.79.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-codec-http-4.1.79.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-common-4.1.79.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-handler-4.1.79.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-resolver-4.1.79.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-transport-4.1.79.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-transport-native-unix-common-4.1.79.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-buffer-4.1.84.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-codec-4.1.84.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-codec-http-4.1.84.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-common-4.1.84.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-handler-4.1.84.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-resolver-4.1.84.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-transport-4.1.84.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-transport-native-unix-common-4.1.84.Final.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/slf4j-api-1.7.30.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/snappy-java-1.1.8.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/zstd-jni-1.5.0-2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jackson-databind-2.13.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/kafka-clients-3.0.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jackson-databind-2.14.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/kafka-clients-3.0.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/bcpkix-jdk15on-1.70.jar + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/antlr4-runtime-4.10.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/common-utils-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/commons-codec-1.15.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/commons-lang3-3.12.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/commons-logging-1.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/cron-utils-9.1.6.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/httpasyncclient-4.1.5.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/httpclient-4.5.13.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/httpcore-4.4.15.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/httpcore-nio-4.4.15.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/kotlin-stdlib-1.6.10.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/opensearch-rest-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/opensearch-security-analytics-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/plugin-descriptor.properties + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/plugin-security.policy + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/LICENSE.txt + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/NOTICE.txt + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/commons-lang3-3.10.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/opensearch-ml-client-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/opensearch-neural-search-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/plugin-descriptor.properties + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/plugin-security.policy chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search/opensearch-asynchronous-search-2.3.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search/common-utils-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search/opensearch-asynchronous-search-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search/common-utils-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search/plugin-security.policy chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection @@ -595,15 +640,15 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/httpcore-nio-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/httpasyncclient-4.1.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/gson-2.8.9.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/common-utils-2.3.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/opensearch-anomaly-detection-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/common-utils-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/opensearch-anomaly-detection-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/org.jacoco.ant-0.8.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/commons-pool2-2.10.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/sketches-core-0.13.4.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/org.jacoco.agent-0.8.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/memory-0.12.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/opensearch-rest-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/opensearch-rest-client-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/plugin-security.policy chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/httpclient-4.5.13.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/commons-codec-1.15.jar @@ -611,8 +656,8 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/httpcore-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/failureaccess-1.0.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/guava-31.0.1-jre.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/jackson-annotations-2.13.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/jackson-databind-2.13.2.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/jackson-annotations-2.13.4.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/jackson-databind-2.13.4.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/javassist-3.28.0-GA.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/protostuff-api-1.8.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/protostuff-collectionschema-1.8.0.jar @@ -626,8 +671,10 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/LICENSE.txt chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/NOTICE.txt chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/commons-lang3-3.12.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/opensearch-geospatial-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/opensearch-geospatial-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/plugin-descriptor.properties + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/geo-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/h3-2.4.0.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/error_prone_annotations-2.3.4.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/httpcore-nio-4.4.15.jar @@ -636,7 +683,7 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/slf4j-api-1.7.30.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/ipaddress-5.3.3.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/j2objc-annotations-1.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/common-utils-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/common-utils-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/jsr305-3.0.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/javax.el-3.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/javassist-3.27.0-GA.jar @@ -645,13 +692,13 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/annotations-13.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/guava-30.0-jre.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/alerting-core-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/alerting-core-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/google-java-format-1.10.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/checker-qual-3.5.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/opensearch-rest-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/opensearch-rest-client-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/plugin-security.policy chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/httpclient-4.5.13.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/opensearch-alerting-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/opensearch-alerting-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/kotlinx-coroutines-core-common-1.1.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/commons-codec-1.13.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/httpcore-4.4.15.jar @@ -664,10 +711,10 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/kotlin-stdlib-common-1.6.10.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/kotlin-stdlib-jdk7-1.6.10.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/kotlin-stdlib-jdk8-1.6.10.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/percolator-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/percolator-client-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/commons-logging-1.2.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/common-utils-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/common-utils-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/commons-beanutils-1.9.4.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/commons-codec-1.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/commons-collections-3.2.2.jar @@ -676,18 +723,18 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/commons-lang3-3.10.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/commons-logging-1.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/commons-math3-3.6.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/commons-text-1.9.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/commons-text-1.10.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-classification-core-4.2.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-classification-sgd-4.2.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-common-tree-4.2.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/gson-2.9.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/gson-2.9.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/guava-31.0.1-jre.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/httpasyncclient-4.1.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/httpclient-4.5.13.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/httpcore-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/httpcore-nio-4.4.15.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jackson-annotations-2.13.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jackson-databind-2.13.3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jackson-annotations-2.14.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jackson-databind-2.14.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jansi-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/javassist-3.26.0-GA.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jline-builtins-3.21.0.jar @@ -699,10 +746,10 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/olcut-config-protobuf-5.2.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/olcut-core-5.2.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opencsv-5.4.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-ml-2.3.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-ml-algorithms-2.3.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-ml-common-2.3.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-rest-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-ml-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-ml-algorithms-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-ml-common-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-rest-client-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/plugin-security.policy chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/protobuf-java-3.19.4.jar @@ -728,6 +775,21 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-util-infotheory-4.2.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-util-onnx-4.2.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-util-tokenization-4.2.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/api-0.19.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/checker-qual-3.12.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/commons-compress-1.21.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/error_prone_annotations-2.7.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/failureaccess-1.0.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/j2objc-annotations-1.3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jsr305-3.0.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/log4j-slf4j-impl-2.19.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/onnxruntime-1.12.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/onnxruntime-engine-0.19.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/pytorch-engine-0.19.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/pytorch-model-zoo-0.19.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/slf4j-api-1.7.36.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tokenizers-0.19.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/ chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/activation-1.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/aws-java-sdk-core-1.12.48.jar @@ -736,132 +798,132 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/aws-java-sdk-sts-1.12.48.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/httpclient-4.5.13.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/httpcore-4.4.15.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/jackson-annotations-2.13.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/jackson-databind-2.13.3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/jackson-annotations-2.14.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/jackson-databind-2.14.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/javax.mail-1.6.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/kotlin-stdlib-1.6.10.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/kotlin-stdlib-common-1.6.10.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/opensearch-notifications-core-2.3.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/opensearch-notifications-core-spi-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/opensearch-notifications-core-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/opensearch-notifications-core-spi-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/commons-logging-1.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/plugin-security.policy chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/common-utils-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/common-utils-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/kotlin-stdlib-common-1.6.10.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/kotlinx-coroutines-core-jvm-1.4.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/opensearch-notifications-2.3.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/opensearch-notifications-2.4.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/plugin-security.policy chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/jcodings-1.0.44.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/opensearch-grok-2.3.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/opensearch-dissect-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/opensearch-grok-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/opensearch-dissect-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/ingest-common-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/ingest-common-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/joni-2.1.43.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/geo chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/geo/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/geo/geo-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/geo/geo-2.4.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/GeoLite2-Country.mmdb chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/GeoLite2-City.mmdb - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/ingest-geoip-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/ingest-geoip-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/GeoLite2-ASN.mmdb chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/plugin-security.policy chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/geoip2-3.0.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/jackson-annotations-2.13.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/jackson-databind-2.13.3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/jackson-annotations-2.14.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/jackson-databind-2.14.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/maxmind-db-2.0.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/percolator chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/percolator/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/percolator/percolator-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/percolator/percolator-client-2.4.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/analysis-common chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/analysis-common/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/analysis-common/analysis-common-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/analysis-common/analysis-common-2.4.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/aggs-matrix-stats - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/aggs-matrix-stats/aggs-matrix-stats-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/aggs-matrix-stats/aggs-matrix-stats-client-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/aggs-matrix-stats/plugin-descriptor.properties chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/repository-url chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/repository-url/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/repository-url/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/repository-url/repository-url-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/repository-url/repository-url-2.4.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-mustache - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-mustache/lang-mustache-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-mustache/lang-mustache-client-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-mustache/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-mustache/compiler-0.9.10.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-mustache/plugin-security.policy chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/systemd chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/systemd/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/systemd/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/systemd/systemd-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/systemd/systemd-2.4.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4 chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/transport-netty4-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/transport-netty4-client-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-buffer-4.1.79.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-codec-4.1.79.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-codec-http-4.1.79.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-common-4.1.79.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-handler-4.1.79.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-resolver-4.1.79.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-transport-4.1.79.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-transport-native-unix-common-4.1.79.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-buffer-4.1.84.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-codec-4.1.84.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-codec-http-4.1.84.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-common-4.1.84.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-handler-4.1.84.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-resolver-4.1.84.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-transport-4.1.84.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-transport-native-unix-common-4.1.84.Final.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/lang-expression-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/lang-expression-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/plugin-security.policy chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/antlr4-runtime-4.9.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/asm-9.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/asm-commons-9.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/asm-tree-9.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/lucene-expressions-9.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/asm-9.4.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/asm-commons-9.4.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/asm-tree-9.4.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/lucene-expressions-9.4.1.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/lang-painless-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/lang-painless-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/opensearch-scripting-painless-spi-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/opensearch-scripting-painless-spi-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/antlr4-runtime-4.9.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/asm-9.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/asm-analysis-9.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/asm-commons-9.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/asm-tree-9.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/asm-util-9.3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/asm-9.4.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/asm-analysis-9.4.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/asm-commons-9.4.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/asm-tree-9.4.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/asm-util-9.4.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/rank-eval chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/rank-eval/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/rank-eval/rank-eval-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/rank-eval/rank-eval-client-2.4.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/httpcore-nio-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/httpasyncclient-4.1.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/reindex-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/reindex-client-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/opensearch-rest-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/opensearch-rest-client-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/httpclient-4.5.13.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/opensearch-dashboards-2.3.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/opensearch-ssl-config-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/opensearch-dashboards-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/opensearch-ssl-config-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/commons-codec-1.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/httpcore-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/commons-logging-1.2.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-user-agent - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-user-agent/ingest-user-agent-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-user-agent/ingest-user-agent-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-user-agent/plugin-descriptor.properties chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/mapper-extras - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/mapper-extras/mapper-extras-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/mapper-extras/mapper-extras-client-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/mapper-extras/plugin-descriptor.properties chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/parent-join chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/parent-join/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/parent-join/parent-join-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/parent-join/parent-join-client-2.4.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/httpcore-nio-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/httpasyncclient-4.1.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/reindex-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/reindex-client-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/opensearch-rest-client-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/opensearch-rest-client-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/plugin-security.policy chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/httpclient-4.5.13.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/opensearch-ssl-config-2.3.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/opensearch-ssl-config-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/commons-codec-1.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/httpcore-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/commons-logging-1.2.jar @@ -1042,6 +1104,7 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/jrt-fs.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libattach.so chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/sizecalc.h chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/jvmti.h chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/classfile_constants.h chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/jdwpTransport.h diff --git a/stack/indexer/deb/docker/amd64/Dockerfile b/stack/indexer/deb/docker/amd64/Dockerfile index 6edf9beae2..e9a5559425 100644 --- a/stack/indexer/deb/docker/amd64/Dockerfile +++ b/stack/indexer/deb/docker/amd64/Dockerfile @@ -2,9 +2,8 @@ FROM debian:8 ENV DEBIAN_FRONTEND noninteractive -# Installing necessary packages RUN apt-get update && apt-get install -y apt-utils && \ - apt-get install -y \ + apt-get install -y --force-yes \ curl sudo wget expect gnupg build-essential \ devscripts equivs selinux-basics procps gawk From 1b9491cb19072c27397fdf27874fa2723c50a020 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 12 Dec 2022 15:01:32 -0300 Subject: [PATCH 061/316] Removed bash for alpine package --- alpine/SPECS/wazuh-agent/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/SPECS/wazuh-agent/APKBUILD b/alpine/SPECS/wazuh-agent/APKBUILD index 993017ce8f..f953fd9f00 100644 --- a/alpine/SPECS/wazuh-agent/APKBUILD +++ b/alpine/SPECS/wazuh-agent/APKBUILD @@ -7,7 +7,7 @@ pkgdesc="Wazuh helps you to gain security visibility into your infrastructure." url="https://www.wazuh.com/" arch="${architecture}" license="GPL" -depends="bash busybox procps" +depends="busybox procps" makedepends="make cmake git openssl-dev libgcc gcc automake autoconf libtool" checkdepends="" install="${pkgname}.pre-install ${pkgname}.post-install ${pkgname}.pre-upgrade ${pkgname}.post-upgrade ${pkgname}.pre-deinstall ${pkgname}.post-deinstall" From 7e171f4292f94c95c4c3bb03207ce3dfed34efeb Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 13 Dec 2022 07:05:07 -0300 Subject: [PATCH 062/316] Removed commented files --- stack/indexer/deb/debian/rules | 9 --------- stack/indexer/rpm/wazuh-indexer.spec | 9 --------- 2 files changed, 18 deletions(-) diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index f53bc051a2..246d3eabca 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -166,13 +166,9 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/commons-io-2.7.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/jooq-3.10.8.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/failureaccess-1.0.1.jar -# chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/animal-sniffer-annotations-1.19.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/bcpkix-jdk15on-1.70.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/bcprov-jdk15on-1.70.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/bcutil-jdk15on-1.70.jar -# chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/checker-compat-qual-2.5.5.jar -# chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/checker-qual-3.5.0.jar -# chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/error_prone_annotations-2.9.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-api-1.49.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-context-1.49.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-core-1.49.0.jar @@ -194,7 +190,6 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-handler-4.1.77.Final.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-handler-proxy-4.1.77.Final.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-resolver-4.1.79.Final.jar -# chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-tcnative-classes-2.0.46.Final.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-transport-4.1.79.Final.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-transport-native-unix-common-4.1.79.Final.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/perfmark-api-0.25.0.jar @@ -211,8 +206,6 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/performance-analyzer.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/plugin-stats-metadata chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/rca.conf -# chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/rca_idle_master.conf -# chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/rca_master.conf chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/rca_cluster_manager.conf chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/rca_idle_cluster_manager.conf chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/supervisord.conf @@ -300,8 +293,6 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/performance-analyzer.properties chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/plugin-stats-metadata chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/rca.conf -# chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/rca_idle_master.conf -# chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/rca_master.conf chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/rca_cluster_manager.conf chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/rca_idle_cluster_manager.conf chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/supervisord.conf diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index babbf89f60..bfea73d74c 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -322,13 +322,9 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/commons-io-2.7.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jooq-3.10.8.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/failureaccess-1.0.1.jar -#%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/animal-sniffer-annotations-1.19.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/bcpkix-jdk15on-1.70.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/bcprov-jdk15on-1.70.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/bcutil-jdk15on-1.70.jar -#%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/checker-compat-qual-2.5.5.jar -#%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/checker-qual-3.5.0.jar -#%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/error_prone_annotations-2.9.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-api-1.49.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-context-1.49.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-core-1.49.0.jar @@ -350,7 +346,6 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-handler-4.1.77.Final.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-handler-proxy-4.1.77.Final.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-resolver-4.1.79.Final.jar -#%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-tcnative-classes-2.0.46.Final.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-transport-4.1.79.Final.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-transport-native-unix-common-4.1.79.Final.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/perfmark-api-0.25.0.jar @@ -367,8 +362,6 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/performance-analyzer.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/plugin-stats-metadata %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/rca.conf -#%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/rca_idle_master.conf -#%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/rca_master.conf %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/rca_cluster_manager.conf %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/rca_idle_cluster_manager.conf %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/supervisord.conf @@ -456,8 +449,6 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/performance-analyzer.properties %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/plugin-stats-metadata %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/rca.conf -#%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/rca_idle_master.conf -#%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/rca_master.conf %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/rca_cluster_manager.conf %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/rca_idle_cluster_manager.conf %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/supervisord.conf From c06fbaad728f002ace6545400aa1de565ddc5f41 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 19 Dec 2022 09:45:20 -0300 Subject: [PATCH 063/316] Added support for Opensearch 2.4.0 --- stack/indexer/base/builder.sh | 2 +- stack/indexer/deb/debian/rules | 282 +++++++++++++-------------- stack/indexer/rpm/wazuh-indexer.spec | 278 +++++++++++++------------- 3 files changed, 281 insertions(+), 281 deletions(-) diff --git a/stack/indexer/base/builder.sh b/stack/indexer/base/builder.sh index 91dbf357f9..304dfa9525 100644 --- a/stack/indexer/base/builder.sh +++ b/stack/indexer/base/builder.sh @@ -16,7 +16,7 @@ architecture="$1" revision="$2" future="$3" reference="$4" -opensearch_version="2.4.0" +opensearch_version="2.4.1" base_dir=/opt/wazuh-indexer-base # ----------------------------------------------------------------------------- diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index 246d3eabca..a00d30a45e 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -153,7 +153,7 @@ override_dh_fixperms: chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/bin/performance-analyzer-rca chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/bin/performance-analyzer-agent chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/performance-analyzer-rca-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/performance-analyzer-rca-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/sqlite-jdbc-3.32.3.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/log4j-api-2.17.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/j2objc-annotations-1.3.jar @@ -193,7 +193,7 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-transport-4.1.79.Final.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-transport-native-unix-common-4.1.79.Final.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/perfmark-api-0.25.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/performance-analyzer-rca-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/performance-analyzer-rca-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/protobuf-java-3.21.8.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/proto-google-common-protos-2.9.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/animal-sniffer-annotations-1.21.jar @@ -226,56 +226,56 @@ override_dh_fixperms: chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-performance-analyzer/performance-analyzer-agent-cli chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/lib chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/hppc-0.8.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-geo-2.4.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-cli-2.4.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/java-version-checker-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-geo-2.4.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-cli-2.4.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/java-version-checker-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/log4j-api-2.17.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/snakeyaml-1.32.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-x-content-2.4.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-plugin-classloader-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-x-content-2.4.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-plugin-classloader-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jna-5.5.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/log4j-core-2.17.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/log4j-jul-2.17.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-launchers-2.4.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-secure-sm-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-launchers-2.4.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-secure-sm-2.4.1.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/plugin-cli chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/plugin-cli/bcpg-fips-1.0.5.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/plugin-cli/opensearch-plugin-cli-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/plugin-cli/opensearch-plugin-cli-2.4.1.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/opensearch-upgrade-cli-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/opensearch-upgrade-cli-2.4.1.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/keystore-cli - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/keystore-cli/keystore-cli-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/keystore-cli/keystore-cli-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jts-core-1.15.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/t-digest-3.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-core-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-core-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/spatial4j-0.7.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-core-2.14.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-dataformat-cbor-2.14.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-dataformat-smile-2.14.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-dataformat-yaml-2.14.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-core-2.14.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-dataformat-cbor-2.14.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-dataformat-smile-2.14.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-dataformat-yaml-2.14.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/joda-time-2.10.12.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jopt-simple-5.0.4.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/HdrHistogram-2.1.12.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-analysis-common-9.4.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-backward-codecs-9.4.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-core-9.4.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-grouping-9.4.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-highlighter-9.4.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-join-9.4.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-memory-9.4.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-misc-9.4.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-queries-9.4.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-queryparser-9.4.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-sandbox-9.4.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-spatial-extras-9.4.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-spatial3d-9.4.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-suggest-9.4.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-analysis-common-9.4.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-backward-codecs-9.4.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-core-9.4.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-grouping-9.4.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-highlighter-9.4.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-join-9.4.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-memory-9.4.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-misc-9.4.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-queries-9.4.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-queryparser-9.4.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-sandbox-9.4.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-spatial-extras-9.4.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-spatial3d-9.4.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-suggest-9.4.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/plugin-cli/bc-fips-1.0.2.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/jackson-annotations-2.14.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/jackson-core-2.14.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/jackson-databind-2.14.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/jackson-annotations-2.14.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/jackson-core-2.14.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/jackson-databind-2.14.1.jar chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-observability chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-observability/observability.yml chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-reports-scheduler @@ -315,8 +315,8 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/LICENSE.txt chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/opensearch-observability-2.4.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/common-utils-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/opensearch-observability-2.4.1.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/common-utils-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/kotlinx-coroutines-core-jvm-1.3.9.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/plugin-security.policy @@ -326,31 +326,31 @@ override_dh_fixperms: chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/jsoup-1.15.3.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/json-flattener-0.1.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/common-utils-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/common-utils-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/json-20180813.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/kotlinx-coroutines-core-jvm-1.3.9.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/opensearch-reports-scheduler-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/opensearch-reports-scheduler-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/gson-2.8.9.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/guava-31.0.1-jre.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/kotlin-stdlib-1.6.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/kotlin-stdlib-common-1.6.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/kotlin-test-1.6.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/geo-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/geo-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/httpcore-nio-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/resilience4j-core-1.5.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/core-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/core-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/httpcore-nio-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/httpasyncclient-4.1.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/protocol-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/protocol-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/slf4j-api-1.7.30.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/druid-1.0.15.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/sql-2.4.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/sql-2.4.1.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/commons-lang3-3.10.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/reindex-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/reindex-client-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/gson-2.8.9.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/j2objc-annotations-1.3.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/jsr305-3.0.2.jar @@ -362,21 +362,21 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/LICENSE.txt chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/vavr-match-0.10.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/parent-join-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/parent-join-client-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/vavr-0.10.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/presto-matching-0.240.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-rest-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-rest-client-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/plugin-security.policy chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/httpclient-4.5.13.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/legacy-2.4.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-ssl-config-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/legacy-2.4.1.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-ssl-config-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/commons-codec-1.13.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-sql-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-sql-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/commons-math3-3.6.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/ppl-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/ppl-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/httpcore-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/failureaccess-1.0.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/common-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/common-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/ST4-4.0.8.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/antlr-runtime-3.5.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/antlr4-4.7.1.jar @@ -384,10 +384,10 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/error_prone_annotations-2.7.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/guava-31.0.1-jre.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/icu4j-58.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/jackson-annotations-2.14.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/jackson-databind-2.14.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/jackson-annotations-2.14.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/jackson-databind-2.14.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/javax.json-1.0.4.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-ml-client-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-ml-client-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/org.abego.treelayout.core-1.0.3.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/spring-aop-5.3.22.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/spring-beans-5.3.22.jar @@ -395,7 +395,7 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/spring-core-5.3.22.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/spring-expression-5.3.22.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/spring-jcl-5.3.22.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/sql-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/sql-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/annotations-13.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/kotlin-reflect-1.4.30.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/kotlin-stdlib-1.6.0.jar @@ -404,13 +404,13 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/okhttp-4.9.3.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/okhttp-aws-signer-1.0.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/okio-jvm-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/prometheus-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/prometheus-2.4.1.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/ipaddress-5.3.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/common-utils-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/common-utils-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/annotations-13.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/opensearch-cross-cluster-replication-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/opensearch-cross-cluster-replication-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/kotlin-stdlib-1.6.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/kotlin-stdlib-common-1.6.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/kotlin-stdlib-jdk7-1.6.0.jar @@ -418,7 +418,7 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/kotlinx-coroutines-core-jvm-1.6.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/commons-lang-2.6.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/opensearch-knn-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/opensearch-knn-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/plugin-security.policy chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/failureaccess-1.0.1.jar @@ -432,11 +432,11 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/lib/libopensearchknn_nmslib.so chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/ipaddress-5.3.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/common-utils-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/common-utils-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/annotations-13.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/kotlinx-coroutines-core-jvm-1.3.9.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/opensearch-index-management-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/opensearch-index-management-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/plugin-security.policy chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/commons-codec-1.13.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/httpclient-4.5.13.jar @@ -444,13 +444,13 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/kotlin-stdlib-1.6.10.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/kotlin-stdlib-common-1.6.10.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/kotlin-stdlib-jdk7-1.6.10.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/opensearch-index-management-spi-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/opensearch-index-management-spi-2.4.1.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/sqlite-jdbc-3.32.3.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/j2objc-annotations-1.3.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/jsr305-3.0.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/opensearch-performance-analyzer-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/opensearch-performance-analyzer-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/annotations-4.1.1.4.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/plugin-security.policy @@ -489,13 +489,13 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-transport-4.1.79.Final.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-transport-native-unix-common-4.1.79.Final.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/perfmark-api-0.25.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/performanceanalyzer-rca-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/performanceanalyzer-rca-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/protobuf-java-3.21.8.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/proto-google-common-protos-2.9.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler/opensearch-job-scheduler-spi-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler/opensearch-job-scheduler-spi-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler/opensearch-job-scheduler-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler/opensearch-job-scheduler-2.4.1.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-saml-api-3.4.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/commons-codec-1.14.jar @@ -505,10 +505,10 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jakarta.activation-1.2.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/commons-logging-1.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/json-path-2.4.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/aggs-matrix-stats-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/aggs-matrix-stats-client-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/httpcore-nio-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/httpasyncclient-4.1.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/lang-mustache-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/lang-mustache-client-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/bcprov-jdk15on-1.67.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/json-flattener-0.5.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/cxf-rt-rs-json-basic-3.4.5.jar @@ -521,7 +521,7 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-messaging-api-3.4.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-storage-api-3.4.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/commons-lang-2.4.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/mapper-extras-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/mapper-extras-client-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jakarta.xml.bind-api-2.3.3.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-saml-impl-3.4.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/java-saml-core-2.5.0.jar @@ -530,14 +530,14 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/commons-lang3-3.4.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/lz4-java-1.7.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/rank-eval-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/rank-eval-client-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/ldaptive-1.2.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensearch-security-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensearch-security-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/woodstox-core-6.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/eventbus-3.2.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/istack-commons-runtime-3.0.12.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/asm-9.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/parent-join-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/parent-join-client-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/json-smart-2.4.7.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/xmlsec-2.2.3.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools @@ -550,14 +550,14 @@ override_dh_fixperms: chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/wazuh-passwords-tool.sh chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/xmlschema-core-2.2.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/httpclient-cache-4.5.13.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/transport-netty4-client-2.4.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensearch-rest-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/transport-netty4-client-2.4.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensearch-rest-client-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/plugin-security.policy chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-xmlsec-api-3.4.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/httpclient-4.5.13.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/zjsonpatch-0.4.4.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/accessors-smart-2.4.7.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensearch-rest-high-level-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensearch-rest-high-level-client-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/cxf-rt-security-3.4.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/java-support-7.5.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/stax2-api-4.2.1.jar @@ -577,7 +577,7 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/failureaccess-1.0.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/guava-30.0-jre.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/j2objc-annotations-1.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jackson-annotations-2.14.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jackson-annotations-2.14.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jjwt-api-0.10.8.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jjwt-impl-0.10.8.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jjwt-jackson-0.10.8.jar @@ -593,12 +593,12 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/slf4j-api-1.7.30.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/snappy-java-1.1.8.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/zstd-jni-1.5.0-2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jackson-databind-2.14.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jackson-databind-2.14.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/kafka-clients-3.0.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/bcpkix-jdk15on-1.70.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/antlr4-runtime-4.10.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/common-utils-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/common-utils-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/commons-codec-1.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/commons-lang3-3.12.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/commons-logging-1.2.jar @@ -608,21 +608,21 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/httpcore-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/httpcore-nio-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/kotlin-stdlib-1.6.10.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/opensearch-rest-client-2.4.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/opensearch-security-analytics-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/opensearch-rest-client-2.4.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/opensearch-security-analytics-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/plugin-security.policy chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/LICENSE.txt chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/NOTICE.txt chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/commons-lang3-3.10.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/opensearch-ml-client-2.4.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/opensearch-neural-search-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/opensearch-ml-client-2.4.1.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/opensearch-neural-search-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/plugin-security.policy chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search/opensearch-asynchronous-search-2.4.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search/common-utils-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search/opensearch-asynchronous-search-2.4.1.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search/common-utils-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search/plugin-security.policy chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection @@ -631,15 +631,15 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/httpcore-nio-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/httpasyncclient-4.1.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/gson-2.8.9.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/common-utils-2.4.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/opensearch-anomaly-detection-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/common-utils-2.4.1.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/opensearch-anomaly-detection-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/org.jacoco.ant-0.8.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/commons-pool2-2.10.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/sketches-core-0.13.4.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/org.jacoco.agent-0.8.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/memory-0.12.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/opensearch-rest-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/opensearch-rest-client-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/plugin-security.policy chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/httpclient-4.5.13.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/commons-codec-1.15.jar @@ -647,8 +647,8 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/httpcore-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/failureaccess-1.0.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/guava-31.0.1-jre.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/jackson-annotations-2.13.4.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/jackson-databind-2.13.4.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/jackson-annotations-2.14.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/jackson-databind-2.14.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/javassist-3.28.0-GA.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/protostuff-api-1.8.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/protostuff-collectionschema-1.8.0.jar @@ -662,10 +662,10 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/LICENSE.txt chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/NOTICE.txt chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/commons-lang3-3.12.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/opensearch-geospatial-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/opensearch-geospatial-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/geo-2.4.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/h3-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/geo-2.4.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/h3-2.4.1.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/error_prone_annotations-2.3.4.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/httpcore-nio-4.4.15.jar @@ -674,7 +674,7 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/slf4j-api-1.7.30.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/ipaddress-5.3.3.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/j2objc-annotations-1.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/common-utils-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/common-utils-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/jsr305-3.0.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/javax.el-3.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/javassist-3.27.0-GA.jar @@ -683,13 +683,13 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/annotations-13.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/guava-30.0-jre.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/alerting-core-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/alerting-core-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/google-java-format-1.10.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/checker-qual-3.5.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/opensearch-rest-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/opensearch-rest-client-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/plugin-security.policy chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/httpclient-4.5.13.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/opensearch-alerting-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/opensearch-alerting-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/kotlinx-coroutines-core-common-1.1.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/commons-codec-1.13.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/httpcore-4.4.15.jar @@ -702,10 +702,10 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/kotlin-stdlib-common-1.6.10.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/kotlin-stdlib-jdk7-1.6.10.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/kotlin-stdlib-jdk8-1.6.10.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/percolator-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/percolator-client-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/commons-logging-1.2.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/common-utils-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/common-utils-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/commons-beanutils-1.9.4.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/commons-codec-1.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/commons-collections-3.2.2.jar @@ -724,8 +724,8 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/httpclient-4.5.13.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/httpcore-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/httpcore-nio-4.4.15.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jackson-annotations-2.14.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jackson-databind-2.14.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jackson-annotations-2.14.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jackson-databind-2.14.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jansi-2.4.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/javassist-3.26.0-GA.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jline-builtins-3.21.0.jar @@ -737,13 +737,13 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/olcut-config-protobuf-5.2.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/olcut-core-5.2.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opencsv-5.4.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-ml-2.4.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-ml-algorithms-2.4.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-ml-common-2.4.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-rest-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-ml-2.4.1.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-ml-algorithms-2.4.1.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-ml-common-2.4.1.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-rest-client-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/protobuf-java-3.19.4.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/protobuf-java-3.21.9.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/protostuff-api-1.8.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/protostuff-collectionschema-1.8.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/protostuff-core-1.8.0.jar @@ -789,70 +789,70 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/aws-java-sdk-sts-1.12.48.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/httpclient-4.5.13.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/httpcore-4.4.15.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/jackson-annotations-2.14.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/jackson-databind-2.14.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/jackson-annotations-2.14.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/jackson-databind-2.14.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/javax.mail-1.6.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/kotlin-stdlib-1.6.10.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/kotlin-stdlib-common-1.6.10.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/opensearch-notifications-core-2.4.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/opensearch-notifications-core-spi-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/opensearch-notifications-core-2.4.1.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/opensearch-notifications-core-spi-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/commons-logging-1.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/plugin-security.policy chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/common-utils-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/common-utils-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/kotlin-stdlib-common-1.6.10.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/kotlinx-coroutines-core-jvm-1.4.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/opensearch-notifications-2.4.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/opensearch-notifications-2.4.1.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/plugin-security.policy chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/jcodings-1.0.44.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/opensearch-grok-2.4.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/opensearch-dissect-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/opensearch-grok-2.4.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/opensearch-dissect-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/ingest-common-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/ingest-common-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/joni-2.1.43.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/geo chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/geo/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/geo/geo-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/geo/geo-2.4.1.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/GeoLite2-Country.mmdb chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/GeoLite2-City.mmdb - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/ingest-geoip-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/ingest-geoip-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/GeoLite2-ASN.mmdb chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/plugin-security.policy chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/geoip2-3.0.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/jackson-annotations-2.14.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/jackson-databind-2.14.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/jackson-annotations-2.14.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/jackson-databind-2.14.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/maxmind-db-2.0.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/percolator chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/percolator/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/percolator/percolator-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/percolator/percolator-client-2.4.1.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/analysis-common chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/analysis-common/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/analysis-common/analysis-common-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/analysis-common/analysis-common-2.4.1.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/aggs-matrix-stats - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/aggs-matrix-stats/aggs-matrix-stats-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/aggs-matrix-stats/aggs-matrix-stats-client-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/aggs-matrix-stats/plugin-descriptor.properties chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/repository-url chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/repository-url/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/repository-url/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/repository-url/repository-url-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/repository-url/repository-url-2.4.1.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-mustache - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-mustache/lang-mustache-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-mustache/lang-mustache-client-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-mustache/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-mustache/compiler-0.9.10.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-mustache/plugin-security.policy chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/systemd chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/systemd/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/systemd/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/systemd/systemd-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/systemd/systemd-2.4.1.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4 chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/transport-netty4-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/transport-netty4-client-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/plugin-security.policy chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-buffer-4.1.84.Final.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-codec-4.1.84.Final.jar @@ -863,19 +863,19 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-transport-4.1.84.Final.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-transport-native-unix-common-4.1.84.Final.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/lang-expression-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/lang-expression-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/plugin-descriptor.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/plugin-security.policy chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/antlr4-runtime-4.9.3.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/asm-9.4.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/asm-commons-9.4.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/asm-tree-9.4.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/lucene-expressions-9.4.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/lucene-expressions-9.4.2.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/lang-painless-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/lang-painless-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/opensearch-scripting-painless-spi-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/opensearch-scripting-painless-spi-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/antlr4-runtime-4.9.3.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/asm-9.4.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/asm-analysis-9.4.jar @@ -884,37 +884,37 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/asm-util-9.4.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/rank-eval chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/rank-eval/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/rank-eval/rank-eval-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/rank-eval/rank-eval-client-2.4.1.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/httpcore-nio-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/httpasyncclient-4.1.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/reindex-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/reindex-client-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/opensearch-rest-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/opensearch-rest-client-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/httpclient-4.5.13.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/opensearch-dashboards-2.4.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/opensearch-ssl-config-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/opensearch-dashboards-2.4.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/opensearch-ssl-config-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/commons-codec-1.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/httpcore-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/commons-logging-1.2.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-user-agent - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-user-agent/ingest-user-agent-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-user-agent/ingest-user-agent-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-user-agent/plugin-descriptor.properties chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/mapper-extras - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/mapper-extras/mapper-extras-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/mapper-extras/mapper-extras-client-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/mapper-extras/plugin-descriptor.properties chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/parent-join chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/parent-join/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/parent-join/parent-join-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/parent-join/parent-join-client-2.4.1.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/httpcore-nio-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/httpasyncclient-4.1.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/reindex-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/reindex-client-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/opensearch-rest-client-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/opensearch-rest-client-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/plugin-security.policy chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/httpclient-4.5.13.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/opensearch-ssl-config-2.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/opensearch-ssl-config-2.4.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/commons-codec-1.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/httpcore-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/commons-logging-1.2.jar diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index bfea73d74c..3f6a844436 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -349,7 +349,7 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-transport-4.1.79.Final.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-transport-native-unix-common-4.1.79.Final.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/perfmark-api-0.25.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/performance-analyzer-rca-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/performance-analyzer-rca-2.4.1.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/protobuf-java-3.21.8.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/proto-google-common-protos-2.9.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/animal-sniffer-annotations-1.21.jar @@ -395,43 +395,43 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jts-core-1.15.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/t-digest-3.2.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/spatial4j-0.7.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-core-2.14.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-cbor-2.14.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-smile-2.14.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-yaml-2.14.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/java-version-checker-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-core-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-cbor-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-smile-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-yaml-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/java-version-checker-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/joda-time-2.10.12.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jopt-simple-5.0.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-2.4.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-cli-2.4.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-core-2.4.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-geo-2.4.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-launchers-2.4.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-plugin-classloader-2.4.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-secure-sm-2.4.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-x-content-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-2.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-cli-2.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-core-2.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-geo-2.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-launchers-2.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-plugin-classloader-2.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-secure-sm-2.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-x-content-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/HdrHistogram-2.1.12.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-analysis-common-9.4.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-backward-codecs-9.4.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-core-9.4.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-grouping-9.4.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-highlighter-9.4.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-join-9.4.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-memory-9.4.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-misc-9.4.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-queries-9.4.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-queryparser-9.4.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-sandbox-9.4.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-spatial-extras-9.4.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-spatial3d-9.4.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-suggest-9.4.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/keystore-cli/keystore-cli-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-analysis-common-9.4.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-backward-codecs-9.4.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-core-9.4.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-grouping-9.4.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-highlighter-9.4.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-join-9.4.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-memory-9.4.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-misc-9.4.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-queries-9.4.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-queryparser-9.4.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-sandbox-9.4.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-spatial-extras-9.4.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-spatial3d-9.4.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-suggest-9.4.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/keystore-cli/keystore-cli-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/plugin-cli/bc-fips-1.0.2.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/plugin-cli/opensearch-plugin-cli-2.4.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-annotations-2.14.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-core-2.14.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-databind-2.14.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/opensearch-upgrade-cli-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/plugin-cli/opensearch-plugin-cli-2.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-annotations-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-core-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-databind-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/opensearch-upgrade-cli-2.4.1.jar %dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-observability %attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-observability/observability.yml %dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-reports-scheduler @@ -474,11 +474,11 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/kotlinx-coroutines-core-jvm-1.3.9.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/common-utils-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/common-utils-2.4.1.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/guava-31.0.1-jre.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/kotlin-stdlib-1.6.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/kotlin-stdlib-common-1.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/opensearch-observability-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/opensearch-observability-2.4.1.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/jsoup-1.15.3.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/json-flattener-0.1.0.jar @@ -486,15 +486,15 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/kotlinx-coroutines-core-jvm-1.3.9.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/common-utils-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/common-utils-2.4.1.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/gson-2.8.9.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/guava-31.0.1-jre.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/kotlin-stdlib-1.6.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/kotlin-stdlib-common-1.6.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/kotlin-test-1.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/opensearch-reports-scheduler-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/opensearch-reports-scheduler-2.4.1.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/geo-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/geo-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/resilience4j-core-1.5.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/httpcore-nio-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/httpasyncclient-4.1.5.jar @@ -524,32 +524,32 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/antlr-runtime-3.5.2.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/antlr4-4.7.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/checker-qual-3.12.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/common-2.4.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/core-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/common-2.4.1.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/core-2.4.1.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/error_prone_annotations-2.7.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/guava-31.0.1-jre.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/icu4j-58.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/jackson-annotations-2.14.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/jackson-databind-2.14.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/jackson-annotations-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/jackson-databind-2.14.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/javax.json-1.0.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/legacy-2.4.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-2.4.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-ml-client-2.4.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-rest-client-2.4.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-sql-2.4.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-ssl-config-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/legacy-2.4.1.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-2.4.1.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-ml-client-2.4.1.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-rest-client-2.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-sql-2.4.1.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-ssl-config-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/org.abego.treelayout.core-1.0.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/parent-join-client-2.4.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/ppl-2.4.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/protocol-2.4.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/reindex-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/parent-join-client-2.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/ppl-2.4.1.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/protocol-2.4.1.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/reindex-client-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/spring-aop-5.3.22.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/spring-beans-5.3.22.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/spring-context-5.3.22.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/spring-core-5.3.22.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/spring-expression-5.3.22.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/spring-jcl-5.3.22.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/sql-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/sql-2.4.1.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/annotations-13.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/kotlin-reflect-1.4.30.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/kotlin-stdlib-1.6.0.jar @@ -558,18 +558,18 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/okhttp-4.9.3.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/okhttp-aws-signer-1.0.2.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/okio-jvm-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/prometheus-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/prometheus-2.4.1.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/ipaddress-5.3.3.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/annotations-13.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/common-utils-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/common-utils-2.4.1.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/kotlin-stdlib-1.6.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/kotlin-stdlib-common-1.6.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/kotlin-stdlib-jdk7-1.6.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/kotlin-stdlib-jdk8-1.6.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/kotlinx-coroutines-core-jvm-1.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/opensearch-cross-cluster-replication-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/opensearch-cross-cluster-replication-2.4.1.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/commons-lang-2.6.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/plugin-descriptor.properties @@ -583,22 +583,22 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/libopensearchknn_common.so %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/libopensearchknn_faiss.so %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/libopensearchknn_nmslib.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/opensearch-knn-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/opensearch-knn-2.4.1.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/ipaddress-5.3.3.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/annotations-13.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/kotlinx-coroutines-core-jvm-1.3.9.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/common-utils-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/common-utils-2.4.1.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/commons-codec-1.13.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/httpclient-4.5.13.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/httpcore-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/kotlin-stdlib-1.6.10.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/kotlin-stdlib-common-1.6.10.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/kotlin-stdlib-jdk7-1.6.10.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/opensearch-index-management-2.4.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/opensearch-index-management-spi-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/opensearch-index-management-2.4.1.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/opensearch-index-management-spi-2.4.1.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/sqlite-jdbc-3.32.3.2.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/j2objc-annotations-1.3.jar @@ -641,15 +641,15 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-resolver-4.1.79.Final.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-transport-4.1.79.Final.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-transport-native-unix-common-4.1.79.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/opensearch-performance-analyzer-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/opensearch-performance-analyzer-2.4.1.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/perfmark-api-0.25.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/performanceanalyzer-rca-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/performanceanalyzer-rca-2.4.1.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/protobuf-java-3.21.8.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/proto-google-common-protos-2.9.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/opensearch-job-scheduler-2.4.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/opensearch-job-scheduler-spi-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/opensearch-job-scheduler-2.4.1.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/opensearch-job-scheduler-spi-2.4.1.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-saml-api-3.4.5.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-codec-1.14.jar @@ -715,7 +715,7 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-text-1.10.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jakarta.annotation-api-1.3.5.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-soap-api-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/aggs-matrix-stats-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/aggs-matrix-stats-client-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/checker-qual-3.5.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/compiler-0.9.10.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/cryptacular-1.2.4.jar @@ -723,13 +723,13 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/failureaccess-1.0.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/guava-30.0-jre.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/j2objc-annotations-1.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jackson-annotations-2.14.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jackson-annotations-2.14.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jjwt-api-0.10.8.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jjwt-impl-0.10.8.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jjwt-jackson-0.10.8.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/lang-mustache-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/lang-mustache-client-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/mapper-extras-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/mapper-extras-client-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-buffer-4.1.84.Final.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-codec-4.1.84.Final.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-codec-http-4.1.84.Final.jar @@ -738,21 +738,21 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-resolver-4.1.84.Final.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-transport-4.1.84.Final.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-transport-native-unix-common-4.1.84.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-rest-client-2.4.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-rest-high-level-client-2.4.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-security-2.4.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/parent-join-client-2.4.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/rank-eval-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-rest-client-2.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-rest-high-level-client-2.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-security-2.4.1.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/parent-join-client-2.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/rank-eval-client-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/slf4j-api-1.7.30.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/snappy-java-1.1.8.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/transport-netty4-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/transport-netty4-client-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/zstd-jni-1.5.0-2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jackson-databind-2.14.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jackson-databind-2.14.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/kafka-clients-3.0.2.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/bcpkix-jdk15on-1.70.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/antlr4-runtime-4.10.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/common-utils-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/common-utils-2.4.1.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/commons-codec-1.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/commons-lang3-3.12.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/commons-logging-1.2.jar @@ -762,23 +762,23 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/httpcore-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/httpcore-nio-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/kotlin-stdlib-1.6.10.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/opensearch-rest-client-2.4.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/opensearch-security-analytics-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/opensearch-rest-client-2.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/opensearch-security-analytics-2.4.1.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/plugin-security.policy %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/LICENSE.txt %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/NOTICE.txt %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/commons-lang3-3.10.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/opensearch-ml-client-2.4.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/opensearch-neural-search-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/opensearch-ml-client-2.4.1.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/opensearch-neural-search-2.4.1.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/plugin-security.policy %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/common-utils-2.4.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/opensearch-asynchronous-search-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/common-utils-2.4.1.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/opensearch-asynchronous-search-2.4.1.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/commons-lang3-3.12.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/commons-lang-2.6.jar @@ -797,13 +797,13 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/commons-math3-3.6.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/httpcore-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/failureaccess-1.0.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/common-utils-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/common-utils-2.4.1.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/guava-31.0.1-jre.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/jackson-annotations-2.13.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/jackson-databind-2.13.4.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/jackson-annotations-2.14.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/jackson-databind-2.14.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/javassist-3.28.0-GA.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/opensearch-anomaly-detection-2.4.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/opensearch-rest-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/opensearch-anomaly-detection-2.4.1.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/opensearch-rest-client-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/protostuff-api-1.8.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/protostuff-collectionschema-1.8.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/protostuff-core-1.8.0.jar @@ -816,10 +816,10 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/LICENSE.txt %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/NOTICE.txt %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/commons-lang3-3.12.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/opensearch-geospatial-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/opensearch-geospatial-2.4.1.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/geo-2.4.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/h3-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/geo-2.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/h3-2.4.1.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/error_prone_annotations-2.3.4.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/httpcore-nio-4.4.15.jar @@ -844,8 +844,8 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/commons-codec-1.13.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/httpcore-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/failureaccess-1.0.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/alerting-core-2.4.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/common-utils-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/alerting-core-2.4.1.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/common-utils-2.4.1.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/commons-beanutils-1.9.4.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/commons-collections-3.2.2.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/commons-digester-2.1.jar @@ -854,12 +854,12 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/kotlin-stdlib-common-1.6.10.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/kotlin-stdlib-jdk7-1.6.10.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/kotlin-stdlib-jdk8-1.6.10.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/opensearch-alerting-2.4.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/opensearch-rest-client-2.4.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/percolator-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/opensearch-alerting-2.4.1.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/opensearch-rest-client-2.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/percolator-client-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/commons-logging-1.2.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/common-utils-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/common-utils-2.4.1.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/commons-beanutils-1.9.4.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/commons-codec-1.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/commons-collections-3.2.2.jar @@ -878,8 +878,8 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/httpclient-4.5.13.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/httpcore-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/httpcore-nio-4.4.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jackson-annotations-2.14.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jackson-databind-2.14.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jackson-annotations-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jackson-databind-2.14.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jansi-2.4.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/javassist-3.26.0-GA.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jline-builtins-3.21.0.jar @@ -891,13 +891,13 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/olcut-config-protobuf-5.2.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/olcut-core-5.2.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opencsv-5.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-ml-2.4.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-ml-algorithms-2.4.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-ml-common-2.4.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-rest-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-ml-2.4.1.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-ml-algorithms-2.4.1.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-ml-common-2.4.1.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-rest-client-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/protobuf-java-3.19.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/protobuf-java-3.21.9.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/protostuff-api-1.8.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/protostuff-collectionschema-1.8.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/protostuff-core-1.8.0.jar @@ -943,34 +943,34 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/aws-java-sdk-sts-1.12.48.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/httpclient-4.5.13.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/httpcore-4.4.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/jackson-annotations-2.14.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/jackson-databind-2.14.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/jackson-annotations-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/jackson-databind-2.14.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/javax.mail-1.6.2.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/kotlin-stdlib-1.6.10.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/kotlin-stdlib-common-1.6.10.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/opensearch-notifications-core-2.4.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/opensearch-notifications-core-spi-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/opensearch-notifications-core-2.4.1.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/opensearch-notifications-core-spi-2.4.1.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/commons-logging-1.2.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/plugin-security.policy %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/common-utils-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/common-utils-2.4.1.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/kotlin-stdlib-common-1.6.10.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/kotlinx-coroutines-core-jvm-1.4.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/opensearch-notifications-2.4.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/opensearch-notifications-2.4.1.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/plugin-security.policy %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/jcodings-1.0.44.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/ingest-common-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/ingest-common-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/joni-2.1.43.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/opensearch-dissect-2.4.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/opensearch-grok-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/opensearch-dissect-2.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/opensearch-grok-2.4.1.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/geo %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/geo/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/geo/geo-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/geo/geo-2.4.1.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/GeoLite2-Country.mmdb %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/GeoLite2-City.mmdb @@ -978,35 +978,35 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/GeoLite2-ASN.mmdb %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/plugin-security.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/geoip2-3.0.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/ingest-geoip-2.4.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/jackson-annotations-2.14.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/jackson-databind-2.14.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/ingest-geoip-2.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/jackson-annotations-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/jackson-databind-2.14.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/maxmind-db-2.0.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/percolator %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/percolator/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/percolator/percolator-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/percolator/percolator-client-2.4.1.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/analysis-common %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/analysis-common/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/analysis-common/analysis-common-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/analysis-common/analysis-common-2.4.1.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/aggs-matrix-stats %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/aggs-matrix-stats/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/aggs-matrix-stats/aggs-matrix-stats-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/aggs-matrix-stats/aggs-matrix-stats-client-2.4.1.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/repository-url-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/repository-url-2.4.1.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/plugin-security.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/compiler-0.9.10.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/lang-mustache-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/lang-mustache-client-2.4.1.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd/systemd-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd/systemd-2.4.1.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4 %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/transport-netty4-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/transport-netty4-client-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/plugin-security.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-buffer-4.1.84.Final.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-codec-4.1.84.Final.jar @@ -1017,19 +1017,19 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-transport-4.1.84.Final.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-transport-native-unix-common-4.1.84.Final.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/lang-expression-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/lang-expression-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/plugin-security.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/antlr4-runtime-4.9.3.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/asm-9.4.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/asm-commons-9.4.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/asm-tree-9.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/lucene-expressions-9.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/lucene-expressions-9.4.2.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/lang-painless-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/lang-painless-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/opensearch-scripting-painless-spi-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/opensearch-scripting-painless-spi-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/antlr4-runtime-4.9.3.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/asm-9.4.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/asm-analysis-9.4.jar @@ -1038,37 +1038,37 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/asm-util-9.4.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/rank-eval %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/rank-eval/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/rank-eval/rank-eval-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/rank-eval/rank-eval-client-2.4.1.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/httpcore-nio-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/httpasyncclient-4.1.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/reindex-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/reindex-client-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/opensearch-rest-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/opensearch-rest-client-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/httpclient-4.5.13.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/opensearch-dashboards-2.4.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/opensearch-ssl-config-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/opensearch-dashboards-2.4.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/opensearch-ssl-config-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/commons-codec-1.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/httpcore-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/commons-logging-1.2.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-user-agent -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-user-agent/ingest-user-agent-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-user-agent/ingest-user-agent-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-user-agent/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/mapper-extras -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/mapper-extras/mapper-extras-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/mapper-extras/mapper-extras-client-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/mapper-extras/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/parent-join %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/parent-join/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/parent-join/parent-join-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/parent-join/parent-join-client-2.4.1.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/httpcore-nio-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/httpasyncclient-4.1.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/reindex-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/reindex-client-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/opensearch-rest-client-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/opensearch-rest-client-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/plugin-security.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/httpclient-4.5.13.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/opensearch-ssl-config-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/opensearch-ssl-config-2.4.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/commons-codec-1.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/httpcore-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/commons-logging-1.2.jar From 720b66bdd8077d67a794b721d3559a62fcd2cf61 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 5 Dec 2022 10:31:57 -0300 Subject: [PATCH 064/316] Changed Opensearch version for dashboard --- stack/dashboard/base/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh index 33cd0b7abf..b827aa085b 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -15,7 +15,7 @@ architecture="$1" revision="$2" future="$3" reference="$4" -opensearch_version="2.3.0" +opensearch_version="2.4.0" base_dir=/opt/wazuh-dashboard-base # ----------------------------------------------------------------------------- From 88ced308f2438cb56f459cce8ccb520768494b0a Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 5 Dec 2022 12:52:26 -0300 Subject: [PATCH 065/316] Fixed dh_strip error --- stack/dashboard/deb/debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/dashboard/deb/debian/rules b/stack/dashboard/deb/debian/rules index f689c3ed4a..22f2c14cad 100644 --- a/stack/dashboard/deb/debian/rules +++ b/stack/dashboard/deb/debian/rules @@ -113,7 +113,7 @@ override_dh_fixperms: # ----------------------------------------------------------------------------- override_dh_strip: - dh_strip --no-automatic-dbgsym + dh_strip --no-automatic-dbgsym -XlibGLESv2.so -XlibEGL.so # ----------------------------------------------------------------------------- From c42bc13f19be226ce0f2a491000423a0173a6d54 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 12 Dec 2022 16:01:20 -0300 Subject: [PATCH 066/316] Removed new plugins --- stack/dashboard/base/builder.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh index b827aa085b..4a1f5452b0 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -133,6 +133,9 @@ mv ./package.json.tmp ./package.json /bin/bash ./bin/opensearch-dashboards-plugin remove queryWorkbenchDashboards --allow-root /bin/bash ./bin/opensearch-dashboards-plugin remove anomalyDetectionDashboards --allow-root /bin/bash ./bin/opensearch-dashboards-plugin remove observabilityDashboards --allow-root +/bin/bash ./bin/opensearch-dashboards-plugin remove securityAnalyticsDashboards --allow-root +/bin/bash ./bin/opensearch-dashboards-plugin remove notificationsDashboards --allow-root +/bin/bash ./bin/opensearch-dashboards-plugin remove searchRelevanceDashboards --allow-root find -type d -exec chmod 750 {} \; find -type f -perm 644 -exec chmod 640 {} \; From e58ba2d20f3645fa198ba1e8eab37204fe978980 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 13 Dec 2022 12:24:48 -0300 Subject: [PATCH 067/316] Removed remove of notification plugin --- stack/dashboard/base/builder.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh index 4a1f5452b0..d87b7e40bc 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -134,7 +134,6 @@ mv ./package.json.tmp ./package.json /bin/bash ./bin/opensearch-dashboards-plugin remove anomalyDetectionDashboards --allow-root /bin/bash ./bin/opensearch-dashboards-plugin remove observabilityDashboards --allow-root /bin/bash ./bin/opensearch-dashboards-plugin remove securityAnalyticsDashboards --allow-root -/bin/bash ./bin/opensearch-dashboards-plugin remove notificationsDashboards --allow-root /bin/bash ./bin/opensearch-dashboards-plugin remove searchRelevanceDashboards --allow-root find -type d -exec chmod 750 {} \; From 71fb04be0e528ee60d6e8d48480f38438bbdf7d1 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 20 Dec 2022 08:14:04 -0300 Subject: [PATCH 068/316] Added support to Openseach dashboards 2.4.1 --- stack/dashboard/base/builder.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh index d87b7e40bc..be6bfb58fc 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -15,7 +15,7 @@ architecture="$1" revision="$2" future="$3" reference="$4" -opensearch_version="2.4.0" +opensearch_version="2.4.1" base_dir=/opt/wazuh-dashboard-base # ----------------------------------------------------------------------------- @@ -105,14 +105,14 @@ brotli -c ./src/plugins/dashboard/target/public/dashboard.chunk.1.js > ./src/plu # Remove `home` button from the sidebar menu sed -i 's|\["EuiHorizontalRule"\],{margin:"none"})),external_osdSharedDeps_React_default.a.createElement(external_osdSharedDeps_ElasticEui_\["EuiFlexItem"\],{grow:false,style:{flexShrink:0}},external_osdSharedDeps_React_default.a.createElement(external_osdSharedDeps_ElasticEui_\["EuiCollapsibleNavGroup"\]|["EuiHorizontalRule"],{margin:"none"})),false\&\&external_osdSharedDeps_React_default.a.createElem(external_osdSharedDeps_ElasticEui_["EuiFlexItem"],{grow:false,style:{flexShrink:0}},external_osdSharedDeps_React_default.a.createElement(external_osdSharedDeps_ElasticEui_["EuiCollapsibleNavGroup"]|' ./src/core/target/public/core.entry.js # Replace OpenSearch login default configuration title with Wazuh login title text -sed -i 's|Please login to OpenSearch Dashboards||g' ./plugins/securityDashboards/server/index.js -sed -i 's|If you have forgotten your username or password, please ask your system administrator||g' ./plugins/securityDashboards/server/index.js +sed -i 's|Log in to OpenSearch Dashboards||g' ./plugins/securityDashboards/server/index.js +sed -i 's|If you have forgotten your username or password, contact your system administrator.||g' ./plugins/securityDashboards/server/index.js # Replace OpenSearch login logo with Wazuh login logo sed -i 's|opensearch_logo_h_default.a|"/ui/Wazuh-Logo.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.chunk.5.js # Replace OpenSearch login title with Wazuh login title -sed -i 's|Please login to OpenSearch Dashboards||g' ./plugins/securityDashboards/target/public/securityDashboards.chunk.5.js +sed -i 's|Log in to OpenSearch Dashboards||g' ./plugins/securityDashboards/target/public/securityDashboards.chunk.5.js # Replace OpenSearch login subtitle with Wazuh login subtitle -sed -i 's|If you have forgotten your username or password, please ask your system administrator||g' ./plugins/securityDashboards/target/public/securityDashboards.chunk.5.js +sed -i 's|If you have forgotten your username or password, contact your system administrator.||g' ./plugins/securityDashboards/target/public/securityDashboards.chunk.5.js # Disable first time pop-up tenant selector sed -i 's|setShouldShowTenantPopup(shouldShowTenantPopup)|setShouldShowTenantPopup(false)|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js gzip -c ./plugins/securityDashboards/target/public/securityDashboards.plugin.js > ./plugins/securityDashboards/target/public/securityDashboards.plugin.js.gz From 7e37338197a551ead63bb937339751420e0b2ef5 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Fri, 23 Dec 2022 11:47:34 +0100 Subject: [PATCH 069/316] Improve sed and apply fixes --- unattended_installer/builder.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index 8e80ccd963..9d0b864ce1 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -276,16 +276,16 @@ function checkFilebeatURL() { # Get the response of the URL and check it response=$(curl --write-out '%{http_code}' --silent --output /dev/null $filebeat_wazuh_template) - if [ $response != "200" ]; then + if [ "${response}" != "200" ]; then response=$(curl --write-out '%{http_code}' --silent --output /dev/null $new_filebeat_url) # Display error if both URLs do not get the resource - if [ $response != "200" ]; then + if [ "${response}" != "200" ]; then echo -e "Error: Could not get the Filebeat Wazuh template. " # If matches, replace the variable of installVariables to the new one else echo -e "Changing Filebeat URL..." - sed -i -E "s/http.+\\$\\{wazuh_major\\}.+wazuh-template.json/https:\/\/raw.githubusercontent.com\/wazuh\/wazuh\/master\/extensions\/elasticsearch\/7.x\/wazuh-template.json/" ${resources_installer}/installVariables.sh + sed -i -E "s|filebeat_wazuh_template=.*|filebeat_wazuh_template=${new_filebeat_url}|g" "${resources_installer}/installVariables.sh" fi fi } From 8b98b000428fd6efebb97e3a79ee2146ff022cef Mon Sep 17 00:00:00 2001 From: DFolchA Date: Fri, 23 Dec 2022 12:01:17 +0100 Subject: [PATCH 070/316] Rename base_path variable in builer.sh --- unattended_installer/builder.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index 9d0b864ce1..be55a44b9c 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -9,13 +9,13 @@ # License (version 2) as published by the FSF - Free Software # Foundation. -readonly base_path="$(dirname "$(readlink -f "$0")")" -readonly resources_installer="${base_path}/install_functions" -readonly resources_config="${base_path}/config" -readonly resources_certs="${base_path}/cert_tool" -readonly resources_passwords="${base_path}/passwords_tool" -readonly resources_common="${base_path}/common_functions" -readonly resources_download="${base_path}/downloader" +readonly base_path_builder="$(dirname "$(readlink -f "$0")")" +readonly resources_installer="${base_path_builder}/install_functions" +readonly resources_config="${base_path_builder}/config" +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" readonly source_branch="4.4" function getHelp() { @@ -50,7 +50,7 @@ function buildInstaller() { checkFilebeatURL - output_script_path="${base_path}/wazuh-install.sh" + output_script_path="${base_path_builder}/wazuh-install.sh" ## Create installer script echo -n > "${output_script_path}" @@ -134,7 +134,7 @@ function buildInstaller() { } function buildPasswordsTool() { - output_script_path="${base_path}/wazuh-passwords-tool.sh" + output_script_path="${base_path_builder}/wazuh-passwords-tool.sh" ## Create installer script echo -n > "${output_script_path}" @@ -174,7 +174,7 @@ function buildPasswordsTool() { } function buildCertsTool() { - output_script_path="${base_path}/wazuh-certs-tool.sh" + output_script_path="${base_path_builder}/wazuh-certs-tool.sh" ## Create installer script echo -n > "${output_script_path}" From 822fa51f81feef4fda8c50794f4ca923012ede20 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Fri, 23 Dec 2022 12:08:13 +0100 Subject: [PATCH 071/316] Revert filebeat_wazuh_template at the end of the builder --- unattended_installer/builder.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index be55a44b9c..831427c223 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -255,6 +255,9 @@ function builder_main() { if [ -n "${installer}" ]; then buildInstaller chmod 500 ${output_script_path} + if [ -n "${change_filebeat_url}" ]; then + sed -i -E "s|filebeat_wazuh_template=.*|filebeat_wazuh_template=\"https://raw.githubusercontent.com/wazuh/wazuh/\${wazuh_major}/extensions/elasticsearch/7.x/wazuh-template.json\"|g" "${resources_installer}/installVariables.sh" + fi fi if [ -n "${passwordsTool}" ]; then @@ -286,6 +289,7 @@ function checkFilebeatURL() { else echo -e "Changing Filebeat URL..." sed -i -E "s|filebeat_wazuh_template=.*|filebeat_wazuh_template=${new_filebeat_url}|g" "${resources_installer}/installVariables.sh" + change_filebeat_url=1 fi fi } From e49726bfc0c53c94930ed84051e6422c43360284 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Fri, 23 Dec 2022 12:36:19 +0100 Subject: [PATCH 072/316] Improve sed commands --- unattended_installer/builder.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index 831427c223..8430ab6d0a 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -256,7 +256,7 @@ function builder_main() { buildInstaller chmod 500 ${output_script_path} if [ -n "${change_filebeat_url}" ]; then - sed -i -E "s|filebeat_wazuh_template=.*|filebeat_wazuh_template=\"https://raw.githubusercontent.com/wazuh/wazuh/\${wazuh_major}/extensions/elasticsearch/7.x/wazuh-template.json\"|g" "${resources_installer}/installVariables.sh" + sed -i -E "s|(https.+)master(.+wazuh-template.json)|\1\\$\\{wazuh_major\\}\2|" "${resources_installer}/installVariables.sh" fi fi @@ -288,7 +288,7 @@ function checkFilebeatURL() { # If matches, replace the variable of installVariables to the new one else echo -e "Changing Filebeat URL..." - sed -i -E "s|filebeat_wazuh_template=.*|filebeat_wazuh_template=${new_filebeat_url}|g" "${resources_installer}/installVariables.sh" + sed -i -E "s|filebeat_wazuh_template=.*|filebeat_wazuh_template=\"${new_filebeat_url}\"|g" "${resources_installer}/installVariables.sh" change_filebeat_url=1 fi fi From 6e51065359b0a57805fa9352a378938227f17fb4 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Fri, 23 Dec 2022 13:48:37 +0100 Subject: [PATCH 073/316] Fix test_unattended.py --- tests/unattended/install/test_unattended.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unattended/install/test_unattended.py b/tests/unattended/install/test_unattended.py index 2da2801b7e..4bf810afd8 100644 --- a/tests/unattended/install/test_unattended.py +++ b/tests/unattended/install/test_unattended.py @@ -175,7 +175,7 @@ def test_check_wazuh_manager_apid(): @pytest.mark.wazuh_cluster def test_check_wazuh_manager_clusterd(): - assert check_call("ps -xa | grep wazuh-clusterd | grep -v grep", shell=True) != "" + assert check_call("ps -xa | grep clusterd.py | grep -v grep", shell=True) != "" @pytest.mark.wazuh def test_check_filebeat_process(): From e2be2087a81b462bd4c9f30b83c72ba6ce6f66a1 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Fri, 23 Dec 2022 16:29:59 +0100 Subject: [PATCH 074/316] Use grep to get variable --- unattended_installer/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index 8430ab6d0a..7c442353fc 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -274,7 +274,7 @@ function builder_main() { function checkFilebeatURL() { # Import variables - . ${resources_installer}/installVariables.sh + eval "$(grep -E "filebeat_wazuh_template=" "unattended_installer/install_functions/installVariables.sh")" new_filebeat_url="https://raw.githubusercontent.com/wazuh/wazuh/master/extensions/elasticsearch/7.x/wazuh-template.json" # Get the response of the URL and check it From 6b2eca03987620fd295f880795619840879ca96a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Rodr=C3=ADguez?= Date: Fri, 30 Dec 2022 10:51:19 +0100 Subject: [PATCH 075/316] Create add-issues-to-projects --- .github/workflows/add-issues-to-projects | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/add-issues-to-projects diff --git a/.github/workflows/add-issues-to-projects b/.github/workflows/add-issues-to-projects new file mode 100644 index 0000000000..8f8cc05235 --- /dev/null +++ b/.github/workflows/add-issues-to-projects @@ -0,0 +1,19 @@ +name: Add opened issues to projects + +on: + issues: + types: + - opened + - transferred + +jobs: + add-to-project: + name: Add issue to project + runs-on: ubuntu-latest + steps: + - uses: actions/add-to-project@RELEASE_VERSION + with: + # You can target a repository in a different organization + # to the issue + project-url: https://github.com/orgs/wazuh/projects/3 + github-token: ${{ secrets.ADD_TO_PROJECT_PAT }} From 3939d4b5c145dc5a3226544baa873a4967329735 Mon Sep 17 00:00:00 2001 From: Alberto R Date: Fri, 30 Dec 2022 11:02:21 +0100 Subject: [PATCH 076/316] Changed workflow extension --- .../{add-issues-to-projects => add-issues-to-projects.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{add-issues-to-projects => add-issues-to-projects.yml} (100%) diff --git a/.github/workflows/add-issues-to-projects b/.github/workflows/add-issues-to-projects.yml similarity index 100% rename from .github/workflows/add-issues-to-projects rename to .github/workflows/add-issues-to-projects.yml From 2eac744cc9178348c56c0d1a4adb8ae65f0dcaa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Rodr=C3=ADguez?= Date: Fri, 30 Dec 2022 11:04:23 +0100 Subject: [PATCH 077/316] Update add-issues-to-projects.yml --- .github/workflows/add-issues-to-projects.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/add-issues-to-projects.yml b/.github/workflows/add-issues-to-projects.yml index 8f8cc05235..a9a02ae846 100644 --- a/.github/workflows/add-issues-to-projects.yml +++ b/.github/workflows/add-issues-to-projects.yml @@ -11,7 +11,7 @@ jobs: name: Add issue to project runs-on: ubuntu-latest steps: - - uses: actions/add-to-project@RELEASE_VERSION + - uses: actions/add-to-project@v0.4.0 with: # You can target a repository in a different organization # to the issue From 39db4bd07e81b0ba376daaf72dab7957aebd6737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Rodr=C3=ADguez?= Date: Fri, 30 Dec 2022 11:09:36 +0100 Subject: [PATCH 078/316] Update add-issues-to-projects.yml --- .github/workflows/add-issues-to-projects.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/add-issues-to-projects.yml b/.github/workflows/add-issues-to-projects.yml index a9a02ae846..9a0ecd16e4 100644 --- a/.github/workflows/add-issues-to-projects.yml +++ b/.github/workflows/add-issues-to-projects.yml @@ -17,3 +17,9 @@ jobs: # to the issue project-url: https://github.com/orgs/wazuh/projects/3 github-token: ${{ secrets.ADD_TO_PROJECT_PAT }} + - uses: actions/add-to-project@v0.4.0 + with: + # You can target a repository in a different organization + # to the issue + project-url: https://github.com/orgs/wazuh/projects/15 + github-token: ${{ secrets.ADD_TO_PROJECT_PAT }} From 20081e408d4a2c8f6e2b65822f070b5bedb37220 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Thu, 29 Dec 2022 17:52:53 -0300 Subject: [PATCH 079/316] Removed header and testing replace of opensearch logo from home icon --- stack/dashboard/base/builder.sh | 9 +++++++++ .../etc/custom_welcome/Assets/default_branding/home.svg | 7 +++++++ .../Assets/default_branding/home_dark_mode.svg | 8 ++++++++ stack/dashboard/base/files/etc/opensearch_dashboards.yml | 1 - 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/home.svg create mode 100644 stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/home_dark_mode.svg diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh index c5846f2d59..25c1ca317b 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -62,6 +62,8 @@ cp ./etc/custom_welcome/light_theme.style.css ./src/core/server/core_app/assets/ cp ./etc/custom_welcome/*svg ./src/core/server/core_app/assets/ cp ./etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg ./src/core/server/core_app/assets/default_branding/opensearch_logo_default_mode.svg cp ./etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg ./src/core/server/core_app/assets/default_branding/opensearch_logo_dark_mode.svg +cp ./etc/custom_welcome/Assets/default_branding/home.svg ./src/core/server/core_app/assets/default_branding/ +cp ./etc/custom_welcome/Assets/default_branding/home_dark_mode.svg ./src/core/server/core_app/assets/default_branding/ cp ./etc/custom_welcome/Assets/Favicons/* ./src/core/server/core_app/assets/favicons/ cp ./etc/custom_welcome/Assets/Favicons/favicon.ico ./src/core/server/core_app/assets/favicons/favicon.ico cp ./etc/http_service.js ./src/core/server/http/http_service.js @@ -69,6 +71,7 @@ cp ./etc/template.js ./src/core/server/rendering/views/template.js cp ./etc/styles.js ./src/core/server/rendering/views/styles.js # Replace App Title sed -i "s|defaultValue: ''|defaultValue: \'Wazuh\'|g" ./src/core/server/opensearch_dashboards_config.js +sed -i "90s|defaultValue: true|defaultValue: false|g" ./src/core/server/opensearch_dashboards_config.js # Replace config path sed -i "s'\$DIR/config'/etc/wazuh-dashboard'g" ./bin/opensearch-dashboards sed -i "s'\$DIR/config'/etc/wazuh-dashboard'g" ./bin/opensearch-dashboards-keystore @@ -96,6 +99,12 @@ sed -i 's|GITHUB_CREATE_ISSUE_LINK="https://github.com/opensearch-project/OpenSe # Build the compressed files gzip -c ./src/core/target/public/core.entry.js > ./src/core/target/public/core.entry.js.gz brotli -c ./src/core/target/public/core.entry.js > ./src/core/target/public/core.entry.js.br +# Replace home logo +sed -i 's|opensearch_mark_default_mode.svg|home.svg|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js +sed -i 's|opensearch_mark_dark_mode.svg|home_dark_mode.svg|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js +# Build the compressed files +gzip -c ./plugins/securityDashboards/target/public/securityDashboards.plugin.js > ./plugins/securityDashboards/target/public/securityDashboards.plugin.js.br +brotli -c ./plugins/securityDashboards/target/public/securityDashboards.plugin.js > ./plugins/securityDashboards/target/public/securityDashboards.plugin.js.gz # Remove Overview plugin from the OpenSearch Dashboards menu. # Remove "updater" property and set the plugin "status" as inaccesible (status:1) sed -i 's|updater\$:appUpdater\$|status:1|' ./src/plugins/opensearch_dashboards_overview/target/public/opensearchDashboardsOverview.plugin.js diff --git a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/home.svg b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/home.svg new file mode 100644 index 0000000000..a62df5484a --- /dev/null +++ b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/home.svg @@ -0,0 +1,7 @@ + + + + Wazuh home + + diff --git a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/home_dark_mode.svg b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/home_dark_mode.svg new file mode 100644 index 0000000000..8258f69eff --- /dev/null +++ b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/home_dark_mode.svg @@ -0,0 +1,8 @@ + + + + Wazuh home + + diff --git a/stack/dashboard/base/files/etc/opensearch_dashboards.yml b/stack/dashboard/base/files/etc/opensearch_dashboards.yml index 5d7c2d0bdd..59f11fa18e 100644 --- a/stack/dashboard/base/files/etc/opensearch_dashboards.yml +++ b/stack/dashboard/base/files/etc/opensearch_dashboards.yml @@ -12,4 +12,3 @@ server.ssl.key: "/etc/wazuh-dashboard/certs/dashboard-key.pem" server.ssl.certificate: "/etc/wazuh-dashboard/certs/dashboard.pem" opensearch.ssl.certificateAuthorities: ["/etc/wazuh-dashboard/certs/root-ca.pem"] uiSettings.overrides.defaultRoute: /app/wazuh - From b20e098e4a0d445f070f274e35b1bc3b7ee890d3 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Fri, 30 Dec 2022 11:58:29 -0300 Subject: [PATCH 080/316] Replaced OpenSearch Logo from Home icon --- stack/dashboard/base/builder.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh index 25c1ca317b..5217ce3ea9 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -96,15 +96,12 @@ sed -i 's|OPENSEARCH_DASHBOARDS_ASK_OPENSEARCH_LINK="https://github.com/opensear sed -i 's|OPENSEARCH_DASHBOARDS_FEEDBACK_LINK="https://github.com/opensearch-project"|OPENSEARCH_DASHBOARDS_FEEDBACK_LINK="https://wazuh.com/community/join-us-on-slack"|' ./src/core/target/public/core.entry.js ## Help link - Open an issue in GitHub sed -i 's|GITHUB_CREATE_ISSUE_LINK="https://github.com/opensearch-project/OpenSearch-Dashboards/issues/new/choose"|GITHUB_CREATE_ISSUE_LINK="https://github.com/wazuh/wazuh/issues/new/choose"|' ./src/core/target/public/core.entry.js +# Replace home logo +sed -i 's|DEFAULT_MARK="opensearch_mark_default_mode.svg"|DEFAULT_MARK="home.svg"|g' ./src/core/target/public/core.entry.js +sed -i 's|DEFAULT_DARK_MARK="opensearch_mark_dark_mode.svg"|DEFAULT_DARK_MARK="home_dark_mode.svg"|g' ./src/core/target/public/core.entry.js # Build the compressed files gzip -c ./src/core/target/public/core.entry.js > ./src/core/target/public/core.entry.js.gz brotli -c ./src/core/target/public/core.entry.js > ./src/core/target/public/core.entry.js.br -# Replace home logo -sed -i 's|opensearch_mark_default_mode.svg|home.svg|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js -sed -i 's|opensearch_mark_dark_mode.svg|home_dark_mode.svg|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js -# Build the compressed files -gzip -c ./plugins/securityDashboards/target/public/securityDashboards.plugin.js > ./plugins/securityDashboards/target/public/securityDashboards.plugin.js.br -brotli -c ./plugins/securityDashboards/target/public/securityDashboards.plugin.js > ./plugins/securityDashboards/target/public/securityDashboards.plugin.js.gz # Remove Overview plugin from the OpenSearch Dashboards menu. # Remove "updater" property and set the plugin "status" as inaccesible (status:1) sed -i 's|updater\$:appUpdater\$|status:1|' ./src/plugins/opensearch_dashboards_overview/target/public/opensearchDashboardsOverview.plugin.js @@ -127,6 +124,9 @@ sed -i 's|Log in to OpenSearch Dashboards||g' ./plugins/securityDashboards/targe sed -i 's|If you have forgotten your username or password, contact your system administrator.||g' ./plugins/securityDashboards/target/public/securityDashboards.chunk.5.js # Disable first time pop-up tenant selector sed -i 's|setShouldShowTenantPopup(shouldShowTenantPopup)|setShouldShowTenantPopup(false)|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js +# Replace home logo +sed -i 's|DEFAULT_MARK="opensearch_mark_default_mode.svg"|DEFAULT_MARK="home.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js +sed -i 's|DEFAULT_DARK_MARK="opensearch_mark_dark_mode.svg"|DEFAULT_DARK_MARK="home_dark_mode.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js gzip -c ./plugins/securityDashboards/target/public/securityDashboards.plugin.js > ./plugins/securityDashboards/target/public/securityDashboards.plugin.js.gz brotli -c ./plugins/securityDashboards/target/public/securityDashboards.plugin.js > ./plugins/securityDashboards/target/public/securityDashboards.plugin.js.br From 3bb6d3b73785a1b8ca8435c277f336fe7230d437 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Fri, 30 Dec 2022 12:05:29 -0300 Subject: [PATCH 081/316] Added a final space --- stack/dashboard/base/files/etc/opensearch_dashboards.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/stack/dashboard/base/files/etc/opensearch_dashboards.yml b/stack/dashboard/base/files/etc/opensearch_dashboards.yml index 59f11fa18e..5d7c2d0bdd 100644 --- a/stack/dashboard/base/files/etc/opensearch_dashboards.yml +++ b/stack/dashboard/base/files/etc/opensearch_dashboards.yml @@ -12,3 +12,4 @@ server.ssl.key: "/etc/wazuh-dashboard/certs/dashboard-key.pem" server.ssl.certificate: "/etc/wazuh-dashboard/certs/dashboard.pem" opensearch.ssl.certificateAuthorities: ["/etc/wazuh-dashboard/certs/root-ca.pem"] uiSettings.overrides.defaultRoute: /app/wazuh + From f116399a585d9dc3cddc7fbcde33d42253fd0956 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 5 Jan 2023 12:12:43 +0100 Subject: [PATCH 082/316] Added lsof as a dependency of the unattended installer --- unattended_installer/install_functions/checks.sh | 14 +++++--------- .../install_functions/installCommon.sh | 10 +++++----- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index 09d5ed8116..a685ffe3a0 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -310,15 +310,11 @@ function checks_ports() { used_port=0 ports=("$@") - if command -v ss > /dev/null; then - port_command="ss -lntup | grep -q " + if command -v lsof > /dev/null; then + port_command="lsof -i:" else - if command -v lsof > /dev/null; then - port_command="lsof -i:" - else - common_logger -w "Cannot find ss or lsof. Port checking will be skipped." - return 1 - fi + common_logger -w "Cannot find lsof. Port checking will be skipped." + return 1 fi for i in "${!ports[@]}"; do @@ -334,4 +330,4 @@ function checks_ports() { exit 1 fi -} +} \ No newline at end of file diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 50ded1d4fe..b86be07619 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -119,7 +119,7 @@ function installCommon_changePasswordApi() { passwords_changeDashboardApiPassword "${password}" fi fi - + } function installCommon_createCertificates() { @@ -211,7 +211,7 @@ function installCommon_changePasswords() { passwords_getNetworkHost passwords_generateHash fi - + passwords_changePassword if [ -n "${start_indexer_cluster}" ] || [ -n "${AIO}" ]; then @@ -263,7 +263,7 @@ function installCommon_getPass() { function installCommon_installPrerequisites() { if [ "${sys_type}" == "yum" ]; then - dependencies=( curl libcap tar gnupg openssl ) + dependencies=( curl libcap tar gnupg openssl lsof ) not_installed=() for dep in "${dependencies[@]}"; do if [ "${dep}" == "openssl" ]; then @@ -289,7 +289,7 @@ function installCommon_installPrerequisites() { elif [ "${sys_type}" == "apt-get" ]; then eval "apt-get update -q ${debug}" - dependencies=( apt-transport-https curl libcap2-bin tar software-properties-common gnupg openssl ) + dependencies=( apt-transport-https curl libcap2-bin tar software-properties-common gnupg openssl lsof ) not_installed=() for dep in "${dependencies[@]}"; do @@ -607,4 +607,4 @@ function installCommon_startService() { exit 1 fi -} +} \ No newline at end of file From b85575a07f3dbbf84f669a2e0f3a8db70f575371 Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Fri, 6 Jan 2023 15:12:59 -0300 Subject: [PATCH 083/316] Fix depothelper arquitecture parameter --- hp-ux/generate_wazuh_packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hp-ux/generate_wazuh_packages.sh b/hp-ux/generate_wazuh_packages.sh index af5d3944ee..896808cc81 100755 --- a/hp-ux/generate_wazuh_packages.sh +++ b/hp-ux/generate_wazuh_packages.sh @@ -44,7 +44,7 @@ build_environment() { if [ -n "${ftp_ip}" ] && [ -n "${ftp_port}" ] && [ -n "${ftp_user}" ] && [ -n "${ftp_pass}" ] then - fpt_connection="-b 64 -p ${ftp_ip}:${ftp_port}:${ftp_user}:${ftp_pass}" + fpt_connection="-p ${ftp_ip}:${ftp_port}:${ftp_user}:${ftp_pass}" fi echo "fpt_connection: $fpt_connection" From c99fdb78adee3621718374373c8e7821fee13282 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Mon, 9 Jan 2023 15:19:15 +0100 Subject: [PATCH 084/316] Change lsof command to show only listening processes --- 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 a685ffe3a0..643299cc90 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -311,7 +311,7 @@ function checks_ports() { ports=("$@") if command -v lsof > /dev/null; then - port_command="lsof -i:" + port_command="lsof -sTCP:LISTEN -i:" else common_logger -w "Cannot find lsof. Port checking will be skipped." return 1 From b1a4f078ef5467292ea9bceece587ed5ee6e2c68 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Mon, 9 Jan 2023 16:19:05 +0100 Subject: [PATCH 085/316] Improve test_unattended.py --- tests/unattended/install/test_unattended.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/tests/unattended/install/test_unattended.py b/tests/unattended/install/test_unattended.py index 4bf810afd8..b803760b96 100644 --- a/tests/unattended/install/test_unattended.py +++ b/tests/unattended/install/test_unattended.py @@ -211,12 +211,9 @@ def test_check_log_errors(): with open('/var/ossec/logs/ossec.log', 'r') as f: for line in f.readlines(): if 'ERROR' in line: - found_error = True - if get_wazuh_version() == 'v4.5.0': - if 'ERROR: Cluster error detected' in line or 'agent-upgrade: ERROR: (8123): There has been an error executing the request in the tasks manager.' in line: - found_error = False - else: - break + if 'ERROR: Cluster error detected' not in line and 'agent-upgrade: ERROR: (8123): There has been an error executing the request in the tasks manager.' not in line: + found_error = True + break assert found_error == False, line @pytest.mark.wazuh_cluster @@ -235,12 +232,9 @@ def test_check_cluster_log_errors(): with open('/var/ossec/logs/cluster.log', 'r') as f: for line in f.readlines(): if 'ERROR' in line: - found_error = True - if get_wazuh_version() == 'v4.5.0': - if 'Could not connect to master' in line or 'Worker node is not connected to master' in line or 'Connection reset by peer' in line: - found_error = False - else: - break + if 'Could not connect to master' not in line and 'Worker node is not connected to master' not in line and 'Connection reset by peer' not in line and "Error sending sendsync response to local client: Error 3020 - Timeout sending" not in line: + found_error = True + break assert found_error == False, line @pytest.mark.wazuh_cluster From 7ab38f697fcc9743eba79cf6b456cc462866abae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 10 Jan 2023 14:43:40 +0100 Subject: [PATCH 086/316] Change the relative path used in checkFilebeat for a defined path variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- unattended_installer/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index 7c442353fc..86e0da54c1 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -274,7 +274,7 @@ function builder_main() { function checkFilebeatURL() { # Import variables - eval "$(grep -E "filebeat_wazuh_template=" "unattended_installer/install_functions/installVariables.sh")" + eval "$(grep -E "filebeat_wazuh_template=" "${resources_installer}/installVariables.sh")" new_filebeat_url="https://raw.githubusercontent.com/wazuh/wazuh/master/extensions/elasticsearch/7.x/wazuh-template.json" # Get the response of the URL and check it From 998b0196d429ce6c6871a9457fbeee76acccc5e3 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Wed, 4 Jan 2023 10:22:40 -0300 Subject: [PATCH 087/316] Testing stoping wazuh manager in provision.sh --- ova/provision.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ova/provision.sh b/ova/provision.sh index e2d6835bd6..433894e6ac 100755 --- a/ova/provision.sh +++ b/ova/provision.sh @@ -40,7 +40,7 @@ preInstall # Install bash ${RESOURCES_PATH}/${INSTALLER} ${INSTALL_ARGS} -systemctl stop wazuh-dashboard filebeat wazuh-indexer +systemctl stop wazuh-dashboard filebeat wazuh-indexer wazuh-manager systemctl enable wazuh-manager clean From 63433b67b44c76df636e95dec9a1a5184cae8b16 Mon Sep 17 00:00:00 2001 From: Dwordcito Date: Wed, 16 Nov 2022 04:09:33 -0300 Subject: [PATCH 088/316] Add trust verification if the package is to be signed. --- windows/entrypoint.sh | 5 +++-- windows/generate_compiled_windows_agent.sh | 14 ++++++++++++-- windows/generate_wazuh_msi.ps1 | 1 + 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/windows/entrypoint.sh b/windows/entrypoint.sh index d09038ff2f..721b05f6bb 100755 --- a/windows/entrypoint.sh +++ b/windows/entrypoint.sh @@ -6,6 +6,7 @@ BRANCH=$1 JOBS=$2 DEBUG=$3 REVISION=$4 +TRUST_VERIFICATION=$5 ZIP_NAME="windows_agent_${REVISION}.zip" URL_REPO=https://github.com/wazuh/wazuh/archive/${BRANCH}.zip @@ -14,7 +15,7 @@ URL_REPO=https://github.com/wazuh/wazuh/archive/${BRANCH}.zip wget -O wazuh.zip ${URL_REPO} && unzip wazuh.zip # Compile the wazuh agent for Windows -FLAGS="-j ${JOBS} " +FLAGS="-j ${JOBS} IMAGE_TRUST_CHECKS=${TRUST_VERIFICATION}" if [[ "${DEBUG}" = "yes" ]]; then FLAGS+="-d " @@ -27,4 +28,4 @@ rm -rf /wazuh-*/src/external # Zip the compiled agent and move it to the shared folder zip -r ${ZIP_NAME} wazuh-* -cp ${ZIP_NAME} /shared \ No newline at end of file +cp ${ZIP_NAME} /shared diff --git a/windows/generate_compiled_windows_agent.sh b/windows/generate_compiled_windows_agent.sh index bcbe0f04da..0eb5e2b114 100755 --- a/windows/generate_compiled_windows_agent.sh +++ b/windows/generate_compiled_windows_agent.sh @@ -6,6 +6,7 @@ REVISION="1" DEBUG="no" OUTDIR="$(pwd)" REVISION="1" +TRUST_VERIFICATION="no" DOCKERFILE_PATH="./" DOCKER_IMAGE_NAME="compile_windows_agent" @@ -20,7 +21,7 @@ generate_compiled_win_agent() { fi docker build -t ${DOCKER_IMAGE_NAME} ./ || exit 1 - docker run --rm -v ${OUTDIR}:/shared ${DOCKER_IMAGE_NAME} ${BRANCH} ${JOBS} ${DEBUG} ${REVISION} || exit 1 + docker run --rm -v ${OUTDIR}:/shared ${DOCKER_IMAGE_NAME} ${BRANCH} ${JOBS} ${DEBUG} ${REVISION} ${TRUST_VERIFICATION} || exit 1 echo "Package $(ls -Art ${OUTDIR} | tail -n 1) added to ${OUTDIR}." } @@ -34,6 +35,7 @@ help() { echo " -r, --revision [Optional] Package revision. By default: 1." echo " -s, --store [Optional] Set the directory where the package will be stored. By default the current path." echo " -d, --debug [Optional] Build the binaries with debug symbols. By default: no." + echo " -t, --trust_verification [Optional] Build the binaries with trust load images verification. By default: no." echo " -h, --help Show this help." echo exit $1 @@ -85,6 +87,14 @@ main() { help 1 fi ;; + "-t"|"--trust_verification") + if [ -n "$2" ]; then + TRUST_VERIFICATION="$2" + shift 2 + else + help 1 + fi + ;; *) help 1 esac @@ -97,4 +107,4 @@ main() { exit 0 } -main "$@" \ No newline at end of file +main "$@" diff --git a/windows/generate_wazuh_msi.ps1 b/windows/generate_wazuh_msi.ps1 index 92a534ae10..1cad2e4574 100644 --- a/windows/generate_wazuh_msi.ps1 +++ b/windows/generate_wazuh_msi.ps1 @@ -78,6 +78,7 @@ function BuildWazuhMsi(){ & $SIGNTOOL_EXE sign /a /tr http://timestamp.digicert.com /td SHA256 ".\InstallerScripts.vbs" Write-Host "Signing .dll files..." & $SIGNTOOL_EXE sign /a /tr http://timestamp.digicert.com /td SHA256 "..\*.dll" + & $SIGNTOOL_EXE sign /a /tr http://timestamp.digicert.com /td SHA256 ".\*.dll" & $SIGNTOOL_EXE sign /a /tr http://timestamp.digicert.com /td SHA256 "..\data_provider\build\bin\sysinfo.dll" & $SIGNTOOL_EXE sign /a /tr http://timestamp.digicert.com /td SHA256 "..\shared_modules\dbsync\build\bin\dbsync.dll" & $SIGNTOOL_EXE sign /a /tr http://timestamp.digicert.com /td SHA256 "..\shared_modules\rsync\build\bin\rsync.dll" From 0b486eff504b50ee65dbdd07032670cdd5a75146 Mon Sep 17 00:00:00 2001 From: pereyra-m Date: Wed, 30 Nov 2022 20:17:44 -0300 Subject: [PATCH 089/316] Updating TRUST_VERIFICATION variable --- windows/generate_compiled_windows_agent.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/generate_compiled_windows_agent.sh b/windows/generate_compiled_windows_agent.sh index 0eb5e2b114..db143e8915 100755 --- a/windows/generate_compiled_windows_agent.sh +++ b/windows/generate_compiled_windows_agent.sh @@ -6,7 +6,7 @@ REVISION="1" DEBUG="no" OUTDIR="$(pwd)" REVISION="1" -TRUST_VERIFICATION="no" +TRUST_VERIFICATION="1" DOCKERFILE_PATH="./" DOCKER_IMAGE_NAME="compile_windows_agent" @@ -35,7 +35,7 @@ help() { echo " -r, --revision [Optional] Package revision. By default: 1." echo " -s, --store [Optional] Set the directory where the package will be stored. By default the current path." echo " -d, --debug [Optional] Build the binaries with debug symbols. By default: no." - echo " -t, --trust_verification [Optional] Build the binaries with trust load images verification. By default: no." + echo " -t, --trust_verification [Optional] Build the binaries with trust load images verification. By default: 1 (only warnings)." echo " -h, --help Show this help." echo exit $1 From cd1b62423e86370c21f890639a4166501a24ec98 Mon Sep 17 00:00:00 2001 From: Dwordcito Date: Thu, 29 Dec 2022 00:37:23 -0300 Subject: [PATCH 090/316] Add flag to define a custom CA_NAME. --- windows/entrypoint.sh | 7 ++++--- windows/generate_compiled_windows_agent.sh | 12 +++++++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/windows/entrypoint.sh b/windows/entrypoint.sh index 721b05f6bb..171ffaa406 100755 --- a/windows/entrypoint.sh +++ b/windows/entrypoint.sh @@ -7,6 +7,7 @@ JOBS=$2 DEBUG=$3 REVISION=$4 TRUST_VERIFICATION=$5 +CA_NAME=$6 ZIP_NAME="windows_agent_${REVISION}.zip" URL_REPO=https://github.com/wazuh/wazuh/archive/${BRANCH}.zip @@ -15,14 +16,14 @@ URL_REPO=https://github.com/wazuh/wazuh/archive/${BRANCH}.zip wget -O wazuh.zip ${URL_REPO} && unzip wazuh.zip # Compile the wazuh agent for Windows -FLAGS="-j ${JOBS} IMAGE_TRUST_CHECKS=${TRUST_VERIFICATION}" +FLAGS="-j ${JOBS} IMAGE_TRUST_CHECKS=${TRUST_VERIFICATION} CA_NAME=\"${CA_NAME}\" " if [[ "${DEBUG}" = "yes" ]]; then FLAGS+="-d " fi -make -C /wazuh-*/src deps TARGET=winagent ${FLAGS} -make -C /wazuh-*/src TARGET=winagent ${FLAGS} +bash -c "make -C /wazuh-*/src deps TARGET=winagent ${FLAGS}" +bash -c "make -C /wazuh-*/src TARGET=winagent ${FLAGS}" rm -rf /wazuh-*/src/external diff --git a/windows/generate_compiled_windows_agent.sh b/windows/generate_compiled_windows_agent.sh index db143e8915..3c450e5c3b 100755 --- a/windows/generate_compiled_windows_agent.sh +++ b/windows/generate_compiled_windows_agent.sh @@ -7,6 +7,7 @@ DEBUG="no" OUTDIR="$(pwd)" REVISION="1" TRUST_VERIFICATION="1" +CA_NAME="DigiCert High Assurance EV Root CA" DOCKERFILE_PATH="./" DOCKER_IMAGE_NAME="compile_windows_agent" @@ -21,7 +22,7 @@ generate_compiled_win_agent() { fi docker build -t ${DOCKER_IMAGE_NAME} ./ || exit 1 - docker run --rm -v ${OUTDIR}:/shared ${DOCKER_IMAGE_NAME} ${BRANCH} ${JOBS} ${DEBUG} ${REVISION} ${TRUST_VERIFICATION} || exit 1 + docker run --rm -v ${OUTDIR}:/shared ${DOCKER_IMAGE_NAME} ${BRANCH} ${JOBS} ${DEBUG} ${REVISION} ${TRUST_VERIFICATION} "${CA_NAME}" || exit 1 echo "Package $(ls -Art ${OUTDIR} | tail -n 1) added to ${OUTDIR}." } @@ -36,6 +37,7 @@ help() { echo " -s, --store [Optional] Set the directory where the package will be stored. By default the current path." echo " -d, --debug [Optional] Build the binaries with debug symbols. By default: no." echo " -t, --trust_verification [Optional] Build the binaries with trust load images verification. By default: 1 (only warnings)." + echo " -c, --ca_name [Optional] CA name to be used to verify the trust of the agent. By default: DigiCert High Assurance EV Root CA." echo " -h, --help Show this help." echo exit $1 @@ -95,6 +97,14 @@ main() { help 1 fi ;; + "-c"|"--ca_name") + if [ -n "$2" ]; then + CA_NAME="$2" + shift 2 + else + help 1 + fi + ;; *) help 1 esac From af949072c34f176e3cc29dfd2bf2e26427a388a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= <72193239+davidcr01@users.noreply.github.com> Date: Wed, 18 Jan 2023 22:08:58 +0100 Subject: [PATCH 091/316] Preserved security config files upon upgrade in the wazuh-indexer package (#1998) * Added config(noreplace) to Wazuh indexer securityconfig files * Copy securityconfig files to new path for 4.3 upgrades * Copy securityconfig files to new path for 4.3 upgrades - Debian * Added --force-yes to Dockerfile * Undo changes in the postrm file * Backup in the preinst stage Also, removed duplicated disappear\n * Improving backup * Removing backup folder * Removing Dockerfile changes and improving echos * Added new action for the Wazuh indexer upgrade * Changing checkouts * Changing checkouts order * Added --force-yes to Dockerfile * Changed name of the last task * Using wget instead of build 4.3 package * Fix wget * Added workflow_dispatch option * Added workflow file in the path filter * Improved script (parametrized) * Improved workflow and script * Added sudo privileges to commands * Fix ls to get debian package name * Fix export command * Fix grep command * Test downloading package instead of building * Fix wget command * Test ls * Test env variable * Test pwd * Test ls * Test env variable * Fix previous * Fix echo command * Import variables * Test env variable * Remove unnecesary jobs * Renamed script * Test echo env variable on script * Test echo env variable on script v2 * Exporting variable to use it in script * Exporting variable to use it in script v2 * Exporting variable to use it in script v3 * Passing name as parameter * Test using parameter * Debugging new package file * Debugging package location * Debugging package location v2 * Removed mv of new package * Removed mv of new package v2 * Fix read_files function * Fix script * Using env variable instead of script parameters * Using eval to get env variable * Using eval to get env variable v2 * Using env bash instead of bash * Fix previous * Trying env parameter in workflow * Fix previous * Debugging env variable * Debugging env variable V2 * Debugging env variable V3 * Debugging env variable V4 * Debugging env variable V4 * Removed github env, using parameter * Removed github env, using parameter v2 * Moving downloaded package * Debugging home directory * Moving and running script in the same step * Debugging paths * Debugging paths v2 * Debugging paths v2 * Debugging paths v3 * Debugging paths v3 * Debugging paths v5 * Generating package - Final test * Expected failed test - Using package without fix * Expected failed test - Using package without fix * Restore to previous commit * Test upgrade RPM - using global variables * Fix printing values * Executing test without fix - failure expected * Final test - generated package instead of downloaded * Testing new feature: versions * Testing new feature: versions * Testing new feature: versions * Testing new feature: versions * Testing new feature: versions * Shared action, using common.sh file * Shared action, using common.sh file * Getting release version * Getting release version * General improvements * General improvements * General improvements * General improvements * Finished workflow and action for upgrading indexer * Removing comments and using braces in common.sh * Improved yml files and deleted testing lines * Removed EQUAL variable in the indexer action * Changed backup directory name in Debian specs * General improvements of the Indexer workflows * Changed path and name of backup folder * Using braces when using variables * General improvements of the Indexer workflow and action * Changed backup folder name * Improvement of actions and workflows for indexer * Changed name of task * Renamed task of the stable latest version of indexer * Fixed different checksum detection * Debugging checksum * Changed path of the backup directory - Debian * Changed path of the backup directory - Debian * Changed backup name path in Debian * General improvements of actions and workflows * Removed REFERENCE_VERSION variable * Removed type error * Solved error in conditional --- .github/actions/upgrade-indexer/common.sh | 112 ++++++++++++++++++ .../upgrade-indexer/upgrade-indexer.sh | 42 +++++++ .github/workflows/test-indexer-debian.yml | 36 ++++++ .github/workflows/test-indexer-rpm.yml | 32 +++++ stack/indexer/deb/debian/postinst | 12 +- stack/indexer/deb/debian/postrm | 4 +- stack/indexer/deb/debian/preinst | 9 +- stack/indexer/deb/docker/amd64/Dockerfile | 3 +- stack/indexer/rpm/wazuh-indexer.spec | 34 ++++-- 9 files changed, 267 insertions(+), 17 deletions(-) create mode 100644 .github/actions/upgrade-indexer/common.sh create mode 100644 .github/actions/upgrade-indexer/upgrade-indexer.sh create mode 100644 .github/workflows/test-indexer-debian.yml create mode 100644 .github/workflows/test-indexer-rpm.yml diff --git a/.github/actions/upgrade-indexer/common.sh b/.github/actions/upgrade-indexer/common.sh new file mode 100644 index 0000000000..78f27904f3 --- /dev/null +++ b/.github/actions/upgrade-indexer/common.sh @@ -0,0 +1,112 @@ +#!/bin/bash +FILES_OLD="/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig" +FILES_NEW="/etc/wazuh-indexer/opensearch-security" +declare -A files_old +declare -A files_new +PACKAGE_NAME="${1}" +MAJOR_MINOR_RELEASE=$((${2})) + +# Check the system to differ between DEB and RPM +function check_system() { + + if [ -n "$(command -v yum)" ]; then + sys_type="rpm" + elif [ -n "$(command -v apt-get)" ]; then + sys_type="deb" + else + echo "Error: could not detect the system." + exit 1 + fi + +} + +# Checks the version of Wazuh with 4.3 version, where path is different. +function check_version() { + + if [ -z "${MAJOR_MINOR_RELEASE}" ]; then + echo "Error: second argument expected." + exit 1 + fi + + # 43 represents the threshold where the path of the securityconfig + # files changes (major and minor) + if [ "${MAJOR_MINOR_RELEASE}" -gt "43" ]; then + FILES_OLD="${FILES_NEW}" + echo "New path detected (/etc)." + else + echo "Old path detected (/usr/share)." + fi + +} + +# Compare the arrays, the loop ends if a different checksum is detected +function compare_arrays() { + + for file in "${!files_old[@]}"; do + echo "Comparing $file file checksum..." + echo "Old: ${files_old[$file]}" + echo "New: ${files_new[$file]}" + if [[ "${files_old[$file]}" == "${files_new[$file]}" ]]; then + echo "${file} - Same checksum." + else + echo "${file} - Different checksum." + exit 1 + fi + done + +} + +# Steps before installing the RPM release package. +function add_production_repository() { + + rpm --import https://packages.wazuh.com/key/GPG-KEY-WAZUH + echo -e '[wazuh]\ngpgcheck=1\ngpgkey=https://packages.wazuh.com/key/GPG-KEY-WAZUH\nenabled=1\nname=EL-$releasever - Wazuh\nbaseurl=https://packages.wazuh.com/4.x/yum/\nprotect=1' | tee /etc/yum.repos.d/wazuh.repo + +} + +# Reads the files passed by param and store their checksum in the array +function read_files() { + + if [ ! -d "${1}" ]; then + echo "Error: the directory does not exist. ${1}." + exit 1 + fi + + for file in ${1}/*; do + if [ -f "${file}" ]; then + echo "Processing ${file} file..." + + # Change only the old files + if [ "${2}" == "old" ]; then + echo "# Adding a new line to force changed checksum" >> ${f} + echo "Changed file." + fi + checksum=`md5sum ${file} | cut -d " " -f1` + basename=`basename ${file}` + if [ "${2}" == "old" ]; then + files_old["${basename}"]="${checksum}" + elif [ "${2}" == "new" ]; then + files_new["${basename}"]="${checksum}" + fi + fi + done + +} + +# Prints associative array of the files passed by params +function print_files() { + + aux=$(declare -p "$1") + eval "declare -A arr="${aux#*=} + + if [ "${#arr[@]}" -eq 0 ]; then + echo "Error: the array didn't scan correctly." + exit 1 + fi + + for KEY in "${!arr[@]}"; do + echo "Key: ${KEY}" + echo "Value: ${arr[${KEY}]}" + done + +} diff --git a/.github/actions/upgrade-indexer/upgrade-indexer.sh b/.github/actions/upgrade-indexer/upgrade-indexer.sh new file mode 100644 index 0000000000..6a50bad4c4 --- /dev/null +++ b/.github/actions/upgrade-indexer/upgrade-indexer.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +# Gets the absolute path of the script, used to load the common.sh file +ABSOLUTE_PATH="$( cd $(dirname ${0}) ; pwd -P )" +. ${ABSOLUTE_PATH}/common.sh + +check_system +check_version + +echo "Installing old version of Wazuh indexer..." +if [ ${sys_type} == "deb" ]; then + apt-get -y install wazuh-indexer +elif [ ${sys_type} == "rpm" ]; then + add_production_repository + yum -y install wazuh-indexer +else + echo "Error: No system detected." + exit 1 +fi + +read_files "${FILES_OLD}" "old" +echo "Old files..." +print_files "files_old" + +echo "Installing new version of Wazuh indexer..." +if [ ${sys_type} == "deb" ]; then + apt-get install $PACKAGE_NAME +elif [ ${sys_type} == "rpm" ]; then + yum -y localinstall $PACKAGE_NAME +fi + +read_files "${FILES_NEW}" "new" +echo "New files..." +print_files "files_new" + +compare_arrays +if [ "$?" -eq 0 ]; then + echo "Same checksums - Test passed correctly." + exit 0 +fi +echo "Error: different checksums detected." +exit 1 diff --git a/.github/workflows/test-indexer-debian.yml b/.github/workflows/test-indexer-debian.yml new file mode 100644 index 0000000000..7506fde912 --- /dev/null +++ b/.github/workflows/test-indexer-debian.yml @@ -0,0 +1,36 @@ +name: Test the preserving of security config files upon upgrade - Wazuh indexer - Debian +on: + pull_request: + paths: + - 'stack/indexer/deb/debian/*' + workflow_dispatch: + +jobs: + Test-security-config-files-preservation-Debian: + runs-on: ubuntu-latest + steps: + - name: Preinstall the latest stable version of the Wazuh indexer package + run: | + curl -s https://packages.wazuh.com/key/GPG-KEY-WAZUH | gpg --no-default-keyring --keyring gnupg-ring:/usr/share/keyrings/wazuh.gpg --import && chmod 644 /usr/share/keyrings/wazuh.gpg + echo "deb [signed-by=/usr/share/keyrings/wazuh.gpg] https://packages.wazuh.com/4.x/apt/ stable main" | sudo tee -a /etc/apt/sources.list.d/wazuh.list + sudo apt-get update + + - name: Get the latest stable Wazuh version (all components) + run: echo "LATEST_STABLE_VERSION=$(jq -r 'map(select(.prerelease == false and .draft == false)) | .[] | .tag_name' <<< $(curl --silent https://api.github.com/repos/wazuh/wazuh/releases) | sed "s|v||g" | sort -rV | head -n 1)" >> $GITHUB_ENV + + - name: Get the major and minor of the latest stable version + run: echo "MAJOR_MINOR=$(echo $LATEST_STABLE_VERSION | cut -d '.' -f1-2 | sed "s|\.||")" >> $GITHUB_ENV + + - uses: actions/checkout@v3 + - name: Build the Wazuh indexer package and set environment variable + working-directory: ./stack/indexer/deb + run: | + sudo ./build_package.sh + echo "PACKAGE_NAME=$(ls ./output | grep .deb | head -n 1)" >> $GITHUB_ENV + + - name: Move the built package + working-directory: ./stack/indexer/deb + run: sudo cp ./output/$PACKAGE_NAME $GITHUB_WORKSPACE/$PACKAGE_NAME + + - name: Run script + run: sudo bash $GITHUB_WORKSPACE/.github/actions/upgrade-indexer/upgrade-indexer.sh $GITHUB_WORKSPACE/$PACKAGE_NAME $MAJOR_MINOR diff --git a/.github/workflows/test-indexer-rpm.yml b/.github/workflows/test-indexer-rpm.yml new file mode 100644 index 0000000000..5cf1bb00af --- /dev/null +++ b/.github/workflows/test-indexer-rpm.yml @@ -0,0 +1,32 @@ +name: Test the preserving of security config files upon upgrade - Wazuh indexer - RPM +on: + pull_request: + paths: + - 'stack/indexer/rpm/wazuh-indexer.spec' + workflow_dispatch: + +jobs: + Test-security-config-files-preservation-RPM: + runs-on: ubuntu-latest + steps: + - name: Get the latest stable Wazuh version (all components) + run: echo "LATEST_STABLE_VERSION=$(jq -r 'map(select(.prerelease == false and .draft == false)) | .[] | .tag_name' <<< $(curl --silent https://api.github.com/repos/wazuh/wazuh/releases) | sed "s|v||g" | sort -rV | head -n 1)" >> $GITHUB_ENV + + - name: Get the major and minor of the latest stable version + run: echo "MAJOR_MINOR=$(echo $LATEST_STABLE_VERSION | cut -d '.' -f1-2 | sed "s|\.||")" >> $GITHUB_ENV + + - uses: actions/checkout@v3 + - name: Build the Wazuh indexer package and set environment variable + working-directory: ./stack/indexer/rpm + run: | + sudo ./build_package.sh + echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV + + - name: Move the built package + working-directory: ./stack/indexer/rpm + run: | + mkdir $GITHUB_WORKSPACE/packages + sudo cp ./output/$PACKAGE_NAME $GITHUB_WORKSPACE/packages/$PACKAGE_NAME + + - name: Launch docker + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/upgrade-indexer/:/tests -v $GITHUB_WORKSPACE/packages/:/packages centos:centos7 bash /tests/upgrade-indexer.sh /packages/$PACKAGE_NAME $MAJOR_MINOR diff --git a/stack/indexer/deb/debian/postinst b/stack/indexer/deb/debian/postinst index ee04f993cb..0ce951f7bf 100644 --- a/stack/indexer/deb/debian/postinst +++ b/stack/indexer/deb/debian/postinst @@ -14,12 +14,13 @@ export USER=${NAME} export GROUP=${NAME} export CONFIG_DIR=/etc/${NAME} export INSTALLATION_DIR=/usr/share/${NAME} +export BACKUP_DIR="${CONFIG_DIR}/upgrade_backup" export LOG_DIR=/var/log/${NAME} export PID_DIR=/run/${NAME} export LIB_DIR=/var/lib/${NAME} export SYS_DIR=/usr/lib -set -e +set -e # # This script is executed in the post-installation phase @@ -44,7 +45,7 @@ case "$1" in # The codeblock below is using the fact that postinst script is called with the most-recently configured version. # In other words, a fresh installed will be called like "postinst configure" with no previous version ($2 is null) if [ -z "$2" ]; then - # If $2 is null, this is an install + # If $2 is null, this is an install # Setting owner and group chown -R ${USER}:${GROUP} ${CONFIG_DIR} @@ -81,6 +82,13 @@ case "$1" in echo "${USER} soft nofile 65535" >> /etc/security/limits.conf else # Otherwise it is an upgrade + + # If the backup of securityconfig files is done (4.3.x), restore them + if [ -d "${BACKUP_DIR}/securityconfig" ]; then + cp "${BACKUP_DIR}"/securityconfig/* "${CONFIG_DIR}/opensearch-security" + rm -rf "${BACKUP_DIR}" + fi + if [ -f "${INSTALLATION_DIR}/${NAME}.restart" ]; then echo -n "Restarting wazuh-indexer service..." rm -f "${INSTALLATION_DIR}/${NAME}.restart" diff --git a/stack/indexer/deb/debian/postrm b/stack/indexer/deb/debian/postrm index 5ed47adbfe..f3a64a2983 100644 --- a/stack/indexer/deb/debian/postrm +++ b/stack/indexer/deb/debian/postrm @@ -7,7 +7,7 @@ # License (version 2) as published by the FSF - Free Software # Foundation. -set -e +set -e export NAME=wazuh-indexer export CONFIG_DIR="/etc/${NAME}" @@ -46,7 +46,7 @@ case "$1" in REMOVE_USER_AND_GROUP=true ;; - failed-upgrade|abort-install|abort-upgrade|disappear|upgrade|disappear) + failed-upgrade|abort-install|abort-upgrade|upgrade|disappear) ;; *) diff --git a/stack/indexer/deb/debian/preinst b/stack/indexer/deb/debian/preinst index f404c33686..310e6367ac 100644 --- a/stack/indexer/deb/debian/preinst +++ b/stack/indexer/deb/debian/preinst @@ -7,10 +7,11 @@ # License (version 2) as published by the FSF - Free Software # Foundation. -set -e +set -e export NAME=wazuh-indexer export CONFIG_DIR="/etc/${NAME}" +export BACKUP_DIR="${CONFIG_DIR}/upgrade_backup" export INSTALLATION_DIR="/usr/share/${NAME}" # @@ -60,6 +61,12 @@ case "$1" in ;; upgrade) + # Move the securityconfig files if they exist (4.3.x versions) + if [ -d "${INSTALLATION_DIR}/plugins/opensearch-security/securityconfig" ]; then + mkdir "${BACKUP_DIR}" + cp -r "${INSTALLATION_DIR}/plugins/opensearch-security/securityconfig/" "${BACKUP_DIR}" + fi + # Stop the services to upgrade if command -v systemctl > /dev/null 2>&1 && systemctl > /dev/null 2>&1 && systemctl is-active --quiet "${NAME}" > /dev/null 2>&1; then systemctl stop "${NAME}".service > /dev/null 2>&1 diff --git a/stack/indexer/deb/docker/amd64/Dockerfile b/stack/indexer/deb/docker/amd64/Dockerfile index e9a5559425..bfbed39da9 100644 --- a/stack/indexer/deb/docker/amd64/Dockerfile +++ b/stack/indexer/deb/docker/amd64/Dockerfile @@ -2,7 +2,8 @@ FROM debian:8 ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update && apt-get install -y apt-utils && \ +# Installing necessary packages +RUN apt-get update && apt-get install -y --force-yes apt-utils && \ apt-get install -y --force-yes \ curl sudo wget expect gnupg build-essential \ devscripts equivs selinux-basics procps gawk diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 3f6a844436..2bd5a3cfbe 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -170,6 +170,18 @@ if [ -f /etc/os-release ]; then fi fi +# If is an upgrade, move the securityconfig files if they exist (4.3.x versions) +if [ ${1} = 2 ]; then + if [ -d "%{INSTALL_DIR}"/plugins/opensearch-security/securityconfig ]; then + + if [ ! -d "%{CONFIG_DIR}"/opensearch-security ]; then + mkdir "%{CONFIG_DIR}"/opensearch-security + fi + + cp -r "%{INSTALL_DIR}"/plugins/opensearch-security/securityconfig/* "%{CONFIG_DIR}"/opensearch-security + fi +fi + # ----------------------------------------------------------------------------- %preun @@ -453,17 +465,17 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/rca_idle_cluster_manager.conf %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/supervisord.conf %dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/action_groups.yml -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/audit.yml -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/config.yml -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/internal_users.yml -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/nodes_dn.yml -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/opensearch.yml.example -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/roles.yml -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/roles_mapping.yml -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/tenants.yml -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/whitelist.yml -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/allowlist.yml +%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/action_groups.yml +%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/audit.yml +%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/config.yml +%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/internal_users.yml +%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/nodes_dn.yml +%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/opensearch.yml.example +%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/roles.yml +%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/roles_mapping.yml +%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/tenants.yml +%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/whitelist.yml +%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/allowlist.yml %attr(440, %{USER}, %{GROUP}) %{INSTALL_DIR}/VERSION %dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/jvm.options.d %config(noreplace) %attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/log4j2.properties From dd6ee396d2fcf094a6bce5446d05ff140789e8a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 19 Jan 2023 19:15:38 +0100 Subject: [PATCH 092/316] Add Alma Linux, Rocky Linux and Oracle Linux to the init.d fix done for RHEL 9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 6a640ef165..80181fadfd 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -242,7 +242,7 @@ fi if [ -f /etc/os-release ]; then source /etc/os-release - if [ "${NAME}" = "Red Hat Enterprise Linux" ] && [ "$((${VERSION_ID:0:1}))" -ge 9 ]; then + if ( [ "${NAME}" = "Red Hat Enterprise Linux" ] || [ "${NAME}" = "Rocky Linux" ] || [ "${NAME}" = "Red Hat Enterprise Linux" ] || [ "${NAME}" = "Oracle Linux Server" ] ) && [ "$((${VERSION_ID:0:1}))" -ge 9 ]; then rm -f %{_initrddir}/wazuh-agent fi fi diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index ccfd0e1aa6..971291d3a3 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -332,7 +332,7 @@ fi if [ -f /etc/os-release ]; then source /etc/os-release - if [ "${NAME}" = "Red Hat Enterprise Linux" ] && [ "$((${VERSION_ID:0:1}))" -ge 9 ]; then + if ( [ "${NAME}" = "Red Hat Enterprise Linux" ] || [ "${NAME}" = "Rocky Linux" ] || [ "${NAME}" = "Red Hat Enterprise Linux" ] || [ "${NAME}" = "Oracle Linux Server" ] ) && [ "$((${VERSION_ID:0:1}))" -ge 9 ]; then rm -f %{_initrddir}/wazuh-manager fi fi From 1312148e4b6220fe6e7c8449769ce2e2e061430c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 19 Jan 2023 19:25:21 +0100 Subject: [PATCH 093/316] Remove Oracle Linux as it does not replicate the error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 80181fadfd..032765e0d9 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -242,7 +242,7 @@ fi if [ -f /etc/os-release ]; then source /etc/os-release - if ( [ "${NAME}" = "Red Hat Enterprise Linux" ] || [ "${NAME}" = "Rocky Linux" ] || [ "${NAME}" = "Red Hat Enterprise Linux" ] || [ "${NAME}" = "Oracle Linux Server" ] ) && [ "$((${VERSION_ID:0:1}))" -ge 9 ]; then + if ( [ "${NAME}" = "Red Hat Enterprise Linux" ] || [ "${NAME}" = "Rocky Linux" ] || [ "${NAME}" = "Red Hat Enterprise Linux" ] ) && [ "$((${VERSION_ID:0:1}))" -ge 9 ]; then rm -f %{_initrddir}/wazuh-agent fi fi diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 971291d3a3..2a838bf8f9 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -332,7 +332,7 @@ fi if [ -f /etc/os-release ]; then source /etc/os-release - if ( [ "${NAME}" = "Red Hat Enterprise Linux" ] || [ "${NAME}" = "Rocky Linux" ] || [ "${NAME}" = "Red Hat Enterprise Linux" ] || [ "${NAME}" = "Oracle Linux Server" ] ) && [ "$((${VERSION_ID:0:1}))" -ge 9 ]; then + if ( [ "${NAME}" = "Red Hat Enterprise Linux" ] || [ "${NAME}" = "Rocky Linux" ] || [ "${NAME}" = "Red Hat Enterprise Linux" ] ) && [ "$((${VERSION_ID:0:1}))" -ge 9 ]; then rm -f %{_initrddir}/wazuh-manager fi fi From 226f3315744464c0e2da84188a205e67bad3ceba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 20 Jan 2023 11:18:00 +0100 Subject: [PATCH 094/316] Fix Red Hat Enterprise Linux repeated and Alma Linux missing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 032765e0d9..8b01346087 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -242,7 +242,7 @@ fi if [ -f /etc/os-release ]; then source /etc/os-release - if ( [ "${NAME}" = "Red Hat Enterprise Linux" ] || [ "${NAME}" = "Rocky Linux" ] || [ "${NAME}" = "Red Hat Enterprise Linux" ] ) && [ "$((${VERSION_ID:0:1}))" -ge 9 ]; then + if ( [ "${NAME}" = "Red Hat Enterprise Linux" ] || [ "${NAME}" = "Rocky Linux" ] || [ "${NAME}" = "AlmaLinux" ] ) && [ "$((${VERSION_ID:0:1}))" -ge 9 ]; then rm -f %{_initrddir}/wazuh-agent fi fi diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 2a838bf8f9..0a75ff63ce 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -332,7 +332,7 @@ fi if [ -f /etc/os-release ]; then source /etc/os-release - if ( [ "${NAME}" = "Red Hat Enterprise Linux" ] || [ "${NAME}" = "Rocky Linux" ] || [ "${NAME}" = "Red Hat Enterprise Linux" ] ) && [ "$((${VERSION_ID:0:1}))" -ge 9 ]; then + if ( [ "${NAME}" = "Red Hat Enterprise Linux" ] || [ "${NAME}" = "Rocky Linux" ] || [ "${NAME}" = "AlmaLinux" ] ) && [ "$((${VERSION_ID:0:1}))" -ge 9 ]; then rm -f %{_initrddir}/wazuh-manager fi fi From 756ae34155ec46386852e2dd5bc53ba983363152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 20 Jan 2023 13:10:46 +0100 Subject: [PATCH 095/316] Add Github Actions test for systemctl in RHEL 9 and derivatives MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../install_and_test_agent.sh | 8 ++++++ .../install_and_test_manager.sh | 8 ++++++ .github/workflows/test-enable-alma9-agent.yml | 26 +++++++++++++++++++ .github/workflows/test-enable-rhel9-agent.yml | 26 +++++++++++++++++++ .../workflows/test-enable-rhel9-manager.yml | 26 +++++++++++++++++++ .../workflows/test-enable-rocky9-agent.yml | 26 +++++++++++++++++++ 6 files changed, 120 insertions(+) create mode 100644 .github/actions/test-enable-rhel9-derivatives/install_and_test_agent.sh create mode 100644 .github/actions/test-enable-rhel9-derivatives/install_and_test_manager.sh create mode 100644 .github/workflows/test-enable-alma9-agent.yml create mode 100644 .github/workflows/test-enable-rhel9-agent.yml create mode 100644 .github/workflows/test-enable-rhel9-manager.yml create mode 100644 .github/workflows/test-enable-rocky9-agent.yml diff --git a/.github/actions/test-enable-rhel9-derivatives/install_and_test_agent.sh b/.github/actions/test-enable-rhel9-derivatives/install_and_test_agent.sh new file mode 100644 index 0000000000..c0a7b30824 --- /dev/null +++ b/.github/actions/test-enable-rhel9-derivatives/install_and_test_agent.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +echo "Installing Wazuh Agent." +yum install $PACKAGE_NAME + +echo "Enabling Wazuh Agent." +systemctl daemon-reload +systemctl enable wazuh-agent \ No newline at end of file diff --git a/.github/actions/test-enable-rhel9-derivatives/install_and_test_manager.sh b/.github/actions/test-enable-rhel9-derivatives/install_and_test_manager.sh new file mode 100644 index 0000000000..2761b8ade9 --- /dev/null +++ b/.github/actions/test-enable-rhel9-derivatives/install_and_test_manager.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +echo "Installing Wazuh Manager." +yum install $PACKAGE_NAME + +echo "Enabling Wazuh Agent." +systemctl daemon-reload +systemctl enable wazuh-manager \ No newline at end of file diff --git a/.github/workflows/test-enable-alma9-agent.yml b/.github/workflows/test-enable-alma9-agent.yml new file mode 100644 index 0000000000..5d2f83d3d3 --- /dev/null +++ b/.github/workflows/test-enable-alma9-agent.yml @@ -0,0 +1,26 @@ +name: Test the preserving of security config files upon upgrade - Wazuh indexer - RPM +on: + pull_request: + paths: + - 'stack/indexer/rpm/wazuh-indexer.spec' + workflow_dispatch: + +jobs: + Test-security-config-files-preservation-RPM: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Build the Wazuh agent package + working-directory: ./rpms + run: | + sudo ./bash generate_rpm_package.sh -b master -t agent -a x86_64 --dev + echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV + + - name: Move the built package + working-directory: ./rpms + run: | + mkdir $GITHUB_WORKSPACE/packages + sudo cp ./output/$PACKAGE_NAME $GITHUB_WORKSPACE/packages/$PACKAGE_NAME + + - name: Launch docker + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages almalinux:latest bash /tests/install-and-test-agent.sh diff --git a/.github/workflows/test-enable-rhel9-agent.yml b/.github/workflows/test-enable-rhel9-agent.yml new file mode 100644 index 0000000000..e8aa830840 --- /dev/null +++ b/.github/workflows/test-enable-rhel9-agent.yml @@ -0,0 +1,26 @@ +name: Test the preserving of security config files upon upgrade - Wazuh indexer - RPM +on: + pull_request: + paths: + - 'stack/indexer/rpm/wazuh-indexer.spec' + workflow_dispatch: + +jobs: + Test-security-config-files-preservation-RPM: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Build the Wazuh agent package + working-directory: ./rpms + run: | + sudo ./bash generate_rpm_package.sh -b master -t agent -a x86_64 --dev + echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV + + - name: Move the built package + working-directory: ./rpms + run: | + mkdir $GITHUB_WORKSPACE/packages + sudo cp ./output/$PACKAGE_NAME $GITHUB_WORKSPACE/packages/$PACKAGE_NAME + + - name: Launch docker + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages redhat/ubi9-minimal:latest bash /tests/install-and-test-agent.sh diff --git a/.github/workflows/test-enable-rhel9-manager.yml b/.github/workflows/test-enable-rhel9-manager.yml new file mode 100644 index 0000000000..4dfd9ea9ea --- /dev/null +++ b/.github/workflows/test-enable-rhel9-manager.yml @@ -0,0 +1,26 @@ +name: Test the preserving of security config files upon upgrade - Wazuh indexer - RPM +on: + pull_request: + paths: + - 'stack/indexer/rpm/wazuh-indexer.spec' + workflow_dispatch: + +jobs: + Test-security-config-files-preservation-RPM: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Build the Wazuh agent package + working-directory: ./rpms + run: | + sudo ./bash generate_rpm_package.sh -b master -t manager -a x86_64 --dev + echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV + + - name: Move the built package + working-directory: ./rpms + run: | + mkdir $GITHUB_WORKSPACE/packages + sudo cp ./output/$PACKAGE_NAME $GITHUB_WORKSPACE/packages/$PACKAGE_NAME + + - name: Launch docker + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages redhat/ubi9-minimal:latest bash /tests/install-and-test-manager.sh diff --git a/.github/workflows/test-enable-rocky9-agent.yml b/.github/workflows/test-enable-rocky9-agent.yml new file mode 100644 index 0000000000..b9d1d5e4a4 --- /dev/null +++ b/.github/workflows/test-enable-rocky9-agent.yml @@ -0,0 +1,26 @@ +name: Test the preserving of security config files upon upgrade - Wazuh indexer - RPM +on: + pull_request: + paths: + - 'stack/indexer/rpm/wazuh-indexer.spec' + workflow_dispatch: + +jobs: + Test-security-config-files-preservation-RPM: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Build the Wazuh agent package + working-directory: ./rpms + run: | + sudo ./bash generate_rpm_package.sh -b master -t agent -a x86_64 --dev + echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV + + - name: Move the built package + working-directory: ./rpms + run: | + mkdir $GITHUB_WORKSPACE/packages + sudo cp ./output/$PACKAGE_NAME $GITHUB_WORKSPACE/packages/$PACKAGE_NAME + + - name: Launch docker + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages rockylinux:9 bash /tests/install-and-test-agent.sh From 1bd2583d9c03d399d6f073a46a00921ffa9f93ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 20 Jan 2023 13:19:21 +0100 Subject: [PATCH 096/316] Change names and Pull request paths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-enable-alma9-agent.yml | 8 +++++--- .github/workflows/test-enable-rhel9-agent.yml | 8 +++++--- .github/workflows/test-enable-rhel9-manager.yml | 8 +++++--- .github/workflows/test-enable-rocky9-agent.yml | 8 +++++--- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test-enable-alma9-agent.yml b/.github/workflows/test-enable-alma9-agent.yml index 5d2f83d3d3..6a56ca01dd 100644 --- a/.github/workflows/test-enable-alma9-agent.yml +++ b/.github/workflows/test-enable-alma9-agent.yml @@ -1,12 +1,14 @@ -name: Test the preserving of security config files upon upgrade - Wazuh indexer - RPM +name: Test the enabling of the Wazuh agent - AlmaLinux 9 - RPM on: pull_request: paths: - - 'stack/indexer/rpm/wazuh-indexer.spec' + - 'rpms/SPECS' + - 'rpms/generate_rpm_package.sh' + - 'rpms/build.sh' workflow_dispatch: jobs: - Test-security-config-files-preservation-RPM: + Test-enable-wazuh-agent-alma9: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/test-enable-rhel9-agent.yml b/.github/workflows/test-enable-rhel9-agent.yml index e8aa830840..375e5fba3c 100644 --- a/.github/workflows/test-enable-rhel9-agent.yml +++ b/.github/workflows/test-enable-rhel9-agent.yml @@ -1,12 +1,14 @@ -name: Test the preserving of security config files upon upgrade - Wazuh indexer - RPM +name: Test the enabling of the Wazuh agent - Red Hat Enterprise Linux 9 - RPM on: pull_request: paths: - - 'stack/indexer/rpm/wazuh-indexer.spec' + - 'rpms/SPECS' + - 'rpms/generate_rpm_package.sh' + - 'rpms/build.sh' workflow_dispatch: jobs: - Test-security-config-files-preservation-RPM: + Test-enable-wazuh-agent-rhel9: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/test-enable-rhel9-manager.yml b/.github/workflows/test-enable-rhel9-manager.yml index 4dfd9ea9ea..73726ee661 100644 --- a/.github/workflows/test-enable-rhel9-manager.yml +++ b/.github/workflows/test-enable-rhel9-manager.yml @@ -1,12 +1,14 @@ -name: Test the preserving of security config files upon upgrade - Wazuh indexer - RPM +name: Test the enabling of the Wazuh manager - Red Hat Enterprise Linux 9 - RPM on: pull_request: paths: - - 'stack/indexer/rpm/wazuh-indexer.spec' + - 'rpms/SPECS' + - 'rpms/generate_rpm_package.sh' + - 'rpms/build.sh' workflow_dispatch: jobs: - Test-security-config-files-preservation-RPM: + Test-enable-wazuh-manager-rhel9: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/test-enable-rocky9-agent.yml b/.github/workflows/test-enable-rocky9-agent.yml index b9d1d5e4a4..e3b9d213a6 100644 --- a/.github/workflows/test-enable-rocky9-agent.yml +++ b/.github/workflows/test-enable-rocky9-agent.yml @@ -1,12 +1,14 @@ -name: Test the preserving of security config files upon upgrade - Wazuh indexer - RPM +name: Test the enabling of the Wazuh agent - Rocky Linux 9 - RPM on: pull_request: paths: - - 'stack/indexer/rpm/wazuh-indexer.spec' + - 'rpms/SPECS' + - 'rpms/generate_rpm_package.sh' + - 'rpms/build.sh' workflow_dispatch: jobs: - Test-security-config-files-preservation-RPM: + Test-enable-wazuh-agent-rocky9: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 From de8edfccd76186103948624b734be0a5b2410bf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 20 Jan 2023 14:50:40 +0100 Subject: [PATCH 097/316] Change images and fix script for github actions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../install_and_test_agent.sh | 12 +++++++++--- .../install_and_test_manager.sh | 12 +++++++++--- .github/workflows/test-enable-alma9-agent.yml | 2 +- .github/workflows/test-enable-rhel9-agent.yml | 2 +- .github/workflows/test-enable-rhel9-manager.yml | 2 +- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.github/actions/test-enable-rhel9-derivatives/install_and_test_agent.sh b/.github/actions/test-enable-rhel9-derivatives/install_and_test_agent.sh index c0a7b30824..2239dfc495 100644 --- a/.github/actions/test-enable-rhel9-derivatives/install_and_test_agent.sh +++ b/.github/actions/test-enable-rhel9-derivatives/install_and_test_agent.sh @@ -1,8 +1,14 @@ #!/bin/bash echo "Installing Wazuh Agent." -yum install $PACKAGE_NAME +yum install -y $PACKAGE_NAME echo "Enabling Wazuh Agent." -systemctl daemon-reload -systemctl enable wazuh-agent \ No newline at end of file +systemctl enable wazuh-agent +if [ "$?" -eq 0 ]; then + echo "Wazuh agent enabled - Test passed correctly." + exit 0 +else + echo "Error: Wazuh agent not enabled." + exit 1 +fi \ No newline at end of file diff --git a/.github/actions/test-enable-rhel9-derivatives/install_and_test_manager.sh b/.github/actions/test-enable-rhel9-derivatives/install_and_test_manager.sh index 2761b8ade9..36af2b0ba2 100644 --- a/.github/actions/test-enable-rhel9-derivatives/install_and_test_manager.sh +++ b/.github/actions/test-enable-rhel9-derivatives/install_and_test_manager.sh @@ -1,8 +1,14 @@ #!/bin/bash echo "Installing Wazuh Manager." -yum install $PACKAGE_NAME +yum install -y $PACKAGE_NAME echo "Enabling Wazuh Agent." -systemctl daemon-reload -systemctl enable wazuh-manager \ No newline at end of file +systemctl enable wazuh-manager +if [ "$?" -eq 0 ]; then + echo "Wazuh agent enabled - Test passed correctly." + exit 0 +else + echo "Error: Wazuh agent not enabled." + exit 1 +fi \ No newline at end of file diff --git a/.github/workflows/test-enable-alma9-agent.yml b/.github/workflows/test-enable-alma9-agent.yml index 6a56ca01dd..a84a779ccf 100644 --- a/.github/workflows/test-enable-alma9-agent.yml +++ b/.github/workflows/test-enable-alma9-agent.yml @@ -25,4 +25,4 @@ jobs: sudo cp ./output/$PACKAGE_NAME $GITHUB_WORKSPACE/packages/$PACKAGE_NAME - name: Launch docker - run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages almalinux:latest bash /tests/install-and-test-agent.sh + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages almalinux:9.1 bash /tests/install-and-test-agent.sh diff --git a/.github/workflows/test-enable-rhel9-agent.yml b/.github/workflows/test-enable-rhel9-agent.yml index 375e5fba3c..0555e4a9df 100644 --- a/.github/workflows/test-enable-rhel9-agent.yml +++ b/.github/workflows/test-enable-rhel9-agent.yml @@ -25,4 +25,4 @@ jobs: sudo cp ./output/$PACKAGE_NAME $GITHUB_WORKSPACE/packages/$PACKAGE_NAME - name: Launch docker - run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages redhat/ubi9-minimal:latest bash /tests/install-and-test-agent.sh + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages redhat/ubi9 bash /tests/install-and-test-agent.sh diff --git a/.github/workflows/test-enable-rhel9-manager.yml b/.github/workflows/test-enable-rhel9-manager.yml index 73726ee661..c3651a81ba 100644 --- a/.github/workflows/test-enable-rhel9-manager.yml +++ b/.github/workflows/test-enable-rhel9-manager.yml @@ -25,4 +25,4 @@ jobs: sudo cp ./output/$PACKAGE_NAME $GITHUB_WORKSPACE/packages/$PACKAGE_NAME - name: Launch docker - run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages redhat/ubi9-minimal:latest bash /tests/install-and-test-manager.sh + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages redhat/ubi9-init bash /tests/install-and-test-manager.sh From 742b4a19cba8248c8441d7134b8767f8b3d3229d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 20 Jan 2023 14:56:13 +0100 Subject: [PATCH 098/316] Small fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- macos/generate_wazuh_packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macos/generate_wazuh_packages.sh b/macos/generate_wazuh_packages.sh index fb035d845f..be8b3c655f 100755 --- a/macos/generate_wazuh_packages.sh +++ b/macos/generate_wazuh_packages.sh @@ -386,7 +386,7 @@ function main() { CHECKSUMDIR="${DESTINATION}" fi - if [[ "$BUILD" != "no" ]]; then + if [[ "${BUILD}" != "no" ]]; then check_root build_package "${CURRENT_PATH}/uninstall.sh" From 9ef7f716475b914d54c68e98bddda1de0a94f269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 20 Jan 2023 14:58:30 +0100 Subject: [PATCH 099/316] Fix paths in workflows for github actions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-enable-alma9-agent.yml | 2 +- .github/workflows/test-enable-rhel9-agent.yml | 2 +- .github/workflows/test-enable-rhel9-manager.yml | 2 +- .github/workflows/test-enable-rocky9-agent.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-enable-alma9-agent.yml b/.github/workflows/test-enable-alma9-agent.yml index a84a779ccf..d842ab9450 100644 --- a/.github/workflows/test-enable-alma9-agent.yml +++ b/.github/workflows/test-enable-alma9-agent.yml @@ -2,7 +2,7 @@ name: Test the enabling of the Wazuh agent - AlmaLinux 9 - RPM on: pull_request: paths: - - 'rpms/SPECS' + - 'rpms/SPECS/*' - 'rpms/generate_rpm_package.sh' - 'rpms/build.sh' workflow_dispatch: diff --git a/.github/workflows/test-enable-rhel9-agent.yml b/.github/workflows/test-enable-rhel9-agent.yml index 0555e4a9df..819940fbd4 100644 --- a/.github/workflows/test-enable-rhel9-agent.yml +++ b/.github/workflows/test-enable-rhel9-agent.yml @@ -2,7 +2,7 @@ name: Test the enabling of the Wazuh agent - Red Hat Enterprise Linux 9 - RPM on: pull_request: paths: - - 'rpms/SPECS' + - 'rpms/SPECS/*' - 'rpms/generate_rpm_package.sh' - 'rpms/build.sh' workflow_dispatch: diff --git a/.github/workflows/test-enable-rhel9-manager.yml b/.github/workflows/test-enable-rhel9-manager.yml index c3651a81ba..5aa02fa990 100644 --- a/.github/workflows/test-enable-rhel9-manager.yml +++ b/.github/workflows/test-enable-rhel9-manager.yml @@ -2,7 +2,7 @@ name: Test the enabling of the Wazuh manager - Red Hat Enterprise Linux 9 - RPM on: pull_request: paths: - - 'rpms/SPECS' + - 'rpms/SPECS/*' - 'rpms/generate_rpm_package.sh' - 'rpms/build.sh' workflow_dispatch: diff --git a/.github/workflows/test-enable-rocky9-agent.yml b/.github/workflows/test-enable-rocky9-agent.yml index e3b9d213a6..6c78fc0d38 100644 --- a/.github/workflows/test-enable-rocky9-agent.yml +++ b/.github/workflows/test-enable-rocky9-agent.yml @@ -2,7 +2,7 @@ name: Test the enabling of the Wazuh agent - Rocky Linux 9 - RPM on: pull_request: paths: - - 'rpms/SPECS' + - 'rpms/SPECS/*' - 'rpms/generate_rpm_package.sh' - 'rpms/build.sh' workflow_dispatch: From d947c57f07a8d33efca48753cb5d6e998212996e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 20 Jan 2023 15:00:16 +0100 Subject: [PATCH 100/316] Fix call to generate_rpm_package in github actions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-enable-alma9-agent.yml | 2 +- .github/workflows/test-enable-rhel9-agent.yml | 2 +- .github/workflows/test-enable-rhel9-manager.yml | 2 +- .github/workflows/test-enable-rocky9-agent.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-enable-alma9-agent.yml b/.github/workflows/test-enable-alma9-agent.yml index d842ab9450..f8d982b9a1 100644 --- a/.github/workflows/test-enable-alma9-agent.yml +++ b/.github/workflows/test-enable-alma9-agent.yml @@ -15,7 +15,7 @@ jobs: - name: Build the Wazuh agent package working-directory: ./rpms run: | - sudo ./bash generate_rpm_package.sh -b master -t agent -a x86_64 --dev + bash generate_rpm_package.sh -b master -t agent -a x86_64 --dev echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - name: Move the built package diff --git a/.github/workflows/test-enable-rhel9-agent.yml b/.github/workflows/test-enable-rhel9-agent.yml index 819940fbd4..4656838ad7 100644 --- a/.github/workflows/test-enable-rhel9-agent.yml +++ b/.github/workflows/test-enable-rhel9-agent.yml @@ -15,7 +15,7 @@ jobs: - name: Build the Wazuh agent package working-directory: ./rpms run: | - sudo ./bash generate_rpm_package.sh -b master -t agent -a x86_64 --dev + bash generate_rpm_package.sh -b master -t agent -a x86_64 --dev echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - name: Move the built package diff --git a/.github/workflows/test-enable-rhel9-manager.yml b/.github/workflows/test-enable-rhel9-manager.yml index 5aa02fa990..2f97d11b8d 100644 --- a/.github/workflows/test-enable-rhel9-manager.yml +++ b/.github/workflows/test-enable-rhel9-manager.yml @@ -15,7 +15,7 @@ jobs: - name: Build the Wazuh agent package working-directory: ./rpms run: | - sudo ./bash generate_rpm_package.sh -b master -t manager -a x86_64 --dev + bash generate_rpm_package.sh -b master -t manager -a x86_64 --dev echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - name: Move the built package diff --git a/.github/workflows/test-enable-rocky9-agent.yml b/.github/workflows/test-enable-rocky9-agent.yml index 6c78fc0d38..f58260d168 100644 --- a/.github/workflows/test-enable-rocky9-agent.yml +++ b/.github/workflows/test-enable-rocky9-agent.yml @@ -15,7 +15,7 @@ jobs: - name: Build the Wazuh agent package working-directory: ./rpms run: | - sudo ./bash generate_rpm_package.sh -b master -t agent -a x86_64 --dev + bash generate_rpm_package.sh -b master -t agent -a x86_64 --dev echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - name: Move the built package From bfbfb0bbd890b350dcee996de0b64f6b963f8913 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Fri, 20 Jan 2023 15:09:16 +0100 Subject: [PATCH 101/316] Disable shard allocation before upgrading wazuh-indexer --- .../install_functions/indexer.sh | 28 +++++++++++++++++++ .../install_functions/upgrade.sh | 2 ++ 2 files changed, 30 insertions(+) diff --git a/unattended_installer/install_functions/indexer.sh b/unattended_installer/install_functions/indexer.sh index 56eb5e30e0..37083109b7 100644 --- a/unattended_installer/install_functions/indexer.sh +++ b/unattended_installer/install_functions/indexer.sh @@ -108,6 +108,34 @@ function indexer_copyCertificates() { } +function indexert_disableShardAllocation() { + + common_logger "Disabling shard allocation." + installCommon_getPass "admin" + eval "curl -XPUT https:127.0.0.1:9200/_cluster/settings -H 'Content-Type: application/json' -d '{\"persistent\": {\"cluster.routing.allocation.enable\": \"primaries\"}}' -uadmin:${u_pass} -k --silent ${debug}" + if [ "${PIPESTATUS[0]}" != 0 ]; then + common_logger -e "Shard allocation could not be disabled." + exit 1 + else + common_logger "Shard allocation disabled." + fi + + eval "curl -X POST https:127.0.0.1:9200/_flush/synced -uadmin:${u_pass} -k --silent ${debug}" +} + + +function indexert_enableShardAllocation() { + + common_logger "Enabling shard allocation." + eval "curl -XPUT https:127.0.0.1:9200/_cluster/settings -H 'Content-Type: application/json' -d '{\"persistent\": {\"cluster.routing.allocation.enable\": \"all\"}}' -uadmin:${u_pass} -k --silent ${debug}" + if [ "${PIPESTATUS[0]}" != 0 ]; then + common_logger -e "Shard allocation could not be enabled." + exit 1 + else + common_logger "Shard allocation enabled." + fi +} + function indexer_initialize() { common_logger "Initializing Wazuh indexer cluster security settings." diff --git a/unattended_installer/install_functions/upgrade.sh b/unattended_installer/install_functions/upgrade.sh index 987d61b599..e493c16b78 100644 --- a/unattended_installer/install_functions/upgrade.sh +++ b/unattended_installer/install_functions/upgrade.sh @@ -86,7 +86,9 @@ function upgrade_upgradeInstalled(){ if [ -n "${indexer_installed}" ]; then if [ -n "${indexer_upgradable}" ]; then common_logger "Upgrading Wazuh Indexer to ${wazuh_version}" + indexert_disableShardAllocation eval "indexer_install ${debug}" + indexert_enableShardAllocation installCommon_startService "wazuh-indexer" else common_logger -w "Wazuh Indexer is already installed and the version is equal or greater than ${wazuh_version}." From 50d2e24fde616ee6327ee38eb905c0672b63fbce Mon Sep 17 00:00:00 2001 From: Daniel Folch Date: Fri, 20 Jan 2023 15:12:59 +0100 Subject: [PATCH 102/316] Merge 4.4 into master (#2055) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add trust verification if the package is to be signed. * Updating TRUST_VERIFICATION variable * Bump indexer RPM to 2.4.0 * Bump Debian 4.4.0 indexer to 2.4.0 * Changed Opensearch version for dashboard * Fixed dh_strip error * Removed bash for alpine package * Removed new plugins * Removed commented files * Removed remove of notification plugin * Added support for Opensearch 2.4.0 * Added support to Openseach dashboards 2.4.1 * Change wazuh-clusterd to clusterd.py * Add break to test * Extend error ignore to 4.4 version * Remove variable of system arquitecture * Add flag to define a custom CA_NAME. * Removed header and testing replace of opensearch logo from home icon * Replaced OpenSearch Logo from Home icon * Added a final space * Testing stoping wazuh manager in provision.sh * The order of the stop services is rearranged * Revert ordering * Same order for all the calls to the opensearch security plugin Signed-off-by: Miguel Verdaguer Velázquez * Add condition to the creation of backup in passwords_changePassword Signed-off-by: Miguel Verdaguer Velázquez * Fix conditions for changes Signed-off-by: Miguel Verdaguer Velázquez * Change condition Signed-off-by: Miguel Verdaguer Velázquez * Remove unnecessary call to changePasswords and fix conditions to create indexer passwords backup Signed-off-by: Miguel Verdaguer Velázquez * Add variable nobackup to avoid creating the indexer backup when runSecurityAdmin is not going to be run Signed-off-by: Miguel Verdaguer Velázquez * Change variable name Signed-off-by: Miguel Verdaguer Velázquez * Increase the TimeOut start seconds on the Wazuh indexer service Signed-off-by: Miguel Verdaguer Velázquez * Create backup before changing password * Update README.md Signed-off-by: Miguel Verdaguer Velázquez Co-authored-by: Dwordcito Co-authored-by: pereyra-m Co-authored-by: José Fernández Co-authored-by: c-bordon Co-authored-by: Alberto Rodríguez Co-authored-by: fcaffieri Co-authored-by: Miguel Verdaguer Velázquez --- README.md | 4 ++-- .../usr/lib/systemd/system/wazuh-indexer.service | 2 +- unattended_installer/install_functions/indexer.sh | 2 +- .../install_functions/installCommon.sh | 2 ++ .../install_functions/installMain.sh | 2 +- .../passwords_tool/passwordsFunctions.sh | 15 +++++++++++---- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 101e95c1b6..5f6b21366f 100644 --- a/README.md +++ b/README.md @@ -35,14 +35,14 @@ The following table shows the references for the versions of each component. | Wazuh dashboard | Opensearch dashboards | |-----------------|-----------------------| | 4.3.x | 1.2.0 | -| 4.4.x | 2.3.0 | +| 4.4.x | 2.4.1 | ### Indexer | Wazuh indexer | Opensearch | |-----------------|-----------------------| | 4.3.x | 1.2.4 | -| 4.4.x | 2.3.0 | +| 4.4.x | 2.4.1 | ## Contribute diff --git a/stack/indexer/base/files/usr/lib/systemd/system/wazuh-indexer.service b/stack/indexer/base/files/usr/lib/systemd/system/wazuh-indexer.service index f40c3eff05..043f0f854c 100644 --- a/stack/indexer/base/files/usr/lib/systemd/system/wazuh-indexer.service +++ b/stack/indexer/base/files/usr/lib/systemd/system/wazuh-indexer.service @@ -58,7 +58,7 @@ SendSIGKILL=no SuccessExitStatus=143 # Allow a slow startup before the systemd notifier module kicks in to extend the timeout -TimeoutStartSec=75 +TimeoutStartSec=180 [Install] WantedBy=multi-user.target diff --git a/unattended_installer/install_functions/indexer.sh b/unattended_installer/install_functions/indexer.sh index 3c543d096f..bab72864b9 100644 --- a/unattended_installer/install_functions/indexer.sh +++ b/unattended_installer/install_functions/indexer.sh @@ -176,7 +176,7 @@ function indexer_startCluster() { fi done eval "wazuh_indexer_ip=( $(cat /etc/wazuh-indexer/opensearch.yml | grep network.host | sed 's/network.host:\s//') )" - eval "sudo -u wazuh-indexer JAVA_HOME=/usr/share/wazuh-indexer/jdk/ OPENSEARCH_CONF_DIR=/etc/wazuh-indexer /usr/share/wazuh-indexer/plugins/opensearch-security/tools/securityadmin.sh -p 9200 -cd /etc/wazuh-indexer/opensearch-security -icl -nhnv -cacert /etc/wazuh-indexer/certs/root-ca.pem -cert /etc/wazuh-indexer/certs/admin.pem -key /etc/wazuh-indexer/certs/admin-key.pem -h ${wazuh_indexer_ip} ${debug}" + eval "sudo -u wazuh-indexer JAVA_HOME=/usr/share/wazuh-indexer/jdk/ OPENSEARCH_CONF_DIR=/etc/wazuh-indexer /usr/share/wazuh-indexer/plugins/opensearch-security/tools/securityadmin.sh -cd /etc/wazuh-indexer/opensearch-security -icl -p 9200 -nhnv -cacert /etc/wazuh-indexer/certs/root-ca.pem -cert /etc/wazuh-indexer/certs/admin.pem -key /etc/wazuh-indexer/certs/admin-key.pem -h ${wazuh_indexer_ip} ${debug}" if [ "${PIPESTATUS[0]}" != 0 ]; then common_logger -e "The Wazuh indexer cluster security configuration could not be initialized." exit 1 diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index b86be07619..644fa6bcd3 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -194,6 +194,8 @@ function installCommon_changePasswords() { if [ -n "${start_indexer_cluster}" ] || [ -n "${AIO}" ]; then changeall=1 passwords_readUsers + else + no_indexer_backup=1 fi if { [ -n "${wazuh}" ] || [ -n "${AIO}" ]; } && { [ "${server_node_types[pos]}" == "master" ] || [ "${#server_node_names[@]}" -eq 1 ]; }; then passwords_getApiToken diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index bc1c6d6a24..c97dcfc366 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -297,7 +297,7 @@ function main() { fi -# -------------- Wazuh case --------------------------------------- +# -------------- Wazuh server case --------------------------------------- if [ -n "${wazuh}" ]; then common_logger "--- Wazuh server ---" diff --git a/unattended_installer/passwords_tool/passwordsFunctions.sh b/unattended_installer/passwords_tool/passwordsFunctions.sh index a53b67c41b..bd9e265303 100644 --- a/unattended_installer/passwords_tool/passwordsFunctions.sh +++ b/unattended_installer/passwords_tool/passwordsFunctions.sh @@ -8,10 +8,12 @@ function passwords_changePassword() { - eval "mkdir /etc/wazuh-indexer/backup/ 2>/dev/null" - eval "cp /etc/wazuh-indexer/opensearch-security/* /etc/wazuh-indexer/backup/ 2>/dev/null" - if [ -n "${changeall}" ]; then + if [ -n "${indexer_installed}" ] && [ -z ${no_indexer_backup} ]; then + eval "mkdir /etc/wazuh-indexer/backup/ 2>/dev/null" + eval "cp /etc/wazuh-indexer/opensearch-security/* /etc/wazuh-indexer/backup/ 2>/dev/null" + passwords_createBackUp + fi for i in "${!passwords[@]}" do if [ -n "${indexer_installed}" ] && [ -f "/etc/wazuh-indexer/backup/internal_users.yml" ]; then @@ -26,8 +28,13 @@ function passwords_changePassword() { done else + if [ -z "${api}" ] && [ -n "${indexer_installed}" ]; then + eval "mkdir /etc/wazuh-indexer/backup/ 2>/dev/null" + eval "cp /etc/wazuh-indexer/opensearch-security/* /etc/wazuh-indexer/backup/ 2>/dev/null" + passwords_createBackUp + fi if [ -n "${indexer_installed}" ] && [ -f "/etc/wazuh-indexer/backup/internal_users.yml" ]; then - awk -v new="$hash" 'prev=="'${nuser}':"{sub(/\042.*/,""); $0=$0 new} {prev=$1} 1' /etc/wazuh-indexer/backup/internal_users.yml > internal_users.yml_tmp && mv -f internal_users.yml_tmp /etc/wazuh-indexer/backup/internal_users.yml + awk -v new="${hash}" 'prev=="'${nuser}':"{sub(/\042.*/,""); $0=$0 new} {prev=$1} 1' /etc/wazuh-indexer/backup/internal_users.yml > internal_users.yml_tmp && mv -f internal_users.yml_tmp /etc/wazuh-indexer/backup/internal_users.yml fi if [ "${nuser}" == "admin" ]; then From 8d49c5a3bed79d298aeb574ae8135fa2639ee1b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 20 Jan 2023 16:37:08 +0100 Subject: [PATCH 103/316] Fix test path in shared file with docker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-enable-alma9-agent.yml | 2 +- .github/workflows/test-enable-rhel9-agent.yml | 2 +- .github/workflows/test-enable-rhel9-manager.yml | 2 +- .github/workflows/test-enable-rocky9-agent.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-enable-alma9-agent.yml b/.github/workflows/test-enable-alma9-agent.yml index f8d982b9a1..e701155da4 100644 --- a/.github/workflows/test-enable-alma9-agent.yml +++ b/.github/workflows/test-enable-alma9-agent.yml @@ -25,4 +25,4 @@ jobs: sudo cp ./output/$PACKAGE_NAME $GITHUB_WORKSPACE/packages/$PACKAGE_NAME - name: Launch docker - run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages almalinux:9.1 bash /tests/install-and-test-agent.sh + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel9-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages almalinux:9.1 bash /tests/install-and-test-agent.sh diff --git a/.github/workflows/test-enable-rhel9-agent.yml b/.github/workflows/test-enable-rhel9-agent.yml index 4656838ad7..10d3aaebd7 100644 --- a/.github/workflows/test-enable-rhel9-agent.yml +++ b/.github/workflows/test-enable-rhel9-agent.yml @@ -25,4 +25,4 @@ jobs: sudo cp ./output/$PACKAGE_NAME $GITHUB_WORKSPACE/packages/$PACKAGE_NAME - name: Launch docker - run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages redhat/ubi9 bash /tests/install-and-test-agent.sh + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel9-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages redhat/ubi9 bash /tests/install-and-test-agent.sh diff --git a/.github/workflows/test-enable-rhel9-manager.yml b/.github/workflows/test-enable-rhel9-manager.yml index 2f97d11b8d..5617901e52 100644 --- a/.github/workflows/test-enable-rhel9-manager.yml +++ b/.github/workflows/test-enable-rhel9-manager.yml @@ -25,4 +25,4 @@ jobs: sudo cp ./output/$PACKAGE_NAME $GITHUB_WORKSPACE/packages/$PACKAGE_NAME - name: Launch docker - run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages redhat/ubi9-init bash /tests/install-and-test-manager.sh + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel9-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages redhat/ubi9-init bash /tests/install-and-test-manager.sh diff --git a/.github/workflows/test-enable-rocky9-agent.yml b/.github/workflows/test-enable-rocky9-agent.yml index f58260d168..a3ee925101 100644 --- a/.github/workflows/test-enable-rocky9-agent.yml +++ b/.github/workflows/test-enable-rocky9-agent.yml @@ -25,4 +25,4 @@ jobs: sudo cp ./output/$PACKAGE_NAME $GITHUB_WORKSPACE/packages/$PACKAGE_NAME - name: Launch docker - run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages rockylinux:9 bash /tests/install-and-test-agent.sh + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel9-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages rockylinux:9 bash /tests/install-and-test-agent.sh From f485443fa32e5df332e6e68714dfbbd8fca89df9 Mon Sep 17 00:00:00 2001 From: Carlos Bordon <64099752+c-bordon@users.noreply.github.com> Date: Mon, 23 Jan 2023 09:01:29 -0300 Subject: [PATCH 104/316] The Wazuh dashboard build_number is updated with the Wazuh app parameters to master (#2057) * mergue changes comming from build_number Pr * Removed full path for packages.json tmp file * Added quotes to var * Added validation for plugin URL * Added indentation --- stack/dashboard/base/builder.sh | 29 ++++++++++++-- stack/dashboard/base/docker/Dockerfile | 5 ++- stack/dashboard/base/generate_base.sh | 18 ++++++++- stack/dashboard/deb/build_package.sh | 54 +++++++++++++++++--------- stack/dashboard/deb/builder.sh | 4 ++ stack/dashboard/rpm/build_package.sh | 54 +++++++++++++++++--------- stack/dashboard/rpm/builder.sh | 4 ++ 7 files changed, 123 insertions(+), 45 deletions(-) diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh index 5217ce3ea9..408ad3ceb6 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -14,7 +14,8 @@ set -e architecture="$1" revision="$2" future="$3" -reference="$4" +repository="$4" +reference="$5" opensearch_version="2.4.1" base_dir=/opt/wazuh-dashboard-base @@ -41,6 +42,22 @@ if [ "${future}" = "yes" ];then fi wazuh_minor=$(echo ${version} | cut -c1-3) +# Obtain Wazuh plugin URL +if [ "${repository}" ];then + valid_url='(https?|ftp|file)://[-[:alnum:]\+&@#/%?=~_|!:,.;]*[-[:alnum:]\+&@#/%=~_|]' + if [[ $repository =~ $valid_url ]];then + url="${repository}" + if ! curl --output /dev/null --silent --head --fail "${url}"; then + echo "The given URL to download the Wazuh plugin zip does not exist: ${url}" + exit 1 + fi + else + url="https://packages-dev.wazuh.com/${repository}/ui/dashboard/wazuh-${version}-${revision}.zip" + fi +else + url="https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuh-${version}-${revision}.zip" +fi + # ----------------------------------------------------------------------------- mkdir -p /tmp/output @@ -138,10 +155,16 @@ cp /root/VERSION . # Add exception for wazuh plugin install wazuh_plugin="if (plugin.includes(\'wazuh\')) {\n return plugin;\n } else {\n return \`\${LATEST_PLUGIN_BASE_URL}\/\${version}\/latest\/\${platform}\/\${arch}\/tar\/builds\/opensearch-dashboards\/plugins\/\${plugin}-\${version}.zip\`;\n }" sed -i "s|return \`\${LATEST_PLUGIN_BASE_URL}\/\${version}\/latest\/\${platform}\/\${arch}\/tar\/builds\/opensearch-dashboards\/plugins\/\${plugin}-\${version}.zip\`;|$wazuh_plugin|" ./src/cli_plugin/install/settings.js -# Changed package.json build number -jq ".build.number=$(cat /root/VERSION | tr -d '.')" ./package.json > ./package.json.tmp +# Generate build number for package.json +curl -sO ${url} +unzip *.zip 'opensearch-dashboards/wazuh/package.json' +build_number=$(jq -r '.version' ./opensearch-dashboards/wazuh/package.json | tr -d '.')$(jq -r '.revision' ./opensearch-dashboards/wazuh/package.json) +rm -rf ./opensearch-dashboards +rm -f ./*.zip +jq ".build.number=${build_number}" ./package.json > ./package.json.tmp mv ./package.json.tmp ./package.json + # Remove plugins /bin/bash ./bin/opensearch-dashboards-plugin remove queryWorkbenchDashboards --allow-root /bin/bash ./bin/opensearch-dashboards-plugin remove anomalyDetectionDashboards --allow-root diff --git a/stack/dashboard/base/docker/Dockerfile b/stack/dashboard/base/docker/Dockerfile index 8f9c25ef1f..184d894e16 100644 --- a/stack/dashboard/base/docker/Dockerfile +++ b/stack/dashboard/base/docker/Dockerfile @@ -18,11 +18,12 @@ RUN yum install -y \ libtool \ python3-devel \ python3-pip \ - jq + jq \ + unzip RUN git clone https://github.com/google/brotli.git -RUN cd brotli && ./bootstrap && ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/sbin --libexecdir=/usr/lib64/brotli --libdir=/usr/lib64/brotli --datarootdir=/usr/share --mandir=/usr/share/man/man1 --docdir=/usr/share/doc \ +RUN cd brotli && chmod +x ./bootstrap && ./bootstrap && ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/sbin --libexecdir=/usr/lib64/brotli --libdir=/usr/lib64/brotli --datarootdir=/usr/share --mandir=/usr/share/man/man1 --docdir=/usr/share/doc \ && make && make install # Add the scripts to build the RPM package diff --git a/stack/dashboard/base/generate_base.sh b/stack/dashboard/base/generate_base.sh index 4cb6129df3..e1a665e83f 100755 --- a/stack/dashboard/base/generate_base.sh +++ b/stack/dashboard/base/generate_base.sh @@ -19,6 +19,7 @@ architecture="x64" outdir="${current_path}/output" revision="1" future="no" +url="" # ----------------------------------------------------------------------------- @@ -44,16 +45,20 @@ build() { # Copy the necessary files cp ${current_path}/builder.sh ${dockerfile_path} + if [ "${repository}" ];then + url="${repository}" + fi + # Build the Docker image docker build -t ${container_name} ${dockerfile_path} || return 1 if [ "${reference}" ];then docker run -t --rm -v ${outdir}/:/tmp/output:Z \ - ${container_name} ${architecture} ${revision} ${future} ${reference} || return 1 + ${container_name} ${architecture} ${revision} ${future} ${url} ${reference} || return 1 else docker run -t --rm -v ${outdir}/:/tmp/output:Z \ -v ${current_path}/../../..:/root:Z \ - ${container_name} ${architecture} ${revision} ${future} || return 1 + ${container_name} ${architecture} ${revision} ${future} ${url} || return 1 fi echo "Base file $(ls -Art ${outdir} | tail -n 1) added to ${outdir}." @@ -67,6 +72,7 @@ help() { echo echo "Usage: $0 [OPTIONS]" echo + echo " --app-url [Optional] Set the repository from where the Wazuh plugin should be downloaded. By default, will be used pre-release." echo " -s, --store [Optional] Set the destination path of package. By default, an output folder will be created." echo " --reference [Optional] wazuh-packages branch or tag" echo " --future [Optional] Build test future package 99.99.0 Used for development purposes." @@ -85,6 +91,14 @@ main() { "-h"|"--help") help 0 ;; + "--app-url") + if [ -n "$2" ]; then + repository="$2" + shift 2 + else + help 1 + fi + ;; "-s"|"--store") if [ -n "${2}" ]; then outdir="${2}" diff --git a/stack/dashboard/deb/build_package.sh b/stack/dashboard/deb/build_package.sh index 5c3ccda789..e75e9aa1d1 100755 --- a/stack/dashboard/deb/build_package.sh +++ b/stack/dashboard/deb/build_package.sh @@ -18,6 +18,7 @@ deb_builder_dockerfile="${current_path}/docker" future="no" base_cmd="" url="" +build_base="yes" trap ctrl_c INT @@ -38,20 +39,25 @@ build_deb() { container_name="$1" dockerfile_path="$2" + if [ "${repository}" ];then + url="${repository}" + fi + # Copy the necessary files cp ${current_path}/builder.sh ${dockerfile_path} - # Base generation - if [ "${future}" == "yes" ];then - base_cmd+="--future " - fi - if [ "${reference}" ];then - base_cmd+="--reference ${reference}" - fi - ../base/generate_base.sh -s ${outdir} -r ${revision} ${base_cmd} - - if [ "${repository}" ];then - url="${repository}" + if [ "${build_base}" == "yes" ];then + # Base generation + if [ "${future}" == "yes" ];then + base_cmd+="--future " + fi + if [ "${reference}" ];then + base_cmd+="--reference ${reference}" + fi + if [ "${url}" ];then + base_cmd+="--app-url ${url}" + fi + ../base/generate_base.sh -s ${outdir} -r ${revision} ${base_cmd} fi # Build the Docker image @@ -98,6 +104,8 @@ help() { echo "Usage: $0 [OPTIONS]" echo echo " -a, --architecture [Optional] Target architecture of the package [amd64]." + echo " --app-url [Optional] Set the repository from where the Wazuh plugin should be downloaded. By default, will be used pre-release." + echo " -b, --build-base [Optional] Build a new base or use a existing one. By default, yes." echo " -r, --revision [Optional] Package revision. By default: 1." echo " -s, --store [Optional] Set the destination path of package. By default, an output folder will be created." echo " --reference [Optional] wazuh-packages branch to download SPECs, not used by default." @@ -124,6 +132,22 @@ main() { help 1 fi ;; + "--app-url") + if [ -n "$2" ]; then + repository="$2" + shift 2 + else + help 1 + fi + ;; + "-b"|"--build-base") + if [ -n "${2}" ]; then + build_base="${2}" + shift 2 + else + help 1 + fi + ;; "-r"|"--revision") if [ -n "${2}" ]; then revision="${2}" @@ -156,14 +180,6 @@ main() { help 1 fi ;; - "--app-url") - if [ -n "$2" ]; then - repository="$2" - shift 2 - else - help 1 - fi - ;; *) help 1 esac diff --git a/stack/dashboard/deb/builder.sh b/stack/dashboard/deb/builder.sh index 039f0be096..c3fd61076f 100755 --- a/stack/dashboard/deb/builder.sh +++ b/stack/dashboard/deb/builder.sh @@ -36,6 +36,10 @@ if [ "${repository}" ];then valid_url='(https?|ftp|file)://[-[:alnum:]\+&@#/%?=~_|!:,.;]*[-[:alnum:]\+&@#/%=~_|]' if [[ $repository =~ $valid_url ]];then url="${repository}" + if ! curl --output /dev/null --silent --head --fail "${url}"; then + echo "The given URL to download the Wazuh plugin zip does not exist: ${url}" + exit 1 + fi else url="https://packages-dev.wazuh.com/${repository}/ui/dashboard/wazuh-${version}-${revision}.zip" fi diff --git a/stack/dashboard/rpm/build_package.sh b/stack/dashboard/rpm/build_package.sh index 71cbcc9ff0..06d48f526b 100755 --- a/stack/dashboard/rpm/build_package.sh +++ b/stack/dashboard/rpm/build_package.sh @@ -18,6 +18,7 @@ rpm_builder_dockerfile="${current_path}/docker" future="no" base_cmd="" url="" +build_base="yes" trap ctrl_c INT @@ -38,20 +39,25 @@ build_rpm() { container_name="$1" dockerfile_path="$2" + if [ "${repository}" ];then + url="${repository}" + fi + # Copy the necessary files cp ${current_path}/builder.sh ${dockerfile_path} - # Base generation - if [ "${future}" == "yes" ];then - base_cmd+="--future " - fi - if [ "${reference}" ];then - base_cmd+="--reference ${reference}" - fi - ../base/generate_base.sh -s ${outdir} -r ${revision} ${base_cmd} - - if [ "${repository}" ];then - url="${repository}" + if [ "${build_base}" == "yes" ];then + # Base generation + if [ "${future}" == "yes" ];then + base_cmd+="--future " + fi + if [ "${reference}" ];then + base_cmd+="--reference ${reference}" + fi + if [ "${url}" ];then + base_cmd+="--app-url ${url}" + fi + ../base/generate_base.sh -s ${outdir} -r ${revision} ${base_cmd} fi # Build the Docker image @@ -98,6 +104,8 @@ help() { echo "Usage: $0 [OPTIONS]" echo echo " -a, --architecture [Optional] Target architecture of the package [x86_64]." + echo " --app-url [Optional] Set the repository from where the Wazuh plugin should be downloaded. By default, will be used pre-release." + echo " -b, --build-base [Optional] Build a new base or use a existing one. By default, yes." echo " -r, --revision [Optional] Package revision. By default: 1." echo " -s, --store [Optional] Set the destination path of package. By default, an output folder will be created." echo " --reference [Optional] wazuh-packages branch to download SPECs, not used by default." @@ -125,6 +133,22 @@ main() { help 1 fi ;; + "--app-url") + if [ -n "$2" ]; then + repository="$2" + shift 2 + else + help 1 + fi + ;; + "-b"|"--build-base") + if [ -n "${2}" ]; then + build_base="${2}" + shift 2 + else + help 1 + fi + ;; "-r"|"--revision") if [ -n "$2" ]; then revision="$2" @@ -157,14 +181,6 @@ main() { help 1 fi ;; - "--app-url") - if [ -n "$2" ]; then - repository="$2" - shift 2 - else - help 1 - fi - ;; *) help 1 esac diff --git a/stack/dashboard/rpm/builder.sh b/stack/dashboard/rpm/builder.sh index 49f983dfb5..c4b9e2a652 100755 --- a/stack/dashboard/rpm/builder.sh +++ b/stack/dashboard/rpm/builder.sh @@ -36,6 +36,10 @@ if [ "${repository}" ];then valid_url='(https?|ftp|file)://[-[:alnum:]\+&@#/%?=~_|!:,.;]*[-[:alnum:]\+&@#/%=~_|]' if [[ $repository =~ $valid_url ]];then url="${repository}" + if ! curl --output /dev/null --silent --head --fail "${url}"; then + echo "The given URL to download the Wazuh plugin zip does not exist: ${url}" + exit 1 + fi else url="https://packages-dev.wazuh.com/${repository}/ui/dashboard/wazuh-${version}-${revision}.zip" fi From 070166e71dbc3e1502b77b196d9cde55858cc8e3 Mon Sep 17 00:00:00 2001 From: Carlos Bordon <64099752+c-bordon@users.noreply.github.com> Date: Mon, 23 Jan 2023 09:01:52 -0300 Subject: [PATCH 105/316] Updated loading page message (#2058) --- stack/dashboard/base/files/etc/template.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/dashboard/base/files/etc/template.js b/stack/dashboard/base/files/etc/template.js index b9d9c1f954..983ce71bc1 100644 --- a/stack/dashboard/base/files/etc/template.js +++ b/stack/dashboard/base/files/etc/template.js @@ -255,7 +255,7 @@ const Template = ({ defaultMessage: `${injectedMetadata.branding.applicationTitle} did not load properly. Check the server output for more information.` }) }, i18n('core.ui.welcomeMessage', { - defaultMessage: `Loading ${injectedMetadata.branding.applicationTitle}` + defaultMessage: `Loading ...` })), renderBrandingEnabledOrDisabledLoadingBar())), /*#__PURE__*/_react.default.createElement("div", { className: "osdWelcomeView", id: "osd_legacy_browser_error", From 3fd0c7d06abdfad81ad6b89ad690bcd6d37ad0a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 23 Jan 2023 14:07:53 +0100 Subject: [PATCH 106/316] Update master with 4.4 changes (#2040) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add trust verification if the package is to be signed. * Updating TRUST_VERIFICATION variable * Bump indexer RPM to 2.4.0 * Bump Debian 4.4.0 indexer to 2.4.0 * Changed Opensearch version for dashboard * Fixed dh_strip error * Removed bash for alpine package * Removed new plugins * Removed commented files * Removed remove of notification plugin * Added support for Opensearch 2.4.0 * Added support to Openseach dashboards 2.4.1 * Change wazuh-clusterd to clusterd.py * Add break to test * Extend error ignore to 4.4 version * Remove variable of system arquitecture * Add flag to define a custom CA_NAME. * Removed header and testing replace of opensearch logo from home icon * Replaced OpenSearch Logo from Home icon * Added a final space * Testing stoping wazuh manager in provision.sh * The order of the stop services is rearranged * Revert ordering * Same order for all the calls to the opensearch security plugin Signed-off-by: Miguel Verdaguer Velázquez * Add condition to the creation of backup in passwords_changePassword Signed-off-by: Miguel Verdaguer Velázquez * Fix conditions for changes Signed-off-by: Miguel Verdaguer Velázquez * Change condition Signed-off-by: Miguel Verdaguer Velázquez * Remove unnecessary call to changePasswords and fix conditions to create indexer passwords backup Signed-off-by: Miguel Verdaguer Velázquez * Add variable nobackup to avoid creating the indexer backup when runSecurityAdmin is not going to be run Signed-off-by: Miguel Verdaguer Velázquez * Change variable name Signed-off-by: Miguel Verdaguer Velázquez * Increase the TimeOut start seconds on the Wazuh indexer service Signed-off-by: Miguel Verdaguer Velázquez * Create backup before changing password Signed-off-by: Miguel Verdaguer Velázquez Co-authored-by: Dwordcito Co-authored-by: pereyra-m Co-authored-by: José Fernández Co-authored-by: c-bordon Co-authored-by: DFolchA Co-authored-by: Alberto Rodríguez Co-authored-by: fcaffieri From 163d3b65402d0cb5a58f94288da44430f6e7eab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 23 Jan 2023 17:14:17 +0100 Subject: [PATCH 107/316] Fixes to github actions tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../test-enable-rhel9-derivatives/install_and_test_agent.sh | 2 +- .../test-enable-rhel9-derivatives/install_and_test_manager.sh | 2 +- .github/workflows/test-enable-alma9-agent.yml | 2 +- .github/workflows/test-enable-rhel9-agent.yml | 2 +- .github/workflows/test-enable-rhel9-manager.yml | 2 +- .github/workflows/test-enable-rocky9-agent.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/test-enable-rhel9-derivatives/install_and_test_agent.sh b/.github/actions/test-enable-rhel9-derivatives/install_and_test_agent.sh index 2239dfc495..e403e3f960 100644 --- a/.github/actions/test-enable-rhel9-derivatives/install_and_test_agent.sh +++ b/.github/actions/test-enable-rhel9-derivatives/install_and_test_agent.sh @@ -1,7 +1,7 @@ #!/bin/bash echo "Installing Wazuh Agent." -yum install -y $PACKAGE_NAME +yum install -y "/packages/$1" echo "Enabling Wazuh Agent." systemctl enable wazuh-agent diff --git a/.github/actions/test-enable-rhel9-derivatives/install_and_test_manager.sh b/.github/actions/test-enable-rhel9-derivatives/install_and_test_manager.sh index 36af2b0ba2..d6bd719a87 100644 --- a/.github/actions/test-enable-rhel9-derivatives/install_and_test_manager.sh +++ b/.github/actions/test-enable-rhel9-derivatives/install_and_test_manager.sh @@ -1,7 +1,7 @@ #!/bin/bash echo "Installing Wazuh Manager." -yum install -y $PACKAGE_NAME +yum install -y "/packages/$1" echo "Enabling Wazuh Agent." systemctl enable wazuh-manager diff --git a/.github/workflows/test-enable-alma9-agent.yml b/.github/workflows/test-enable-alma9-agent.yml index e701155da4..8d62ff8aba 100644 --- a/.github/workflows/test-enable-alma9-agent.yml +++ b/.github/workflows/test-enable-alma9-agent.yml @@ -25,4 +25,4 @@ jobs: sudo cp ./output/$PACKAGE_NAME $GITHUB_WORKSPACE/packages/$PACKAGE_NAME - name: Launch docker - run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel9-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages almalinux:9.1 bash /tests/install-and-test-agent.sh + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel9-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages almalinux:9.1 bash /tests/install_and_test_agent.sh $PACKAGE_NAME diff --git a/.github/workflows/test-enable-rhel9-agent.yml b/.github/workflows/test-enable-rhel9-agent.yml index 10d3aaebd7..d54740e256 100644 --- a/.github/workflows/test-enable-rhel9-agent.yml +++ b/.github/workflows/test-enable-rhel9-agent.yml @@ -25,4 +25,4 @@ jobs: sudo cp ./output/$PACKAGE_NAME $GITHUB_WORKSPACE/packages/$PACKAGE_NAME - name: Launch docker - run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel9-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages redhat/ubi9 bash /tests/install-and-test-agent.sh + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel9-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages redhat/ubi9 bash /tests/install_and_test_agent.sh $PACKAGE_NAME diff --git a/.github/workflows/test-enable-rhel9-manager.yml b/.github/workflows/test-enable-rhel9-manager.yml index 5617901e52..71f7304c3c 100644 --- a/.github/workflows/test-enable-rhel9-manager.yml +++ b/.github/workflows/test-enable-rhel9-manager.yml @@ -25,4 +25,4 @@ jobs: sudo cp ./output/$PACKAGE_NAME $GITHUB_WORKSPACE/packages/$PACKAGE_NAME - name: Launch docker - run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel9-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages redhat/ubi9-init bash /tests/install-and-test-manager.sh + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel9-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages redhat/ubi9-init bash /tests/install_and_test_manager.sh $PACKAGE_NAME diff --git a/.github/workflows/test-enable-rocky9-agent.yml b/.github/workflows/test-enable-rocky9-agent.yml index a3ee925101..07471dc381 100644 --- a/.github/workflows/test-enable-rocky9-agent.yml +++ b/.github/workflows/test-enable-rocky9-agent.yml @@ -25,4 +25,4 @@ jobs: sudo cp ./output/$PACKAGE_NAME $GITHUB_WORKSPACE/packages/$PACKAGE_NAME - name: Launch docker - run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel9-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages rockylinux:9 bash /tests/install-and-test-agent.sh + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel9-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages rockylinux:9 bash /tests/install_and_test_agent.sh $PACKAGE_NAME From f68ffc13c8015bfe3e83508b424189797fa2cbdc Mon Sep 17 00:00:00 2001 From: DFolchA Date: Mon, 23 Jan 2023 17:40:24 +0100 Subject: [PATCH 108/316] Make the user introduce the admin password to upgrade indexer --- .../install_functions/indexer.sh | 25 ++++++++++++++----- .../install_functions/installMain.sh | 3 ++- .../install_functions/upgrade.sh | 6 ++--- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/unattended_installer/install_functions/indexer.sh b/unattended_installer/install_functions/indexer.sh index 37083109b7..bc494979ad 100644 --- a/unattended_installer/install_functions/indexer.sh +++ b/unattended_installer/install_functions/indexer.sh @@ -108,11 +108,17 @@ function indexer_copyCertificates() { } -function indexert_disableShardAllocation() { +function indexer_disableShardAllocation() { common_logger "Disabling shard allocation." - installCommon_getPass "admin" - eval "curl -XPUT https:127.0.0.1:9200/_cluster/settings -H 'Content-Type: application/json' -d '{\"persistent\": {\"cluster.routing.allocation.enable\": \"primaries\"}}' -uadmin:${u_pass} -k --silent ${debug}" + + if [ -z "indexer_admin_pass" ]; then + common_logger -e "Could not disable shard allocation. Admin password not found." + exit 1 + fi + + eval "curl -XPUT https://127.0.0.1:9200/_cluster/settings -H 'Content-Type: application/json' -d '{\"persistent\": {\"cluster.routing.allocation.enable\": \"primaries\"}}' -uadmin:${indexer_admin_pass} -k --silent ${debug}" + if [ "${PIPESTATUS[0]}" != 0 ]; then common_logger -e "Shard allocation could not be disabled." exit 1 @@ -120,14 +126,21 @@ function indexert_disableShardAllocation() { common_logger "Shard allocation disabled." fi - eval "curl -X POST https:127.0.0.1:9200/_flush/synced -uadmin:${u_pass} -k --silent ${debug}" + eval "curl -X POST https://127.0.0.1:9200/_flush/synced -uadmin:${u_pass} -k --silent ${debug}" + + if [ "${PIPESTATUS[0]}" != 0 ]; then + common_logger -e "Could not flush synced." + exit 1 + fi } -function indexert_enableShardAllocation() { +function indexer_enableShardAllocation() { common_logger "Enabling shard allocation." - eval "curl -XPUT https:127.0.0.1:9200/_cluster/settings -H 'Content-Type: application/json' -d '{\"persistent\": {\"cluster.routing.allocation.enable\": \"all\"}}' -uadmin:${u_pass} -k --silent ${debug}" + + eval "curl -XPUT https://127.0.0.1:9200/_cluster/settings -H 'Content-Type: application/json' -d '{\"persistent\": {\"cluster.routing.allocation.enable\": \"all\"}}' -uadmin:${indexer_admin_pass} -k --silent ${debug}" + if [ "${PIPESTATUS[0]}" != 0 ]; then common_logger -e "Shard allocation could not be enabled." exit 1 diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index d747b7377e..f10e367f8b 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -134,7 +134,8 @@ function main() { ;; "-up"|"--upgrade") upgrade=1 - shift 1 + indexer_admin_pass="${2}" + shift 2 ;; "-v"|"--verbose") debugEnabled=1 diff --git a/unattended_installer/install_functions/upgrade.sh b/unattended_installer/install_functions/upgrade.sh index e493c16b78..18b8725559 100644 --- a/unattended_installer/install_functions/upgrade.sh +++ b/unattended_installer/install_functions/upgrade.sh @@ -35,7 +35,7 @@ function upgrade_getUpgradable { if [ -n "${indexer_installed}" ]; then if [ "${sys_type}" == "yum" ]; then - indexer_upgradable=$(yum list wazuh-indexer --showduplicates | tail -n +8 | grep -A 5000 ${wazuh_installed} | tail -n +2 | grep ${wazuh_version}) + indexer_upgradable=$(yum list wazuh-indexer --showduplicates | tail -n +8 | grep -A 5000 ${indexer_installed} | tail -n +2 | grep ${wazuh_version}) elif [ "${sys_type}" == "apt-get" ]; then indexer_upgradable=$(apt-get install wazuh-indexer=${wazuh_version}-* --dry-run |grep "The following packages will be upgraded:") fi @@ -86,9 +86,9 @@ function upgrade_upgradeInstalled(){ if [ -n "${indexer_installed}" ]; then if [ -n "${indexer_upgradable}" ]; then common_logger "Upgrading Wazuh Indexer to ${wazuh_version}" - indexert_disableShardAllocation + indexer_disableShardAllocation eval "indexer_install ${debug}" - indexert_enableShardAllocation + indexer_enableShardAllocation installCommon_startService "wazuh-indexer" else common_logger -w "Wazuh Indexer is already installed and the version is equal or greater than ${wazuh_version}." From ef4db24d8a9fbe647ab0b7645bb40156ca97a75f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 24 Jan 2023 12:45:21 +0100 Subject: [PATCH 109/316] Add workflow to create rpm packages for all architectures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/create-rpm-packages.yml | 64 +++++++++++++++++++ .github/workflows/test-enable-alma9-agent.yml | 28 -------- .github/workflows/test-enable-rhel9-agent.yml | 28 -------- .../workflows/test-enable-rhel9-manager.yml | 28 -------- .../workflows/test-enable-rocky9-agent.yml | 28 -------- 5 files changed, 64 insertions(+), 112 deletions(-) create mode 100644 .github/workflows/create-rpm-packages.yml delete mode 100644 .github/workflows/test-enable-alma9-agent.yml delete mode 100644 .github/workflows/test-enable-rhel9-agent.yml delete mode 100644 .github/workflows/test-enable-rhel9-manager.yml delete mode 100644 .github/workflows/test-enable-rocky9-agent.yml diff --git a/.github/workflows/create-rpm-packages.yml b/.github/workflows/create-rpm-packages.yml new file mode 100644 index 0000000000..c5c10bb584 --- /dev/null +++ b/.github/workflows/create-rpm-packages.yml @@ -0,0 +1,64 @@ +name: Build Wazuh Packages - RPM - All architectures +on: + pull_request: + paths: + - 'rpms/SPECS/*' + - 'rpms/generate_rpm_package.sh' + - 'rpms/build.sh' + workflow_dispatch: + +jobs: + Wazuh-agent-rpm-package-builds-aarch64-armv7-ppc64le: + runs-on: ubuntu-latest + strategy: + matrix: + type: [agent, manager] + arch : [aarch64, armv7] + distro: [ubuntu18.04] + include: + - arch: ppc64le + distro: alpine_latest + type: agent + - arch: ppc64le + distro: alpine_latest + type: manager + steps: + - uses: actions/checkout@v3 + + - uses: uraimo/run-on-arch-action@v2 + name: Build the ${{ matrix.arch }} rpm Wazuh ${{ matrix.type }} package + working-directory: ./rpms + with: + arch: ${{ matrix.arch }} + distro: ${{ matrix.distro }} + githubToken: ${{ github.token }} + run: | + bash generate_rpm_package.sh -b master -t ${{ matrix.type }} -a ${{ matrix.arch }} --dev + echo "PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV + + - name: Upload Wazuh ${{ matrix.type }} ${{ matrix.arch }} package as artifact + uses: actions/upload-artifact@v2 + with: + name: $PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }} + path: ./rpms/output/$PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }} + + Wazuh-agent-rpm-package-builds-x86_64-i386: + runs-on: ubuntu-latest + strategy: + matrix: + type: [agent, manager] + arch : [x86_64, i386] + steps: + - uses: actions/checkout@v3 + + - name: Build the ${{ matrix.arch }} rpm Wazuh ${{ matrix.type }} package + working-directory: ./rpms + run: | + bash generate_rpm_package.sh -b master -t ${{ matrix.type }} -a ${{ matrix.arch }} --dev + echo "PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV + + - name: Upload Wazuh ${{ matrix.type }} ${{ matrix.arch }} package as artifact + uses: actions/upload-artifact@v2 + with: + name: $PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }} + path: ./rpms/output/$PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }} \ No newline at end of file diff --git a/.github/workflows/test-enable-alma9-agent.yml b/.github/workflows/test-enable-alma9-agent.yml deleted file mode 100644 index 8d62ff8aba..0000000000 --- a/.github/workflows/test-enable-alma9-agent.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Test the enabling of the Wazuh agent - AlmaLinux 9 - RPM -on: - pull_request: - paths: - - 'rpms/SPECS/*' - - 'rpms/generate_rpm_package.sh' - - 'rpms/build.sh' - workflow_dispatch: - -jobs: - Test-enable-wazuh-agent-alma9: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Build the Wazuh agent package - working-directory: ./rpms - run: | - bash generate_rpm_package.sh -b master -t agent -a x86_64 --dev - echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - - - name: Move the built package - working-directory: ./rpms - run: | - mkdir $GITHUB_WORKSPACE/packages - sudo cp ./output/$PACKAGE_NAME $GITHUB_WORKSPACE/packages/$PACKAGE_NAME - - - name: Launch docker - run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel9-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages almalinux:9.1 bash /tests/install_and_test_agent.sh $PACKAGE_NAME diff --git a/.github/workflows/test-enable-rhel9-agent.yml b/.github/workflows/test-enable-rhel9-agent.yml deleted file mode 100644 index d54740e256..0000000000 --- a/.github/workflows/test-enable-rhel9-agent.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Test the enabling of the Wazuh agent - Red Hat Enterprise Linux 9 - RPM -on: - pull_request: - paths: - - 'rpms/SPECS/*' - - 'rpms/generate_rpm_package.sh' - - 'rpms/build.sh' - workflow_dispatch: - -jobs: - Test-enable-wazuh-agent-rhel9: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Build the Wazuh agent package - working-directory: ./rpms - run: | - bash generate_rpm_package.sh -b master -t agent -a x86_64 --dev - echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - - - name: Move the built package - working-directory: ./rpms - run: | - mkdir $GITHUB_WORKSPACE/packages - sudo cp ./output/$PACKAGE_NAME $GITHUB_WORKSPACE/packages/$PACKAGE_NAME - - - name: Launch docker - run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel9-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages redhat/ubi9 bash /tests/install_and_test_agent.sh $PACKAGE_NAME diff --git a/.github/workflows/test-enable-rhel9-manager.yml b/.github/workflows/test-enable-rhel9-manager.yml deleted file mode 100644 index 71f7304c3c..0000000000 --- a/.github/workflows/test-enable-rhel9-manager.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Test the enabling of the Wazuh manager - Red Hat Enterprise Linux 9 - RPM -on: - pull_request: - paths: - - 'rpms/SPECS/*' - - 'rpms/generate_rpm_package.sh' - - 'rpms/build.sh' - workflow_dispatch: - -jobs: - Test-enable-wazuh-manager-rhel9: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Build the Wazuh agent package - working-directory: ./rpms - run: | - bash generate_rpm_package.sh -b master -t manager -a x86_64 --dev - echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - - - name: Move the built package - working-directory: ./rpms - run: | - mkdir $GITHUB_WORKSPACE/packages - sudo cp ./output/$PACKAGE_NAME $GITHUB_WORKSPACE/packages/$PACKAGE_NAME - - - name: Launch docker - run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel9-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages redhat/ubi9-init bash /tests/install_and_test_manager.sh $PACKAGE_NAME diff --git a/.github/workflows/test-enable-rocky9-agent.yml b/.github/workflows/test-enable-rocky9-agent.yml deleted file mode 100644 index 07471dc381..0000000000 --- a/.github/workflows/test-enable-rocky9-agent.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Test the enabling of the Wazuh agent - Rocky Linux 9 - RPM -on: - pull_request: - paths: - - 'rpms/SPECS/*' - - 'rpms/generate_rpm_package.sh' - - 'rpms/build.sh' - workflow_dispatch: - -jobs: - Test-enable-wazuh-agent-rocky9: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Build the Wazuh agent package - working-directory: ./rpms - run: | - bash generate_rpm_package.sh -b master -t agent -a x86_64 --dev - echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - - - name: Move the built package - working-directory: ./rpms - run: | - mkdir $GITHUB_WORKSPACE/packages - sudo cp ./output/$PACKAGE_NAME $GITHUB_WORKSPACE/packages/$PACKAGE_NAME - - - name: Launch docker - run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-enable-rhel9-derivatives/:/tests -v $GITHUB_WORKSPACE/packages/:/packages rockylinux:9 bash /tests/install_and_test_agent.sh $PACKAGE_NAME From 752f5cc9d19fc9f14e18ead7f457ac06f5762692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 24 Jan 2023 13:58:34 +0100 Subject: [PATCH 110/316] Change working directory position on package creation workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/create-rpm-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-rpm-packages.yml b/.github/workflows/create-rpm-packages.yml index c5c10bb584..d151935164 100644 --- a/.github/workflows/create-rpm-packages.yml +++ b/.github/workflows/create-rpm-packages.yml @@ -27,11 +27,11 @@ jobs: - uses: uraimo/run-on-arch-action@v2 name: Build the ${{ matrix.arch }} rpm Wazuh ${{ matrix.type }} package - working-directory: ./rpms with: arch: ${{ matrix.arch }} distro: ${{ matrix.distro }} githubToken: ${{ github.token }} + working-directory: ./rpms run: | bash generate_rpm_package.sh -b master -t ${{ matrix.type }} -a ${{ matrix.arch }} --dev echo "PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV From 3861d8a44e9bcc155916bd23d98eb014f4a96925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 24 Jan 2023 14:41:29 +0100 Subject: [PATCH 111/316] Unify install and enable tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../install_and_test_agent.sh | 14 ------- .../install_and_test_manager.sh | 14 ------- .../test-install-enable/install_and_enable.sh | 21 ++++++++++ .../workflows/test-install-and-enable-rpm.yml | 41 +++++++++++++++++++ 4 files changed, 62 insertions(+), 28 deletions(-) delete mode 100644 .github/actions/test-enable-rhel9-derivatives/install_and_test_agent.sh delete mode 100644 .github/actions/test-enable-rhel9-derivatives/install_and_test_manager.sh create mode 100644 .github/actions/test-install-enable/install_and_enable.sh create mode 100644 .github/workflows/test-install-and-enable-rpm.yml diff --git a/.github/actions/test-enable-rhel9-derivatives/install_and_test_agent.sh b/.github/actions/test-enable-rhel9-derivatives/install_and_test_agent.sh deleted file mode 100644 index e403e3f960..0000000000 --- a/.github/actions/test-enable-rhel9-derivatives/install_and_test_agent.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -echo "Installing Wazuh Agent." -yum install -y "/packages/$1" - -echo "Enabling Wazuh Agent." -systemctl enable wazuh-agent -if [ "$?" -eq 0 ]; then - echo "Wazuh agent enabled - Test passed correctly." - exit 0 -else - echo "Error: Wazuh agent not enabled." - exit 1 -fi \ No newline at end of file diff --git a/.github/actions/test-enable-rhel9-derivatives/install_and_test_manager.sh b/.github/actions/test-enable-rhel9-derivatives/install_and_test_manager.sh deleted file mode 100644 index d6bd719a87..0000000000 --- a/.github/actions/test-enable-rhel9-derivatives/install_and_test_manager.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -echo "Installing Wazuh Manager." -yum install -y "/packages/$1" - -echo "Enabling Wazuh Agent." -systemctl enable wazuh-manager -if [ "$?" -eq 0 ]; then - echo "Wazuh agent enabled - Test passed correctly." - exit 0 -else - echo "Error: Wazuh agent not enabled." - exit 1 -fi \ No newline at end of file diff --git a/.github/actions/test-install-enable/install_and_enable.sh b/.github/actions/test-install-enable/install_and_enable.sh new file mode 100644 index 0000000000..5753e9d6fe --- /dev/null +++ b/.github/actions/test-install-enable/install_and_enable.sh @@ -0,0 +1,21 @@ +#!/bin/bash +set -x +ls -la /packages +echo "Installing Wazuh $2." +source /etc/os-release +if [ "$ID" = "centos" ] && [ "$VERSION_ID" = "8" ]; then + find /etc/yum.repos.d/ -type f -exec sed -i 's/mirrorlist/#mirrorlist/g' {} \; + find /etc/yum.repos.d/ -type f -exec sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' {} \; +fi +yum install -y "/packages/$1" + +echo "Enabling Wazuh $2." +systemctl enable wazuh-$2 +if [ "$?" -eq 0 ]; then + echo "Wazuh $2 enabled - Test passed correctly." + exit 0 +else + echo "Error: Wazuh $2 not enabled." + exit 1 +fi +set +x \ No newline at end of file diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml new file mode 100644 index 0000000000..862e3d40ee --- /dev/null +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -0,0 +1,41 @@ +name: Test install and enable Wazuh agent and manager - RPM +on: + pull_request: + paths: + - 'rpms/SPECS/*' + - 'rpms/generate_rpm_package.sh' + - 'rpms/build.sh' + workflow_dispatch: + +jobs: + Test-install-and-enable-rpm-systems: + runs-on: ubuntu-latest + strategy: + matrix: + distro: [almalinux:9.1, oraclelinux:9, rockylinux:9.1, centos:7, centos:8, redhat/ubi8, redhat/ubi9] + type: [agent, manager] + exclude: + - distro: almalinux:9.1 + type: manager + - distro: oraclelinux:9 + type: manager + - distro: rockylinux:9.1 + type: manager + - distro: centos:9 + type: manager + steps: + - uses: actions/checkout@v3 + + - name: Setup directories and variables + run: | + mkdir $GITHUB_WORKSPACE/packages + echo 'PACKAGE_NAME=wazuh-${{ matrix.type }}-4.4.0-1.x86_64.rpm' >> $GITHUB_ENV + + - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro }} + working-directory: ./rpms + run: | + curl -o $PACKAGE_NAME https://packages-dev.wazuh.com/pre-release/yum/$PACKAGE_NAME + mv $PACKAGE_NAME $GITHUB_WORKSPACE/packages + + - name: Launch docker + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.distro }} bash /tests/install_and_enable.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file From c85eb2ce079def907e83be7b1506d84891dc6c5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 24 Jan 2023 14:42:24 +0100 Subject: [PATCH 112/316] Remove working directory in package creation workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/create-rpm-packages.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/create-rpm-packages.yml b/.github/workflows/create-rpm-packages.yml index d151935164..ea23bae456 100644 --- a/.github/workflows/create-rpm-packages.yml +++ b/.github/workflows/create-rpm-packages.yml @@ -31,9 +31,8 @@ jobs: arch: ${{ matrix.arch }} distro: ${{ matrix.distro }} githubToken: ${{ github.token }} - working-directory: ./rpms run: | - bash generate_rpm_package.sh -b master -t ${{ matrix.type }} -a ${{ matrix.arch }} --dev + bash ./rpms/generate_rpm_package.sh -b master -t ${{ matrix.type }} -a ${{ matrix.arch }} --dev echo "PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - name: Upload Wazuh ${{ matrix.type }} ${{ matrix.arch }} package as artifact From 26c962d368f88b2c9750998fc3840d58a3354ff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 24 Jan 2023 14:56:51 +0100 Subject: [PATCH 113/316] Fixes in install and enable test workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../test-install-enable/install_and_enable.sh | 5 +---- .github/workflows/test-install-and-enable-rpm.yml | 14 +++++++------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/actions/test-install-enable/install_and_enable.sh b/.github/actions/test-install-enable/install_and_enable.sh index 5753e9d6fe..d97cfb83ec 100644 --- a/.github/actions/test-install-enable/install_and_enable.sh +++ b/.github/actions/test-install-enable/install_and_enable.sh @@ -1,6 +1,4 @@ #!/bin/bash -set -x -ls -la /packages echo "Installing Wazuh $2." source /etc/os-release if [ "$ID" = "centos" ] && [ "$VERSION_ID" = "8" ]; then @@ -17,5 +15,4 @@ if [ "$?" -eq 0 ]; then else echo "Error: Wazuh $2 not enabled." exit 1 -fi -set +x \ No newline at end of file +fi \ No newline at end of file diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 862e3d40ee..aff4f0bea5 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -12,16 +12,14 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - distro: [almalinux:9.1, oraclelinux:9, rockylinux:9.1, centos:7, centos:8, redhat/ubi8, redhat/ubi9] - type: [agent, manager] + distro: [ almalinux\:9, oraclelinux\:9, rockylinux\:9, centos\:7, centos\:8, redhat/ubi8, redhat/ubi9] + type: [manager] exclude: - - distro: almalinux:9.1 + - distro: almalinux\:9 type: manager - - distro: oraclelinux:9 + - distro: oraclelinux\:9 type: manager - - distro: rockylinux:9.1 - type: manager - - distro: centos:9 + - distro: rockylinux\:9 type: manager steps: - uses: actions/checkout@v3 @@ -37,5 +35,7 @@ jobs: curl -o $PACKAGE_NAME https://packages-dev.wazuh.com/pre-release/yum/$PACKAGE_NAME mv $PACKAGE_NAME $GITHUB_WORKSPACE/packages + - run: find $GITHUB_WORKSPACE + - name: Launch docker run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.distro }} bash /tests/install_and_enable.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file From 1263c736614fbec674a1833cc5630b8cbfabd484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 24 Jan 2023 15:50:17 +0100 Subject: [PATCH 114/316] Remove `:` from docker images in install and enable test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../workflows/test-install-and-enable-rpm.yml | 43 ++++++++++++++----- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index aff4f0bea5..f5593d2c07 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -12,14 +12,39 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - distro: [ almalinux\:9, oraclelinux\:9, rockylinux\:9, centos\:7, centos\:8, redhat/ubi8, redhat/ubi9] - type: [manager] - exclude: - - distro: almalinux\:9 + include: + - imagename: almalinux + version: 9 + type: agent + - imagename: oraclelinux + version: 9 + type: agent + - imagename: rockylinux + version: 9 + type: agent + - imagename: centos + version: 7 + type: agent + - imagename: centos + version: 7 type: manager - - distro: oraclelinux\:9 + - imagename: centos + version: 8 + type: agent + - imagename: centos + version: 8 type: manager - - distro: rockylinux\:9 + - imagename: redhat/ubi8 + version: latest + type: agent + - imagename: redhat/ubi8 + version: latest + type: manager + - imagename: redhat/ubi9 + version: latest + type: agent + - imagename: redhat/ubi9 + version: latest type: manager steps: - uses: actions/checkout@v3 @@ -29,13 +54,11 @@ jobs: mkdir $GITHUB_WORKSPACE/packages echo 'PACKAGE_NAME=wazuh-${{ matrix.type }}-4.4.0-1.x86_64.rpm' >> $GITHUB_ENV - - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro }} + - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.imagename }}:${{ matrix.version }} working-directory: ./rpms run: | curl -o $PACKAGE_NAME https://packages-dev.wazuh.com/pre-release/yum/$PACKAGE_NAME mv $PACKAGE_NAME $GITHUB_WORKSPACE/packages - - run: find $GITHUB_WORKSPACE - - name: Launch docker - run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.distro }} bash /tests/install_and_enable.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.imagename }}:${{ matrix.version }} bash /tests/install_and_enable.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file From 59c5a9c4c3fc4f4efab5ee13f89e11012598f269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 24 Jan 2023 16:18:39 +0100 Subject: [PATCH 115/316] Disable automatic cancel when one fails MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/create-rpm-packages.yml | 1 + .github/workflows/test-install-and-enable-rpm.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/create-rpm-packages.yml b/.github/workflows/create-rpm-packages.yml index ea23bae456..f00d2b8f56 100644 --- a/.github/workflows/create-rpm-packages.yml +++ b/.github/workflows/create-rpm-packages.yml @@ -22,6 +22,7 @@ jobs: - arch: ppc64le distro: alpine_latest type: manager + fail-fast: false steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index f5593d2c07..27b35fa4ab 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -46,6 +46,7 @@ jobs: - imagename: redhat/ubi9 version: latest type: manager + fail-fast: false steps: - uses: actions/checkout@v3 From ca0619f24cb35109af38f8124868fba0ec55b4db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 24 Jan 2023 16:39:31 +0100 Subject: [PATCH 116/316] Install docker on rare architectures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../common-tools/install_docker_on_ubuntu.sh | 9 +++++++++ .github/workflows/create-rpm-packages.yml | 17 +++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 .github/actions/common-tools/install_docker_on_ubuntu.sh diff --git a/.github/actions/common-tools/install_docker_on_ubuntu.sh b/.github/actions/common-tools/install_docker_on_ubuntu.sh new file mode 100644 index 0000000000..fdd3ce2965 --- /dev/null +++ b/.github/actions/common-tools/install_docker_on_ubuntu.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +apt-get update +apt-get install ca-certificates curl gnupg lsb-release +mkdir -p /etc/apt/keyrings +curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg +echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null +apt-get update +apt-get install -y docker-ce docker-ce-cli containerd.io \ No newline at end of file diff --git a/.github/workflows/create-rpm-packages.yml b/.github/workflows/create-rpm-packages.yml index f00d2b8f56..4ca3622895 100644 --- a/.github/workflows/create-rpm-packages.yml +++ b/.github/workflows/create-rpm-packages.yml @@ -14,26 +14,27 @@ jobs: matrix: type: [agent, manager] arch : [aarch64, armv7] - distro: [ubuntu18.04] - include: - - arch: ppc64le + distro: [ubuntu18.04, alpine_latest] + exclude: + - arch: armv7 distro: alpine_latest - type: agent - - arch: ppc64le + - arch: aarch64 distro: alpine_latest - type: manager + - arch: ppc64le + distro: ubuntu18.04 fail-fast: false steps: - uses: actions/checkout@v3 - - uses: uraimo/run-on-arch-action@v2 + - uses: uraimo/run-on-arch-action@v2.5.0 name: Build the ${{ matrix.arch }} rpm Wazuh ${{ matrix.type }} package with: arch: ${{ matrix.arch }} distro: ${{ matrix.distro }} githubToken: ${{ github.token }} run: | - bash ./rpms/generate_rpm_package.sh -b master -t ${{ matrix.type }} -a ${{ matrix.arch }} --dev + bash $GItHUB_WORKSPACE/.github/actions/common-tools/install_docker_on_ubuntu.sh + bash $GITHUB_WORKSPACE/rpms/generate_rpm_package.sh -b master -t ${{ matrix.type }} -a ${{ matrix.arch }} --dev echo "PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - name: Upload Wazuh ${{ matrix.type }} ${{ matrix.arch }} package as artifact From cec21cbe3b21a418cc0e7b8ee987618624302b40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 24 Jan 2023 16:41:24 +0100 Subject: [PATCH 117/316] Fix variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/create-rpm-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-rpm-packages.yml b/.github/workflows/create-rpm-packages.yml index 4ca3622895..7f47f66bfe 100644 --- a/.github/workflows/create-rpm-packages.yml +++ b/.github/workflows/create-rpm-packages.yml @@ -33,7 +33,7 @@ jobs: distro: ${{ matrix.distro }} githubToken: ${{ github.token }} run: | - bash $GItHUB_WORKSPACE/.github/actions/common-tools/install_docker_on_ubuntu.sh + bash $GITHUB_WORKSPACE/.github/actions/common-tools/install_docker_on_ubuntu.sh bash $GITHUB_WORKSPACE/rpms/generate_rpm_package.sh -b master -t ${{ matrix.type }} -a ${{ matrix.arch }} --dev echo "PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV From a316ac26d3b860bd2f93f33a801e6ba53480bf31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 24 Jan 2023 17:45:32 +0100 Subject: [PATCH 118/316] The package is now downloaded as an artifact from the package creation workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/create-rpm-packages.yml | 10 +++++----- .github/workflows/test-install-and-enable-rpm.yml | 10 +++++++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/create-rpm-packages.yml b/.github/workflows/create-rpm-packages.yml index 7f47f66bfe..87cf247979 100644 --- a/.github/workflows/create-rpm-packages.yml +++ b/.github/workflows/create-rpm-packages.yml @@ -40,8 +40,8 @@ jobs: - name: Upload Wazuh ${{ matrix.type }} ${{ matrix.arch }} package as artifact uses: actions/upload-artifact@v2 with: - name: $PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }} - path: ./rpms/output/$PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }} + name: ${PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}} + path: ./rpms/output/${PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}} Wazuh-agent-rpm-package-builds-x86_64-i386: runs-on: ubuntu-latest @@ -56,10 +56,10 @@ jobs: working-directory: ./rpms run: | bash generate_rpm_package.sh -b master -t ${{ matrix.type }} -a ${{ matrix.arch }} --dev - echo "PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV + echo "{PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}}=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - name: Upload Wazuh ${{ matrix.type }} ${{ matrix.arch }} package as artifact uses: actions/upload-artifact@v2 with: - name: $PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }} - path: ./rpms/output/$PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }} \ No newline at end of file + name: ${PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}} + path: ./rpms/output/${PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}} \ No newline at end of file diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 27b35fa4ab..7b8a30eff8 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -55,10 +55,18 @@ jobs: mkdir $GITHUB_WORKSPACE/packages echo 'PACKAGE_NAME=wazuh-${{ matrix.type }}-4.4.0-1.x86_64.rpm' >> $GITHUB_ENV + - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.imagename }}:${{ matrix.version }} + uses: dawidd6/action-download-artifact@v2 + with: + workflow: create-rpm-packages.yml + workflow_conclusion: success + name: $PACKAGE_NAME + + - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.imagename }}:${{ matrix.version }} working-directory: ./rpms run: | - curl -o $PACKAGE_NAME https://packages-dev.wazuh.com/pre-release/yum/$PACKAGE_NAME + #curl -o $PACKAGE_NAME https://packages-dev.wazuh.com/pre-release/yum/$PACKAGE_NAME mv $PACKAGE_NAME $GITHUB_WORKSPACE/packages - name: Launch docker From 0ad5cb22f6cb126e30659f2e14fa3ee41f3e5f9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 24 Jan 2023 17:45:58 +0100 Subject: [PATCH 119/316] The uploading of the package creation images is automatised in a GitHub Action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../upload-package-creation-images.yml | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .github/workflows/upload-package-creation-images.yml diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml new file mode 100644 index 0000000000..8c87d15916 --- /dev/null +++ b/.github/workflows/upload-package-creation-images.yml @@ -0,0 +1,40 @@ +name: Upload package creation Docker images +on: + pull_request: + paths: + - 'rpms/CentOS/*' + workflow_dispatch: + +jobs: + Upload RPM x86_64 image: + runs-on: ubuntu-latest + strategy: + matrix: + image: [ \ + {CONTAINER_NAME: 'rpm_builder_x86', DOCKERFILE_PATH: '$GITHUB_WORKSPACE/rpms/CentOS/6/x86_64'}, \ + {CONTAINER_NAME: 'rpm_builder_i386', DOCKERFILE_PATH: '$GITHUB_WORKSPACE/rpms/CentOS/6/i386'}, \ + {CONTAINER_NAME: 'rpm_builder_aarch64', DOCKERFILE_PATH: '$GITHUB_WORKSPACE/rpms/CentOS/7/aarch64'}, \ + {CONTAINER_NAME: 'rpm_builder_ppc64le', DOCKERFILE_PATH: '$GITHUB_WORKSPACE/rpms/CentOS/7/ppc64le'}, \ + {CONTAINER_NAME: 'rpm_builder_armv7', DOCKERFILE_PATH: '$GITHUB_WORKSPACE/rpms/CentOS/7/armv7hl'} + ] + steps: + + - uses: actions/checkout@v2 + - uses: dorny/paths-filter@v2 + id: changes + with: + filters: | + src: + - 'src/**' + + # run only if some file in 'src' folder was changed +- if: steps.changes.outputs.src == 'true' + run: ... + - name: Build and push image ${{ image.CONTAINER_NAME }} to GIthub Container Registry + uses: pmorelli92/github-container-registry-build-push@2.0.0 + name: Build and Publish latest service image + with: + github-push-secret: ${{secrets.GITHUB_TOKEN}} + docker-image-name: ${{ image.CONTAINER_NAME }} + docker-image-tag: latest + dockerfile-path: ${{ image.DOCKERFILE_PATH }}/Dockerfile \ No newline at end of file From 4adee7229688898323b0123653c8be2411438f6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 25 Jan 2023 09:39:39 +0100 Subject: [PATCH 120/316] Fixes in upload images workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../workflows/upload-package-creation-images.yml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index 8c87d15916..788d097fa6 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -15,24 +15,14 @@ jobs: {CONTAINER_NAME: 'rpm_builder_i386', DOCKERFILE_PATH: '$GITHUB_WORKSPACE/rpms/CentOS/6/i386'}, \ {CONTAINER_NAME: 'rpm_builder_aarch64', DOCKERFILE_PATH: '$GITHUB_WORKSPACE/rpms/CentOS/7/aarch64'}, \ {CONTAINER_NAME: 'rpm_builder_ppc64le', DOCKERFILE_PATH: '$GITHUB_WORKSPACE/rpms/CentOS/7/ppc64le'}, \ - {CONTAINER_NAME: 'rpm_builder_armv7', DOCKERFILE_PATH: '$GITHUB_WORKSPACE/rpms/CentOS/7/armv7hl'} - ] + {CONTAINER_NAME: 'rpm_builder_armv7', DOCKERFILE_PATH: '$GITHUB_WORKSPACE/rpms/CentOS/7/armv7hl'} ] steps: - - uses: actions/checkout@v2 - - uses: dorny/paths-filter@v2 - id: changes - with: - filters: | - src: - - 'src/**' # run only if some file in 'src' folder was changed -- if: steps.changes.outputs.src == 'true' - run: ... - - name: Build and push image ${{ image.CONTAINER_NAME }} to GIthub Container Registry + - if: steps.changes.outputs.src == 'true' + name: Build and push image ${{ image.CONTAINER_NAME }} to GIthub Container Registry uses: pmorelli92/github-container-registry-build-push@2.0.0 - name: Build and Publish latest service image with: github-push-secret: ${{secrets.GITHUB_TOKEN}} docker-image-name: ${{ image.CONTAINER_NAME }} From 34e79d291e6b86b0b7155ef1552baafd0ff81a02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 25 Jan 2023 09:45:04 +0100 Subject: [PATCH 121/316] Change file name for build packages workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../{create-rpm-packages.yml => build-rpm-packages.yml} | 1 + 1 file changed, 1 insertion(+) rename .github/workflows/{create-rpm-packages.yml => build-rpm-packages.yml} (99%) diff --git a/.github/workflows/create-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml similarity index 99% rename from .github/workflows/create-rpm-packages.yml rename to .github/workflows/build-rpm-packages.yml index 87cf247979..7bb57cd24b 100644 --- a/.github/workflows/create-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -49,6 +49,7 @@ jobs: matrix: type: [agent, manager] arch : [x86_64, i386] + fail-fast: false steps: - uses: actions/checkout@v3 From c42c420a30033921ffdbf7b0b27e95403997d7e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 25 Jan 2023 09:45:25 +0100 Subject: [PATCH 122/316] More syntax fixes in upload images workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-package-creation-images.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index 788d097fa6..3442091818 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -10,12 +10,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - image: [ \ - {CONTAINER_NAME: 'rpm_builder_x86', DOCKERFILE_PATH: '$GITHUB_WORKSPACE/rpms/CentOS/6/x86_64'}, \ - {CONTAINER_NAME: 'rpm_builder_i386', DOCKERFILE_PATH: '$GITHUB_WORKSPACE/rpms/CentOS/6/i386'}, \ - {CONTAINER_NAME: 'rpm_builder_aarch64', DOCKERFILE_PATH: '$GITHUB_WORKSPACE/rpms/CentOS/7/aarch64'}, \ - {CONTAINER_NAME: 'rpm_builder_ppc64le', DOCKERFILE_PATH: '$GITHUB_WORKSPACE/rpms/CentOS/7/ppc64le'}, \ - {CONTAINER_NAME: 'rpm_builder_armv7', DOCKERFILE_PATH: '$GITHUB_WORKSPACE/rpms/CentOS/7/armv7hl'} ] + image: [ {CONTAINER_NAME: rpm_builder_x86, DOCKERFILE_PATH: $GITHUB_WORKSPACE/rpms/CentOS/6/x86_64}, {CONTAINER_NAME: rpm_builder_i386, DOCKERFILE_PATH: $GITHUB_WORKSPACE/rpms/CentOS/6/i386}, {CONTAINER_NAME: rpm_builder_aarch64, DOCKERFILE_PATH: $GITHUB_WORKSPACE/rpms/CentOS/7/aarch64}, {CONTAINER_NAME: rpm_builder_ppc64le, DOCKERFILE_PATH: $GITHUB_WORKSPACE/rpms/CentOS/7/ppc64le}, {CONTAINER_NAME: rpm_builder_armv7, DOCKERFILE_PATH: $GITHUB_WORKSPACE/rpms/CentOS/7/armv7hl} ] + fail-fast: false steps: - uses: actions/checkout@v2 From fa93d78ffb819c975eb5f9603d818c612a764f83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 25 Jan 2023 09:53:20 +0100 Subject: [PATCH 123/316] Run upload images worflow when changed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-package-creation-images.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index 3442091818..c71baec10c 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -3,6 +3,7 @@ on: pull_request: paths: - 'rpms/CentOS/*' + - '.github/workflows/upload-package-creation-images.yml' workflow_dispatch: jobs: From 40c5e745f1d208fdcfc039ede540381ab7196e2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 25 Jan 2023 10:11:46 +0100 Subject: [PATCH 124/316] More syntax fixes for upload images workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-package-creation-images.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index c71baec10c..5791a85358 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -7,7 +7,7 @@ on: workflow_dispatch: jobs: - Upload RPM x86_64 image: + Upload-RPM-x86_64-image: runs-on: ubuntu-latest strategy: matrix: @@ -16,12 +16,10 @@ jobs: steps: - uses: actions/checkout@v2 - # run only if some file in 'src' folder was changed - - if: steps.changes.outputs.src == 'true' - name: Build and push image ${{ image.CONTAINER_NAME }} to GIthub Container Registry + - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} to Github Container Registry uses: pmorelli92/github-container-registry-build-push@2.0.0 with: github-push-secret: ${{secrets.GITHUB_TOKEN}} - docker-image-name: ${{ image.CONTAINER_NAME }} + docker-image-name: ${{ matrix.image.CONTAINER_NAME }} docker-image-tag: latest - dockerfile-path: ${{ image.DOCKERFILE_PATH }}/Dockerfile \ No newline at end of file + dockerfile-path: ${{ matrix.image.DOCKERFILE_PATH }}/Dockerfile \ No newline at end of file From fc001069f4e75fa75b0b317c2720614587cd4fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 25 Jan 2023 10:43:24 +0100 Subject: [PATCH 125/316] Change path for dockerfile in upload image workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-package-creation-images.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index 5791a85358..fec5b5710c 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -2,8 +2,13 @@ name: Upload package creation Docker images on: pull_request: paths: - - 'rpms/CentOS/*' - '.github/workflows/upload-package-creation-images.yml' + push: + branches: + - master + - 4.4 + paths: + - './rpms/CentOS/*' workflow_dispatch: jobs: @@ -11,7 +16,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - image: [ {CONTAINER_NAME: rpm_builder_x86, DOCKERFILE_PATH: $GITHUB_WORKSPACE/rpms/CentOS/6/x86_64}, {CONTAINER_NAME: rpm_builder_i386, DOCKERFILE_PATH: $GITHUB_WORKSPACE/rpms/CentOS/6/i386}, {CONTAINER_NAME: rpm_builder_aarch64, DOCKERFILE_PATH: $GITHUB_WORKSPACE/rpms/CentOS/7/aarch64}, {CONTAINER_NAME: rpm_builder_ppc64le, DOCKERFILE_PATH: $GITHUB_WORKSPACE/rpms/CentOS/7/ppc64le}, {CONTAINER_NAME: rpm_builder_armv7, DOCKERFILE_PATH: $GITHUB_WORKSPACE/rpms/CentOS/7/armv7hl} ] + image: [ {CONTAINER_NAME: rpm_builder_x86, DOCKERFILE_PATH: /rpms/CentOS/6/x86_64}, {CONTAINER_NAME: rpm_builder_i386, DOCKERFILE_PATH: /rpms/CentOS/6/i386}, {CONTAINER_NAME: rpm_builder_aarch64, DOCKERFILE_PATH: /rpms/CentOS/7/aarch64}, {CONTAINER_NAME: rpm_builder_ppc64le, DOCKERFILE_PATH: /rpms/CentOS/7/ppc64le}, {CONTAINER_NAME: rpm_builder_armv7, DOCKERFILE_PATH: /rpms/CentOS/7/armv7hl} ] fail-fast: false steps: - uses: actions/checkout@v2 @@ -22,4 +27,4 @@ jobs: github-push-secret: ${{secrets.GITHUB_TOKEN}} docker-image-name: ${{ matrix.image.CONTAINER_NAME }} docker-image-tag: latest - dockerfile-path: ${{ matrix.image.DOCKERFILE_PATH }}/Dockerfile \ No newline at end of file + dockerfile-path: $GITHUB_WORKSPACE/${{ matrix.image.DOCKERFILE_PATH }}/Dockerfile \ No newline at end of file From 6a2552b5ec38f696c13c76af885e56ba3899189a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 25 Jan 2023 11:05:03 +0100 Subject: [PATCH 126/316] Remove unnecessary slash in path for Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-package-creation-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index fec5b5710c..4737409c36 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -27,4 +27,4 @@ jobs: github-push-secret: ${{secrets.GITHUB_TOKEN}} docker-image-name: ${{ matrix.image.CONTAINER_NAME }} docker-image-tag: latest - dockerfile-path: $GITHUB_WORKSPACE/${{ matrix.image.DOCKERFILE_PATH }}/Dockerfile \ No newline at end of file + dockerfile-path: $GITHUB_WORKSPACE${{ matrix.image.DOCKERFILE_PATH }}/Dockerfile \ No newline at end of file From 7d4e0568e4ca69cc1a770664878edfab52c46422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 25 Jan 2023 11:05:24 +0100 Subject: [PATCH 127/316] Add cancel of last runs for test install MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-rpm.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 7b8a30eff8..efea81a784 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -8,6 +8,15 @@ on: workflow_dispatch: jobs: + Cancel-previous-runs: + name: 'Cancel Previous Runs' + runs-on: ubuntu-latest + timeout-minutes: 3 + steps: + - uses: styfle/cancel-workflow-action + with: + workflow_id: ${{ github.run_id }} + Test-install-and-enable-rpm-systems: runs-on: ubuntu-latest strategy: From c046b70412e998e6288f9806497b2af8c97cffcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 25 Jan 2023 11:39:24 +0100 Subject: [PATCH 128/316] Fix calls to env variable GITHUB_WORKSPACE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 5 ++--- .github/workflows/upload-package-creation-images.yml | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 7bb57cd24b..c92a455252 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -41,7 +41,7 @@ jobs: uses: actions/upload-artifact@v2 with: name: ${PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}} - path: ./rpms/output/${PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}} + path: ${{github.workspace}}/rpms/output/${PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}} Wazuh-agent-rpm-package-builds-x86_64-i386: runs-on: ubuntu-latest @@ -49,7 +49,6 @@ jobs: matrix: type: [agent, manager] arch : [x86_64, i386] - fail-fast: false steps: - uses: actions/checkout@v3 @@ -63,4 +62,4 @@ jobs: uses: actions/upload-artifact@v2 with: name: ${PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}} - path: ./rpms/output/${PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}} \ No newline at end of file + path: ${{github.workspace}}/rpms/output/${PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}} \ No newline at end of file diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index 4737409c36..81ceb32f49 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -8,7 +8,7 @@ on: - master - 4.4 paths: - - './rpms/CentOS/*' + - 'rpms/CentOS/*' workflow_dispatch: jobs: @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - image: [ {CONTAINER_NAME: rpm_builder_x86, DOCKERFILE_PATH: /rpms/CentOS/6/x86_64}, {CONTAINER_NAME: rpm_builder_i386, DOCKERFILE_PATH: /rpms/CentOS/6/i386}, {CONTAINER_NAME: rpm_builder_aarch64, DOCKERFILE_PATH: /rpms/CentOS/7/aarch64}, {CONTAINER_NAME: rpm_builder_ppc64le, DOCKERFILE_PATH: /rpms/CentOS/7/ppc64le}, {CONTAINER_NAME: rpm_builder_armv7, DOCKERFILE_PATH: /rpms/CentOS/7/armv7hl} ] + image: [ {CONTAINER_NAME: rpm_builder_x86, DOCKERFILE_PATH: rpms/CentOS/6/x86_64}, {CONTAINER_NAME: rpm_builder_i386, DOCKERFILE_PATH: rpms/CentOS/6/i386}, {CONTAINER_NAME: rpm_builder_aarch64, DOCKERFILE_PATH: rpms/CentOS/7/aarch64}, {CONTAINER_NAME: rpm_builder_ppc64le, DOCKERFILE_PATH: rpms/CentOS/7/ppc64le}, {CONTAINER_NAME: rpm_builder_armv7, DOCKERFILE_PATH: rpms/CentOS/7/armv7hl} ] fail-fast: false steps: - uses: actions/checkout@v2 @@ -27,4 +27,4 @@ jobs: github-push-secret: ${{secrets.GITHUB_TOKEN}} docker-image-name: ${{ matrix.image.CONTAINER_NAME }} docker-image-tag: latest - dockerfile-path: $GITHUB_WORKSPACE${{ matrix.image.DOCKERFILE_PATH }}/Dockerfile \ No newline at end of file + dockerfile-path: ${{github.workspace}}/${{ matrix.image.DOCKERFILE_PATH }}/Dockerfile \ No newline at end of file From 54449387b4e382739a7493f841db8120ac3af076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 25 Jan 2023 11:43:33 +0100 Subject: [PATCH 129/316] Remove env variable from dockerfile path for upload package creation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-package-creation-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index 81ceb32f49..22165cead4 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -27,4 +27,4 @@ jobs: github-push-secret: ${{secrets.GITHUB_TOKEN}} docker-image-name: ${{ matrix.image.CONTAINER_NAME }} docker-image-tag: latest - dockerfile-path: ${{github.workspace}}/${{ matrix.image.DOCKERFILE_PATH }}/Dockerfile \ No newline at end of file + dockerfile-path: ./${{ matrix.image.DOCKERFILE_PATH }}/Dockerfile \ No newline at end of file From 9d98190d8c58b5b2d030f9c9f3b3257340f21a86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 25 Jan 2023 11:46:22 +0100 Subject: [PATCH 130/316] Add build context to upload image workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-package-creation-images.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index 22165cead4..a2fe9e4c3d 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -27,4 +27,5 @@ jobs: github-push-secret: ${{secrets.GITHUB_TOKEN}} docker-image-name: ${{ matrix.image.CONTAINER_NAME }} docker-image-tag: latest - dockerfile-path: ./${{ matrix.image.DOCKERFILE_PATH }}/Dockerfile \ No newline at end of file + dockerfile-path: ./${{ matrix.image.DOCKERFILE_PATH }}/Dockerfile + build-context: ./${{ matrix.image.DOCKERFILE_PATH }} \ No newline at end of file From fe289e0f48b67cdf4c7cfefe490217437293f20e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 25 Jan 2023 11:59:51 +0100 Subject: [PATCH 131/316] Change variable for the package name in the building of the package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index c92a455252..4831d24132 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -56,10 +56,10 @@ jobs: working-directory: ./rpms run: | bash generate_rpm_package.sh -b master -t ${{ matrix.type }} -a ${{ matrix.arch }} --dev - echo "{PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}}=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV + echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - name: Upload Wazuh ${{ matrix.type }} ${{ matrix.arch }} package as artifact uses: actions/upload-artifact@v2 with: - name: ${PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}} - path: ${{github.workspace}}/rpms/output/${PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}} \ No newline at end of file + name: ${PACKAGE_NAME} + path: ${{github.workspace}}/rpms/output/${PACKAGE_NAME} \ No newline at end of file From 157cf2e1fadbc6b61dcf3f0baeb2250095509b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 25 Jan 2023 12:00:35 +0100 Subject: [PATCH 132/316] Change container name to include branch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-package-creation-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index a2fe9e4c3d..4f045e6ec1 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -25,7 +25,7 @@ jobs: uses: pmorelli92/github-container-registry-build-push@2.0.0 with: github-push-secret: ${{secrets.GITHUB_TOKEN}} - docker-image-name: ${{ matrix.image.CONTAINER_NAME }} + docker-image-name: ${{ matrix.image.CONTAINER_NAME }}_${{github.branch}} docker-image-tag: latest dockerfile-path: ./${{ matrix.image.DOCKERFILE_PATH }}/Dockerfile build-context: ./${{ matrix.image.DOCKERFILE_PATH }} \ No newline at end of file From 504586f4a36e9334a7a57d74e5f9ee11fda139db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 25 Jan 2023 12:06:13 +0100 Subject: [PATCH 133/316] Change github branch name reference MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-package-creation-images.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index 4f045e6ec1..2d6bf07748 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -21,11 +21,11 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} to Github Container Registry + - name: Build and push image ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} to Github Container Registry uses: pmorelli92/github-container-registry-build-push@2.0.0 with: github-push-secret: ${{secrets.GITHUB_TOKEN}} - docker-image-name: ${{ matrix.image.CONTAINER_NAME }}_${{github.branch}} + docker-image-name: ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} docker-image-tag: latest dockerfile-path: ./${{ matrix.image.DOCKERFILE_PATH }}/Dockerfile build-context: ./${{ matrix.image.DOCKERFILE_PATH }} \ No newline at end of file From 8603bded7d0eae06674c4fda02cbe23da425c520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 25 Jan 2023 13:25:17 +0100 Subject: [PATCH 134/316] Change the building and upload of images to be done with a script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../build_and_push_image_to_ghcr.sh | 33 +++++++++++++++++++ .github/workflows/build-rpm-packages.yml | 2 +- .../upload-package-creation-images.yml | 28 +++++++++++----- 3 files changed, 54 insertions(+), 9 deletions(-) create mode 100644 .github/actions/common-tools/build_and_push_image_to_ghcr.sh diff --git a/.github/actions/common-tools/build_and_push_image_to_ghcr.sh b/.github/actions/common-tools/build_and_push_image_to_ghcr.sh new file mode 100644 index 0000000000..847c22c55a --- /dev/null +++ b/.github/actions/common-tools/build_and_push_image_to_ghcr.sh @@ -0,0 +1,33 @@ +GITHUB_PUSH_SECRET=$1 +DOCKER_IMAGE_NAME=$2 +BUILD_CONTEXT=$3 +DOCKERFILE_PATH="$BUILD_CONTEXT/Dockerfile" +if [ -n "$4" ]; then + DOCKER_IMAGE_TAG=$4 +else + DOCKER_IMAGE_TAG="latest" +fi + + +# Login to GHCR +echo ${GITHUB_PUSH_SECRET} | docker login https://ghcr.io -u "wazuh"--password-stdin + +# GITHUB_REPOSITORY is always org/repo syntax. Get the owner in case it is different than the actor (when working in an org) +GITHUB_REPOSITORY="wazuh/wazuh-packages" +GITHUB_OWNER="wazuh" + +# Set up full image with tag +IMAGE_ID=ghcr.io/${GITHUB_OWNER}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} +IMAGE_ID=$(echo ${IMAGE_ID} | tr '[A-Z]' '[a-z]') + + +# Build image +echo build -t ${IMAGE_ID} -f ${DOCKERFILE_PATH} ${BUILD_CONTEXT} +docker build -t ${IMAGE_ID} -f ${DOCKERFILE_PATH} ${BUILD_CONTEXT} + +# Push image +if [ "$BUILD_ONLY" == "true" ]; then + echo "skipping push" +else + docker push ${IMAGE_ID} +fi \ No newline at end of file diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 4831d24132..b3d4ffd056 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: type: [agent, manager] - arch : [aarch64, armv7] + arch : [aarch64, armv7, ppc64le] distro: [ubuntu18.04, alpine_latest] exclude: - arch: armv7 diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index 2d6bf07748..eeb7dcc6f5 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -12,20 +12,32 @@ on: workflow_dispatch: jobs: - Upload-RPM-x86_64-image: + Upload-RPM-x86_64-i386-images: runs-on: ubuntu-latest strategy: matrix: - image: [ {CONTAINER_NAME: rpm_builder_x86, DOCKERFILE_PATH: rpms/CentOS/6/x86_64}, {CONTAINER_NAME: rpm_builder_i386, DOCKERFILE_PATH: rpms/CentOS/6/i386}, {CONTAINER_NAME: rpm_builder_aarch64, DOCKERFILE_PATH: rpms/CentOS/7/aarch64}, {CONTAINER_NAME: rpm_builder_ppc64le, DOCKERFILE_PATH: rpms/CentOS/7/ppc64le}, {CONTAINER_NAME: rpm_builder_armv7, DOCKERFILE_PATH: rpms/CentOS/7/armv7hl} ] + image: [ {CONTAINER_NAME: rpm_builder_x86, DOCKERFILE_PATH: rpms/CentOS/6/x86_64}, {CONTAINER_NAME: rpm_builder_i386, DOCKERFILE_PATH: rpms/CentOS/6/i386}] fail-fast: false steps: - uses: actions/checkout@v2 - name: Build and push image ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} to Github Container Registry - uses: pmorelli92/github-container-registry-build-push@2.0.0 + run: + bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} ./${{ matrix.image.DOCKERFILE_PATH }} + + Upload-RPM-armv7-ppc64le-aarch64-images: + runs-on: ubuntu-latest + strategy: + matrix: + image: [ {CONTAINER_NAME: rpm_builder_aarch64, DOCKERFILE_PATH: rpms/CentOS/7/aarch64, ARCHITECTURE: aarch64, DISTRO: ubuntu18.04}, {CONTAINER_NAME: rpm_builder_ppc64le, DOCKERFILE_PATH: rpms/CentOS/7/ppc64le, ARCHITECTURE: ppc64le, DISTRO: alpine_latest}, {CONTAINER_NAME: rpm_builder_armv7, DOCKERFILE_PATH: rpms/CentOS/7/armv7hl, ARCHITECTURE: armv7 , DISTRO: ubuntu18.04} ] + fail-fast: false + steps: + - uses: actions/checkout@v2 + + - uses: uraimo/run-on-arch-action@v2.5.0 + name: Build and push image ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} to Github Container Registry with: - github-push-secret: ${{secrets.GITHUB_TOKEN}} - docker-image-name: ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} - docker-image-tag: latest - dockerfile-path: ./${{ matrix.image.DOCKERFILE_PATH }}/Dockerfile - build-context: ./${{ matrix.image.DOCKERFILE_PATH }} \ No newline at end of file + arch: ${{ matrix.image.ARCHITECTURE }} + distro: ${{ matrix.image.DISTRO }} + run: + bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} ./${{ matrix.image.DOCKERFILE_PATH }} From 6eae325a1f8fb894064609689efd2b4f88b141d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 25 Jan 2023 13:31:44 +0100 Subject: [PATCH 135/316] Install docker on rare architecture containers to build image for package creation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-package-creation-images.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index eeb7dcc6f5..4cae8b1770 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -40,4 +40,5 @@ jobs: arch: ${{ matrix.image.ARCHITECTURE }} distro: ${{ matrix.image.DISTRO }} run: + bash $GITHUB_WORKSPACE/.github/actions/common-tools/install_docker_on_ubuntu.sh bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} ./${{ matrix.image.DOCKERFILE_PATH }} From ad260a804d55587fd0666e1f1307437c9c32297f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 25 Jan 2023 13:50:23 +0100 Subject: [PATCH 136/316] Copy build.sh to correct place before building images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-package-creation-images.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index 4cae8b1770..fabf0ed126 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -9,6 +9,7 @@ on: - 4.4 paths: - 'rpms/CentOS/*' + - 'rpms/build.sh' workflow_dispatch: jobs: @@ -23,7 +24,8 @@ jobs: - name: Build and push image ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} to Github Container Registry run: - bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} ./${{ matrix.image.DOCKERFILE_PATH }} + cp $GITHUB_WORKSPACE/rpms/build.sh $GITHUB_WORKSPACE/${{ matrix.image.DOCKERFILE_PATH }} + bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} rpms ${{ matrix.image.DOCKERFILE_PATH }} Upload-RPM-armv7-ppc64le-aarch64-images: runs-on: ubuntu-latest @@ -41,4 +43,5 @@ jobs: distro: ${{ matrix.image.DISTRO }} run: bash $GITHUB_WORKSPACE/.github/actions/common-tools/install_docker_on_ubuntu.sh - bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} ./${{ matrix.image.DOCKERFILE_PATH }} + cp $GITHUB_WORKSPACE/rpms/build.sh $GITHUB_WORKSPACE/${{ matrix.image.DOCKERFILE_PATH }} + bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} ${{ matrix.image.DOCKERFILE_PATH }} From c459080aaa791fdbff45d9d40529626eb9fbb5c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 25 Jan 2023 14:04:05 +0100 Subject: [PATCH 137/316] Separate commands MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-package-creation-images.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index fabf0ed126..f6f96d7c67 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -22,10 +22,13 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Build and push image ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} to Github Container Registry + - name: Copy build.sh before building image run: cp $GITHUB_WORKSPACE/rpms/build.sh $GITHUB_WORKSPACE/${{ matrix.image.DOCKERFILE_PATH }} - bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} rpms ${{ matrix.image.DOCKERFILE_PATH }} + + - name: Build and push image ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} to Github Container Registry + run: + bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} ${{ matrix.image.DOCKERFILE_PATH }} Upload-RPM-armv7-ppc64le-aarch64-images: runs-on: ubuntu-latest From f017bc82b195995c8d372ae3afa058683b07766d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 25 Jan 2023 16:00:29 +0100 Subject: [PATCH 138/316] Separate docker setup scripts for ubuntu and alpine MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/actions/common-tools/setup_docker.sh | 9 +++++++++ .github/actions/common-tools/setup_docker_alpine.sh | 7 +++++++ ...nstall_docker_on_ubuntu.sh => setup_docker_ubuntu.sh} | 4 ++-- .github/workflows/build-rpm-packages.yml | 2 +- .github/workflows/upload-package-creation-images.yml | 4 ++-- 5 files changed, 21 insertions(+), 5 deletions(-) create mode 100755 .github/actions/common-tools/setup_docker.sh create mode 100644 .github/actions/common-tools/setup_docker_alpine.sh rename .github/actions/common-tools/{install_docker_on_ubuntu.sh => setup_docker_ubuntu.sh} (67%) diff --git a/.github/actions/common-tools/setup_docker.sh b/.github/actions/common-tools/setup_docker.sh new file mode 100755 index 0000000000..628c7819d8 --- /dev/null +++ b/.github/actions/common-tools/setup_docker.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +scriptpath=$(dirname "$0") +. /etc/os-release +if [ "$ID" = "alpine" ]; then + sh $scriptpath/setup_docker_alpine.sh +elif [ "$ID" = "ubuntu" ]; then + bash $scriptpath/setup_docker_ubuntu.sh +fi \ No newline at end of file diff --git a/.github/actions/common-tools/setup_docker_alpine.sh b/.github/actions/common-tools/setup_docker_alpine.sh new file mode 100644 index 0000000000..3e37944b5c --- /dev/null +++ b/.github/actions/common-tools/setup_docker_alpine.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +apk update +apk add bash +apk add docker docker-compose +apk add openrc +service docker start diff --git a/.github/actions/common-tools/install_docker_on_ubuntu.sh b/.github/actions/common-tools/setup_docker_ubuntu.sh similarity index 67% rename from .github/actions/common-tools/install_docker_on_ubuntu.sh rename to .github/actions/common-tools/setup_docker_ubuntu.sh index fdd3ce2965..3ff33642b1 100644 --- a/.github/actions/common-tools/install_docker_on_ubuntu.sh +++ b/.github/actions/common-tools/setup_docker_ubuntu.sh @@ -1,9 +1,9 @@ #!/bin/bash apt-get update -apt-get install ca-certificates curl gnupg lsb-release +apt-get install -y ca-certificates curl gnupg lsb-release mkdir -p /etc/apt/keyrings -curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg +curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null apt-get update apt-get install -y docker-ce docker-ce-cli containerd.io \ No newline at end of file diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index b3d4ffd056..43c1b9fabb 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -33,7 +33,7 @@ jobs: distro: ${{ matrix.distro }} githubToken: ${{ github.token }} run: | - bash $GITHUB_WORKSPACE/.github/actions/common-tools/install_docker_on_ubuntu.sh + sh $GITHUB_WORKSPACE/.github/actions/common-tools/setup_docker.sh bash $GITHUB_WORKSPACE/rpms/generate_rpm_package.sh -b master -t ${{ matrix.type }} -a ${{ matrix.arch }} --dev echo "PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index f6f96d7c67..50fdcd3f57 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -22,7 +22,7 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Copy build.sh before building image + - name: Copy build.sh to Dockerfile path run: cp $GITHUB_WORKSPACE/rpms/build.sh $GITHUB_WORKSPACE/${{ matrix.image.DOCKERFILE_PATH }} @@ -45,6 +45,6 @@ jobs: arch: ${{ matrix.image.ARCHITECTURE }} distro: ${{ matrix.image.DISTRO }} run: - bash $GITHUB_WORKSPACE/.github/actions/common-tools/install_docker_on_ubuntu.sh + sh $GITHUB_WORKSPACE/.github/actions/common-tools/setup_docker.sh cp $GITHUB_WORKSPACE/rpms/build.sh $GITHUB_WORKSPACE/${{ matrix.image.DOCKERFILE_PATH }} bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} ${{ matrix.image.DOCKERFILE_PATH }} From 8e4fdb269af3cdc188096a89e02a6cc659e1e092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 25 Jan 2023 16:45:24 +0100 Subject: [PATCH 139/316] Pass user as argument to the build and push image scritp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../common-tools/build_and_push_image_to_ghcr.sh | 11 ++++++----- .github/actions/common-tools/setup_docker_ubuntu.sh | 4 ++-- .github/workflows/build-rpm-packages.yml | 1 + .github/workflows/upload-package-creation-images.yml | 5 +++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/actions/common-tools/build_and_push_image_to_ghcr.sh b/.github/actions/common-tools/build_and_push_image_to_ghcr.sh index 847c22c55a..33d35310bc 100644 --- a/.github/actions/common-tools/build_and_push_image_to_ghcr.sh +++ b/.github/actions/common-tools/build_and_push_image_to_ghcr.sh @@ -1,16 +1,17 @@ GITHUB_PUSH_SECRET=$1 -DOCKER_IMAGE_NAME=$2 -BUILD_CONTEXT=$3 +GITHUB_USER=$2 +DOCKER_IMAGE_NAME=$3 +BUILD_CONTEXT=$4 DOCKERFILE_PATH="$BUILD_CONTEXT/Dockerfile" -if [ -n "$4" ]; then - DOCKER_IMAGE_TAG=$4 +if [ -n "$5" ]; then + DOCKER_IMAGE_TAG=$5 else DOCKER_IMAGE_TAG="latest" fi # Login to GHCR -echo ${GITHUB_PUSH_SECRET} | docker login https://ghcr.io -u "wazuh"--password-stdin +echo ${GITHUB_PUSH_SECRET} | docker login https://ghcr.io -u $GITHUB_USER --password-stdin # GITHUB_REPOSITORY is always org/repo syntax. Get the owner in case it is different than the actor (when working in an org) GITHUB_REPOSITORY="wazuh/wazuh-packages" diff --git a/.github/actions/common-tools/setup_docker_ubuntu.sh b/.github/actions/common-tools/setup_docker_ubuntu.sh index 3ff33642b1..3520225296 100644 --- a/.github/actions/common-tools/setup_docker_ubuntu.sh +++ b/.github/actions/common-tools/setup_docker_ubuntu.sh @@ -1,9 +1,9 @@ #!/bin/bash apt-get update -apt-get install -y ca-certificates curl gnupg lsb-release +apt-get install ca-certificates curl gnupg lsb-release mkdir -p /etc/apt/keyrings curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg -echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null +echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null apt-get update apt-get install -y docker-ce docker-ce-cli containerd.io \ No newline at end of file diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 43c1b9fabb..895e8bc74b 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -32,6 +32,7 @@ jobs: arch: ${{ matrix.arch }} distro: ${{ matrix.distro }} githubToken: ${{ github.token }} + dockerRunArgs: --volume /var/run/docker.sock:/var/run/docker.sock run: | sh $GITHUB_WORKSPACE/.github/actions/common-tools/setup_docker.sh bash $GITHUB_WORKSPACE/rpms/generate_rpm_package.sh -b master -t ${{ matrix.type }} -a ${{ matrix.arch }} --dev diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index 50fdcd3f57..1d89543af9 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -28,7 +28,7 @@ jobs: - name: Build and push image ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} to Github Container Registry run: - bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} ${{ matrix.image.DOCKERFILE_PATH }} + bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} ${{ matrix.image.DOCKERFILE_PATH }} Upload-RPM-armv7-ppc64le-aarch64-images: runs-on: ubuntu-latest @@ -44,7 +44,8 @@ jobs: with: arch: ${{ matrix.image.ARCHITECTURE }} distro: ${{ matrix.image.DISTRO }} + dockerRunArgs: --volume /var/run/docker.sock:/var/run/docker.sock run: sh $GITHUB_WORKSPACE/.github/actions/common-tools/setup_docker.sh cp $GITHUB_WORKSPACE/rpms/build.sh $GITHUB_WORKSPACE/${{ matrix.image.DOCKERFILE_PATH }} - bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} ${{ matrix.image.DOCKERFILE_PATH }} + bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} ${{ matrix.image.DOCKERFILE_PATH }} From dbf68f0c379838c402bee496e627ed24cea510ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 25 Jan 2023 16:54:51 +0100 Subject: [PATCH 140/316] Remove unneccessary commands in alpine setup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/actions/common-tools/setup_docker_alpine.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/actions/common-tools/setup_docker_alpine.sh b/.github/actions/common-tools/setup_docker_alpine.sh index 3e37944b5c..b9bb7139c5 100644 --- a/.github/actions/common-tools/setup_docker_alpine.sh +++ b/.github/actions/common-tools/setup_docker_alpine.sh @@ -3,5 +3,3 @@ apk update apk add bash apk add docker docker-compose -apk add openrc -service docker start From cccd73c062299d882c92f7d21072bbb1c45e9795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 25 Jan 2023 17:02:09 +0100 Subject: [PATCH 141/316] Allow for more than one command on the upload image workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-package-creation-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index 1d89543af9..d042622a32 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -45,7 +45,7 @@ jobs: arch: ${{ matrix.image.ARCHITECTURE }} distro: ${{ matrix.image.DISTRO }} dockerRunArgs: --volume /var/run/docker.sock:/var/run/docker.sock - run: + run: | sh $GITHUB_WORKSPACE/.github/actions/common-tools/setup_docker.sh cp $GITHUB_WORKSPACE/rpms/build.sh $GITHUB_WORKSPACE/${{ matrix.image.DOCKERFILE_PATH }} bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} ${{ matrix.image.DOCKERFILE_PATH }} From e77e3f733221c9bccf2f04181c60e624a225e86d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 25 Jan 2023 17:34:39 +0100 Subject: [PATCH 142/316] Change OS on which the images are generated MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/actions/common-tools/setup_docker_alpine.sh | 6 +++--- .github/actions/common-tools/setup_docker_ubuntu.sh | 4 ++-- .github/workflows/upload-package-creation-images.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/common-tools/setup_docker_alpine.sh b/.github/actions/common-tools/setup_docker_alpine.sh index b9bb7139c5..6ce1f343e8 100644 --- a/.github/actions/common-tools/setup_docker_alpine.sh +++ b/.github/actions/common-tools/setup_docker_alpine.sh @@ -1,5 +1,5 @@ #!/bin/sh -apk update -apk add bash -apk add docker docker-compose +apk -q update +apk -q add bash +apk -q add docker docker-compose diff --git a/.github/actions/common-tools/setup_docker_ubuntu.sh b/.github/actions/common-tools/setup_docker_ubuntu.sh index 3520225296..e727b17868 100644 --- a/.github/actions/common-tools/setup_docker_ubuntu.sh +++ b/.github/actions/common-tools/setup_docker_ubuntu.sh @@ -1,9 +1,9 @@ #!/bin/bash apt-get update -apt-get install ca-certificates curl gnupg lsb-release +apt-get install -y -q ca-certificates curl gnupg lsb-release mkdir -p /etc/apt/keyrings curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null apt-get update -apt-get install -y docker-ce docker-ce-cli containerd.io \ No newline at end of file +apt-get install -y -q docker-ce docker-ce-cli containerd.io \ No newline at end of file diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index d042622a32..170e1cfb8d 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -34,7 +34,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - image: [ {CONTAINER_NAME: rpm_builder_aarch64, DOCKERFILE_PATH: rpms/CentOS/7/aarch64, ARCHITECTURE: aarch64, DISTRO: ubuntu18.04}, {CONTAINER_NAME: rpm_builder_ppc64le, DOCKERFILE_PATH: rpms/CentOS/7/ppc64le, ARCHITECTURE: ppc64le, DISTRO: alpine_latest}, {CONTAINER_NAME: rpm_builder_armv7, DOCKERFILE_PATH: rpms/CentOS/7/armv7hl, ARCHITECTURE: armv7 , DISTRO: ubuntu18.04} ] + image: [ {CONTAINER_NAME: rpm_builder_aarch64, DOCKERFILE_PATH: rpms/CentOS/7/aarch64, ARCHITECTURE: aarch64, DISTRO: alpine_latest}, {CONTAINER_NAME: rpm_builder_ppc64le, DOCKERFILE_PATH: rpms/CentOS/7/ppc64le, ARCHITECTURE: ppc64le, DISTRO: alpine_latest}, {CONTAINER_NAME: rpm_builder_armv7, DOCKERFILE_PATH: rpms/CentOS/7/armv7hl, ARCHITECTURE: armv7 , DISTRO: alpine_latest} ] fail-fast: false steps: - uses: actions/checkout@v2 From efd6472e0b6d2ba5eb6418fe27721b0e3b5f27fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 25 Jan 2023 17:38:19 +0100 Subject: [PATCH 143/316] Change Os in which the images are built MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-package-creation-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index 170e1cfb8d..7f4e2fe82a 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -34,7 +34,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - image: [ {CONTAINER_NAME: rpm_builder_aarch64, DOCKERFILE_PATH: rpms/CentOS/7/aarch64, ARCHITECTURE: aarch64, DISTRO: alpine_latest}, {CONTAINER_NAME: rpm_builder_ppc64le, DOCKERFILE_PATH: rpms/CentOS/7/ppc64le, ARCHITECTURE: ppc64le, DISTRO: alpine_latest}, {CONTAINER_NAME: rpm_builder_armv7, DOCKERFILE_PATH: rpms/CentOS/7/armv7hl, ARCHITECTURE: armv7 , DISTRO: alpine_latest} ] + image: [ {CONTAINER_NAME: rpm_builder_aarch64, DOCKERFILE_PATH: rpms/CentOS/7/aarch64, ARCHITECTURE: aarch64, DISTRO: ubuntu_latest}, {CONTAINER_NAME: rpm_builder_ppc64le, DOCKERFILE_PATH: rpms/CentOS/7/ppc64le, ARCHITECTURE: ppc64le, DISTRO: ubuntu_latest}, {CONTAINER_NAME: rpm_builder_armv7, DOCKERFILE_PATH: rpms/CentOS/7/armv7hl, ARCHITECTURE: armv7 , DISTRO: ubuntu_latest} ] fail-fast: false steps: - uses: actions/checkout@v2 From 776faddb56e301886167e8f568584a8e7e358ce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Fern=C3=A1ndez=20Poyatos?= Date: Thu, 26 Jan 2023 09:16:46 +0100 Subject: [PATCH 144/316] Add RBAC CLI to RPM SPEC (#1659) --- rpms/SPECS/wazuh-manager.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index ccfd0e1aa6..544136e75c 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -630,6 +630,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/bin/wazuh-clusterd %attr(750, root, root) %{_localstatedir}/bin/wazuh-db %attr(750, root, root) %{_localstatedir}/bin/wazuh-modulesd +%attr(750, root, root) %{_localstatedir}/bin/rbac_control %dir %attr(770, wazuh, wazuh) %{_localstatedir}/etc %attr(660, root, wazuh) %config(noreplace) %{_localstatedir}/etc/ossec.conf %attr(640, root, wazuh) %config(noreplace) %{_localstatedir}/etc/client.keys From 1c874c45f3424ca2d1c2867d2635486fdf0f045c Mon Sep 17 00:00:00 2001 From: Franco Rivero Date: Thu, 26 Jan 2023 05:30:41 -0300 Subject: [PATCH 145/316] Change FIM database management using DBSync and RSync (#1275) * Add libfimdb to CentOS SPECS. * Add libfimdb to Solaris SPECS. * Update HP-UX generate packages script to include GCC-9.4 and cmake-3.22.2 * Include GCC libs to HPUX agent package * Added link to use gcc 9.4 after installing * Remove perl version while provisioning environment * Change to http protocol because can be problems in HP-UX * Export LD_LIBRARY_PATH to fix compilation Co-authored-by: Antonio Manuel Fresneda Rodriguez Co-authored-by: Chema Martinez Co-authored-by: Jotacarma --- debs/Debian/amd64/Dockerfile | 3 +- debs/Debian/arm64/Dockerfile | 3 +- debs/Debian/armhf/Dockerfile | 3 +- debs/Debian/i386/Dockerfile | 3 +- debs/Debian/ppc64le/Dockerfile | 3 +- hp-ux/generate_wazuh_packages.sh | 35 +++++++++++++++++++-- rpms/CentOS/5/i386/Dockerfile | 3 +- rpms/CentOS/5/x86_64/Dockerfile | 3 +- rpms/CentOS/6/i386/Dockerfile | 3 +- rpms/CentOS/6/x86_64/Dockerfile | 3 +- rpms/CentOS/7/aarch64/Dockerfile | 3 +- rpms/CentOS/7/armv7hl/Dockerfile | 3 +- rpms/CentOS/7/ppc64le/Dockerfile | 3 +- rpms/SPECS/wazuh-agent.spec | 1 + rpms/SPECS/wazuh-manager.spec | 1 + solaris/solaris11/SPECS/template_agent.json | 8 +++++ wpk/linux/x86_64/Dockerfile | 3 +- 17 files changed, 69 insertions(+), 15 deletions(-) diff --git a/debs/Debian/amd64/Dockerfile b/debs/Debian/amd64/Dockerfile index c3734b3576..2610d3f139 100644 --- a/debs/Debian/amd64/Dockerfile +++ b/debs/Debian/amd64/Dockerfile @@ -20,7 +20,8 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ ./configure --prefix=/usr/local/gcc-9.4.0 --enable-languages=c,c++ --disable-multilib \ --disable-libsanitizer && \ make -j$(nproc) && make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ + ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib64:${LD_LIBRARY_PATH}" diff --git a/debs/Debian/arm64/Dockerfile b/debs/Debian/arm64/Dockerfile index 7c4737fbe0..3a24ee820f 100644 --- a/debs/Debian/arm64/Dockerfile +++ b/debs/Debian/arm64/Dockerfile @@ -23,7 +23,8 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ ./configure --prefix=/usr/local/gcc-9.4.0 --enable-languages=c,c++ --disable-multilib \ --disable-libsanitizer && \ make -j$(nproc) && make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ + ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib64/" diff --git a/debs/Debian/armhf/Dockerfile b/debs/Debian/armhf/Dockerfile index b9d5d8a015..4320d43498 100644 --- a/debs/Debian/armhf/Dockerfile +++ b/debs/Debian/armhf/Dockerfile @@ -24,7 +24,8 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ --with-fpu=vfpv3-d16 --with-float=hard --enable-languages=c,c++ \ --disable-multilib --disable-libsanitizer && \ linux32 make -j$(nproc) && linux32 make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ + ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib/" diff --git a/debs/Debian/i386/Dockerfile b/debs/Debian/i386/Dockerfile index 99eef6c673..f1e8867b13 100644 --- a/debs/Debian/i386/Dockerfile +++ b/debs/Debian/i386/Dockerfile @@ -23,7 +23,8 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ linux32 ./configure --prefix=/usr/local/gcc-9.4.0 --enable-languages=c,c++ \ --disable-multilib --disable-libsanitizer && \ linux32 make -j$(nproc) && linux32 make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ + ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib:${LD_LIBRARY_PATH}" diff --git a/debs/Debian/ppc64le/Dockerfile b/debs/Debian/ppc64le/Dockerfile index cbdf066de4..2fa4fe311a 100644 --- a/debs/Debian/ppc64le/Dockerfile +++ b/debs/Debian/ppc64le/Dockerfile @@ -20,7 +20,8 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ ./configure --prefix=/usr/local/gcc-9.4.0 --enable-languages=c,c++ --disable-multilib \ --disable-libsanitizer && \ make -j$(nproc) && make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ + ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib64:${LD_LIBRARY_PATH}" diff --git a/hp-ux/generate_wazuh_packages.sh b/hp-ux/generate_wazuh_packages.sh index 896808cc81..caf58ddce6 100755 --- a/hp-ux/generate_wazuh_packages.sh +++ b/hp-ux/generate_wazuh_packages.sh @@ -8,9 +8,9 @@ install_path="/var/ossec" current_path=`pwd` +build_tools_path="/home/okkam" source_directory=${current_path}/wazuh-sources configuration_file="${source_directory}/etc/preloaded-vars.conf" -PATH=$PATH:/usr/local/bin target_dir="${current_path}/output" checksum_dir="" wazuh_version="" @@ -18,6 +18,12 @@ wazuh_revision="1" depot_path="" control_binary="" +# Needed variables to build Wazuh with custom GCC and cmake +PATH=${build_tools_path}/bootstrap-gcc/gcc94_prefix/bin:${build_tools_path}/cmake_prefix_install/bin:$PATH:/usr/local/bin +LD_LIBRARY_PATH=${build_tools_path}/bootstrap-gcc/gcc94_prefix/lib +export LD_LIBRARY_PATH +CXX=${build_tools_path}/bootstrap-gcc/gcc94_prefix/bin/g++ + build_environment() { # Resizing partitions for Site Ox boxes (used by Wazuh team) @@ -53,7 +59,6 @@ build_environment() { swinstall -s $depot \* /usr/local/bin/depothelper $fpt_connection -f curl /usr/local/bin/depothelper $fpt_connection -f unzip - /usr/local/bin/depothelper $fpt_connection -f gcc /usr/local/bin/depothelper $fpt_connection -f make /usr/local/bin/depothelper $fpt_connection -f bash /usr/local/bin/depothelper $fpt_connection -f gzip @@ -65,6 +70,24 @@ build_environment() { /usr/local/bin/depothelper $fpt_connection -f perl /usr/local/bin/depothelper $fpt_connection -f regex /usr/local/bin/depothelper $fpt_connection -f python + + # Install GCC 9.4 + mkdir ${build_tools_path} + cd ${build_tools_path} + mkdir bootstrap-gcc + cd ${build_tools_path}/bootstrap-gcc + curl -k -SO http://packages.wazuh.com/utils/gcc/gcc_9.4_HPUX_build.tar.gz + gunzip gcc_9.4_HPUX_build.tar.gz + tar -xf gcc_9.4_HPUX_build.tar + rm -f gcc_9.4_HPUX_build.tar + cp -f ${build_tools_path}/bootstrap-gcc/gcc94_prefix/bin/gcc ${build_tools_path}/bootstrap-gcc/gcc94_prefix/bin/cc + + # Install cmake 3.22.2 + cd ${build_tools_path} + curl -k -SO http://packages.wazuh.com/utils/cmake/cmake_3.22.2_HPUX_build.tar.gz + gunzip cmake_3.22.2_HPUX_build.tar.gz + tar -xf cmake_3.22.2_HPUX_build.tar + rm -f cmake_3.22.2_HPUX_build.tar } config() { @@ -117,6 +140,12 @@ compile() { gmake deps RESOURCES_URL=http://packages.wazuh.com/deps/${deps_version} TARGET=agent gmake TARGET=agent USE_SELINUX=no bash ${source_directory}/install.sh + # Install std libs needed to run the agent + cp -f ${build_tools_path}/bootstrap-gcc/gcc94_prefix/lib/libstdc++.so.6.28 ${install_path}/lib + cp -f ${build_tools_path}/bootstrap-gcc/gcc94_prefix/lib/libgcc_s.so.0 ${install_path}/lib + ln -s ${install_path}/lib/libstdc++.so.6.28 ${install_path}/lib/libstdc++.so.6 + ln -s ${install_path}/lib/libstdc++.so.6.28 ${install_path}/lib/libstdc++.so + ln -s ${install_path}/lib/libgcc_s.so.0 ${install_path}/lib/libgcc_s.so cd $current_path } @@ -172,6 +201,8 @@ clean() { userdel wazuh groupdel wazuh + rm -rf ${build_tools_path} + exit ${exit_code} } diff --git a/rpms/CentOS/5/i386/Dockerfile b/rpms/CentOS/5/i386/Dockerfile index 7c19499b5c..af68534de5 100644 --- a/rpms/CentOS/5/i386/Dockerfile +++ b/rpms/CentOS/5/i386/Dockerfile @@ -31,7 +31,8 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ linux32 ./contrib/download_prerequisites && \ linux32 ./configure --prefix=/usr/local/gcc-9.4.0 --enable-languages=c,c++ --disable-multilib --disable-libsanitizer && \ linux32 make -j2 && linux32 make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ + ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib/" diff --git a/rpms/CentOS/5/x86_64/Dockerfile b/rpms/CentOS/5/x86_64/Dockerfile index 01e4e65e64..2a6b2d9581 100644 --- a/rpms/CentOS/5/x86_64/Dockerfile +++ b/rpms/CentOS/5/x86_64/Dockerfile @@ -35,7 +35,8 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ ./configure --prefix=/usr/local/gcc-9.4.0 --enable-languages=c,c++ \ --disable-multilib --disable-libsanitizer && \ make -j2 && make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ + ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib64/" diff --git a/rpms/CentOS/6/i386/Dockerfile b/rpms/CentOS/6/i386/Dockerfile index 04cdb78fa5..289dee9946 100644 --- a/rpms/CentOS/6/i386/Dockerfile +++ b/rpms/CentOS/6/i386/Dockerfile @@ -46,7 +46,8 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ linux32 ./configure --prefix=/usr/local/gcc-9.4.0 --enable-languages=c,c++ \ --disable-multilib --disable-libsanitizer && \ linux32 make -j$(nproc) && linux32 make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ + ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib/" diff --git a/rpms/CentOS/6/x86_64/Dockerfile b/rpms/CentOS/6/x86_64/Dockerfile index 898fb35bf9..d6968907c6 100644 --- a/rpms/CentOS/6/x86_64/Dockerfile +++ b/rpms/CentOS/6/x86_64/Dockerfile @@ -46,7 +46,8 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ ./configure --prefix=/usr/local/gcc-9.4.0 --enable-languages=c,c++ \ --disable-multilib --disable-libsanitizer && \ make -j$(nproc) && make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ + ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib64/" diff --git a/rpms/CentOS/7/aarch64/Dockerfile b/rpms/CentOS/7/aarch64/Dockerfile index cedd1811a7..1b4a6ad33d 100644 --- a/rpms/CentOS/7/aarch64/Dockerfile +++ b/rpms/CentOS/7/aarch64/Dockerfile @@ -30,7 +30,8 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ ./configure --prefix=/usr/local/gcc-9.4.0 --enable-languages=c,c++ --disable-multilib \ --disable-libsanitizer --disable-bootstrap && \ make -j$(nproc) && make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ + ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib64/" diff --git a/rpms/CentOS/7/armv7hl/Dockerfile b/rpms/CentOS/7/armv7hl/Dockerfile index dc929b2005..f4e81eae0c 100644 --- a/rpms/CentOS/7/armv7hl/Dockerfile +++ b/rpms/CentOS/7/armv7hl/Dockerfile @@ -10,7 +10,8 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ --with-float=hard --with-fpu=vfpv3-d16 --enable-languages=c,c++ --disable-multilib \ --disable-libsanitizer && \ linux32 make -j$(nproc) && linux32 make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ + ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib/" diff --git a/rpms/CentOS/7/ppc64le/Dockerfile b/rpms/CentOS/7/ppc64le/Dockerfile index 23a0620696..e588b6c2e2 100644 --- a/rpms/CentOS/7/ppc64le/Dockerfile +++ b/rpms/CentOS/7/ppc64le/Dockerfile @@ -27,7 +27,8 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ ./configure --prefix=/usr/local/gcc-9.4.0 --enable-languages=c,c++ \ --disable-multilib --disable-libsanitizer && \ make -j$(nproc) && make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ + ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib64/" diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 6a640ef165..6ffe4c6be0 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -549,6 +549,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/lib/libsysinfo.so %attr(750, root, wazuh) %{_localstatedir}/lib/libstdc++.so.6 %attr(750, root, wazuh) %{_localstatedir}/lib/libgcc_s.so.1 +%attr(750, root, wazuh) %{_localstatedir}/lib/libfimdb.so %dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp %dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/generic %attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/generic/* diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 544136e75c..a6c479bbd8 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -676,6 +676,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/lib/libjemalloc.so.2 %attr(750, root, wazuh) %{_localstatedir}/lib/libstdc++.so.6 %attr(750, root, wazuh) %{_localstatedir}/lib/libgcc_s.so.1 +%attr(750, root, wazuh) %{_localstatedir}/lib/libfimdb.so %{_localstatedir}/lib/libpython3.9.so.1.0 %dir %attr(770, wazuh, wazuh) %{_localstatedir}/logs %attr(660, wazuh, wazuh) %ghost %{_localstatedir}/logs/active-responses.log diff --git a/solaris/solaris11/SPECS/template_agent.json b/solaris/solaris11/SPECS/template_agent.json index ec6b503f6e..81bc2c8fd0 100644 --- a/solaris/solaris11/SPECS/template_agent.json +++ b/solaris/solaris11/SPECS/template_agent.json @@ -679,6 +679,14 @@ "type": "file", "user": "root" }, + "/var/ossec/lib/libfimdb.so": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, "/var/ossec/lib/libsysinfo.so": { "class": "static", "group": "wazuh", diff --git a/wpk/linux/x86_64/Dockerfile b/wpk/linux/x86_64/Dockerfile index a7a184192d..8caddc00f7 100644 --- a/wpk/linux/x86_64/Dockerfile +++ b/wpk/linux/x86_64/Dockerfile @@ -25,7 +25,8 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ ./configure --prefix=/usr/local/gcc-9.4.0 --enable-languages=c,c++ \ --disable-multilib --disable-libsanitizer && \ make -j$(nproc) && make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ + ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib64/" From 85d7293ce869b5a789d4b64a375050c4be640a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chema=20Mart=C3=ADnez?= Date: Thu, 26 Jan 2023 10:44:24 +0100 Subject: [PATCH 146/316] Revert "Change FIM database management using DBSync and RSync (#1275)" (#2061) This reverts commit 1c874c45f3424ca2d1c2867d2635486fdf0f045c. --- debs/Debian/amd64/Dockerfile | 3 +- debs/Debian/arm64/Dockerfile | 3 +- debs/Debian/armhf/Dockerfile | 3 +- debs/Debian/i386/Dockerfile | 3 +- debs/Debian/ppc64le/Dockerfile | 3 +- hp-ux/generate_wazuh_packages.sh | 35 ++------------------- rpms/CentOS/5/i386/Dockerfile | 3 +- rpms/CentOS/5/x86_64/Dockerfile | 3 +- rpms/CentOS/6/i386/Dockerfile | 3 +- rpms/CentOS/6/x86_64/Dockerfile | 3 +- rpms/CentOS/7/aarch64/Dockerfile | 3 +- rpms/CentOS/7/armv7hl/Dockerfile | 3 +- rpms/CentOS/7/ppc64le/Dockerfile | 3 +- rpms/SPECS/wazuh-agent.spec | 1 - rpms/SPECS/wazuh-manager.spec | 1 - solaris/solaris11/SPECS/template_agent.json | 8 ----- wpk/linux/x86_64/Dockerfile | 3 +- 17 files changed, 15 insertions(+), 69 deletions(-) diff --git a/debs/Debian/amd64/Dockerfile b/debs/Debian/amd64/Dockerfile index 2610d3f139..c3734b3576 100644 --- a/debs/Debian/amd64/Dockerfile +++ b/debs/Debian/amd64/Dockerfile @@ -20,8 +20,7 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ ./configure --prefix=/usr/local/gcc-9.4.0 --enable-languages=c,c++ --disable-multilib \ --disable-libsanitizer && \ make -j$(nproc) && make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ - ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib64:${LD_LIBRARY_PATH}" diff --git a/debs/Debian/arm64/Dockerfile b/debs/Debian/arm64/Dockerfile index 3a24ee820f..7c4737fbe0 100644 --- a/debs/Debian/arm64/Dockerfile +++ b/debs/Debian/arm64/Dockerfile @@ -23,8 +23,7 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ ./configure --prefix=/usr/local/gcc-9.4.0 --enable-languages=c,c++ --disable-multilib \ --disable-libsanitizer && \ make -j$(nproc) && make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ - ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib64/" diff --git a/debs/Debian/armhf/Dockerfile b/debs/Debian/armhf/Dockerfile index 4320d43498..b9d5d8a015 100644 --- a/debs/Debian/armhf/Dockerfile +++ b/debs/Debian/armhf/Dockerfile @@ -24,8 +24,7 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ --with-fpu=vfpv3-d16 --with-float=hard --enable-languages=c,c++ \ --disable-multilib --disable-libsanitizer && \ linux32 make -j$(nproc) && linux32 make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ - ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib/" diff --git a/debs/Debian/i386/Dockerfile b/debs/Debian/i386/Dockerfile index f1e8867b13..99eef6c673 100644 --- a/debs/Debian/i386/Dockerfile +++ b/debs/Debian/i386/Dockerfile @@ -23,8 +23,7 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ linux32 ./configure --prefix=/usr/local/gcc-9.4.0 --enable-languages=c,c++ \ --disable-multilib --disable-libsanitizer && \ linux32 make -j$(nproc) && linux32 make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ - ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib:${LD_LIBRARY_PATH}" diff --git a/debs/Debian/ppc64le/Dockerfile b/debs/Debian/ppc64le/Dockerfile index 2fa4fe311a..cbdf066de4 100644 --- a/debs/Debian/ppc64le/Dockerfile +++ b/debs/Debian/ppc64le/Dockerfile @@ -20,8 +20,7 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ ./configure --prefix=/usr/local/gcc-9.4.0 --enable-languages=c,c++ --disable-multilib \ --disable-libsanitizer && \ make -j$(nproc) && make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ - ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib64:${LD_LIBRARY_PATH}" diff --git a/hp-ux/generate_wazuh_packages.sh b/hp-ux/generate_wazuh_packages.sh index caf58ddce6..896808cc81 100755 --- a/hp-ux/generate_wazuh_packages.sh +++ b/hp-ux/generate_wazuh_packages.sh @@ -8,9 +8,9 @@ install_path="/var/ossec" current_path=`pwd` -build_tools_path="/home/okkam" source_directory=${current_path}/wazuh-sources configuration_file="${source_directory}/etc/preloaded-vars.conf" +PATH=$PATH:/usr/local/bin target_dir="${current_path}/output" checksum_dir="" wazuh_version="" @@ -18,12 +18,6 @@ wazuh_revision="1" depot_path="" control_binary="" -# Needed variables to build Wazuh with custom GCC and cmake -PATH=${build_tools_path}/bootstrap-gcc/gcc94_prefix/bin:${build_tools_path}/cmake_prefix_install/bin:$PATH:/usr/local/bin -LD_LIBRARY_PATH=${build_tools_path}/bootstrap-gcc/gcc94_prefix/lib -export LD_LIBRARY_PATH -CXX=${build_tools_path}/bootstrap-gcc/gcc94_prefix/bin/g++ - build_environment() { # Resizing partitions for Site Ox boxes (used by Wazuh team) @@ -59,6 +53,7 @@ build_environment() { swinstall -s $depot \* /usr/local/bin/depothelper $fpt_connection -f curl /usr/local/bin/depothelper $fpt_connection -f unzip + /usr/local/bin/depothelper $fpt_connection -f gcc /usr/local/bin/depothelper $fpt_connection -f make /usr/local/bin/depothelper $fpt_connection -f bash /usr/local/bin/depothelper $fpt_connection -f gzip @@ -70,24 +65,6 @@ build_environment() { /usr/local/bin/depothelper $fpt_connection -f perl /usr/local/bin/depothelper $fpt_connection -f regex /usr/local/bin/depothelper $fpt_connection -f python - - # Install GCC 9.4 - mkdir ${build_tools_path} - cd ${build_tools_path} - mkdir bootstrap-gcc - cd ${build_tools_path}/bootstrap-gcc - curl -k -SO http://packages.wazuh.com/utils/gcc/gcc_9.4_HPUX_build.tar.gz - gunzip gcc_9.4_HPUX_build.tar.gz - tar -xf gcc_9.4_HPUX_build.tar - rm -f gcc_9.4_HPUX_build.tar - cp -f ${build_tools_path}/bootstrap-gcc/gcc94_prefix/bin/gcc ${build_tools_path}/bootstrap-gcc/gcc94_prefix/bin/cc - - # Install cmake 3.22.2 - cd ${build_tools_path} - curl -k -SO http://packages.wazuh.com/utils/cmake/cmake_3.22.2_HPUX_build.tar.gz - gunzip cmake_3.22.2_HPUX_build.tar.gz - tar -xf cmake_3.22.2_HPUX_build.tar - rm -f cmake_3.22.2_HPUX_build.tar } config() { @@ -140,12 +117,6 @@ compile() { gmake deps RESOURCES_URL=http://packages.wazuh.com/deps/${deps_version} TARGET=agent gmake TARGET=agent USE_SELINUX=no bash ${source_directory}/install.sh - # Install std libs needed to run the agent - cp -f ${build_tools_path}/bootstrap-gcc/gcc94_prefix/lib/libstdc++.so.6.28 ${install_path}/lib - cp -f ${build_tools_path}/bootstrap-gcc/gcc94_prefix/lib/libgcc_s.so.0 ${install_path}/lib - ln -s ${install_path}/lib/libstdc++.so.6.28 ${install_path}/lib/libstdc++.so.6 - ln -s ${install_path}/lib/libstdc++.so.6.28 ${install_path}/lib/libstdc++.so - ln -s ${install_path}/lib/libgcc_s.so.0 ${install_path}/lib/libgcc_s.so cd $current_path } @@ -201,8 +172,6 @@ clean() { userdel wazuh groupdel wazuh - rm -rf ${build_tools_path} - exit ${exit_code} } diff --git a/rpms/CentOS/5/i386/Dockerfile b/rpms/CentOS/5/i386/Dockerfile index af68534de5..7c19499b5c 100644 --- a/rpms/CentOS/5/i386/Dockerfile +++ b/rpms/CentOS/5/i386/Dockerfile @@ -31,8 +31,7 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ linux32 ./contrib/download_prerequisites && \ linux32 ./configure --prefix=/usr/local/gcc-9.4.0 --enable-languages=c,c++ --disable-multilib --disable-libsanitizer && \ linux32 make -j2 && linux32 make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ - ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib/" diff --git a/rpms/CentOS/5/x86_64/Dockerfile b/rpms/CentOS/5/x86_64/Dockerfile index 2a6b2d9581..01e4e65e64 100644 --- a/rpms/CentOS/5/x86_64/Dockerfile +++ b/rpms/CentOS/5/x86_64/Dockerfile @@ -35,8 +35,7 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ ./configure --prefix=/usr/local/gcc-9.4.0 --enable-languages=c,c++ \ --disable-multilib --disable-libsanitizer && \ make -j2 && make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ - ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib64/" diff --git a/rpms/CentOS/6/i386/Dockerfile b/rpms/CentOS/6/i386/Dockerfile index 289dee9946..04cdb78fa5 100644 --- a/rpms/CentOS/6/i386/Dockerfile +++ b/rpms/CentOS/6/i386/Dockerfile @@ -46,8 +46,7 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ linux32 ./configure --prefix=/usr/local/gcc-9.4.0 --enable-languages=c,c++ \ --disable-multilib --disable-libsanitizer && \ linux32 make -j$(nproc) && linux32 make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ - ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib/" diff --git a/rpms/CentOS/6/x86_64/Dockerfile b/rpms/CentOS/6/x86_64/Dockerfile index d6968907c6..898fb35bf9 100644 --- a/rpms/CentOS/6/x86_64/Dockerfile +++ b/rpms/CentOS/6/x86_64/Dockerfile @@ -46,8 +46,7 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ ./configure --prefix=/usr/local/gcc-9.4.0 --enable-languages=c,c++ \ --disable-multilib --disable-libsanitizer && \ make -j$(nproc) && make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ - ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib64/" diff --git a/rpms/CentOS/7/aarch64/Dockerfile b/rpms/CentOS/7/aarch64/Dockerfile index 1b4a6ad33d..cedd1811a7 100644 --- a/rpms/CentOS/7/aarch64/Dockerfile +++ b/rpms/CentOS/7/aarch64/Dockerfile @@ -30,8 +30,7 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ ./configure --prefix=/usr/local/gcc-9.4.0 --enable-languages=c,c++ --disable-multilib \ --disable-libsanitizer --disable-bootstrap && \ make -j$(nproc) && make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ - ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib64/" diff --git a/rpms/CentOS/7/armv7hl/Dockerfile b/rpms/CentOS/7/armv7hl/Dockerfile index f4e81eae0c..dc929b2005 100644 --- a/rpms/CentOS/7/armv7hl/Dockerfile +++ b/rpms/CentOS/7/armv7hl/Dockerfile @@ -10,8 +10,7 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ --with-float=hard --with-fpu=vfpv3-d16 --enable-languages=c,c++ --disable-multilib \ --disable-libsanitizer && \ linux32 make -j$(nproc) && linux32 make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ - ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib/" diff --git a/rpms/CentOS/7/ppc64le/Dockerfile b/rpms/CentOS/7/ppc64le/Dockerfile index e588b6c2e2..23a0620696 100644 --- a/rpms/CentOS/7/ppc64le/Dockerfile +++ b/rpms/CentOS/7/ppc64le/Dockerfile @@ -27,8 +27,7 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ ./configure --prefix=/usr/local/gcc-9.4.0 --enable-languages=c,c++ \ --disable-multilib --disable-libsanitizer && \ make -j$(nproc) && make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ - ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib64/" diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 6ffe4c6be0..6a640ef165 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -549,7 +549,6 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/lib/libsysinfo.so %attr(750, root, wazuh) %{_localstatedir}/lib/libstdc++.so.6 %attr(750, root, wazuh) %{_localstatedir}/lib/libgcc_s.so.1 -%attr(750, root, wazuh) %{_localstatedir}/lib/libfimdb.so %dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp %dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/generic %attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/generic/* diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index a6c479bbd8..544136e75c 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -676,7 +676,6 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/lib/libjemalloc.so.2 %attr(750, root, wazuh) %{_localstatedir}/lib/libstdc++.so.6 %attr(750, root, wazuh) %{_localstatedir}/lib/libgcc_s.so.1 -%attr(750, root, wazuh) %{_localstatedir}/lib/libfimdb.so %{_localstatedir}/lib/libpython3.9.so.1.0 %dir %attr(770, wazuh, wazuh) %{_localstatedir}/logs %attr(660, wazuh, wazuh) %ghost %{_localstatedir}/logs/active-responses.log diff --git a/solaris/solaris11/SPECS/template_agent.json b/solaris/solaris11/SPECS/template_agent.json index 81bc2c8fd0..ec6b503f6e 100644 --- a/solaris/solaris11/SPECS/template_agent.json +++ b/solaris/solaris11/SPECS/template_agent.json @@ -679,14 +679,6 @@ "type": "file", "user": "root" }, - "/var/ossec/lib/libfimdb.so": { - "class": "static", - "group": "wazuh", - "mode": "0750", - "prot": "-rwxr-x---", - "type": "file", - "user": "root" - }, "/var/ossec/lib/libsysinfo.so": { "class": "static", "group": "wazuh", diff --git a/wpk/linux/x86_64/Dockerfile b/wpk/linux/x86_64/Dockerfile index 8caddc00f7..a7a184192d 100644 --- a/wpk/linux/x86_64/Dockerfile +++ b/wpk/linux/x86_64/Dockerfile @@ -25,8 +25,7 @@ RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ ./configure --prefix=/usr/local/gcc-9.4.0 --enable-languages=c,c++ \ --disable-multilib --disable-libsanitizer && \ make -j$(nproc) && make install && \ - ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && \ - ln -fs /usr/local/gcc-9.4.0/bin/gcc /usr/bin/cc && cd / && rm -rf gcc-* + ln -fs /usr/local/gcc-9.4.0/bin/g++ /usr/bin/c++ && cd / && rm -rf gcc-* ENV CPLUS_INCLUDE_PATH "/usr/local/gcc-9.4.0/include/c++/9.4.0/" ENV LD_LIBRARY_PATH "/usr/local/gcc-9.4.0/lib64/" From e6c763e89fe7db9fa265c38eb266196bdf7c1fe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 26 Jan 2023 12:04:47 +0100 Subject: [PATCH 147/316] Correct name for images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-package-creation-images.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index 7f4e2fe82a..0b4aa1feb9 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -26,9 +26,14 @@ jobs: run: cp $GITHUB_WORKSPACE/rpms/build.sh $GITHUB_WORKSPACE/${{ matrix.image.DOCKERFILE_PATH }} + - name: Set image name + run: | + if [[ -n ${{github.base_ref}} ]]; then IMAGE_NAME=${{ matrix.image.CONTAINER_NAME }}_${{github.base_ref}}; else IMAGE_NAME=${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}}; fi + echo "IMAGE_NAME=$IMAGE_NAME" >> $GITHUB_ENV + - name: Build and push image ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} to Github Container Registry run: - bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} ${{ matrix.image.DOCKERFILE_PATH }} + bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $IMAGE_NAME ${{ matrix.image.DOCKERFILE_PATH }} Upload-RPM-armv7-ppc64le-aarch64-images: runs-on: ubuntu-latest @@ -40,7 +45,7 @@ jobs: - uses: actions/checkout@v2 - uses: uraimo/run-on-arch-action@v2.5.0 - name: Build and push image ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} to Github Container Registry + name: Build and push image $IMAGE_NAME to Github Container Registry with: arch: ${{ matrix.image.ARCHITECTURE }} distro: ${{ matrix.image.DISTRO }} @@ -48,4 +53,4 @@ jobs: run: | sh $GITHUB_WORKSPACE/.github/actions/common-tools/setup_docker.sh cp $GITHUB_WORKSPACE/rpms/build.sh $GITHUB_WORKSPACE/${{ matrix.image.DOCKERFILE_PATH }} - bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} ${{ matrix.image.DOCKERFILE_PATH }} + bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $IMAGE_NAME ${{ matrix.image.DOCKERFILE_PATH }} From e79cd126debd571b61d87ce809215f1effba31f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 26 Jan 2023 12:11:18 +0100 Subject: [PATCH 148/316] Add image name variable definition where needed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-package-creation-images.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index 0b4aa1feb9..4410b91e24 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -44,6 +44,11 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Set image name + run: | + if [[ -n ${{github.base_ref}} ]]; then IMAGE_NAME=${{ matrix.image.CONTAINER_NAME }}_${{github.base_ref}}; else IMAGE_NAME=${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}}; fi + echo "IMAGE_NAME=$IMAGE_NAME" >> $GITHUB_ENV + - uses: uraimo/run-on-arch-action@v2.5.0 name: Build and push image $IMAGE_NAME to Github Container Registry with: From f8d759dd5d7d8519c92fd6951d4ff778af18b469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 26 Jan 2023 12:21:22 +0100 Subject: [PATCH 149/316] Fix adding image_name to environment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-package-creation-images.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index 4410b91e24..956eef9057 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -28,8 +28,7 @@ jobs: - name: Set image name run: | - if [[ -n ${{github.base_ref}} ]]; then IMAGE_NAME=${{ matrix.image.CONTAINER_NAME }}_${{github.base_ref}}; else IMAGE_NAME=${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}}; fi - echo "IMAGE_NAME=$IMAGE_NAME" >> $GITHUB_ENV + if [[ -n ${{github.base_ref}} ]]; then echo "IMAGE_NAME=${{ matrix.image.CONTAINER_NAME }}_${{github.base_ref}}" >> $GITHUB_ENV; else echo "IMAGE_NAME=${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}}" >> $GITHUB_ENV ; fi - name: Build and push image ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} to Github Container Registry run: @@ -46,8 +45,7 @@ jobs: - name: Set image name run: | - if [[ -n ${{github.base_ref}} ]]; then IMAGE_NAME=${{ matrix.image.CONTAINER_NAME }}_${{github.base_ref}}; else IMAGE_NAME=${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}}; fi - echo "IMAGE_NAME=$IMAGE_NAME" >> $GITHUB_ENV + if [[ -n ${{github.base_ref}} ]]; then echo "IMAGE_NAME=${{ matrix.image.CONTAINER_NAME }}_${{github.base_ref}}" >> $GITHUB_ENV; else echo "IMAGE_NAME=${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}}" >> $GITHUB_ENV ; fi - uses: uraimo/run-on-arch-action@v2.5.0 name: Build and push image $IMAGE_NAME to Github Container Registry From f10965d9e41ebf37d9316652106e4f7d2b8957a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 26 Jan 2023 12:37:17 +0100 Subject: [PATCH 150/316] Version is now in tag instead of name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../workflows/upload-package-creation-images.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index 956eef9057..dbda28bd17 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -26,13 +26,13 @@ jobs: run: cp $GITHUB_WORKSPACE/rpms/build.sh $GITHUB_WORKSPACE/${{ matrix.image.DOCKERFILE_PATH }} - - name: Set image name - run: | - if [[ -n ${{github.base_ref}} ]]; then echo "IMAGE_NAME=${{ matrix.image.CONTAINER_NAME }}_${{github.base_ref}}" >> $GITHUB_ENV; else echo "IMAGE_NAME=${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}}" >> $GITHUB_ENV ; fi + - name: Set tag as version + run: + if [ ! -z ${{ github.base_ref }} ]; then echo "TAG=${{ github.base_ref }}" >> $GITHUB_ENV; else echo "TAG=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi - name: Build and push image ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} to Github Container Registry run: - bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $IMAGE_NAME ${{ matrix.image.DOCKERFILE_PATH }} + bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} $TAG Upload-RPM-armv7-ppc64le-aarch64-images: runs-on: ubuntu-latest @@ -43,12 +43,12 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set image name + - name: Set tag as version run: | - if [[ -n ${{github.base_ref}} ]]; then echo "IMAGE_NAME=${{ matrix.image.CONTAINER_NAME }}_${{github.base_ref}}" >> $GITHUB_ENV; else echo "IMAGE_NAME=${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}}" >> $GITHUB_ENV ; fi + if [ ! -z ${{ github.base_ref }} ]; then echo "TAG=${{ github.base_ref }}" >> $GITHUB_ENV; else echo "TAG=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi - uses: uraimo/run-on-arch-action@v2.5.0 - name: Build and push image $IMAGE_NAME to Github Container Registry + name: Build and push image ${{matrix.image.CONTAINER_NAME}} to Github Container Registry with: arch: ${{ matrix.image.ARCHITECTURE }} distro: ${{ matrix.image.DISTRO }} @@ -56,4 +56,4 @@ jobs: run: | sh $GITHUB_WORKSPACE/.github/actions/common-tools/setup_docker.sh cp $GITHUB_WORKSPACE/rpms/build.sh $GITHUB_WORKSPACE/${{ matrix.image.DOCKERFILE_PATH }} - bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $IMAGE_NAME ${{ matrix.image.DOCKERFILE_PATH }} + bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} $TAG From 37be5b72c9a66d06f8c6dd31bf1b15d47930de75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 26 Jan 2023 12:55:15 +0100 Subject: [PATCH 151/316] Add efficiency options to save images and MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-package-creation-images.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index dbda28bd17..c35a5a214b 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -52,8 +52,12 @@ jobs: with: arch: ${{ matrix.image.ARCHITECTURE }} distro: ${{ matrix.image.DISTRO }} + githubToken: ${{ secrets.GITHUB_TOKEN }} dockerRunArgs: --volume /var/run/docker.sock:/var/run/docker.sock - run: | - sh $GITHUB_WORKSPACE/.github/actions/common-tools/setup_docker.sh + env: + TAG: ${{ env.TAG }} + install: | + bash $GITHUB_WORKSPACE/.github/actions/common-tools/setup_docker.sh cp $GITHUB_WORKSPACE/rpms/build.sh $GITHUB_WORKSPACE/${{ matrix.image.DOCKERFILE_PATH }} + run: | bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} $TAG From c5cedae7e66aa6418c22b90bb73bc6d61c526aec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 26 Jan 2023 14:13:15 +0100 Subject: [PATCH 152/316] Add environment variables to run-on-arch and setup docker on install part MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/actions/common-tools/setup_docker.sh | 9 ------ .../common-tools/setup_docker_alpine.sh | 5 ---- .../common-tools/setup_docker_ubuntu.sh | 9 ------ .../upload-package-creation-images.yml | 28 +++++++++++++++---- 4 files changed, 23 insertions(+), 28 deletions(-) delete mode 100755 .github/actions/common-tools/setup_docker.sh delete mode 100644 .github/actions/common-tools/setup_docker_alpine.sh delete mode 100644 .github/actions/common-tools/setup_docker_ubuntu.sh diff --git a/.github/actions/common-tools/setup_docker.sh b/.github/actions/common-tools/setup_docker.sh deleted file mode 100755 index 628c7819d8..0000000000 --- a/.github/actions/common-tools/setup_docker.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -scriptpath=$(dirname "$0") -. /etc/os-release -if [ "$ID" = "alpine" ]; then - sh $scriptpath/setup_docker_alpine.sh -elif [ "$ID" = "ubuntu" ]; then - bash $scriptpath/setup_docker_ubuntu.sh -fi \ No newline at end of file diff --git a/.github/actions/common-tools/setup_docker_alpine.sh b/.github/actions/common-tools/setup_docker_alpine.sh deleted file mode 100644 index 6ce1f343e8..0000000000 --- a/.github/actions/common-tools/setup_docker_alpine.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -apk -q update -apk -q add bash -apk -q add docker docker-compose diff --git a/.github/actions/common-tools/setup_docker_ubuntu.sh b/.github/actions/common-tools/setup_docker_ubuntu.sh deleted file mode 100644 index e727b17868..0000000000 --- a/.github/actions/common-tools/setup_docker_ubuntu.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -apt-get update -apt-get install -y -q ca-certificates curl gnupg lsb-release -mkdir -p /etc/apt/keyrings -curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg -echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null -apt-get update -apt-get install -y -q docker-ce docker-ce-cli containerd.io \ No newline at end of file diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index c35a5a214b..63d5fb19ac 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -53,11 +53,29 @@ jobs: arch: ${{ matrix.image.ARCHITECTURE }} distro: ${{ matrix.image.DISTRO }} githubToken: ${{ secrets.GITHUB_TOKEN }} - dockerRunArgs: --volume /var/run/docker.sock:/var/run/docker.sock - env: - TAG: ${{ env.TAG }} + dockerRunArgs: | + --volume /var/run/docker.sock:/var/run/docker.sock + --volume $GITHUB_WORKSPACE:/github/workspace + env: | + TAG: $TAG + GITHUB_WORKSPACE: "/github/workspace" install: | - bash $GITHUB_WORKSPACE/.github/actions/common-tools/setup_docker.sh - cp $GITHUB_WORKSPACE/rpms/build.sh $GITHUB_WORKSPACE/${{ matrix.image.DOCKERFILE_PATH }} + case "${{ matrix.image.DISTRO }}" in + ubuntu*) + apt-get update + apt-get install -y -q ca-certificates curl gnupg lsb-release apt-utils + mkdir -p /etc/apt/keyrings + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg + echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null + apt-get update + apt-get install -y -q docker-ce docker-ce-cli containerd.io + ;; + alpine*) + apk -q update + apk -q add bash + apk -q add docker docker-compose + ;; + esac run: | + cp $GITHUB_WORKSPACE/rpms/build.sh $GITHUB_WORKSPACE/${{ matrix.image.DOCKERFILE_PATH }} bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} $TAG From edb2d09c0cc3aa3bfe801f8c77d54993c7b49e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 26 Jan 2023 14:21:04 +0100 Subject: [PATCH 153/316] Remove GITHUB_WORKSPACE variable from explicitly declared variables for run-on-arch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-package-creation-images.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index 63d5fb19ac..de8ee4bf5b 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -55,10 +55,8 @@ jobs: githubToken: ${{ secrets.GITHUB_TOKEN }} dockerRunArgs: | --volume /var/run/docker.sock:/var/run/docker.sock - --volume $GITHUB_WORKSPACE:/github/workspace env: | TAG: $TAG - GITHUB_WORKSPACE: "/github/workspace" install: | case "${{ matrix.image.DISTRO }}" in ubuntu*) From a48f4baf5be64a818e9158c9ebb2384f85f9dc3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 26 Jan 2023 14:40:53 +0100 Subject: [PATCH 154/316] Echo the tag used to push the image to ghcr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-package-creation-images.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index de8ee4bf5b..bb4397b6a4 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -56,7 +56,7 @@ jobs: dockerRunArgs: | --volume /var/run/docker.sock:/var/run/docker.sock env: | - TAG: $TAG + TAG: ${{ env.TAG }} install: | case "${{ matrix.image.DISTRO }}" in ubuntu*) @@ -76,4 +76,5 @@ jobs: esac run: | cp $GITHUB_WORKSPACE/rpms/build.sh $GITHUB_WORKSPACE/${{ matrix.image.DOCKERFILE_PATH }} - bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} $TAG + echo "TAG=$TAG" + bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} ${TAG} From ede0cefa5c6df9fb2101a910b7eb214daae94c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 26 Jan 2023 14:45:19 +0100 Subject: [PATCH 155/316] When the action is called from a PR, the image uploaded has the tag for the PR's head branch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-package-creation-images.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index bb4397b6a4..c539d31544 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -28,7 +28,7 @@ jobs: - name: Set tag as version run: - if [ ! -z ${{ github.base_ref }} ]; then echo "TAG=${{ github.base_ref }}" >> $GITHUB_ENV; else echo "TAG=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi + if [ ! -z ${{ github.head_ref }} ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi - name: Build and push image ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} to Github Container Registry run: @@ -45,7 +45,7 @@ jobs: - name: Set tag as version run: | - if [ ! -z ${{ github.base_ref }} ]; then echo "TAG=${{ github.base_ref }}" >> $GITHUB_ENV; else echo "TAG=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi + if [ ! -z ${{ github.head_ref }} ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi - uses: uraimo/run-on-arch-action@v2.5.0 name: Build and push image ${{matrix.image.CONTAINER_NAME}} to Github Container Registry From 4132931043fedef477486b40ca6acfe11db6cc04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 26 Jan 2023 18:03:23 +0100 Subject: [PATCH 156/316] Download the docker images to create the packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../build_and_push_image_to_ghcr.sh | 8 +- .../common-tools/pull_image_from_ghcr.sh | 28 +++++ .github/workflows/build-rpm-packages.yml | 101 ++++++++++++------ .../upload-package-creation-images.yml | 2 + 4 files changed, 100 insertions(+), 39 deletions(-) create mode 100644 .github/actions/common-tools/pull_image_from_ghcr.sh diff --git a/.github/actions/common-tools/build_and_push_image_to_ghcr.sh b/.github/actions/common-tools/build_and_push_image_to_ghcr.sh index 33d35310bc..a61d23bbf0 100644 --- a/.github/actions/common-tools/build_and_push_image_to_ghcr.sh +++ b/.github/actions/common-tools/build_and_push_image_to_ghcr.sh @@ -25,10 +25,4 @@ IMAGE_ID=$(echo ${IMAGE_ID} | tr '[A-Z]' '[a-z]') # Build image echo build -t ${IMAGE_ID} -f ${DOCKERFILE_PATH} ${BUILD_CONTEXT} docker build -t ${IMAGE_ID} -f ${DOCKERFILE_PATH} ${BUILD_CONTEXT} - -# Push image -if [ "$BUILD_ONLY" == "true" ]; then - echo "skipping push" -else - docker push ${IMAGE_ID} -fi \ No newline at end of file +docker push ${IMAGE_ID} \ No newline at end of file diff --git a/.github/actions/common-tools/pull_image_from_ghcr.sh b/.github/actions/common-tools/pull_image_from_ghcr.sh new file mode 100644 index 0000000000..844376cc31 --- /dev/null +++ b/.github/actions/common-tools/pull_image_from_ghcr.sh @@ -0,0 +1,28 @@ +GITHUB_PUSH_SECRET=$1 +GITHUB_USER=$2 +DOCKER_IMAGE_NAME=$3 +BUILD_CONTEXT=$4 +DOCKERFILE_PATH="$BUILD_CONTEXT/Dockerfile" +if [ -n "$5" ]; then + DOCKER_IMAGE_TAG="$5" +else + DOCKER_IMAGE_TAG="latest" +fi + + +# Login to GHCR +echo ${GITHUB_PUSH_SECRET} | docker login https://ghcr.io -u $GITHUB_USER --password-stdin + +# GITHUB_REPOSITORY is always org/repo syntax. Get the owner in case it is different than the actor (when working in an org) +GITHUB_REPOSITORY="wazuh/wazuh-packages" +GITHUB_OWNER="wazuh" + +# Set up full image with tag +IMAGE_ID=ghcr.io/${GITHUB_OWNER}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} +IMAGE_ID=$(echo ${IMAGE_ID} | tr '[A-Z]' '[a-z]') + +docker pull ${IMAGE_ID} + +docker rmi ghcr.io/wazuh/rpm_builder_x86_2053/merge:latest +docker rmi ghcr.io/wazuh/rpm_builder_i386_2053/merge:latest +docker rmi ghcr.io/wazuh/rpm_builder_aarch64_2053/merge:latest diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 895e8bc74b..7b6d239799 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -8,59 +8,96 @@ on: workflow_dispatch: jobs: - Wazuh-agent-rpm-package-builds-aarch64-armv7-ppc64le: + Wazuh-agent-rpm-package-builds-x86_64-i386: runs-on: ubuntu-latest strategy: matrix: type: [agent, manager] - arch : [aarch64, armv7, ppc64le] - distro: [ubuntu18.04, alpine_latest] - exclude: - - arch: armv7 - distro: alpine_latest - - arch: aarch64 - distro: alpine_latest - - arch: ppc64le - distro: ubuntu18.04 - fail-fast: false + arch : [x86_64, i386] steps: - uses: actions/checkout@v3 - - uses: uraimo/run-on-arch-action@v2.5.0 - name: Build the ${{ matrix.arch }} rpm Wazuh ${{ matrix.type }} package - with: - arch: ${{ matrix.arch }} - distro: ${{ matrix.distro }} - githubToken: ${{ github.token }} - dockerRunArgs: --volume /var/run/docker.sock:/var/run/docker.sock - run: | - sh $GITHUB_WORKSPACE/.github/actions/common-tools/setup_docker.sh - bash $GITHUB_WORKSPACE/rpms/generate_rpm_package.sh -b master -t ${{ matrix.type }} -a ${{ matrix.arch }} --dev - echo "PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV + - name: Set tag as version + run: + if [ ! -z ${{ github.head_ref }} ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi + + - name: Download docker image for package building + run: + bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} $TAG + + - name: Build the ${{ matrix.arch }} rpm Wazuh ${{ matrix.type }} package + working-directory: ./rpms + run: | + bash generate_rpm_package.sh -b master -t ${{ matrix.type }} -a ${{ matrix.arch }} --dev + echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - name: Upload Wazuh ${{ matrix.type }} ${{ matrix.arch }} package as artifact uses: actions/upload-artifact@v2 with: - name: ${PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}} - path: ${{github.workspace}}/rpms/output/${PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}} + name: ${PACKAGE_NAME} + path: ${{github.workspace}}/rpms/output/${PACKAGE_NAME} - Wazuh-agent-rpm-package-builds-x86_64-i386: + + Wazuh-agent-rpm-package-builds-aarch64-armv7-ppc64le: runs-on: ubuntu-latest strategy: matrix: type: [agent, manager] - arch : [x86_64, i386] + arch : [aarch64, armv7, ppc64le] + distro: [ubuntu_latest] + fail-fast: false steps: - uses: actions/checkout@v3 - - name: Build the ${{ matrix.arch }} rpm Wazuh ${{ matrix.type }} package - working-directory: ./rpms + - name: Get changed files + id: changes + # Set outputs using the command. run: | - bash generate_rpm_package.sh -b master -t ${{ matrix.type }} -a ${{ matrix.arch }} --dev - echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV + echo "::set-output name=all::$(git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | xargs)" + echo "::set-output name=ts::$(git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | grep .ts$ | xargs)" + + - name: Set tag as version + run: + if [ ! -z ${{ github.head_ref }} && $(git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | xargs | grep 'rpms/CentOS')]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi + + - name: Download docker image for package building + run: + bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} 1626-fix-rhel9-derived-services + + - uses: uraimo/run-on-arch-action@v2.5.0 + name: Build the ${{ matrix.arch }} rpm Wazuh ${{ matrix.type }} package + with: + arch: ${{ matrix.arch }} + distro: ${{ matrix.distro }} + githubToken: ${{ secrets.GITHUB_TOKEN }} + dockerRunArgs: | + --volume /var/run/docker.sock:/var/run/docker.sock + env: | + TAG: ${{ env.TAG }} + install: | + case "${{ matrix.image.DISTRO }}" in + ubuntu*) + apt-get update + apt-get install -y -q ca-certificates curl gnupg lsb-release apt-utils + mkdir -p /etc/apt/keyrings + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg + echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null + apt-get update + apt-get install -y -q docker-ce docker-ce-cli containerd.io + ;; + alpine*) + apk -q update + apk -q add bash + apk -q add docker docker-compose + ;; + esac + run: | + bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} 1626-fix-rhel9-derived-services + bash $GITHUB_WORKSPACE/rpms/generate_rpm_package.sh -b master -t ${{ matrix.type }} -a ${{ matrix.arch }} --dev --dont-build-docker + echo "PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - name: Upload Wazuh ${{ matrix.type }} ${{ matrix.arch }} package as artifact uses: actions/upload-artifact@v2 with: - name: ${PACKAGE_NAME} - path: ${{github.workspace}}/rpms/output/${PACKAGE_NAME} \ No newline at end of file + name: ${PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}} + path: ${{github.workspace}}/rpms/output/${PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}} diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index c539d31544..b100a1ed1c 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -3,6 +3,8 @@ on: pull_request: paths: - '.github/workflows/upload-package-creation-images.yml' + - 'rpms/CentOS/*' + - 'rpms/build.sh' push: branches: - master From b42cec35dfbfda089a930fe2ffe99b7f8d874d66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 26 Jan 2023 18:05:05 +0100 Subject: [PATCH 157/316] Change OS for armv7 creation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-package-creation-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index b100a1ed1c..01741d488d 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - image: [ {CONTAINER_NAME: rpm_builder_aarch64, DOCKERFILE_PATH: rpms/CentOS/7/aarch64, ARCHITECTURE: aarch64, DISTRO: ubuntu_latest}, {CONTAINER_NAME: rpm_builder_ppc64le, DOCKERFILE_PATH: rpms/CentOS/7/ppc64le, ARCHITECTURE: ppc64le, DISTRO: ubuntu_latest}, {CONTAINER_NAME: rpm_builder_armv7, DOCKERFILE_PATH: rpms/CentOS/7/armv7hl, ARCHITECTURE: armv7 , DISTRO: ubuntu_latest} ] + image: [ {CONTAINER_NAME: rpm_builder_aarch64, DOCKERFILE_PATH: rpms/CentOS/7/aarch64, ARCHITECTURE: aarch64, DISTRO: ubuntu_latest}, {CONTAINER_NAME: rpm_builder_ppc64le, DOCKERFILE_PATH: rpms/CentOS/7/ppc64le, ARCHITECTURE: ppc64le, DISTRO: ubuntu_latest}, {CONTAINER_NAME: rpm_builder_armv7, DOCKERFILE_PATH: rpms/CentOS/7/armv7hl, ARCHITECTURE: armv7 , DISTRO: alpine_latest} ] fail-fast: false steps: - uses: actions/checkout@v2 From 7ae6dedb0aee29a59e509fbed3907667f792a015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 26 Jan 2023 18:22:51 +0100 Subject: [PATCH 158/316] Fix container name to pull from ghcr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../actions/common-tools/pull_image_from_ghcr.sh | 7 +++---- .github/workflows/build-rpm-packages.yml | 13 ++++++------- .../workflows/upload-package-creation-images.yml | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/actions/common-tools/pull_image_from_ghcr.sh b/.github/actions/common-tools/pull_image_from_ghcr.sh index 844376cc31..ee88a7199b 100644 --- a/.github/actions/common-tools/pull_image_from_ghcr.sh +++ b/.github/actions/common-tools/pull_image_from_ghcr.sh @@ -1,10 +1,8 @@ GITHUB_PUSH_SECRET=$1 GITHUB_USER=$2 DOCKER_IMAGE_NAME=$3 -BUILD_CONTEXT=$4 -DOCKERFILE_PATH="$BUILD_CONTEXT/Dockerfile" -if [ -n "$5" ]; then - DOCKER_IMAGE_TAG="$5" +if [ -n "$4" ]; then + DOCKER_IMAGE_TAG="$4" else DOCKER_IMAGE_TAG="latest" fi @@ -21,6 +19,7 @@ GITHUB_OWNER="wazuh" IMAGE_ID=ghcr.io/${GITHUB_OWNER}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} IMAGE_ID=$(echo ${IMAGE_ID} | tr '[A-Z]' '[a-z]') +echo "docker pull ${IMAGE_ID}" docker pull ${IMAGE_ID} docker rmi ghcr.io/wazuh/rpm_builder_x86_2053/merge:latest diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 7b6d239799..544b273137 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -20,6 +20,7 @@ jobs: - name: Set tag as version run: if [ ! -z ${{ github.head_ref }} ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi + if [ ${{ matrix.arch }} == "x86_64" ]; then echo "CONTAINER_NAME=rpm_builder_x86" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=${{ matrix.arch }}" >> $GITHUB_ENV ; fi - name: Download docker image for package building run: @@ -56,13 +57,10 @@ jobs: echo "::set-output name=all::$(git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | xargs)" echo "::set-output name=ts::$(git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | grep .ts$ | xargs)" - - name: Set tag as version - run: + - name: Set tag and container name + run: | if [ ! -z ${{ github.head_ref }} && $(git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | xargs | grep 'rpms/CentOS')]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi - - - name: Download docker image for package building - run: - bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} 1626-fix-rhel9-derived-services + echo "CONTAINER_NAME=rpm_builder_${{ matrix.arch}}" >> $GITHUB_ENV - uses: uraimo/run-on-arch-action@v2.5.0 name: Build the ${{ matrix.arch }} rpm Wazuh ${{ matrix.type }} package @@ -74,6 +72,7 @@ jobs: --volume /var/run/docker.sock:/var/run/docker.sock env: | TAG: ${{ env.TAG }} + CONTAINER_NAME: ${{ env.CONTAINER_NAME }} install: | case "${{ matrix.image.DISTRO }}" in ubuntu*) @@ -92,7 +91,7 @@ jobs: ;; esac run: | - bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} 1626-fix-rhel9-derived-services + bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{ env.CONTAINER_NAME }} 1626-fix-rhel9-derived-services bash $GITHUB_WORKSPACE/rpms/generate_rpm_package.sh -b master -t ${{ matrix.type }} -a ${{ matrix.arch }} --dev --dont-build-docker echo "PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index 01741d488d..b100a1ed1c 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - image: [ {CONTAINER_NAME: rpm_builder_aarch64, DOCKERFILE_PATH: rpms/CentOS/7/aarch64, ARCHITECTURE: aarch64, DISTRO: ubuntu_latest}, {CONTAINER_NAME: rpm_builder_ppc64le, DOCKERFILE_PATH: rpms/CentOS/7/ppc64le, ARCHITECTURE: ppc64le, DISTRO: ubuntu_latest}, {CONTAINER_NAME: rpm_builder_armv7, DOCKERFILE_PATH: rpms/CentOS/7/armv7hl, ARCHITECTURE: armv7 , DISTRO: alpine_latest} ] + image: [ {CONTAINER_NAME: rpm_builder_aarch64, DOCKERFILE_PATH: rpms/CentOS/7/aarch64, ARCHITECTURE: aarch64, DISTRO: ubuntu_latest}, {CONTAINER_NAME: rpm_builder_ppc64le, DOCKERFILE_PATH: rpms/CentOS/7/ppc64le, ARCHITECTURE: ppc64le, DISTRO: ubuntu_latest}, {CONTAINER_NAME: rpm_builder_armv7, DOCKERFILE_PATH: rpms/CentOS/7/armv7hl, ARCHITECTURE: armv7 , DISTRO: ubuntu_latest} ] fail-fast: false steps: - uses: actions/checkout@v2 From 798beda81dc5dc3f49f7371d5189cb87ace8de38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 26 Jan 2023 18:28:41 +0100 Subject: [PATCH 159/316] Unify build packages jobs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 59 +++++++++--------------- 1 file changed, 21 insertions(+), 38 deletions(-) diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 544b273137..9406853a43 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -8,62 +8,45 @@ on: workflow_dispatch: jobs: - Wazuh-agent-rpm-package-builds-x86_64-i386: + Wazuh-agent-rpm-package-builds: runs-on: ubuntu-latest strategy: matrix: type: [agent, manager] - arch : [x86_64, i386] + arch : [x86_64, i386, aarch64, armv7, ppc64le] + distro: [ubuntu_latest] + fail-fast: false + steps: - uses: actions/checkout@v3 + - name: Get changed files + id: changes + # Set outputs using the command. + run: | + echo "::set-output name=all::$(git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | xargs)" + echo "::set-output name=ts::$(git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | grep .ts$ | xargs)" + - name: Set tag as version - run: + run: | if [ ! -z ${{ github.head_ref }} ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi - if [ ${{ matrix.arch }} == "x86_64" ]; then echo "CONTAINER_NAME=rpm_builder_x86" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=${{ matrix.arch }}" >> $GITHUB_ENV ; fi + if [ ${{ matrix.arch }} == "x86_64" ]; then echo "CONTAINER_NAME=rpm_builder_x86" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=rpm_builder_${{ matrix.arch }}" >> $GITHUB_ENV ; fi - name: Download docker image for package building + if: "${{ matrix.arch }}" == "x86_64" || "${{ matrix.arch }}" == "i386" run: bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} $TAG - name: Build the ${{ matrix.arch }} rpm Wazuh ${{ matrix.type }} package + if: "${{ matrix.arch }}" == "x86_64" || "${{ matrix.arch }}" == "i386" working-directory: ./rpms run: | bash generate_rpm_package.sh -b master -t ${{ matrix.type }} -a ${{ matrix.arch }} --dev echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - - name: Upload Wazuh ${{ matrix.type }} ${{ matrix.arch }} package as artifact - uses: actions/upload-artifact@v2 - with: - name: ${PACKAGE_NAME} - path: ${{github.workspace}}/rpms/output/${PACKAGE_NAME} - - - Wazuh-agent-rpm-package-builds-aarch64-armv7-ppc64le: - runs-on: ubuntu-latest - strategy: - matrix: - type: [agent, manager] - arch : [aarch64, armv7, ppc64le] - distro: [ubuntu_latest] - fail-fast: false - steps: - - uses: actions/checkout@v3 - - - name: Get changed files - id: changes - # Set outputs using the command. - run: | - echo "::set-output name=all::$(git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | xargs)" - echo "::set-output name=ts::$(git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | grep .ts$ | xargs)" - - - name: Set tag and container name - run: | - if [ ! -z ${{ github.head_ref }} && $(git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | xargs | grep 'rpms/CentOS')]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi - echo "CONTAINER_NAME=rpm_builder_${{ matrix.arch}}" >> $GITHUB_ENV - - - uses: uraimo/run-on-arch-action@v2.5.0 - name: Build the ${{ matrix.arch }} rpm Wazuh ${{ matrix.type }} package + - name: Build the ${{ matrix.arch }} rpm Wazuh ${{ matrix.type }} package + if: "${{ matrix.arch }}" != "x86_64" && "${{ matrix.arch }}" != "i386" + uses: uraimo/run-on-arch-action@v2.5.0 with: arch: ${{ matrix.arch }} distro: ${{ matrix.distro }} @@ -98,5 +81,5 @@ jobs: - name: Upload Wazuh ${{ matrix.type }} ${{ matrix.arch }} package as artifact uses: actions/upload-artifact@v2 with: - name: ${PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}} - path: ${{github.workspace}}/rpms/output/${PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}} + name: ${PACKAGE_NAME} + path: ${{github.workspace}}/rpms/output/${PACKAGE_NAME} \ No newline at end of file From e8962de553726cfbf9d4a24727f45a36268d513a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 26 Jan 2023 18:42:59 +0100 Subject: [PATCH 160/316] Unify upload images jobs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 6 +++--- .../upload-package-creation-images.yml | 19 +++++-------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 9406853a43..e35b04ef69 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -33,19 +33,19 @@ jobs: if [ ${{ matrix.arch }} == "x86_64" ]; then echo "CONTAINER_NAME=rpm_builder_x86" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=rpm_builder_${{ matrix.arch }}" >> $GITHUB_ENV ; fi - name: Download docker image for package building - if: "${{ matrix.arch }}" == "x86_64" || "${{ matrix.arch }}" == "i386" + if: ${{ ( matrix.image.arch == 'x86_64') || ( matrix.arch == 'i386' ) }} run: bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} $TAG - name: Build the ${{ matrix.arch }} rpm Wazuh ${{ matrix.type }} package - if: "${{ matrix.arch }}" == "x86_64" || "${{ matrix.arch }}" == "i386" + if: ${{ ( matrix.image.arch == 'x86_64') || ( matrix.arch == 'i386' ) }} working-directory: ./rpms run: | bash generate_rpm_package.sh -b master -t ${{ matrix.type }} -a ${{ matrix.arch }} --dev echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - name: Build the ${{ matrix.arch }} rpm Wazuh ${{ matrix.type }} package - if: "${{ matrix.arch }}" != "x86_64" && "${{ matrix.arch }}" != "i386" + if: ${{ ( matrix.image.arch != 'x86_64') && ( matrix.arch != 'i386' )}} uses: uraimo/run-on-arch-action@v2.5.0 with: arch: ${{ matrix.arch }} diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index b100a1ed1c..4bba331d8e 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -19,12 +19,13 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - image: [ {CONTAINER_NAME: rpm_builder_x86, DOCKERFILE_PATH: rpms/CentOS/6/x86_64}, {CONTAINER_NAME: rpm_builder_i386, DOCKERFILE_PATH: rpms/CentOS/6/i386}] + image: [ {CONTAINER_NAME: rpm_builder_x86, DOCKERFILE_PATH: rpms/CentOS/6/x86_64, ARCHITECTURE: x86_64}, {CONTAINER_NAME: rpm_builder_i386, DOCKERFILE_PATH: rpms/CentOS/6/i386, ARCHITECTURE: i386}, {CONTAINER_NAME: rpm_builder_aarch64, DOCKERFILE_PATH: rpms/CentOS/7/aarch64, ARCHITECTURE: aarch64, DISTRO: ubuntu_latest}, {CONTAINER_NAME: rpm_builder_ppc64le, DOCKERFILE_PATH: rpms/CentOS/7/ppc64le, ARCHITECTURE: ppc64le, DISTRO: ubuntu_latest}, {CONTAINER_NAME: rpm_builder_armv7, DOCKERFILE_PATH: rpms/CentOS/7/armv7hl, ARCHITECTURE: armv7 , DISTRO: ubuntu_latest}] fail-fast: false steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Copy build.sh to Dockerfile path + if: ${{ ( matrix.image.ARCHITECTURE == 'x86_64') || ( matrix.image.ARCHITECTURE == 'i386' )}} run: cp $GITHUB_WORKSPACE/rpms/build.sh $GITHUB_WORKSPACE/${{ matrix.image.DOCKERFILE_PATH }} @@ -33,23 +34,13 @@ jobs: if [ ! -z ${{ github.head_ref }} ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi - name: Build and push image ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} to Github Container Registry + if: ${{ ( matrix.image.ARCHITECTURE == 'x86_64') || ( matrix.image.ARCHITECTURE == 'i386' )}} run: bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} $TAG - Upload-RPM-armv7-ppc64le-aarch64-images: - runs-on: ubuntu-latest - strategy: - matrix: - image: [ {CONTAINER_NAME: rpm_builder_aarch64, DOCKERFILE_PATH: rpms/CentOS/7/aarch64, ARCHITECTURE: aarch64, DISTRO: ubuntu_latest}, {CONTAINER_NAME: rpm_builder_ppc64le, DOCKERFILE_PATH: rpms/CentOS/7/ppc64le, ARCHITECTURE: ppc64le, DISTRO: ubuntu_latest}, {CONTAINER_NAME: rpm_builder_armv7, DOCKERFILE_PATH: rpms/CentOS/7/armv7hl, ARCHITECTURE: armv7 , DISTRO: ubuntu_latest} ] - fail-fast: false - steps: - - uses: actions/checkout@v2 - - - name: Set tag as version - run: | - if [ ! -z ${{ github.head_ref }} ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi - uses: uraimo/run-on-arch-action@v2.5.0 + if: ${{ ( matrix.image.ARCHITECTURE != 'x86_64') && ( matrix.image.ARCHITECTURE != 'i386' )}} name: Build and push image ${{matrix.image.CONTAINER_NAME}} to Github Container Registry with: arch: ${{ matrix.image.ARCHITECTURE }} From 47353e90859b5445cb5b9cf3ef814a6be48ebed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 26 Jan 2023 18:48:59 +0100 Subject: [PATCH 161/316] Fix variable names for the package building workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 32 +++++++++---------- .../upload-package-creation-images.yml | 6 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index e35b04ef69..ba56ce1c01 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -12,9 +12,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - type: [agent, manager] - arch : [x86_64, i386, aarch64, armv7, ppc64le] - distro: [ubuntu_latest] + TYPE: [agent, manager] + ARCHITECTURE : [x86_64, i386, aarch64, armv7, ppc64le] + DISTRO: [ubuntu_latest] fail-fast: false steps: @@ -30,26 +30,26 @@ jobs: - name: Set tag as version run: | if [ ! -z ${{ github.head_ref }} ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi - if [ ${{ matrix.arch }} == "x86_64" ]; then echo "CONTAINER_NAME=rpm_builder_x86" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=rpm_builder_${{ matrix.arch }}" >> $GITHUB_ENV ; fi + if [ ${{ matrix.ARCHITECTURE }} == "x86_64" ]; then echo "CONTAINER_NAME=rpm_builder_x86" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=rpm_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; fi - name: Download docker image for package building - if: ${{ ( matrix.image.arch == 'x86_64') || ( matrix.arch == 'i386' ) }} + if: ${{ ( matrix.ARCHITECTURE == 'x86_64') || ( matrix.ARCHITECTURE == 'i386' ) }} run: bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} $TAG - - name: Build the ${{ matrix.arch }} rpm Wazuh ${{ matrix.type }} package - if: ${{ ( matrix.image.arch == 'x86_64') || ( matrix.arch == 'i386' ) }} + - name: Build the ${{ matrix.ARCHITECTURE }} rpm Wazuh ${{ matrix.TYPE }} package + if: ${{ ( matrix.ARCHITECTURE == 'x86_64') || ( matrix.ARCHITECTURE == 'i386' ) }} working-directory: ./rpms run: | - bash generate_rpm_package.sh -b master -t ${{ matrix.type }} -a ${{ matrix.arch }} --dev + bash generate_rpm_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - - name: Build the ${{ matrix.arch }} rpm Wazuh ${{ matrix.type }} package - if: ${{ ( matrix.image.arch != 'x86_64') && ( matrix.arch != 'i386' )}} + - name: Build the ${{ matrix.ARCHITECTURE }} rpm Wazuh ${{ matrix.TYPE }} package + if: ${{ ( matrix.ARCHITECTURE != 'x86_64') && ( matrix.ARCHITECTURE != 'i386' )}} uses: uraimo/run-on-arch-action@v2.5.0 with: - arch: ${{ matrix.arch }} - distro: ${{ matrix.distro }} + arch: ${{ matrix.ARCHITECTURE }} + distro: ${{ matrix.DISTRO }} githubToken: ${{ secrets.GITHUB_TOKEN }} dockerRunArgs: | --volume /var/run/docker.sock:/var/run/docker.sock @@ -57,7 +57,7 @@ jobs: TAG: ${{ env.TAG }} CONTAINER_NAME: ${{ env.CONTAINER_NAME }} install: | - case "${{ matrix.image.DISTRO }}" in + case "${{ matrix.DISTRO }}" in ubuntu*) apt-get update apt-get install -y -q ca-certificates curl gnupg lsb-release apt-utils @@ -75,10 +75,10 @@ jobs: esac run: | bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{ env.CONTAINER_NAME }} 1626-fix-rhel9-derived-services - bash $GITHUB_WORKSPACE/rpms/generate_rpm_package.sh -b master -t ${{ matrix.type }} -a ${{ matrix.arch }} --dev --dont-build-docker - echo "PACKAGE_NAME_${{ matrix.arch }}_${{ matrix.type }}=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV + bash $GITHUB_WORKSPACE/rpms/generate_rpm_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev --dont-build-docker + echo "PACKAGE_NAME_${{ matrix.ARCHITECTURE }}_${{ matrix.TYPE }}=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - - name: Upload Wazuh ${{ matrix.type }} ${{ matrix.arch }} package as artifact + - name: Upload Wazuh ${{ matrix.TYPE }} ${{ matrix.ARCHITECTURE }} package as artifact uses: actions/upload-artifact@v2 with: name: ${PACKAGE_NAME} diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index 4bba331d8e..90c329aa62 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -33,15 +33,15 @@ jobs: run: if [ ! -z ${{ github.head_ref }} ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi - - name: Build and push image ${{ matrix.image.CONTAINER_NAME }}_${{github.ref_name}} to Github Container Registry + - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} to Github Container Registry if: ${{ ( matrix.image.ARCHITECTURE == 'x86_64') || ( matrix.image.ARCHITECTURE == 'i386' )}} run: bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} $TAG - - uses: uraimo/run-on-arch-action@v2.5.0 + - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} to Github Container Registry + uses: uraimo/run-on-arch-action@v2.5.0 if: ${{ ( matrix.image.ARCHITECTURE != 'x86_64') && ( matrix.image.ARCHITECTURE != 'i386' )}} - name: Build and push image ${{matrix.image.CONTAINER_NAME}} to Github Container Registry with: arch: ${{ matrix.image.ARCHITECTURE }} distro: ${{ matrix.image.DISTRO }} From 2463c24af6181c590ce3733682426c51d589bd2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 26 Jan 2023 18:56:15 +0100 Subject: [PATCH 162/316] Fix variable name for container name in x86_64 and i386 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/actions/common-tools/pull_image_from_ghcr.sh | 4 ---- .github/workflows/build-rpm-packages.yml | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/actions/common-tools/pull_image_from_ghcr.sh b/.github/actions/common-tools/pull_image_from_ghcr.sh index ee88a7199b..ab8cf315cb 100644 --- a/.github/actions/common-tools/pull_image_from_ghcr.sh +++ b/.github/actions/common-tools/pull_image_from_ghcr.sh @@ -21,7 +21,3 @@ IMAGE_ID=$(echo ${IMAGE_ID} | tr '[A-Z]' '[a-z]') echo "docker pull ${IMAGE_ID}" docker pull ${IMAGE_ID} - -docker rmi ghcr.io/wazuh/rpm_builder_x86_2053/merge:latest -docker rmi ghcr.io/wazuh/rpm_builder_i386_2053/merge:latest -docker rmi ghcr.io/wazuh/rpm_builder_aarch64_2053/merge:latest diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index ba56ce1c01..812cec396c 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -27,15 +27,15 @@ jobs: echo "::set-output name=all::$(git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | xargs)" echo "::set-output name=ts::$(git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | grep .ts$ | xargs)" - - name: Set tag as version + - name: Set tag and container name run: | if [ ! -z ${{ github.head_ref }} ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi - if [ ${{ matrix.ARCHITECTURE }} == "x86_64" ]; then echo "CONTAINER_NAME=rpm_builder_x86" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=rpm_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; fi + if [ "${{ matrix.ARCHITECTURE }}" == "x86_64" ]; then echo "CONTAINER_NAME=rpm_builder_x86" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=rpm_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; fi - name: Download docker image for package building if: ${{ ( matrix.ARCHITECTURE == 'x86_64') || ( matrix.ARCHITECTURE == 'i386' ) }} run: - bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} $TAG + bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ matrix.image.DOCKERFILE_PATH }} $TAG - name: Build the ${{ matrix.ARCHITECTURE }} rpm Wazuh ${{ matrix.TYPE }} package if: ${{ ( matrix.ARCHITECTURE == 'x86_64') || ( matrix.ARCHITECTURE == 'i386' ) }} From 5b1fbee4d85eaa1665d192278153e77a69914801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 27 Jan 2023 11:38:59 +0100 Subject: [PATCH 163/316] Remove support for ppc64 aarch64 and armv7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../common-tools/pull_image_from_ghcr.sh | 2 +- .github/workflows/build-rpm-packages.yml | 61 ++++--------------- .../upload-package-creation-images.yml | 40 +----------- 3 files changed, 16 insertions(+), 87 deletions(-) diff --git a/.github/actions/common-tools/pull_image_from_ghcr.sh b/.github/actions/common-tools/pull_image_from_ghcr.sh index ab8cf315cb..474279c754 100644 --- a/.github/actions/common-tools/pull_image_from_ghcr.sh +++ b/.github/actions/common-tools/pull_image_from_ghcr.sh @@ -3,7 +3,7 @@ GITHUB_USER=$2 DOCKER_IMAGE_NAME=$3 if [ -n "$4" ]; then DOCKER_IMAGE_TAG="$4" -else +else DOCKER_IMAGE_TAG="latest" fi diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 812cec396c..47bc5442f1 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -5,6 +5,8 @@ on: - 'rpms/SPECS/*' - 'rpms/generate_rpm_package.sh' - 'rpms/build.sh' + - 'rpms/CentOS/*' + - 'rpms/build.sh' workflow_dispatch: jobs: @@ -13,23 +15,24 @@ jobs: strategy: matrix: TYPE: [agent, manager] - ARCHITECTURE : [x86_64, i386, aarch64, armv7, ppc64le] - DISTRO: [ubuntu_latest] + ARCHITECTURE : [x86_64, i386] fail-fast: false steps: - uses: actions/checkout@v3 - name: Get changed files - id: changes - # Set outputs using the command. - run: | - echo "::set-output name=all::$(git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | xargs)" - echo "::set-output name=ts::$(git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | grep .ts$ | xargs)" + uses: dorny/paths-filter@v2 + id: changes + with: + filters: | + rpm_images: + - 'rpms/CentOS/**' + - 'rpms/build.sh' - name: Set tag and container name run: | - if [ ! -z ${{ github.head_ref }} ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi + if [ "${{ steps.changes.outputs.src }}" == "true" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi if [ "${{ matrix.ARCHITECTURE }}" == "x86_64" ]; then echo "CONTAINER_NAME=rpm_builder_x86" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=rpm_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; fi - name: Download docker image for package building @@ -42,44 +45,4 @@ jobs: working-directory: ./rpms run: | bash generate_rpm_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev - echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - - - name: Build the ${{ matrix.ARCHITECTURE }} rpm Wazuh ${{ matrix.TYPE }} package - if: ${{ ( matrix.ARCHITECTURE != 'x86_64') && ( matrix.ARCHITECTURE != 'i386' )}} - uses: uraimo/run-on-arch-action@v2.5.0 - with: - arch: ${{ matrix.ARCHITECTURE }} - distro: ${{ matrix.DISTRO }} - githubToken: ${{ secrets.GITHUB_TOKEN }} - dockerRunArgs: | - --volume /var/run/docker.sock:/var/run/docker.sock - env: | - TAG: ${{ env.TAG }} - CONTAINER_NAME: ${{ env.CONTAINER_NAME }} - install: | - case "${{ matrix.DISTRO }}" in - ubuntu*) - apt-get update - apt-get install -y -q ca-certificates curl gnupg lsb-release apt-utils - mkdir -p /etc/apt/keyrings - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg - echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null - apt-get update - apt-get install -y -q docker-ce docker-ce-cli containerd.io - ;; - alpine*) - apk -q update - apk -q add bash - apk -q add docker docker-compose - ;; - esac - run: | - bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{ env.CONTAINER_NAME }} 1626-fix-rhel9-derived-services - bash $GITHUB_WORKSPACE/rpms/generate_rpm_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev --dont-build-docker - echo "PACKAGE_NAME_${{ matrix.ARCHITECTURE }}_${{ matrix.TYPE }}=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - - - name: Upload Wazuh ${{ matrix.TYPE }} ${{ matrix.ARCHITECTURE }} package as artifact - uses: actions/upload-artifact@v2 - with: - name: ${PACKAGE_NAME} - path: ${{github.workspace}}/rpms/output/${PACKAGE_NAME} \ No newline at end of file + echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV \ No newline at end of file diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-package-creation-images.yml index 90c329aa62..753a606a84 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-package-creation-images.yml @@ -15,11 +15,11 @@ on: workflow_dispatch: jobs: - Upload-RPM-x86_64-i386-images: + Upload-rpm-package-building-images: runs-on: ubuntu-latest strategy: matrix: - image: [ {CONTAINER_NAME: rpm_builder_x86, DOCKERFILE_PATH: rpms/CentOS/6/x86_64, ARCHITECTURE: x86_64}, {CONTAINER_NAME: rpm_builder_i386, DOCKERFILE_PATH: rpms/CentOS/6/i386, ARCHITECTURE: i386}, {CONTAINER_NAME: rpm_builder_aarch64, DOCKERFILE_PATH: rpms/CentOS/7/aarch64, ARCHITECTURE: aarch64, DISTRO: ubuntu_latest}, {CONTAINER_NAME: rpm_builder_ppc64le, DOCKERFILE_PATH: rpms/CentOS/7/ppc64le, ARCHITECTURE: ppc64le, DISTRO: ubuntu_latest}, {CONTAINER_NAME: rpm_builder_armv7, DOCKERFILE_PATH: rpms/CentOS/7/armv7hl, ARCHITECTURE: armv7 , DISTRO: ubuntu_latest}] + image: [ {CONTAINER_NAME: rpm_builder_x86, DOCKERFILE_PATH: rpms/CentOS/6/x86_64, ARCHITECTURE: x86_64}, {CONTAINER_NAME: rpm_builder_i386, DOCKERFILE_PATH: rpms/CentOS/6/i386, ARCHITECTURE: i386}] fail-fast: false steps: - uses: actions/checkout@v3 @@ -31,43 +31,9 @@ jobs: - name: Set tag as version run: - if [ ! -z ${{ github.head_ref }} ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi + if [ "${{ github.event_name }}" == "pull_request" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} to Github Container Registry if: ${{ ( matrix.image.ARCHITECTURE == 'x86_64') || ( matrix.image.ARCHITECTURE == 'i386' )}} run: bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} $TAG - - - - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} to Github Container Registry - uses: uraimo/run-on-arch-action@v2.5.0 - if: ${{ ( matrix.image.ARCHITECTURE != 'x86_64') && ( matrix.image.ARCHITECTURE != 'i386' )}} - with: - arch: ${{ matrix.image.ARCHITECTURE }} - distro: ${{ matrix.image.DISTRO }} - githubToken: ${{ secrets.GITHUB_TOKEN }} - dockerRunArgs: | - --volume /var/run/docker.sock:/var/run/docker.sock - env: | - TAG: ${{ env.TAG }} - install: | - case "${{ matrix.image.DISTRO }}" in - ubuntu*) - apt-get update - apt-get install -y -q ca-certificates curl gnupg lsb-release apt-utils - mkdir -p /etc/apt/keyrings - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg - echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null - apt-get update - apt-get install -y -q docker-ce docker-ce-cli containerd.io - ;; - alpine*) - apk -q update - apk -q add bash - apk -q add docker docker-compose - ;; - esac - run: | - cp $GITHUB_WORKSPACE/rpms/build.sh $GITHUB_WORKSPACE/${{ matrix.image.DOCKERFILE_PATH }} - echo "TAG=$TAG" - bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} ${TAG} From 23a9b811c38d2173f70a9e57dd5328413f199ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 27 Jan 2023 11:40:19 +0100 Subject: [PATCH 164/316] Fix syntax error in buil_rpm_packages.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 47bc5442f1..87f73c1e16 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -23,7 +23,7 @@ jobs: - name: Get changed files uses: dorny/paths-filter@v2 - id: changes + id: changes with: filters: | rpm_images: From 286d874b79f585a6bb3d87003665087a134f5104 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 27 Jan 2023 12:16:40 +0100 Subject: [PATCH 165/316] Remove unnecessary code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 18 ++++++++++-------- ...eation-images.yml => upload-rpm-images.yml} | 12 +++++------- 2 files changed, 15 insertions(+), 15 deletions(-) rename .github/workflows/{upload-package-creation-images.yml => upload-rpm-images.yml} (68%) diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 87f73c1e16..67cb2be5e1 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -4,9 +4,9 @@ on: paths: - 'rpms/SPECS/*' - 'rpms/generate_rpm_package.sh' - - 'rpms/build.sh' - 'rpms/CentOS/*' - 'rpms/build.sh' + - '.github/workflows/upload-rpm-images.yml' workflow_dispatch: jobs: @@ -24,11 +24,15 @@ jobs: - name: Get changed files uses: dorny/paths-filter@v2 id: changes - with: - filters: | - rpm_images: - - 'rpms/CentOS/**' - - 'rpms/build.sh' + with: + filters: | + rpm_images: + - 'rpms/CentOS/**' + - 'rpms/build.sh' + - '.github/workflows/upload-rpm-images.yml' + rpm_packages: + - 'rpms/SPECS/**' + - 'rpms/generate_rpm_package.sh' - name: Set tag and container name run: | @@ -36,12 +40,10 @@ jobs: if [ "${{ matrix.ARCHITECTURE }}" == "x86_64" ]; then echo "CONTAINER_NAME=rpm_builder_x86" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=rpm_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; fi - name: Download docker image for package building - if: ${{ ( matrix.ARCHITECTURE == 'x86_64') || ( matrix.ARCHITECTURE == 'i386' ) }} run: bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ matrix.image.DOCKERFILE_PATH }} $TAG - name: Build the ${{ matrix.ARCHITECTURE }} rpm Wazuh ${{ matrix.TYPE }} package - if: ${{ ( matrix.ARCHITECTURE == 'x86_64') || ( matrix.ARCHITECTURE == 'i386' ) }} working-directory: ./rpms run: | bash generate_rpm_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev diff --git a/.github/workflows/upload-package-creation-images.yml b/.github/workflows/upload-rpm-images.yml similarity index 68% rename from .github/workflows/upload-package-creation-images.yml rename to .github/workflows/upload-rpm-images.yml index 753a606a84..fc42fa2fb3 100644 --- a/.github/workflows/upload-package-creation-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -2,7 +2,7 @@ name: Upload package creation Docker images on: pull_request: paths: - - '.github/workflows/upload-package-creation-images.yml' + - '.github/workflows/upload-rpm-images.yml' - 'rpms/CentOS/*' - 'rpms/build.sh' push: @@ -19,21 +19,19 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - image: [ {CONTAINER_NAME: rpm_builder_x86, DOCKERFILE_PATH: rpms/CentOS/6/x86_64, ARCHITECTURE: x86_64}, {CONTAINER_NAME: rpm_builder_i386, DOCKERFILE_PATH: rpms/CentOS/6/i386, ARCHITECTURE: i386}] + image: [ {CONTAINER_NAME: rpm_builder_x86, DOCKERFILE_PATH: rpms/CentOS/6/x86_64}, {CONTAINER_NAME: rpm_builder_i386, DOCKERFILE_PATH: rpms/CentOS/6/i386}] fail-fast: false steps: - uses: actions/checkout@v3 - name: Copy build.sh to Dockerfile path - if: ${{ ( matrix.image.ARCHITECTURE == 'x86_64') || ( matrix.image.ARCHITECTURE == 'i386' )}} run: cp $GITHUB_WORKSPACE/rpms/build.sh $GITHUB_WORKSPACE/${{ matrix.image.DOCKERFILE_PATH }} - name: Set tag as version - run: - if [ "${{ github.event_name }}" == "pull_request" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi + run: + if [ "${{ github.event_name }}" == "pull_request" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi - - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} to Github Container Registry - if: ${{ ( matrix.image.ARCHITECTURE == 'x86_64') || ( matrix.image.ARCHITECTURE == 'i386' )}} + - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} with tag $TAG to Github Container Registry run: bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} $TAG From 040cb16b84409d7dc4857ffad5bf4b447fa2abe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 27 Jan 2023 12:19:28 +0100 Subject: [PATCH 166/316] Force a run of the image upload workflow to create 4.5 images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-rpm-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index fc42fa2fb3..007a98f1b9 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -34,4 +34,4 @@ jobs: - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} with tag $TAG to Github Container Registry run: - bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} $TAG + bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} 4.5 From 9f2ae9cbdfcb83a7a7c2f35576a733b569fbc099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 27 Jan 2023 12:21:00 +0100 Subject: [PATCH 167/316] Fix tags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 2 +- .github/workflows/upload-rpm-images.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 67cb2be5e1..b858ca145b 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -36,7 +36,7 @@ jobs: - name: Set tag and container name run: | - if [ "${{ steps.changes.outputs.src }}" == "true" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi + if [ "${{ steps.changes.outputs.src }}" == "true" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi if [ "${{ matrix.ARCHITECTURE }}" == "x86_64" ]; then echo "CONTAINER_NAME=rpm_builder_x86" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=rpm_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; fi - name: Download docker image for package building diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index 007a98f1b9..fc42fa2fb3 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -34,4 +34,4 @@ jobs: - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} with tag $TAG to Github Container Registry run: - bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} 4.5 + bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} $TAG From 018d1fcea5371fd22d451e3c91bcec0599365c09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 27 Jan 2023 12:47:37 +0100 Subject: [PATCH 168/316] Add deb GitHub Actions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 50 ++++++++++++++++++++++++ .github/workflows/build-rpm-packages.yml | 2 +- .github/workflows/upload-deb-images.yml | 37 ++++++++++++++++++ .github/workflows/upload-rpm-images.yml | 4 +- 4 files changed, 90 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/build-deb-packages.yml create mode 100644 .github/workflows/upload-deb-images.yml diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml new file mode 100644 index 0000000000..64e6ccf976 --- /dev/null +++ b/.github/workflows/build-deb-packages.yml @@ -0,0 +1,50 @@ +name: Build Wazuh Packages - DEB - All architectures +on: + pull_request: + paths: + - 'debs/SPECS/*' + - 'debs/generate_debian_package.sh' + - 'debs/Debian/*' + - 'debs/build.sh' + - '.github/workflows/upload-deb-images.yml' + workflow_dispatch: + +jobs: + Wazuh-agent-deb-package-builds: + runs-on: ubuntu-latest + strategy: + matrix: + TYPE: [agent, manager] + ARCHITECTURE : [amd64, i386] + fail-fast: false + + steps: + - uses: actions/checkout@v3 + + - name: Get changed files + uses: dorny/paths-filter@v2 + id: changes + with: + filters: | + deb_images: + - 'debs/Debian/**' + - 'debs/build.sh' + - '.github/workflows/upload-deb-images.yml' + deb_packages: + - 'debs/SPECS/**' + - 'debs/generate_debian_package.sh' + + - name: Set tag and container name + run: | + if [ "${{ steps.changes.outputs.src }}" == "true" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi + echo "CONTAINER_NAME=deb_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV + + - name: Download docker image for package building + run: + bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ matrix.image.DOCKERFILE_PATH }} $TAG + + - name: Build the ${{ matrix.ARCHITECTURE }} deb Wazuh ${{ matrix.TYPE }} package + working-directory: ./debs + run: | + bash generate_debian_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 + echo "PACKAGE_NAME=$(ls ./output | grep .deb | head -n 1)" >> $GITHUB_ENV \ No newline at end of file diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index b858ca145b..52b8f8aef5 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -46,5 +46,5 @@ jobs: - name: Build the ${{ matrix.ARCHITECTURE }} rpm Wazuh ${{ matrix.TYPE }} package working-directory: ./rpms run: | - bash generate_rpm_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev + bash generate_rpm_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV \ No newline at end of file diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml new file mode 100644 index 0000000000..854a79a48f --- /dev/null +++ b/.github/workflows/upload-deb-images.yml @@ -0,0 +1,37 @@ +name: Upload DEB package creation Docker images +on: + pull_request: + paths: + - '.github/workflows/upload-deb-images.yml' + - 'debs/Debian/*' + - 'debs/build.sh' + push: + branches: + - master + - 4.4 + paths: + - 'debs/Debian/*' + - 'debs/build.sh' + workflow_dispatch: + +jobs: + Upload-rpm-package-building-images: + runs-on: ubuntu-latest + strategy: + matrix: + image: [ {CONTAINER_NAME: deb_builder_amd64, DOCKERFILE_PATH: debs/Debian/amd64}, {CONTAINER_NAME: deb_builder_i386, DOCKERFILE_PATH: debs/Debian/i386}] + fail-fast: false + steps: + - uses: actions/checkout@v3 + + - name: Copy build.sh to Dockerfile path + run: + cp $GITHUB_WORKSPACE/debs/build.sh $GITHUB_WORKSPACE/${{ matrix.image.DOCKERFILE_PATH }} + + - name: Set tag as version + run: + if [ "${{ github.event_name }}" == "pull_request" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi + + - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} with tag ${{ env.TAG }} to Github Container Registry + run: + bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} $TAG diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index fc42fa2fb3..de28bc14cc 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -1,4 +1,4 @@ -name: Upload package creation Docker images +name: Upload RPM package creation Docker images on: pull_request: paths: @@ -32,6 +32,6 @@ jobs: run: if [ "${{ github.event_name }}" == "pull_request" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi - - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} with tag $TAG to Github Container Registry + - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} with tag ${{ env.TAG }} to Github Container Registry run: bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} $TAG From fbffbd28e1d907faa2ae21da03f3994ee0c661ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 27 Jan 2023 13:12:24 +0100 Subject: [PATCH 169/316] Add `--force-yes` to apt-utils install in deb image build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- debs/Debian/amd64/Dockerfile | 2 +- debs/Debian/i386/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debs/Debian/amd64/Dockerfile b/debs/Debian/amd64/Dockerfile index c3734b3576..76198ac058 100644 --- a/debs/Debian/amd64/Dockerfile +++ b/debs/Debian/amd64/Dockerfile @@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND noninteractive # Installing necessary packages RUN echo "deb http://archive.debian.org/debian/ wheezy contrib main non-free" > /etc/apt/sources.list && \ echo "deb-src http://archive.debian.org/debian/ wheezy contrib main non-free" >> /etc/apt/sources.list && \ - apt-get update && apt-get install -y apt-utils && \ + apt-get update && apt-get install -y --force-yes apt-utils && \ apt-get install -y --force-yes \ curl gcc make sudo wget expect gnupg perl-base=5.14.2-21+deb7u3 perl \ libc-bin=2.13-38+deb7u10 libc6=2.13-38+deb7u10 libc6-dev build-essential \ diff --git a/debs/Debian/i386/Dockerfile b/debs/Debian/i386/Dockerfile index 99eef6c673..b2c9234fa2 100644 --- a/debs/Debian/i386/Dockerfile +++ b/debs/Debian/i386/Dockerfile @@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND noninteractive # Installing necessary packages RUN echo "deb http://archive.debian.org/debian/ wheezy contrib main non-free" > /etc/apt/sources.list && \ echo "deb-src http://archive.debian.org/debian/ wheezy contrib main non-free" >> /etc/apt/sources.list && \ - apt-get update && apt-get install -y apt-utils && \ + apt-get update && apt-get install -y --force-yes apt-utils && \ apt-get install -y --force-yes \ curl gcc-multilib make wget sudo expect gnupg perl-base=5.14.2-21+deb7u3 \ perl libc-bin=2.13-38+deb7u10 libc6=2.13-38+deb7u10 libc6-dev \ From b68b669c74c70023e8f39bcc999731f0080bf34f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 27 Jan 2023 13:24:25 +0100 Subject: [PATCH 170/316] Add `--force-yes` to the Dockerfile for deb package creation to be able to test it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 2 +- .github/workflows/build-rpm-packages.yml | 2 +- .github/workflows/upload-deb-images.yml | 2 +- debs/Debian/amd64/Dockerfile | 2 +- debs/Debian/i386/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 64e6ccf976..5420efd803 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -36,7 +36,7 @@ jobs: - name: Set tag and container name run: | - if [ "${{ steps.changes.outputs.src }}" == "true" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi + if [ "${{ steps.changes.outputs.deb_images }}" == "true" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi echo "CONTAINER_NAME=deb_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV - name: Download docker image for package building diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 52b8f8aef5..78d932ab7c 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -36,7 +36,7 @@ jobs: - name: Set tag and container name run: | - if [ "${{ steps.changes.outputs.src }}" == "true" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi + if [ "${{ steps.changes.outputs.rpm_images }}" == "true" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi if [ "${{ matrix.ARCHITECTURE }}" == "x86_64" ]; then echo "CONTAINER_NAME=rpm_builder_x86" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=rpm_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; fi - name: Download docker image for package building diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index 854a79a48f..06dc25e6b5 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -15,7 +15,7 @@ on: workflow_dispatch: jobs: - Upload-rpm-package-building-images: + Upload-deb-package-building-images: runs-on: ubuntu-latest strategy: matrix: diff --git a/debs/Debian/amd64/Dockerfile b/debs/Debian/amd64/Dockerfile index 76198ac058..cab85b23cd 100644 --- a/debs/Debian/amd64/Dockerfile +++ b/debs/Debian/amd64/Dockerfile @@ -12,7 +12,7 @@ RUN echo "deb http://archive.debian.org/debian/ wheezy contrib main non-free" > cdbs devscripts equivs automake autoconf libtool libaudit-dev selinux-basics \ libdb5.1=5.1.29-5 libdb5.1-dev libssl1.0.0=1.0.1e-2+deb7u20 procps gawk libsigsegv2 -RUN apt-get update && apt-get build-dep python3.2 -y +RUN apt-get update && apt-get build-dep python3.2 -y --force-yes RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ tar xzf gcc-9.4.0.tar.gz && cd gcc-9.4.0/ && \ diff --git a/debs/Debian/i386/Dockerfile b/debs/Debian/i386/Dockerfile index b2c9234fa2..c43803f4bf 100644 --- a/debs/Debian/i386/Dockerfile +++ b/debs/Debian/i386/Dockerfile @@ -14,7 +14,7 @@ RUN echo "deb http://archive.debian.org/debian/ wheezy contrib main non-free" > libssl1.0.0=1.0.1e-2+deb7u20 gawk libsigsegv2 procps # Add Debian's source repository -RUN apt-get update && apt-get build-dep python3.2 -y +RUN apt-get update && apt-get build-dep python3.2 -y --force-yes RUN sed -i "s;/\* To add :#define SO_REUSEPORT 15 \*/;#define SO_REUSEPORT 15;g" /usr/include/asm-generic/socket.h RUN curl -OL http://packages.wazuh.com/utils/gcc/gcc-9.4.0.tar.gz && \ From a833e1fb114260b742076de3365517f8fa05a687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 27 Jan 2023 13:50:16 +0100 Subject: [PATCH 171/316] Call package builder from image uploader if run from a pr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 4 +--- .github/workflows/build-rpm-packages.yml | 4 +--- .github/workflows/upload-deb-images.yml | 5 +++++ .github/workflows/upload-rpm-images.yml | 5 +++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 5420efd803..31eb5ff57c 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -4,10 +4,8 @@ on: paths: - 'debs/SPECS/*' - 'debs/generate_debian_package.sh' - - 'debs/Debian/*' - - 'debs/build.sh' - - '.github/workflows/upload-deb-images.yml' workflow_dispatch: + workflow_call: jobs: Wazuh-agent-deb-package-builds: diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 78d932ab7c..7663b617bb 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -4,10 +4,8 @@ on: paths: - 'rpms/SPECS/*' - 'rpms/generate_rpm_package.sh' - - 'rpms/CentOS/*' - - 'rpms/build.sh' - - '.github/workflows/upload-rpm-images.yml' workflow_dispatch: + workflow_call: jobs: Wazuh-agent-rpm-package-builds: diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index 06dc25e6b5..1ade025193 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -35,3 +35,8 @@ jobs: - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} with tag ${{ env.TAG }} to Github Container Registry run: bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} $TAG + + - name: Call create packages workflow + if: github.event_name == 'pull_request' + uses: ./.github/workflows/build-deb-packages.yml + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index de28bc14cc..5e9d8b2c19 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -35,3 +35,8 @@ jobs: - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} with tag ${{ env.TAG }} to Github Container Registry run: bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} $TAG + + - name: Call create packages workflow + if: github.event_name == 'pull_request' + uses: ./.github/workflows/build-rpm-packages.yml + secrets: inherit \ No newline at end of file From 5e5ed8f565620aaa98fcea2cb5c6c9b44a4e3138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 27 Jan 2023 13:56:16 +0100 Subject: [PATCH 172/316] Change call to package creations from step to job MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 1 - .github/workflows/build-rpm-packages.yml | 1 - .github/workflows/upload-deb-images.yml | 9 ++++----- .github/workflows/upload-rpm-images.yml | 9 ++++----- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 31eb5ff57c..37eef805d2 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -27,7 +27,6 @@ jobs: deb_images: - 'debs/Debian/**' - 'debs/build.sh' - - '.github/workflows/upload-deb-images.yml' deb_packages: - 'debs/SPECS/**' - 'debs/generate_debian_package.sh' diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 7663b617bb..19ef223423 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -27,7 +27,6 @@ jobs: rpm_images: - 'rpms/CentOS/**' - 'rpms/build.sh' - - '.github/workflows/upload-rpm-images.yml' rpm_packages: - 'rpms/SPECS/**' - 'rpms/generate_rpm_package.sh' diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index 1ade025193..5475121e53 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -2,7 +2,6 @@ name: Upload DEB package creation Docker images on: pull_request: paths: - - '.github/workflows/upload-deb-images.yml' - 'debs/Debian/*' - 'debs/build.sh' push: @@ -36,7 +35,7 @@ jobs: run: bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} $TAG - - name: Call create packages workflow - if: github.event_name == 'pull_request' - uses: ./.github/workflows/build-deb-packages.yml - secrets: inherit \ No newline at end of file + Call create packages workflow: + if: github.event_name == 'pull_request' + uses: ./.github/workflows/build-deb-packages.yml + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index 5e9d8b2c19..f3f3983b49 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -2,7 +2,6 @@ name: Upload RPM package creation Docker images on: pull_request: paths: - - '.github/workflows/upload-rpm-images.yml' - 'rpms/CentOS/*' - 'rpms/build.sh' push: @@ -36,7 +35,7 @@ jobs: run: bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} $TAG - - name: Call create packages workflow - if: github.event_name == 'pull_request' - uses: ./.github/workflows/build-rpm-packages.yml - secrets: inherit \ No newline at end of file + Call create packages workflow: + if: github.event_name == 'pull_request' + uses: ./.github/workflows/build-rpm-packages.yml + secrets: inherit \ No newline at end of file From 8b645f24d1e26ad06dbe32089afa04de78a47f4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 27 Jan 2023 14:20:36 +0100 Subject: [PATCH 173/316] Dont build docker image when creating packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 2 +- .github/workflows/build-rpm-packages.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 37eef805d2..76cc2edf00 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -43,5 +43,5 @@ jobs: - name: Build the ${{ matrix.ARCHITECTURE }} deb Wazuh ${{ matrix.TYPE }} package working-directory: ./debs run: | - bash generate_debian_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 + bash generate_debian_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker echo "PACKAGE_NAME=$(ls ./output | grep .deb | head -n 1)" >> $GITHUB_ENV \ No newline at end of file diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 19ef223423..d04bc63ae5 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -43,5 +43,5 @@ jobs: - name: Build the ${{ matrix.ARCHITECTURE }} rpm Wazuh ${{ matrix.TYPE }} package working-directory: ./rpms run: | - bash generate_rpm_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 + bash generate_rpm_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV \ No newline at end of file From 724c70ea8572b8b54d405e4642c865571ca6e53c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 27 Jan 2023 14:24:52 +0100 Subject: [PATCH 174/316] Fix paths in trigger of worflows and call to TAG MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 2 +- .github/workflows/build-rpm-packages.yml | 2 +- .github/workflows/upload-deb-images.yml | 4 ++-- .github/workflows/upload-rpm-images.yml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 76cc2edf00..d9aa854a05 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -38,7 +38,7 @@ jobs: - name: Download docker image for package building run: - bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ matrix.image.DOCKERFILE_PATH }} $TAG + bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} - name: Build the ${{ matrix.ARCHITECTURE }} deb Wazuh ${{ matrix.TYPE }} package working-directory: ./debs diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index d04bc63ae5..0338d3c727 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -38,7 +38,7 @@ jobs: - name: Download docker image for package building run: - bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ matrix.image.DOCKERFILE_PATH }} $TAG + bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} - name: Build the ${{ matrix.ARCHITECTURE }} rpm Wazuh ${{ matrix.TYPE }} package working-directory: ./rpms diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index 5475121e53..6b312b9da4 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -2,7 +2,7 @@ name: Upload DEB package creation Docker images on: pull_request: paths: - - 'debs/Debian/*' + - 'debs/Debian/**' - 'debs/build.sh' push: branches: @@ -33,7 +33,7 @@ jobs: - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} with tag ${{ env.TAG }} to Github Container Registry run: - bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} $TAG + bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} Call create packages workflow: if: github.event_name == 'pull_request' diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index f3f3983b49..db3208ffce 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -2,7 +2,7 @@ name: Upload RPM package creation Docker images on: pull_request: paths: - - 'rpms/CentOS/*' + - 'rpms/CentOS/**' - 'rpms/build.sh' push: branches: @@ -33,7 +33,7 @@ jobs: - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} with tag ${{ env.TAG }} to Github Container Registry run: - bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} $TAG + bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} Call create packages workflow: if: github.event_name == 'pull_request' From 1138bff4226f84d6d6d8629331521f1c738733b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 27 Jan 2023 14:33:36 +0100 Subject: [PATCH 175/316] Add clean workflow runs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/clean-worflow-runs.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/workflows/clean-worflow-runs.yml diff --git a/.github/workflows/clean-worflow-runs.yml b/.github/workflows/clean-worflow-runs.yml new file mode 100644 index 0000000000..9dd8b21405 --- /dev/null +++ b/.github/workflows/clean-worflow-runs.yml @@ -0,0 +1,15 @@ +name: Clean workflow runs +on: workflow-dispatch +jobs: + delete_runs: + runs-on: ubuntu-latest + steps: + - name: Delete workflow runs + uses: dmvict/clean-workflow-runs@v1.0.0 + with: + token: ${{ secrets.GITHUB_TOKEN }} + run_conclusions: | + cancelled + skipped + save_period: 10 + save_min_runs_number: 0 \ No newline at end of file From fbc3b190d73a9afe3bb24ead9794f51af917b231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 27 Jan 2023 14:33:45 +0100 Subject: [PATCH 176/316] Syntax errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-deb-images.yml | 2 +- .github/workflows/upload-rpm-images.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index 6b312b9da4..0e091dc482 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -35,7 +35,7 @@ jobs: run: bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} - Call create packages workflow: + Call-build-packages-workflow: if: github.event_name == 'pull_request' uses: ./.github/workflows/build-deb-packages.yml secrets: inherit \ No newline at end of file diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index db3208ffce..4bd11917fd 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -35,7 +35,7 @@ jobs: run: bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} - Call create packages workflow: + Call-build-packages-workflow: if: github.event_name == 'pull_request' uses: ./.github/workflows/build-rpm-packages.yml secrets: inherit \ No newline at end of file From a7b0e41314aea0f54e7bb7daf1e5d052460b1927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 27 Jan 2023 14:37:21 +0100 Subject: [PATCH 177/316] Add needs to sub-job in upload images and debug MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 1 + .github/workflows/build-rpm-packages.yml | 1 + .github/workflows/upload-deb-images.yml | 1 + .github/workflows/upload-rpm-images.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index d9aa854a05..ec552f91ee 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -38,6 +38,7 @@ jobs: - name: Download docker image for package building run: + echo "bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }}" bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} - name: Build the ${{ matrix.ARCHITECTURE }} deb Wazuh ${{ matrix.TYPE }} package diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 0338d3c727..815617a973 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -38,6 +38,7 @@ jobs: - name: Download docker image for package building run: + echo "bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }}" bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} - name: Build the ${{ matrix.ARCHITECTURE }} rpm Wazuh ${{ matrix.TYPE }} package diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index 0e091dc482..7a3318e279 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -36,6 +36,7 @@ jobs: bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} Call-build-packages-workflow: + needs: Upload-deb-package-building-images if: github.event_name == 'pull_request' uses: ./.github/workflows/build-deb-packages.yml secrets: inherit \ No newline at end of file diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index 4bd11917fd..9a859391a9 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -36,6 +36,7 @@ jobs: bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} Call-build-packages-workflow: + needs: Upload-rpm-package-building-images if: github.event_name == 'pull_request' uses: ./.github/workflows/build-rpm-packages.yml secrets: inherit \ No newline at end of file From 9c99ad5c08fc3e462209eb3701bacb6321dc882c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 27 Jan 2023 14:51:46 +0100 Subject: [PATCH 178/316] Add argument --tag to generate__packages and call it on the actions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 2 +- .github/workflows/build-rpm-packages.yml | 2 +- .github/workflows/clean-worflow-runs.yml | 3 ++- debs/generate_debian_package.sh | 14 ++++++++++++-- rpms/generate_rpm_package.sh | 14 ++++++++++++-- 5 files changed, 28 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index ec552f91ee..bfe7b30c28 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -44,5 +44,5 @@ jobs: - name: Build the ${{ matrix.ARCHITECTURE }} deb Wazuh ${{ matrix.TYPE }} package working-directory: ./debs run: | - bash generate_debian_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker + bash generate_debian_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} echo "PACKAGE_NAME=$(ls ./output | grep .deb | head -n 1)" >> $GITHUB_ENV \ No newline at end of file diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 815617a973..eb88f5f875 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -44,5 +44,5 @@ jobs: - name: Build the ${{ matrix.ARCHITECTURE }} rpm Wazuh ${{ matrix.TYPE }} package working-directory: ./rpms run: | - bash generate_rpm_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker + bash generate_rpm_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV \ No newline at end of file diff --git a/.github/workflows/clean-worflow-runs.yml b/.github/workflows/clean-worflow-runs.yml index 9dd8b21405..49ac19f2c7 100644 --- a/.github/workflows/clean-worflow-runs.yml +++ b/.github/workflows/clean-worflow-runs.yml @@ -1,5 +1,6 @@ name: Clean workflow runs -on: workflow-dispatch +on: + workflow-dispatch: jobs: delete_runs: runs-on: ubuntu-latest diff --git a/debs/generate_debian_package.sh b/debs/generate_debian_package.sh index 6195db8ebb..ca8c5f964b 100755 --- a/debs/generate_debian_package.sh +++ b/debs/generate_debian_package.sh @@ -16,6 +16,7 @@ TARGET="" JOBS="2" DEBUG="no" BUILD_DOCKER="yes" +DOCKER_TAG="latest" INSTALLATION_PATH="/var/ossec" DEB_AMD64_BUILDER="deb_builder_amd64" DEB_I386_BUILDER="deb_builder_i386" @@ -66,7 +67,7 @@ build_deb() { # Build the Docker image if [[ ${BUILD_DOCKER} == "yes" ]]; then - docker build -t ${CONTAINER_NAME} ${DOCKERFILE_PATH} || return 1 + docker build -t ${CONTAINER_NAME}:${DOCKER_TAG} ${DOCKERFILE_PATH} || return 1 fi # Build the Debian package with a Docker container @@ -74,7 +75,7 @@ build_deb() { -v ${CHECKSUMDIR}:/var/local/checksum:Z \ -v ${LOCAL_SPECS}:/specs:Z \ ${CUSTOM_CODE_VOL} \ - ${CONTAINER_NAME} ${TARGET} ${BRANCH} ${ARCHITECTURE} \ + ${CONTAINER_NAME}:${DOCKER_TAG} ${TARGET} ${BRANCH} ${ARCHITECTURE} \ ${REVISION} ${JOBS} ${INSTALLATION_PATH} ${DEBUG} \ ${CHECKSUM} ${PACKAGES_BRANCH} ${USE_LOCAL_SPECS} \ ${USE_LOCAL_SOURCE_CODE} ${FUTURE}|| return 1 @@ -152,6 +153,7 @@ help() { echo " -d, --debug [Optional] Build the binaries with debug symbols. By default: no." echo " -c, --checksum [Optional] Generate checksum on the desired path (by default, if no path is specified it will be generated on the same directory than the package)." echo " --dont-build-docker [Optional] Locally built docker image will be used instead of generating a new one." + echo " --tag [Optional] Tag to use with the docker image." echo " --sources [Optional] Absolute path containing wazuh source code. This option will use local source code instead of downloading it from GitHub." echo " --packages-branch [Optional] Select Git branch or tag from wazuh-packages repository. e.g master." echo " --dev [Optional] Use the SPECS files stored in the host instead of downloading them from GitHub." @@ -237,6 +239,14 @@ main() { BUILD_DOCKER="no" shift 1 ;; + "--tag") + if [ -n "$2" ]; then + TAG="$2" + shift 2 + else + help 1 + fi + ;; "-s"|"--store") if [ -n "$2" ]; then OUTDIR="$2" diff --git a/rpms/generate_rpm_package.sh b/rpms/generate_rpm_package.sh index 89d57977dd..530407ac53 100755 --- a/rpms/generate_rpm_package.sh +++ b/rpms/generate_rpm_package.sh @@ -19,6 +19,7 @@ TARGET="" JOBS="2" DEBUG="no" BUILD_DOCKER="yes" +DOCKER_TAG="latest" USER_PATH="no" SRC="no" RPM_AARCH64_BUILDER="rpm_builder_aarch64" @@ -86,7 +87,7 @@ build_rpm() { # Build the Docker image if [[ ${BUILD_DOCKER} == "yes" ]]; then - docker build -t ${CONTAINER_NAME} ${DOCKERFILE_PATH} || return 1 + docker build -t ${CONTAINER_NAME}:${DOCKER_TAG} ${DOCKERFILE_PATH} || return 1 fi # Build the RPM package with a Docker container @@ -94,7 +95,7 @@ build_rpm() { -v ${CHECKSUMDIR}:/var/local/checksum:Z \ -v ${LOCAL_SPECS}:/specs:Z \ ${CUSTOM_CODE_VOL} \ - ${CONTAINER_NAME} ${TARGET} ${BRANCH} ${ARCHITECTURE} \ + ${CONTAINER_NAME}:${DOCKER_TAG} ${TARGET} ${BRANCH} ${ARCHITECTURE} \ ${JOBS} ${REVISION} ${INSTALLATION_PATH} ${DEBUG} \ ${CHECKSUM} ${PACKAGES_BRANCH} ${USE_LOCAL_SPECS} ${SRC} \ ${LEGACY} ${USE_LOCAL_SOURCE_CODE} ${FUTURE}|| return 1 @@ -181,6 +182,7 @@ help() { echo " -d, --debug [Optional] Build the binaries with debug symbols and create debuginfo packages. By default: no." echo " -c, --checksum [Optional] Generate checksum on the desired path (by default, if no path is specified it will be generated on the same directory than the package)." echo " --dont-build-docker [Optional] Locally built docker image will be used instead of generating a new one." + echo " --tag [Optional] Tag to use with the docker image." echo " --sources [Optional] Absolute path containing wazuh source code. This option will use local source code instead of downloading it from GitHub." echo " --packages-branch [Optional] Select Git branch or tag from wazuh-packages repository. e.g ${PACKAGES_BRANCH}" echo " --dev [Optional] Use the SPECS files stored in the host instead of downloading them from GitHub." @@ -261,6 +263,14 @@ main() { BUILD_DOCKER="no" shift 1 ;; + "--tag") + if [ -n "$2" ]; then + TAG="$2" + shift 2 + else + help 1 + fi + ;; "-c"|"--checksum") if [ -n "$2" ]; then CHECKSUMDIR="$2" From 903bb9a30ed32ff7f2633cd4b5f59bec1c4fc196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 27 Jan 2023 14:58:14 +0100 Subject: [PATCH 179/316] Fix syntax MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/clean-worflow-runs.yml | 3 +-- debs/generate_debian_package.sh | 2 +- rpms/generate_rpm_package.sh | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/clean-worflow-runs.yml b/.github/workflows/clean-worflow-runs.yml index 49ac19f2c7..66b38ff0fc 100644 --- a/.github/workflows/clean-worflow-runs.yml +++ b/.github/workflows/clean-worflow-runs.yml @@ -1,6 +1,5 @@ name: Clean workflow runs -on: - workflow-dispatch: +on: workflow_dispatch jobs: delete_runs: runs-on: ubuntu-latest diff --git a/debs/generate_debian_package.sh b/debs/generate_debian_package.sh index ca8c5f964b..e3ccf969dc 100755 --- a/debs/generate_debian_package.sh +++ b/debs/generate_debian_package.sh @@ -241,7 +241,7 @@ main() { ;; "--tag") if [ -n "$2" ]; then - TAG="$2" + DOCKER_TAG="$2" shift 2 else help 1 diff --git a/rpms/generate_rpm_package.sh b/rpms/generate_rpm_package.sh index 530407ac53..9371dec599 100755 --- a/rpms/generate_rpm_package.sh +++ b/rpms/generate_rpm_package.sh @@ -265,7 +265,7 @@ main() { ;; "--tag") if [ -n "$2" ]; then - TAG="$2" + DOCKER_TAG="$2" shift 2 else help 1 From c4008743d913a552d6d25417932b30a6de603550 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 27 Jan 2023 15:10:22 +0100 Subject: [PATCH 180/316] Change made to force the different runtype of the workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- rpms/CentOS/6/i386/CentOS-Base.repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpms/CentOS/6/i386/CentOS-Base.repo b/rpms/CentOS/6/i386/CentOS-Base.repo index 1f492ab2b8..aac76933ec 100644 --- a/rpms/CentOS/6/i386/CentOS-Base.repo +++ b/rpms/CentOS/6/i386/CentOS-Base.repo @@ -8,7 +8,7 @@ # If the mirrorlist= does not work for you, as a fall back you can try the # remarked out baseurl= line instead. # -# + [base] name=CentOS-$releasever - Base From 80451d0a269cebfe6a897c6a0cdcbd84391ad00e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 27 Jan 2023 15:22:16 +0100 Subject: [PATCH 181/316] Remove debug and fix call to pull image script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/actions/common-tools/pull_image_from_ghcr.sh | 1 - .github/workflows/build-deb-packages.yml | 3 +-- .github/workflows/build-rpm-packages.yml | 3 +-- .github/workflows/clean-worflow-runs.yml | 4 +++- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/actions/common-tools/pull_image_from_ghcr.sh b/.github/actions/common-tools/pull_image_from_ghcr.sh index 474279c754..98f668d89e 100644 --- a/.github/actions/common-tools/pull_image_from_ghcr.sh +++ b/.github/actions/common-tools/pull_image_from_ghcr.sh @@ -19,5 +19,4 @@ GITHUB_OWNER="wazuh" IMAGE_ID=ghcr.io/${GITHUB_OWNER}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} IMAGE_ID=$(echo ${IMAGE_ID} | tr '[A-Z]' '[a-z]') -echo "docker pull ${IMAGE_ID}" docker pull ${IMAGE_ID} diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index bfe7b30c28..731ebcc786 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -38,8 +38,7 @@ jobs: - name: Download docker image for package building run: - echo "bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }}" - bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} + bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ env.TAG }} - name: Build the ${{ matrix.ARCHITECTURE }} deb Wazuh ${{ matrix.TYPE }} package working-directory: ./debs diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index eb88f5f875..bd1a9fd862 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -38,8 +38,7 @@ jobs: - name: Download docker image for package building run: - echo "bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }}" - bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} + bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ env.TAG }} - name: Build the ${{ matrix.ARCHITECTURE }} rpm Wazuh ${{ matrix.TYPE }} package working-directory: ./rpms diff --git a/.github/workflows/clean-worflow-runs.yml b/.github/workflows/clean-worflow-runs.yml index 66b38ff0fc..d61ffdae79 100644 --- a/.github/workflows/clean-worflow-runs.yml +++ b/.github/workflows/clean-worflow-runs.yml @@ -1,5 +1,7 @@ name: Clean workflow runs -on: workflow_dispatch +on: + workflow_dispatch: + jobs: delete_runs: runs-on: ubuntu-latest From e720ff75bf68e19ef3360bb140cbead42ce64046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 27 Jan 2023 16:09:00 +0100 Subject: [PATCH 182/316] Add other ways of triggering the cleaning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/clean-worflow-runs.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/clean-worflow-runs.yml b/.github/workflows/clean-worflow-runs.yml index d61ffdae79..78a169eebb 100644 --- a/.github/workflows/clean-worflow-runs.yml +++ b/.github/workflows/clean-worflow-runs.yml @@ -1,9 +1,14 @@ name: Clean workflow runs -on: +on: workflow_dispatch: + schedule: + - cron: '0 0 * * 1' + pull_request: + paths: + - '.github/workflows/clean-workflow-runs.yml' jobs: - delete_runs: + Clean-runs: runs-on: ubuntu-latest steps: - name: Delete workflow runs @@ -13,5 +18,4 @@ jobs: run_conclusions: | cancelled skipped - save_period: 10 - save_min_runs_number: 0 \ No newline at end of file + save_period: 10 \ No newline at end of file From 26f4cb6671e7835a244bec8f9b1a2d1515254c2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 27 Jan 2023 16:16:43 +0100 Subject: [PATCH 183/316] Debug MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 3 ++- .github/workflows/build-rpm-packages.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 731ebcc786..be555ab665 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -37,8 +37,9 @@ jobs: echo "CONTAINER_NAME=deb_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV - name: Download docker image for package building - run: + run: | bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ env.TAG }} + echo $(docker images) - name: Build the ${{ matrix.ARCHITECTURE }} deb Wazuh ${{ matrix.TYPE }} package working-directory: ./debs diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index bd1a9fd862..b60c1c0ad0 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -37,8 +37,9 @@ jobs: if [ "${{ matrix.ARCHITECTURE }}" == "x86_64" ]; then echo "CONTAINER_NAME=rpm_builder_x86" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=rpm_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; fi - name: Download docker image for package building - run: + run: | bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ env.TAG }} + echo $(docker images) - name: Build the ${{ matrix.ARCHITECTURE }} rpm Wazuh ${{ matrix.TYPE }} package working-directory: ./rpms From 4e768aac8ae816295b3e9ff8c2cc31375fc1ccd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 27 Jan 2023 16:27:44 +0100 Subject: [PATCH 184/316] Remove repo name from image name after pulling it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/actions/common-tools/pull_image_from_ghcr.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/common-tools/pull_image_from_ghcr.sh b/.github/actions/common-tools/pull_image_from_ghcr.sh index 98f668d89e..79c2682f51 100644 --- a/.github/actions/common-tools/pull_image_from_ghcr.sh +++ b/.github/actions/common-tools/pull_image_from_ghcr.sh @@ -20,3 +20,4 @@ IMAGE_ID=ghcr.io/${GITHUB_OWNER}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} IMAGE_ID=$(echo ${IMAGE_ID} | tr '[A-Z]' '[a-z]') docker pull ${IMAGE_ID} +docker image tag ghcr.io/${GITHUB_OWNER}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} ${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} From fff3dd8d761b0225a71a2ad1eaef6221ebebdcb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 27 Jan 2023 16:33:41 +0100 Subject: [PATCH 185/316] Upload the created package as an artifact MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 9 +++++++-- .github/workflows/build-rpm-packages.yml | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index be555ab665..75d44fa245 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -39,10 +39,15 @@ jobs: - name: Download docker image for package building run: | bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ env.TAG }} - echo $(docker images) - name: Build the ${{ matrix.ARCHITECTURE }} deb Wazuh ${{ matrix.TYPE }} package working-directory: ./debs run: | bash generate_debian_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} - echo "PACKAGE_NAME=$(ls ./output | grep .deb | head -n 1)" >> $GITHUB_ENV \ No newline at end of file + echo "PACKAGE_NAME=$(ls ./output | grep .deb | head -n 1)" >> $GITHUB_ENV + + - name: Upload Wazuh ${{ matrix.TYPE }} ${{ matrix.ARCHITECTURE }} package as artifact + uses: actions/upload-artifact@v2 + with: + name: ${{ env.PACKAGE_NAME }} + path: ${{github.workspace}}/rpms/output/${{ env.PACKAGE_NAME }} \ No newline at end of file diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index b60c1c0ad0..73a5dda2ef 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -39,10 +39,15 @@ jobs: - name: Download docker image for package building run: | bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ env.TAG }} - echo $(docker images) - name: Build the ${{ matrix.ARCHITECTURE }} rpm Wazuh ${{ matrix.TYPE }} package working-directory: ./rpms run: | bash generate_rpm_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} - echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV \ No newline at end of file + echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV + + - name: Upload Wazuh ${{ matrix.TYPE }} ${{ matrix.ARCHITECTURE }} package as artifact + uses: actions/upload-artifact@v2 + with: + name: ${{ env.PACKAGE_NAME }} + path: ${{github.workspace}}/rpms/output/${{ env.PACKAGE_NAME }} \ No newline at end of file From 7b707ce3f383d7e66926fad2ac154510d377f8ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 27 Jan 2023 17:02:15 +0100 Subject: [PATCH 186/316] Fix workflow names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 2 +- .github/workflows/build-rpm-packages.yml | 2 +- .github/workflows/upload-deb-images.yml | 2 +- .github/workflows/upload-rpm-images.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 75d44fa245..d8272ca996 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -1,4 +1,4 @@ -name: Build Wazuh Packages - DEB - All architectures +name: Build Wazuh Packages - DEB - amd64 and i386 on: pull_request: paths: diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 73a5dda2ef..4e28656056 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -1,4 +1,4 @@ -name: Build Wazuh Packages - RPM - All architectures +name: Build Wazuh Packages - RPM - x86_64 and i386 on: pull_request: paths: diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index 7a3318e279..0941aefc87 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -1,4 +1,4 @@ -name: Upload DEB package creation Docker images +name: Upload package creation Docker images - DEB - amd64 and i386 on: pull_request: paths: diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index 9a859391a9..711e9252d1 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -1,4 +1,4 @@ -name: Upload RPM package creation Docker images +name: Upload package creation Docker images - RPM - x86 and i386 on: pull_request: paths: From 026d6530c3e6f0efde82772bf173c6a188f4dad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 10:16:01 +0100 Subject: [PATCH 187/316] Remove the test for manager i386, as it is not supported MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 3 +++ .github/workflows/build-rpm-packages.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index d8272ca996..74921c6f34 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -14,6 +14,9 @@ jobs: matrix: TYPE: [agent, manager] ARCHITECTURE : [amd64, i386] + exclude: + - TYPE: manager + ARCHITECTURE: i386 fail-fast: false steps: diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 4e28656056..87a286b252 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -14,6 +14,9 @@ jobs: matrix: TYPE: [agent, manager] ARCHITECTURE : [x86_64, i386] + exclude: + - TYPE: manager + ARCHITECTURE: i386 fail-fast: false steps: From 16228ac30b2cfc07aab1d8ddf4cc76b578d058ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 11:28:03 +0100 Subject: [PATCH 188/316] Add install and enable tests after the creation of packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 2 +- .github/workflows/build-rpm-packages.yml | 9 ++- .../workflows/test-install-and-enable-rpm.yml | 56 ++++--------------- 3 files changed, 18 insertions(+), 49 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 74921c6f34..3e4695e8c3 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -46,7 +46,7 @@ jobs: - name: Build the ${{ matrix.ARCHITECTURE }} deb Wazuh ${{ matrix.TYPE }} package working-directory: ./debs run: | - bash generate_debian_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} + bash generate_debian_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} -r 'test' echo "PACKAGE_NAME=$(ls ./output | grep .deb | head -n 1)" >> $GITHUB_ENV - name: Upload Wazuh ${{ matrix.TYPE }} ${{ matrix.ARCHITECTURE }} package as artifact diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 87a286b252..09cb442a75 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -46,11 +46,16 @@ jobs: - name: Build the ${{ matrix.ARCHITECTURE }} rpm Wazuh ${{ matrix.TYPE }} package working-directory: ./rpms run: | - bash generate_rpm_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} + bash generate_rpm_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} -r 'test' echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - name: Upload Wazuh ${{ matrix.TYPE }} ${{ matrix.ARCHITECTURE }} package as artifact uses: actions/upload-artifact@v2 with: name: ${{ env.PACKAGE_NAME }} - path: ${{github.workspace}}/rpms/output/${{ env.PACKAGE_NAME }} \ No newline at end of file + path: ${{github.workspace}}/rpms/output/${{ env.PACKAGE_NAME }} + + Call-test-packages-workflow: + needs: Wazuh-agent-rpm-package-builds + uses: ./.github/workflows/test-install-and-enable-rpm.yml + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index efea81a784..b98851e691 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -1,11 +1,7 @@ name: Test install and enable Wazuh agent and manager - RPM on: - pull_request: - paths: - - 'rpms/SPECS/*' - - 'rpms/generate_rpm_package.sh' - - 'rpms/build.sh' workflow_dispatch: + workflow_call: jobs: Cancel-previous-runs: @@ -21,62 +17,30 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - include: - - imagename: almalinux - version: 9 - type: agent - - imagename: oraclelinux - version: 9 - type: agent - - imagename: rockylinux - version: 9 - type: agent - - imagename: centos - version: 7 - type: agent - - imagename: centos - version: 7 - type: manager - - imagename: centos - version: 8 - type: agent - - imagename: centos - version: 8 - type: manager - - imagename: redhat/ubi8 - version: latest - type: agent - - imagename: redhat/ubi8 - version: latest - type: manager - - imagename: redhat/ubi9 - version: latest - type: agent - - imagename: redhat/ubi9 - version: latest - type: manager + system: [{DISTRO: "oraclelinux", VERSION: 9}, {DISTRO: "almalinux", VERSION: 9}, {DISTRO: "rockylinux", VERSION: 9}, {DISTRO: "centos", VERSION: 7, 8}, {DISTRO: "redhat/ubi8", VERSION: latest}, {DISTRO: "redhat/ubi9", VERSION: latest"}] + type: [agent, manager] fail-fast: false steps: - uses: actions/checkout@v3 - name: Setup directories and variables run: | - mkdir $GITHUB_WORKSPACE/packages - echo 'PACKAGE_NAME=wazuh-${{ matrix.type }}-4.4.0-1.x86_64.rpm' >> $GITHUB_ENV + echo 'VERSION=$GITHUB_WORKSPACE/VERSION' >> $GITHUB_ENV + echo 'PACKAGE_NAME=wazuh-${{ matrix.type }}-${{ env.VERSION }}-test.x86_64.rpm' >> $GITHUB_ENV - - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.imagename }}:${{ matrix.version }} + - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.DISTRO }}:${{ matrix.system.VERSION }} uses: dawidd6/action-download-artifact@v2 with: - workflow: create-rpm-packages.yml + workflow: build-rpm-packages.yml workflow_conclusion: success name: $PACKAGE_NAME - - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.imagename }}:${{ matrix.version }} + - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.system.DISTRO }}:${{ matrix.system.VERSION }} to the packages directory working-directory: ./rpms run: | - #curl -o $PACKAGE_NAME https://packages-dev.wazuh.com/pre-release/yum/$PACKAGE_NAME + mkdir $GITHUB_WORKSPACE/packages mv $PACKAGE_NAME $GITHUB_WORKSPACE/packages - name: Launch docker - run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.imagename }}:${{ matrix.version }} bash /tests/install_and_enable.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.system.DISTRO }}:${{ matrix.system.VERSION }} bash /tests/install_and_enable.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file From 5a9a74300d68ff50bd130777d96af3566d1945ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 11:32:11 +0100 Subject: [PATCH 189/316] Fix syntax error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 2 +- .github/workflows/build-rpm-packages.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 3e4695e8c3..fdb0bab7f6 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -46,7 +46,7 @@ jobs: - name: Build the ${{ matrix.ARCHITECTURE }} deb Wazuh ${{ matrix.TYPE }} package working-directory: ./debs run: | - bash generate_debian_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} -r 'test' + bash generate_debian_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} -r 'test' echo "PACKAGE_NAME=$(ls ./output | grep .deb | head -n 1)" >> $GITHUB_ENV - name: Upload Wazuh ${{ matrix.TYPE }} ${{ matrix.ARCHITECTURE }} package as artifact diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 09cb442a75..3ff51d43ec 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -46,7 +46,7 @@ jobs: - name: Build the ${{ matrix.ARCHITECTURE }} rpm Wazuh ${{ matrix.TYPE }} package working-directory: ./rpms run: | - bash generate_rpm_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} -r 'test' + bash generate_rpm_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} -r test echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - name: Upload Wazuh ${{ matrix.TYPE }} ${{ matrix.ARCHITECTURE }} package as artifact From fb8b0ebd1de1bd5cb4cd1cf48f68b8f42e88f996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 11:38:05 +0100 Subject: [PATCH 190/316] Change uses syntax from path to owner/repo/path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 2 +- .github/workflows/upload-deb-images.yml | 2 +- .github/workflows/upload-rpm-images.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 3ff51d43ec..1f3932becb 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -57,5 +57,5 @@ jobs: Call-test-packages-workflow: needs: Wazuh-agent-rpm-package-builds - uses: ./.github/workflows/test-install-and-enable-rpm.yml + uses: wazuh/wazuh-packages/.github/workflows/test-install-and-enable-rpm.yml secrets: inherit \ No newline at end of file diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index 0941aefc87..466cb03f8c 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -38,5 +38,5 @@ jobs: Call-build-packages-workflow: needs: Upload-deb-package-building-images if: github.event_name == 'pull_request' - uses: ./.github/workflows/build-deb-packages.yml + uses: wazuh/wazuh-packages/.github/workflows/build-deb-packages.yml secrets: inherit \ No newline at end of file diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index 711e9252d1..6b44b8abb7 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -38,5 +38,5 @@ jobs: Call-build-packages-workflow: needs: Upload-rpm-package-building-images if: github.event_name == 'pull_request' - uses: ./.github/workflows/build-rpm-packages.yml + uses: wazuh/wazuh-packages/.github/workflows/build-rpm-packages.yml secrets: inherit \ No newline at end of file From 2ad23d6abbf854c3b900e1ff83e00f4e8ab46e32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 12:01:53 +0100 Subject: [PATCH 191/316] Add commit reference to uses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 2 +- .github/workflows/upload-deb-images.yml | 2 +- .github/workflows/upload-rpm-images.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 1f3932becb..c0bb64a9e3 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -57,5 +57,5 @@ jobs: Call-test-packages-workflow: needs: Wazuh-agent-rpm-package-builds - uses: wazuh/wazuh-packages/.github/workflows/test-install-and-enable-rpm.yml + uses: wazuh/wazuh-packages/.github/workflows/test-install-and-enable-rpm.yml@${{ github.commit_ref }} secrets: inherit \ No newline at end of file diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index 466cb03f8c..373c0d5406 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -38,5 +38,5 @@ jobs: Call-build-packages-workflow: needs: Upload-deb-package-building-images if: github.event_name == 'pull_request' - uses: wazuh/wazuh-packages/.github/workflows/build-deb-packages.yml + uses: wazuh/wazuh-packages/.github/workflows/build-deb-packages.yml@${{ github.commit_ref }} secrets: inherit \ No newline at end of file diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index 6b44b8abb7..033d1291a2 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -38,5 +38,5 @@ jobs: Call-build-packages-workflow: needs: Upload-rpm-package-building-images if: github.event_name == 'pull_request' - uses: wazuh/wazuh-packages/.github/workflows/build-rpm-packages.yml + uses: wazuh/wazuh-packages/.github/workflows/build-rpm-packages.yml@${{ github.commit_ref }} secrets: inherit \ No newline at end of file From 898423327ffa38d6a07f8680c5ac4308aa8632c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 12:03:41 +0100 Subject: [PATCH 192/316] Change variable used to add reference to commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 2 +- .github/workflows/upload-deb-images.yml | 2 +- .github/workflows/upload-rpm-images.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index c0bb64a9e3..2ffddf0219 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -57,5 +57,5 @@ jobs: Call-test-packages-workflow: needs: Wazuh-agent-rpm-package-builds - uses: wazuh/wazuh-packages/.github/workflows/test-install-and-enable-rpm.yml@${{ github.commit_ref }} + uses: wazuh/wazuh-packages/.github/workflows/test-install-and-enable-rpm.yml@${{ github.sha }} secrets: inherit \ No newline at end of file diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index 373c0d5406..8ae421da9b 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -38,5 +38,5 @@ jobs: Call-build-packages-workflow: needs: Upload-deb-package-building-images if: github.event_name == 'pull_request' - uses: wazuh/wazuh-packages/.github/workflows/build-deb-packages.yml@${{ github.commit_ref }} + uses: wazuh/wazuh-packages/.github/workflows/build-deb-packages.yml@${{ github.sha }} secrets: inherit \ No newline at end of file diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index 033d1291a2..22be710674 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -38,5 +38,5 @@ jobs: Call-build-packages-workflow: needs: Upload-rpm-package-building-images if: github.event_name == 'pull_request' - uses: wazuh/wazuh-packages/.github/workflows/build-rpm-packages.yml@${{ github.commit_ref }} + uses: wazuh/wazuh-packages/.github/workflows/build-rpm-packages.yml@${{ github.sha }} secrets: inherit \ No newline at end of file From 0663e3df8cb0e905f18c7a049f626d7f795b0ffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 12:16:07 +0100 Subject: [PATCH 193/316] Try direct path for reusable worflows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 8 ++++---- .github/workflows/upload-deb-images.yml | 2 +- .github/workflows/upload-rpm-images.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 2ffddf0219..e3aabb2d55 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -55,7 +55,7 @@ jobs: name: ${{ env.PACKAGE_NAME }} path: ${{github.workspace}}/rpms/output/${{ env.PACKAGE_NAME }} - Call-test-packages-workflow: - needs: Wazuh-agent-rpm-package-builds - uses: wazuh/wazuh-packages/.github/workflows/test-install-and-enable-rpm.yml@${{ github.sha }} - secrets: inherit \ No newline at end of file + # Call-test-packages-workflow: + # needs: Wazuh-agent-rpm-package-builds + # uses: wazuh/wazuh-packages/.github/workflows/test-install-and-enable-rpm.yml@${{ github.sha }} + # secrets: inherit \ No newline at end of file diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index 8ae421da9b..048042fd47 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -38,5 +38,5 @@ jobs: Call-build-packages-workflow: needs: Upload-deb-package-building-images if: github.event_name == 'pull_request' - uses: wazuh/wazuh-packages/.github/workflows/build-deb-packages.yml@${{ github.sha }} + uses: .github/workflows/build-deb-packages.yml secrets: inherit \ No newline at end of file diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index 22be710674..58efbcade8 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -38,5 +38,5 @@ jobs: Call-build-packages-workflow: needs: Upload-rpm-package-building-images if: github.event_name == 'pull_request' - uses: wazuh/wazuh-packages/.github/workflows/build-rpm-packages.yml@${{ github.sha }} + uses: .github/workflows/build-rpm-packages.yml secrets: inherit \ No newline at end of file From d52d9551914e1afbbce1ff73b5586686a2ca0824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 12:17:53 +0100 Subject: [PATCH 194/316] Change path type to reuse workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-deb-images.yml | 2 +- .github/workflows/upload-rpm-images.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index 048042fd47..0941aefc87 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -38,5 +38,5 @@ jobs: Call-build-packages-workflow: needs: Upload-deb-package-building-images if: github.event_name == 'pull_request' - uses: .github/workflows/build-deb-packages.yml + uses: ./.github/workflows/build-deb-packages.yml secrets: inherit \ No newline at end of file diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index 58efbcade8..711e9252d1 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -38,5 +38,5 @@ jobs: Call-build-packages-workflow: needs: Upload-rpm-package-building-images if: github.event_name == 'pull_request' - uses: .github/workflows/build-rpm-packages.yml + uses: ./.github/workflows/build-rpm-packages.yml secrets: inherit \ No newline at end of file From 35f1a023f0a30419f1189f075bf13d7415906773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 12:27:05 +0100 Subject: [PATCH 195/316] Add call to test the packages after creating them MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index e3aabb2d55..3ff51d43ec 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -55,7 +55,7 @@ jobs: name: ${{ env.PACKAGE_NAME }} path: ${{github.workspace}}/rpms/output/${{ env.PACKAGE_NAME }} - # Call-test-packages-workflow: - # needs: Wazuh-agent-rpm-package-builds - # uses: wazuh/wazuh-packages/.github/workflows/test-install-and-enable-rpm.yml@${{ github.sha }} - # secrets: inherit \ No newline at end of file + Call-test-packages-workflow: + needs: Wazuh-agent-rpm-package-builds + uses: ./.github/workflows/test-install-and-enable-rpm.yml + secrets: inherit \ No newline at end of file From ba1d83195b5d066d367d4eb7b7fd1743c0fa0cc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 12:34:49 +0100 Subject: [PATCH 196/316] Check if test install and enable works on its own MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 9 +++++---- .github/workflows/test-install-and-enable-rpm.yml | 13 ++++--------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 3ff51d43ec..d38e6b62e9 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -55,7 +55,8 @@ jobs: name: ${{ env.PACKAGE_NAME }} path: ${{github.workspace}}/rpms/output/${{ env.PACKAGE_NAME }} - Call-test-packages-workflow: - needs: Wazuh-agent-rpm-package-builds - uses: ./.github/workflows/test-install-and-enable-rpm.yml - secrets: inherit \ No newline at end of file + # Call-test-packages-workflow: + # needs: + # - Wazuh-agent-rpm-package-builds + # uses: ./.github/workflows/test-install-and-enable-rpm.yml + # secrets: inherit \ No newline at end of file diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index b98851e691..79c8fef6d3 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -1,18 +1,13 @@ name: Test install and enable Wazuh agent and manager - RPM on: + pull_request: + paths: + - 'rpms/SPECS/*' + - 'rpms/generate_rpm_package.sh' workflow_dispatch: workflow_call: jobs: - Cancel-previous-runs: - name: 'Cancel Previous Runs' - runs-on: ubuntu-latest - timeout-minutes: 3 - steps: - - uses: styfle/cancel-workflow-action - with: - workflow_id: ${{ github.run_id }} - Test-install-and-enable-rpm-systems: runs-on: ubuntu-latest strategy: From 68e3eeeefee11be20a1cd9346cd0990dc6641622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 12:52:04 +0100 Subject: [PATCH 197/316] Fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 5 +++-- .github/workflows/build-rpm-packages.yml | 1 + .github/workflows/test-install-and-enable-rpm.yml | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index fdb0bab7f6..b81826f934 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -46,11 +46,12 @@ jobs: - name: Build the ${{ matrix.ARCHITECTURE }} deb Wazuh ${{ matrix.TYPE }} package working-directory: ./debs run: | - bash generate_debian_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} -r 'test' + bash generate_debian_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} -r test echo "PACKAGE_NAME=$(ls ./output | grep .deb | head -n 1)" >> $GITHUB_ENV - name: Upload Wazuh ${{ matrix.TYPE }} ${{ matrix.ARCHITECTURE }} package as artifact uses: actions/upload-artifact@v2 with: name: ${{ env.PACKAGE_NAME }} - path: ${{github.workspace}}/rpms/output/${{ env.PACKAGE_NAME }} \ No newline at end of file + path: ${{github.workspace}}/debs/output/${{ env.PACKAGE_NAME }} + if-no-files-found: error \ No newline at end of file diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index d38e6b62e9..bd83e50322 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -54,6 +54,7 @@ jobs: with: name: ${{ env.PACKAGE_NAME }} path: ${{github.workspace}}/rpms/output/${{ env.PACKAGE_NAME }} + if-no-files-found: error # Call-test-packages-workflow: # needs: diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 79c8fef6d3..9c851cf7b3 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -28,14 +28,14 @@ jobs: with: workflow: build-rpm-packages.yml workflow_conclusion: success - name: $PACKAGE_NAME + name: ${{env.PACKAGE_NAME}} - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.system.DISTRO }}:${{ matrix.system.VERSION }} to the packages directory working-directory: ./rpms run: | mkdir $GITHUB_WORKSPACE/packages - mv $PACKAGE_NAME $GITHUB_WORKSPACE/packages + mv ${{env.PACKAGE_NAME}} $GITHUB_WORKSPACE/packages - name: Launch docker run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.system.DISTRO }}:${{ matrix.system.VERSION }} bash /tests/install_and_enable.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file From 023be39f0d8710188b7d25f77059a1a82fe57e2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 12:58:17 +0100 Subject: [PATCH 198/316] Change call to VERSION variable inside step MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-rpm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 9c851cf7b3..4f2182dcdd 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -21,7 +21,7 @@ jobs: - name: Setup directories and variables run: | echo 'VERSION=$GITHUB_WORKSPACE/VERSION' >> $GITHUB_ENV - echo 'PACKAGE_NAME=wazuh-${{ matrix.type }}-${{ env.VERSION }}-test.x86_64.rpm' >> $GITHUB_ENV + echo 'PACKAGE_NAME=wazuh-${{ matrix.type }}-$VERSION-test.x86_64.rpm' >> $GITHUB_ENV - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.DISTRO }}:${{ matrix.system.VERSION }} uses: dawidd6/action-download-artifact@v2 From 7abf95b709e32e07f6095bf7e19d3dd150fddcfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 13:01:04 +0100 Subject: [PATCH 199/316] Fix variable VERSION setting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-rpm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 4f2182dcdd..c32150a6d5 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -20,7 +20,7 @@ jobs: - name: Setup directories and variables run: | - echo 'VERSION=$GITHUB_WORKSPACE/VERSION' >> $GITHUB_ENV + VERSION=$GITHUB_WORKSPACE/VERSION echo 'PACKAGE_NAME=wazuh-${{ matrix.type }}-$VERSION-test.x86_64.rpm' >> $GITHUB_ENV - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.DISTRO }}:${{ matrix.system.VERSION }} From dc2b1c705843177ecd16fd1f70c953f517b49518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 13:04:28 +0100 Subject: [PATCH 200/316] Fix variable VERSION setting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-rpm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index c32150a6d5..aaae625837 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -20,7 +20,7 @@ jobs: - name: Setup directories and variables run: | - VERSION=$GITHUB_WORKSPACE/VERSION + VERSION=$(cat $GITHUB_WORKSPACE/VERSION) echo 'PACKAGE_NAME=wazuh-${{ matrix.type }}-$VERSION-test.x86_64.rpm' >> $GITHUB_ENV - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.DISTRO }}:${{ matrix.system.VERSION }} From 7da79992683a7951027841d4232a13b72372fa5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 13:10:05 +0100 Subject: [PATCH 201/316] Change single for double quotes when setting the package name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-rpm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index aaae625837..431b71ef0e 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -21,7 +21,7 @@ jobs: - name: Setup directories and variables run: | VERSION=$(cat $GITHUB_WORKSPACE/VERSION) - echo 'PACKAGE_NAME=wazuh-${{ matrix.type }}-$VERSION-test.x86_64.rpm' >> $GITHUB_ENV + echo "PACKAGE_NAME=wazuh-${{ matrix.type }}-$VERSION-test.x86_64.rpm" >> $GITHUB_ENV - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.DISTRO }}:${{ matrix.system.VERSION }} uses: dawidd6/action-download-artifact@v2 From aa2ebc343e6795fa61b01176743281c3b6775637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 13:20:26 +0100 Subject: [PATCH 202/316] Change path for the moving of the package and add argument to artifact download MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-rpm.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 431b71ef0e..2296d885c8 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -29,13 +29,14 @@ jobs: workflow: build-rpm-packages.yml workflow_conclusion: success name: ${{env.PACKAGE_NAME}} + if_no_artifact_found: fail - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.system.DISTRO }}:${{ matrix.system.VERSION }} to the packages directory working-directory: ./rpms run: | mkdir $GITHUB_WORKSPACE/packages - mv ${{env.PACKAGE_NAME}} $GITHUB_WORKSPACE/packages + mv ./${{env.PACKAGE_NAME}} $GITHUB_WORKSPACE/packages - name: Launch docker run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.system.DISTRO }}:${{ matrix.system.VERSION }} bash /tests/install_and_enable.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file From d1e6c053123f251c211e26fbeea2ed485203d538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 13:23:04 +0100 Subject: [PATCH 203/316] Remove unneccessary working directory from step MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-rpm.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 2296d885c8..c32b7676c9 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -33,10 +33,9 @@ jobs: - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.system.DISTRO }}:${{ matrix.system.VERSION }} to the packages directory - working-directory: ./rpms run: | mkdir $GITHUB_WORKSPACE/packages - mv ./${{env.PACKAGE_NAME}} $GITHUB_WORKSPACE/packages + mv ${{env.PACKAGE_NAME}} $GITHUB_WORKSPACE/packages - name: Launch docker run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.system.DISTRO }}:${{ matrix.system.VERSION }} bash /tests/install_and_enable.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file From 94629360d96147cb9e471b2dfb9907bd61e462dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 13:29:42 +0100 Subject: [PATCH 204/316] Cancel duplicate workflows and fix test install MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 3 +++ .github/workflows/build-rpm-packages.yml | 3 +++ .github/workflows/test-install-and-enable-rpm.yml | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index b81826f934..a54cf02e3a 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -22,6 +22,9 @@ jobs: steps: - uses: actions/checkout@v3 + - id: skip_check + uses: fkirc/skip-duplicate-actions@master + - name: Get changed files uses: dorny/paths-filter@v2 id: changes diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index bd83e50322..c0ebd6df4c 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -22,6 +22,9 @@ jobs: steps: - uses: actions/checkout@v3 + - id: skip_check + uses: fkirc/skip-duplicate-actions@master + - name: Get changed files uses: dorny/paths-filter@v2 id: changes diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index c32b7676c9..a7fe6932e4 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - system: [{DISTRO: "oraclelinux", VERSION: 9}, {DISTRO: "almalinux", VERSION: 9}, {DISTRO: "rockylinux", VERSION: 9}, {DISTRO: "centos", VERSION: 7, 8}, {DISTRO: "redhat/ubi8", VERSION: latest}, {DISTRO: "redhat/ubi9", VERSION: latest"}] + system: [{DISTRO: "oraclelinux", VERSION: 9}, {DISTRO: "almalinux", VERSION: 9}, {DISTRO: "rockylinux", VERSION: 9}, {DISTRO: "centos", VERSION: 7, 8}, {DISTRO: "redhat/ubi8", VERSION: latest}, {DISTRO: "redhat/ubi9", VERSION: latest}] type: [agent, manager] fail-fast: false steps: From ec3f3d56fcf7035fcf02f8a4755d4709f2292943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 13:36:35 +0100 Subject: [PATCH 205/316] Call the install test after creating the packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index c0ebd6df4c..cd064cad6e 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -59,8 +59,7 @@ jobs: path: ${{github.workspace}}/rpms/output/${{ env.PACKAGE_NAME }} if-no-files-found: error - # Call-test-packages-workflow: - # needs: - # - Wazuh-agent-rpm-package-builds - # uses: ./.github/workflows/test-install-and-enable-rpm.yml - # secrets: inherit \ No newline at end of file + Call-test-packages-workflow: + needs: Wazuh-agent-rpm-package-builds + uses: ./.github/workflows/test-install-and-enable-rpm.yml + secrets: inherit \ No newline at end of file From 253b2fe0a6ca3055a7864a67b1a31970b2640014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 14:30:13 +0100 Subject: [PATCH 206/316] Add tests install and enable for debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 7 ++- .github/workflows/build-rpm-packages.yml | 2 +- .../workflows/test-install-and-enable-deb.yml | 43 +++++++++++++++++++ .../workflows/test-install-and-enable-rpm.yml | 26 +++++++---- 4 files changed, 67 insertions(+), 11 deletions(-) create mode 100644 .github/workflows/test-install-and-enable-deb.yml diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index a54cf02e3a..aaa5024ca0 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -57,4 +57,9 @@ jobs: with: name: ${{ env.PACKAGE_NAME }} path: ${{github.workspace}}/debs/output/${{ env.PACKAGE_NAME }} - if-no-files-found: error \ No newline at end of file + if-no-files-found: error + + Test-install-packages-deb: + needs: Wazuh-agent-deb-package-builds + uses: ./.github/workflows/test-install-and-enable-deb.yml + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index cd064cad6e..ccf195fe2a 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -59,7 +59,7 @@ jobs: path: ${{github.workspace}}/rpms/output/${{ env.PACKAGE_NAME }} if-no-files-found: error - Call-test-packages-workflow: + Test-install-packages-rpm: needs: Wazuh-agent-rpm-package-builds uses: ./.github/workflows/test-install-and-enable-rpm.yml secrets: inherit \ No newline at end of file diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml new file mode 100644 index 0000000000..1b9cec5b3e --- /dev/null +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -0,0 +1,43 @@ +name: Test install and enable Wazuh agent and manager - DEB +on: + workflow_dispatch: + workflow_call: + +jobs: + Test-install-and-enable-deb-systems: + runs-on: ubuntu-latest + strategy: + matrix: + distro_name: [ubuntu:xenial, ubuntu:bionic, ubuntu:focal, ubuntu:jammy, debian:stretch, debian:buster, debian:bullseye, amazonlinux:2] + type: [agent, manager] + arch: [amd64, i386] + exclude: + - distro_name: amazonlinux:2 + arch: i386 + - type: manager + arch: i386 + fail-fast: false + steps: + - uses: actions/checkout@v3 + + - name: Setup directories and variables + run: | + VERSION=$(cat $GITHUB_WORKSPACE/VERSION) + echo "PACKAGE_NAME=wazuh-${{ matrix.type }}-$VERSION-test.${{ matrix.arch }}.rpm" >> $GITHUB_ENV + + - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} + uses: dawidd6/action-download-artifact@v2 + with: + workflow: build-rpm-packages.yml + workflow_conclusion: success + name: ${{env.PACKAGE_NAME}} + if_no_artifact_found: fail + + + - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} to the packages directory + run: | + mkdir $GITHUB_WORKSPACE/packages + mv ${{env.PACKAGE_NAME}} $GITHUB_WORKSPACE/packages + + - name: Launch docker + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.distro_name }} bash /tests/install_and_enable.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index a7fe6932e4..b9fce9db4d 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -1,9 +1,5 @@ name: Test install and enable Wazuh agent and manager - RPM on: - pull_request: - paths: - - 'rpms/SPECS/*' - - 'rpms/generate_rpm_package.sh' workflow_dispatch: workflow_call: @@ -12,8 +8,20 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - system: [{DISTRO: "oraclelinux", VERSION: 9}, {DISTRO: "almalinux", VERSION: 9}, {DISTRO: "rockylinux", VERSION: 9}, {DISTRO: "centos", VERSION: 7, 8}, {DISTRO: "redhat/ubi8", VERSION: latest}, {DISTRO: "redhat/ubi9", VERSION: latest}] + system: [ + {NAME: "oraclelinux:9", ARCH: "x86_64"}, + {NAME: "almalinux:9", ARCH: "x86_64"}, + {NAME: "rockylinux:9", ARCH: "x86_64"}, + {NAME: "centos:7", ARCH: "x86_64"}, + {NAME: "centos:8", ARCH: "i386"}, + {NAME: "i386/centos:7", ARCH: "x86_64"}, + {NAME: "i386/centos:7", ARCH: "i386"}, + {NAME: "redhat/ubi8:latest", ARCH: "x86_64"}, + {NAME: "redhat/ubi9:latest", ARCH: "x86_64"}] type: [agent, manager] + exclude: + - system: {ARCH: "i386"} + type: manager fail-fast: false steps: - uses: actions/checkout@v3 @@ -21,9 +29,9 @@ jobs: - name: Setup directories and variables run: | VERSION=$(cat $GITHUB_WORKSPACE/VERSION) - echo "PACKAGE_NAME=wazuh-${{ matrix.type }}-$VERSION-test.x86_64.rpm" >> $GITHUB_ENV + echo "PACKAGE_NAME=wazuh-${{ matrix.type }}-$VERSION-test.${{matrix.system.ARCH}}.rpm" >> $GITHUB_ENV - - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.DISTRO }}:${{ matrix.system.VERSION }} + - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} uses: dawidd6/action-download-artifact@v2 with: workflow: build-rpm-packages.yml @@ -32,10 +40,10 @@ jobs: if_no_artifact_found: fail - - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.system.DISTRO }}:${{ matrix.system.VERSION }} to the packages directory + - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} to the packages directory run: | mkdir $GITHUB_WORKSPACE/packages mv ${{env.PACKAGE_NAME}} $GITHUB_WORKSPACE/packages - name: Launch docker - run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.system.DISTRO }}:${{ matrix.system.VERSION }} bash /tests/install_and_enable.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.system.NAME }} bash /tests/install_and_enable.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file From 93afcdd4604adbc5459e6494026a572ad55ccd04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 14:34:19 +0100 Subject: [PATCH 207/316] Change quotes in docker images name for testing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../workflows/test-install-and-enable-deb.yml | 2 +- .../workflows/test-install-and-enable-rpm.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 1b9cec5b3e..f6d6880a99 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - distro_name: [ubuntu:xenial, ubuntu:bionic, ubuntu:focal, ubuntu:jammy, debian:stretch, debian:buster, debian:bullseye, amazonlinux:2] + distro_name: ['ubuntu:xenial', 'ubuntu:bionic', 'ubuntu:focal', 'ubuntu:jammy', 'debian:stretch', 'debian:buster', 'debian:bullseye', 'amazonlinux:2'] type: [agent, manager] arch: [amd64, i386] exclude: diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index b9fce9db4d..987224b1c8 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -9,15 +9,15 @@ jobs: strategy: matrix: system: [ - {NAME: "oraclelinux:9", ARCH: "x86_64"}, - {NAME: "almalinux:9", ARCH: "x86_64"}, - {NAME: "rockylinux:9", ARCH: "x86_64"}, - {NAME: "centos:7", ARCH: "x86_64"}, - {NAME: "centos:8", ARCH: "i386"}, - {NAME: "i386/centos:7", ARCH: "x86_64"}, - {NAME: "i386/centos:7", ARCH: "i386"}, - {NAME: "redhat/ubi8:latest", ARCH: "x86_64"}, - {NAME: "redhat/ubi9:latest", ARCH: "x86_64"}] + {NAME: 'oraclelinux:9', ARCH: "x86_64"}, + {NAME: 'almalinux:0', ARCH: "x86_64"}, + {NAME: 'rockylinux:9', ARCH: "x86_64"}, + {NAME: 'centos:7', ARCH: "x86_64"}, + {NAME: 'centos:8', ARCH: "i386"}, + {NAME: 'i386/centos:7', ARCH: "x86_64"}, + {NAME: 'i386/centos:7', ARCH: "i386"}, + {NAME: 'redhat/ubi8:latest', ARCH: "x86_64"}, + {NAME: 'redhat/ubi9:latest', ARCH: "x86_64"}] type: [agent, manager] exclude: - system: {ARCH: "i386"} From 43d7de26927acfce46862ce3285192bc6fdb1bbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 14:41:03 +0100 Subject: [PATCH 208/316] Remove the skip duplicates action in the package building and change names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 3 --- .github/workflows/build-rpm-packages.yml | 3 --- .github/workflows/upload-deb-images.yml | 2 +- .github/workflows/upload-rpm-images.yml | 2 +- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index aaa5024ca0..d667353d45 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -22,9 +22,6 @@ jobs: steps: - uses: actions/checkout@v3 - - id: skip_check - uses: fkirc/skip-duplicate-actions@master - - name: Get changed files uses: dorny/paths-filter@v2 id: changes diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index ccf195fe2a..f9a2dad486 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -22,9 +22,6 @@ jobs: steps: - uses: actions/checkout@v3 - - id: skip_check - uses: fkirc/skip-duplicate-actions@master - - name: Get changed files uses: dorny/paths-filter@v2 id: changes diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index 0941aefc87..c94f3a961d 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -35,7 +35,7 @@ jobs: run: bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} - Call-build-packages-workflow: + Build-packages-rpm: needs: Upload-deb-package-building-images if: github.event_name == 'pull_request' uses: ./.github/workflows/build-deb-packages.yml diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index 711e9252d1..cfbbb4844c 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -35,7 +35,7 @@ jobs: run: bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} - Call-build-packages-workflow: + Build-packages-rpm: needs: Upload-rpm-package-building-images if: github.event_name == 'pull_request' uses: ./.github/workflows/build-rpm-packages.yml From 42c6fef8248a5d6fdd612fa81f137178faf47959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 14:49:18 +0100 Subject: [PATCH 209/316] Fix architecture errors for the install and enable tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../test-install-enable/install_and_enable.sh | 15 ++++++++++++++- .github/workflows/build-deb-packages.yml | 3 +++ .github/workflows/build-rpm-packages.yml | 3 +++ .github/workflows/test-install-and-enable-deb.yml | 2 +- .github/workflows/test-install-and-enable-rpm.yml | 6 +++--- 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/.github/actions/test-install-enable/install_and_enable.sh b/.github/actions/test-install-enable/install_and_enable.sh index d97cfb83ec..2c895e26d0 100644 --- a/.github/actions/test-install-enable/install_and_enable.sh +++ b/.github/actions/test-install-enable/install_and_enable.sh @@ -1,11 +1,24 @@ #!/bin/bash echo "Installing Wazuh $2." + source /etc/os-release if [ "$ID" = "centos" ] && [ "$VERSION_ID" = "8" ]; then find /etc/yum.repos.d/ -type f -exec sed -i 's/mirrorlist/#mirrorlist/g' {} \; find /etc/yum.repos.d/ -type f -exec sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' {} \; fi -yum install -y "/packages/$1" + +if [ -n "$(command -v yum)" ]; then + sys_type="yum" + sep="-" +elif [ -n "$(command -v apt-get)" ]; then + sys_type="apt-get" + sep="=" +else + common_logger -e "Couldn'd find type of system" + exit 1 +fi + +$sys_type install -y "/packages/$1" echo "Enabling Wazuh $2." systemctl enable wazuh-$2 diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index d667353d45..aaa5024ca0 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -22,6 +22,9 @@ jobs: steps: - uses: actions/checkout@v3 + - id: skip_check + uses: fkirc/skip-duplicate-actions@master + - name: Get changed files uses: dorny/paths-filter@v2 id: changes diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index f9a2dad486..ccf195fe2a 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -22,6 +22,9 @@ jobs: steps: - uses: actions/checkout@v3 + - id: skip_check + uses: fkirc/skip-duplicate-actions@master + - name: Get changed files uses: dorny/paths-filter@v2 id: changes diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index f6d6880a99..d7a6827707 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -10,7 +10,7 @@ jobs: matrix: distro_name: ['ubuntu:xenial', 'ubuntu:bionic', 'ubuntu:focal', 'ubuntu:jammy', 'debian:stretch', 'debian:buster', 'debian:bullseye', 'amazonlinux:2'] type: [agent, manager] - arch: [amd64, i386] + arch: [x86_64, i386] exclude: - distro_name: amazonlinux:2 arch: i386 diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 987224b1c8..ca5e9acfcf 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -10,12 +10,12 @@ jobs: matrix: system: [ {NAME: 'oraclelinux:9', ARCH: "x86_64"}, - {NAME: 'almalinux:0', ARCH: "x86_64"}, + {NAME: 'almalinux:9', ARCH: "x86_64"}, {NAME: 'rockylinux:9', ARCH: "x86_64"}, {NAME: 'centos:7', ARCH: "x86_64"}, - {NAME: 'centos:8', ARCH: "i386"}, - {NAME: 'i386/centos:7', ARCH: "x86_64"}, + {NAME: 'centos:8', ARCH: "x86_64"}, {NAME: 'i386/centos:7', ARCH: "i386"}, + {NAME: 'i386/centos:8', ARCH: "i386"}, {NAME: 'redhat/ubi8:latest', ARCH: "x86_64"}, {NAME: 'redhat/ubi9:latest', ARCH: "x86_64"}] type: [agent, manager] From 32e2f1e1239cfe0425af468287e491eeb552e35f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 15:37:18 +0100 Subject: [PATCH 210/316] Fixes for the install and enable test for both rpm and deb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 4 ++-- .github/workflows/test-install-and-enable-rpm.yml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index d7a6827707..9df52375b1 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -23,12 +23,12 @@ jobs: - name: Setup directories and variables run: | VERSION=$(cat $GITHUB_WORKSPACE/VERSION) - echo "PACKAGE_NAME=wazuh-${{ matrix.type }}-$VERSION-test.${{ matrix.arch }}.rpm" >> $GITHUB_ENV + echo "PACKAGE_NAME=wazuh-${{ matrix.type }}-$VERSION-test.${{ matrix.arch }}.deb" >> $GITHUB_ENV - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} uses: dawidd6/action-download-artifact@v2 with: - workflow: build-rpm-packages.yml + workflow: build-deb-packages.yml workflow_conclusion: success name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index ca5e9acfcf..f2b9f54874 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -15,7 +15,6 @@ jobs: {NAME: 'centos:7', ARCH: "x86_64"}, {NAME: 'centos:8', ARCH: "x86_64"}, {NAME: 'i386/centos:7', ARCH: "i386"}, - {NAME: 'i386/centos:8', ARCH: "i386"}, {NAME: 'redhat/ubi8:latest', ARCH: "x86_64"}, {NAME: 'redhat/ubi9:latest', ARCH: "x86_64"}] type: [agent, manager] From 080e1d927d4f710d43c33d95f13df15e8e592098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 15:48:02 +0100 Subject: [PATCH 211/316] Architecture fixes in install and enable test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 3 --- .github/workflows/build-rpm-packages.yml | 3 --- .github/workflows/test-install-and-enable-deb.yml | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index aaa5024ca0..d667353d45 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -22,9 +22,6 @@ jobs: steps: - uses: actions/checkout@v3 - - id: skip_check - uses: fkirc/skip-duplicate-actions@master - - name: Get changed files uses: dorny/paths-filter@v2 id: changes diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index ccf195fe2a..f9a2dad486 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -22,9 +22,6 @@ jobs: steps: - uses: actions/checkout@v3 - - id: skip_check - uses: fkirc/skip-duplicate-actions@master - - name: Get changed files uses: dorny/paths-filter@v2 id: changes diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 9df52375b1..5d755d58ff 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -10,7 +10,7 @@ jobs: matrix: distro_name: ['ubuntu:xenial', 'ubuntu:bionic', 'ubuntu:focal', 'ubuntu:jammy', 'debian:stretch', 'debian:buster', 'debian:bullseye', 'amazonlinux:2'] type: [agent, manager] - arch: [x86_64, i386] + arch: [amd64, i386] exclude: - distro_name: amazonlinux:2 arch: i386 From 96a16e172ad4cb529078ffcf71b4f2329f482100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 15:53:49 +0100 Subject: [PATCH 212/316] Change amazon linux from deb to rpm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 4 +--- .github/workflows/test-install-and-enable-rpm.yml | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 5d755d58ff..4dfbfb59f8 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -8,12 +8,10 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - distro_name: ['ubuntu:xenial', 'ubuntu:bionic', 'ubuntu:focal', 'ubuntu:jammy', 'debian:stretch', 'debian:buster', 'debian:bullseye', 'amazonlinux:2'] + distro_name: ['ubuntu:xenial', 'ubuntu:bionic', 'ubuntu:focal', 'ubuntu:jammy', 'debian:stretch', 'debian:buster', 'debian:bullseye'] type: [agent, manager] arch: [amd64, i386] exclude: - - distro_name: amazonlinux:2 - arch: i386 - type: manager arch: i386 fail-fast: false diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index f2b9f54874..982128ca9d 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -16,7 +16,8 @@ jobs: {NAME: 'centos:8', ARCH: "x86_64"}, {NAME: 'i386/centos:7', ARCH: "i386"}, {NAME: 'redhat/ubi8:latest', ARCH: "x86_64"}, - {NAME: 'redhat/ubi9:latest', ARCH: "x86_64"}] + {NAME: 'redhat/ubi9:latest', ARCH: "x86_64"}, + {NAME: 'amazonlinux:2', ARCH: "x86_64"}] type: [agent, manager] exclude: - system: {ARCH: "i386"} From 4a92498fc92177316cc63a79b12f02fe4bcedc19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 16:03:10 +0100 Subject: [PATCH 213/316] Fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 4dfbfb59f8..c07171ec87 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -21,7 +21,7 @@ jobs: - name: Setup directories and variables run: | VERSION=$(cat $GITHUB_WORKSPACE/VERSION) - echo "PACKAGE_NAME=wazuh-${{ matrix.type }}-$VERSION-test.${{ matrix.arch }}.deb" >> $GITHUB_ENV + echo "PACKAGE_NAME=wazuh-${{ matrix.type }}-$VERSION-test_${{ matrix.arch }}.deb" >> $GITHUB_ENV - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} uses: dawidd6/action-download-artifact@v2 From 887f670fbae9f72c56b10ce28e1f4386a80a368b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 16:16:05 +0100 Subject: [PATCH 214/316] Fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index c07171ec87..f420426453 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -21,7 +21,7 @@ jobs: - name: Setup directories and variables run: | VERSION=$(cat $GITHUB_WORKSPACE/VERSION) - echo "PACKAGE_NAME=wazuh-${{ matrix.type }}-$VERSION-test_${{ matrix.arch }}.deb" >> $GITHUB_ENV + echo "PACKAGE_NAME=wazuh-${{ matrix.type }}_$VERSION-test_${{ matrix.arch }}.deb" >> $GITHUB_ENV - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} uses: dawidd6/action-download-artifact@v2 From 50b5e27d12c369fe5d5db872d0d1e24efec20294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 16:58:22 +0100 Subject: [PATCH 215/316] Update apt repos before installing the package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/actions/test-install-enable/install_and_enable.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/actions/test-install-enable/install_and_enable.sh b/.github/actions/test-install-enable/install_and_enable.sh index 2c895e26d0..22d31dd041 100644 --- a/.github/actions/test-install-enable/install_and_enable.sh +++ b/.github/actions/test-install-enable/install_and_enable.sh @@ -9,10 +9,9 @@ fi if [ -n "$(command -v yum)" ]; then sys_type="yum" - sep="-" elif [ -n "$(command -v apt-get)" ]; then sys_type="apt-get" - sep="=" + apt-get update else common_logger -e "Couldn'd find type of system" exit 1 From 82c4953646079c554c201d03421b38dd5659879a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 17:21:14 +0100 Subject: [PATCH 216/316] Install systemd on DEB systems MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/actions/test-install-enable/install_and_enable.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/test-install-enable/install_and_enable.sh b/.github/actions/test-install-enable/install_and_enable.sh index 22d31dd041..ed82e33ada 100644 --- a/.github/actions/test-install-enable/install_and_enable.sh +++ b/.github/actions/test-install-enable/install_and_enable.sh @@ -12,6 +12,7 @@ if [ -n "$(command -v yum)" ]; then elif [ -n "$(command -v apt-get)" ]; then sys_type="apt-get" apt-get update + apt-get install -y systemd else common_logger -e "Couldn'd find type of system" exit 1 From 23ad40755fc825c37daa8aaf4cf670a6df225c76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 17:34:09 +0100 Subject: [PATCH 217/316] DEB docker add architecture MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index f420426453..80090c423a 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -38,4 +38,4 @@ jobs: mv ${{env.PACKAGE_NAME}} $GITHUB_WORKSPACE/packages - name: Launch docker - run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.distro_name }} bash /tests/install_and_enable.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.arch }}/${{ matrix.distro_name }} bash /tests/install_and_enable.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file From 7ce0a3c2b80f052c493275c5b7bb38e98478e88c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 30 Jan 2023 17:44:43 +0100 Subject: [PATCH 218/316] Remove distro combination ubuntu:jammy with i386 architecture MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 80090c423a..605e1397de 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -14,6 +14,8 @@ jobs: exclude: - type: manager arch: i386 + - distro_name: 'ubuntu:jammy' + arch: i386 fail-fast: false steps: - uses: actions/checkout@v3 From 527f94f3baf42ff6413c74725b9d249e655ea3bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 09:29:35 +0100 Subject: [PATCH 219/316] Change revision of packages for the name of the branch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 3 ++- .github/workflows/build-rpm-packages.yml | 3 ++- .github/workflows/test-install-and-enable-deb.yml | 3 ++- .github/workflows/test-install-and-enable-rpm.yml | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index d667353d45..7e41f948b9 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -46,7 +46,8 @@ jobs: - name: Build the ${{ matrix.ARCHITECTURE }} deb Wazuh ${{ matrix.TYPE }} package working-directory: ./debs run: | - bash generate_debian_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} -r test + REVISION="${{ github.ref }}" + bash generate_debian_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} -r REVISION echo "PACKAGE_NAME=$(ls ./output | grep .deb | head -n 1)" >> $GITHUB_ENV - name: Upload Wazuh ${{ matrix.TYPE }} ${{ matrix.ARCHITECTURE }} package as artifact diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index f9a2dad486..8bc939f95c 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -46,7 +46,8 @@ jobs: - name: Build the ${{ matrix.ARCHITECTURE }} rpm Wazuh ${{ matrix.TYPE }} package working-directory: ./rpms run: | - bash generate_rpm_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} -r test + REVISION="${{ github.ref }}" + bash generate_rpm_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} -r REVISION echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - name: Upload Wazuh ${{ matrix.TYPE }} ${{ matrix.ARCHITECTURE }} package as artifact diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 605e1397de..f0e6670d2b 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -23,7 +23,8 @@ jobs: - name: Setup directories and variables run: | VERSION=$(cat $GITHUB_WORKSPACE/VERSION) - echo "PACKAGE_NAME=wazuh-${{ matrix.type }}_$VERSION-test_${{ matrix.arch }}.deb" >> $GITHUB_ENV + REVISION="${{ github.ref }}" + echo "PACKAGE_NAME=wazuh-${{ matrix.type }}_$VERSION-$REVISION_${{ matrix.arch }}.deb" >> $GITHUB_ENV - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} uses: dawidd6/action-download-artifact@v2 diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 982128ca9d..c1a32ee6cf 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -29,7 +29,8 @@ jobs: - name: Setup directories and variables run: | VERSION=$(cat $GITHUB_WORKSPACE/VERSION) - echo "PACKAGE_NAME=wazuh-${{ matrix.type }}-$VERSION-test.${{matrix.system.ARCH}}.rpm" >> $GITHUB_ENV + REVISION="${{ github.ref }}" + echo "PACKAGE_NAME=wazuh-${{ matrix.type }}-$VERSION-$REVISION.${{matrix.system.ARCH}}.rpm" >> $GITHUB_ENV - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} uses: dawidd6/action-download-artifact@v2 From d35caa5bbf18848066dfa4f3ba7091181771270b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 09:51:18 +0100 Subject: [PATCH 220/316] Change package revision name and add step to retry artifact uri MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 4 ++-- .github/workflows/build-rpm-packages.yml | 6 ++++-- .github/workflows/test-install-and-enable-deb.yml | 13 +++++++++++-- .github/workflows/test-install-and-enable-rpm.yml | 11 ++++++++++- 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 7e41f948b9..2c3902d83c 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -46,8 +46,8 @@ jobs: - name: Build the ${{ matrix.ARCHITECTURE }} deb Wazuh ${{ matrix.TYPE }} package working-directory: ./debs run: | - REVISION="${{ github.ref }}" - bash generate_debian_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} -r REVISION + REVISION="${{ github.head_ref }}" + bash generate_debian_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} -r $REVISION echo "PACKAGE_NAME=$(ls ./output | grep .deb | head -n 1)" >> $GITHUB_ENV - name: Upload Wazuh ${{ matrix.TYPE }} ${{ matrix.ARCHITECTURE }} package as artifact diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 8bc939f95c..a039b0db7d 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -6,6 +6,8 @@ on: - 'rpms/generate_rpm_package.sh' workflow_dispatch: workflow_call: + input: + jobs: Wazuh-agent-rpm-package-builds: @@ -46,8 +48,8 @@ jobs: - name: Build the ${{ matrix.ARCHITECTURE }} rpm Wazuh ${{ matrix.TYPE }} package working-directory: ./rpms run: | - REVISION="${{ github.ref }}" - bash generate_rpm_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} -r REVISION + REVISION="${{ github.head_ref }}" + bash generate_rpm_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} -r $REVISION echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - name: Upload Wazuh ${{ matrix.TYPE }} ${{ matrix.ARCHITECTURE }} package as artifact diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index f0e6670d2b..6be79486c6 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -23,10 +23,20 @@ jobs: - name: Setup directories and variables run: | VERSION=$(cat $GITHUB_WORKSPACE/VERSION) - REVISION="${{ github.ref }}" + REVISION="${{ github.head_ref }}" echo "PACKAGE_NAME=wazuh-${{ matrix.type }}_$VERSION-$REVISION_${{ matrix.arch }}.deb" >> $GITHUB_ENV - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} + id: download_package + uses: dawidd6/action-download-artifact@v2 + with: + workflow: build-deb-packages.yml + workflow_conclusion: success + name: ${{env.PACKAGE_NAME}} + if_no_artifact_found: warn + + - name: Try again to download execution timetable from the last workflow if failed + if: ${{ always() && steps.download_package.outcome == 'failure' }} uses: dawidd6/action-download-artifact@v2 with: workflow: build-deb-packages.yml @@ -34,7 +44,6 @@ jobs: name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail - - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} to the packages directory run: | mkdir $GITHUB_WORKSPACE/packages diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index c1a32ee6cf..cf3246c06e 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -29,10 +29,11 @@ jobs: - name: Setup directories and variables run: | VERSION=$(cat $GITHUB_WORKSPACE/VERSION) - REVISION="${{ github.ref }}" + REVISION="${{ github.head_ref }}" echo "PACKAGE_NAME=wazuh-${{ matrix.type }}-$VERSION-$REVISION.${{matrix.system.ARCH}}.rpm" >> $GITHUB_ENV - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} + id: download_package uses: dawidd6/action-download-artifact@v2 with: workflow: build-rpm-packages.yml @@ -40,6 +41,14 @@ jobs: name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail + - name: Try again to download execution timetable from the last workflow if failed + if: ${{ always() && steps.download_package.outcome == 'failure' }} + uses: dawidd6/action-download-artifact@v2 + with: + workflow: build-rpm-packages.yml + workflow_conclusion: success + name: ${{env.PACKAGE_NAME}} + if_no_artifact_found: fail - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} to the packages directory run: | From 642237ff649b92ed7aabc7317d401438b8c16aea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 09:52:58 +0100 Subject: [PATCH 221/316] Remove unnecessary input: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index a039b0db7d..7513d8dee2 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -6,7 +6,6 @@ on: - 'rpms/generate_rpm_package.sh' workflow_dispatch: workflow_call: - input: jobs: From 18b46714ccdde3eb9b01637f2d229d114062b8c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 10:14:51 +0100 Subject: [PATCH 222/316] Remove hyphen for revision in rpm and debug MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 2 +- .github/workflows/test-install-and-enable-deb.yml | 1 + .github/workflows/test-install-and-enable-rpm.yml | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 7513d8dee2..4a0691926c 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -47,7 +47,7 @@ jobs: - name: Build the ${{ matrix.ARCHITECTURE }} rpm Wazuh ${{ matrix.TYPE }} package working-directory: ./rpms run: | - REVISION="${{ github.head_ref }}" + REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g' ) bash generate_rpm_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} -r $REVISION echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 6be79486c6..663fa1d188 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -25,6 +25,7 @@ jobs: VERSION=$(cat $GITHUB_WORKSPACE/VERSION) REVISION="${{ github.head_ref }}" echo "PACKAGE_NAME=wazuh-${{ matrix.type }}_$VERSION-$REVISION_${{ matrix.arch }}.deb" >> $GITHUB_ENV + cat $GITHUB_ENV - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} id: download_package diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index cf3246c06e..06c4d3f136 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -29,8 +29,9 @@ jobs: - name: Setup directories and variables run: | VERSION=$(cat $GITHUB_WORKSPACE/VERSION) - REVISION="${{ github.head_ref }}" + REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g' ) echo "PACKAGE_NAME=wazuh-${{ matrix.type }}-$VERSION-$REVISION.${{matrix.system.ARCH}}.rpm" >> $GITHUB_ENV + cat $GITHUB_ENV - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} id: download_package @@ -39,7 +40,7 @@ jobs: workflow: build-rpm-packages.yml workflow_conclusion: success name: ${{env.PACKAGE_NAME}} - if_no_artifact_found: fail + if_no_artifact_found: warn - name: Try again to download execution timetable from the last workflow if failed if: ${{ always() && steps.download_package.outcome == 'failure' }} From 051171da8cd435489aa4ecd9f73f5ba448b7a720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 10:27:02 +0100 Subject: [PATCH 223/316] Change the workflow conclusion neccessary to download the artifact to in_progress MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 6 +++--- .github/workflows/test-install-and-enable-rpm.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 663fa1d188..f22235e6db 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -32,16 +32,16 @@ jobs: uses: dawidd6/action-download-artifact@v2 with: workflow: build-deb-packages.yml - workflow_conclusion: success + workflow_conclusion: in_progress name: ${{env.PACKAGE_NAME}} - if_no_artifact_found: warn + if_no_artifact_found: fail - name: Try again to download execution timetable from the last workflow if failed if: ${{ always() && steps.download_package.outcome == 'failure' }} uses: dawidd6/action-download-artifact@v2 with: workflow: build-deb-packages.yml - workflow_conclusion: success + workflow_conclusion: in_progress name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 06c4d3f136..8c83422534 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -38,16 +38,16 @@ jobs: uses: dawidd6/action-download-artifact@v2 with: workflow: build-rpm-packages.yml - workflow_conclusion: success + workflow_conclusion: in_progress name: ${{env.PACKAGE_NAME}} - if_no_artifact_found: warn + if_no_artifact_found: fail - name: Try again to download execution timetable from the last workflow if failed if: ${{ always() && steps.download_package.outcome == 'failure' }} uses: dawidd6/action-download-artifact@v2 with: workflow: build-rpm-packages.yml - workflow_conclusion: success + workflow_conclusion: in_progress name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail From 0a42059f258b78c712f314e1c468465a1e6a1bfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 10:52:58 +0100 Subject: [PATCH 224/316] Change way to retry down,load of artifact MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../workflows/test-install-and-enable-deb.yml | 28 ++++++++----------- .../workflows/test-install-and-enable-rpm.yml | 26 +++++++---------- 2 files changed, 21 insertions(+), 33 deletions(-) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index f22235e6db..43365d27a7 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -23,27 +23,21 @@ jobs: - name: Setup directories and variables run: | VERSION=$(cat $GITHUB_WORKSPACE/VERSION) - REVISION="${{ github.head_ref }}" + REVISION=${{ github.head_ref }} echo "PACKAGE_NAME=wazuh-${{ matrix.type }}_$VERSION-$REVISION_${{ matrix.arch }}.deb" >> $GITHUB_ENV cat $GITHUB_ENV - - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} - id: download_package - uses: dawidd6/action-download-artifact@v2 + - uses: Wandalen/wretry.action@master + name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} with: - workflow: build-deb-packages.yml - workflow_conclusion: in_progress - name: ${{env.PACKAGE_NAME}} - if_no_artifact_found: fail - - - name: Try again to download execution timetable from the last workflow if failed - if: ${{ always() && steps.download_package.outcome == 'failure' }} - uses: dawidd6/action-download-artifact@v2 - with: - workflow: build-deb-packages.yml - workflow_conclusion: in_progress - name: ${{env.PACKAGE_NAME}} - if_no_artifact_found: fail + action: dawidd6/action-download-artifact@v2 + with: | + workflow: build-deb-packages.yml + workflow_conclusion: in_progress + name: ${{env.PACKAGE_NAME}} + if_no_artifact_found: fail + attempt_limit: 3 + attempt_delay: 2000 - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} to the packages directory run: | diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 8c83422534..d73ceeb078 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -33,23 +33,17 @@ jobs: echo "PACKAGE_NAME=wazuh-${{ matrix.type }}-$VERSION-$REVISION.${{matrix.system.ARCH}}.rpm" >> $GITHUB_ENV cat $GITHUB_ENV - - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} - id: download_package - uses: dawidd6/action-download-artifact@v2 + - uses: Wandalen/wretry.action@master + name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} with: - workflow: build-rpm-packages.yml - workflow_conclusion: in_progress - name: ${{env.PACKAGE_NAME}} - if_no_artifact_found: fail - - - name: Try again to download execution timetable from the last workflow if failed - if: ${{ always() && steps.download_package.outcome == 'failure' }} - uses: dawidd6/action-download-artifact@v2 - with: - workflow: build-rpm-packages.yml - workflow_conclusion: in_progress - name: ${{env.PACKAGE_NAME}} - if_no_artifact_found: fail + action: dawidd6/action-download-artifact@v2 + with: | + workflow: build-rpm-packages.yml + workflow_conclusion: in_progress + name: ${{env.PACKAGE_NAME}} + if_no_artifact_found: fail + attempt_limit: 3 + attempt_delay: 2000 - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} to the packages directory run: | From f70e5598eb2ebad263483a5534d267216f8c4884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 11:06:10 +0100 Subject: [PATCH 225/316] Increase timeout to download artifact MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 6 +++--- .github/workflows/test-install-and-enable-rpm.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 43365d27a7..fcedd892f1 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -23,7 +23,7 @@ jobs: - name: Setup directories and variables run: | VERSION=$(cat $GITHUB_WORKSPACE/VERSION) - REVISION=${{ github.head_ref }} + REVISION=$( echo ${{ github.head_ref }}) echo "PACKAGE_NAME=wazuh-${{ matrix.type }}_$VERSION-$REVISION_${{ matrix.arch }}.deb" >> $GITHUB_ENV cat $GITHUB_ENV @@ -36,8 +36,8 @@ jobs: workflow_conclusion: in_progress name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail - attempt_limit: 3 - attempt_delay: 2000 + attempt_limit: 15 + attempt_delay: 20000 - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} to the packages directory run: | diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index d73ceeb078..8a1b9035a5 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -42,8 +42,8 @@ jobs: workflow_conclusion: in_progress name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail - attempt_limit: 3 - attempt_delay: 2000 + attempt_limit: 15 + attempt_delay: 20000 - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} to the packages directory run: | From 9eb370be1af93929dd0c3ec5a8a80eb20b4e299f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 11:28:03 +0100 Subject: [PATCH 226/316] Search for artifact with commit sha instead of workflow name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 7 +++---- .github/workflows/test-install-and-enable-rpm.yml | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index fcedd892f1..56770a38ab 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -24,7 +24,7 @@ jobs: run: | VERSION=$(cat $GITHUB_WORKSPACE/VERSION) REVISION=$( echo ${{ github.head_ref }}) - echo "PACKAGE_NAME=wazuh-${{ matrix.type }}_$VERSION-$REVISION_${{ matrix.arch }}.deb" >> $GITHUB_ENV + echo "PACKAGE_NAME=wazuh-${{ matrix.type }}_${VERSION}-${REVISION_}${{ matrix.arch }}.deb" >> $GITHUB_ENV cat $GITHUB_ENV - uses: Wandalen/wretry.action@master @@ -32,12 +32,11 @@ jobs: with: action: dawidd6/action-download-artifact@v2 with: | - workflow: build-deb-packages.yml - workflow_conclusion: in_progress + commit: ${{ github.sha }} name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail attempt_limit: 15 - attempt_delay: 20000 + attempt_delay: 60000 - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} to the packages directory run: | diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 8a1b9035a5..41d259a35b 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -30,7 +30,7 @@ jobs: run: | VERSION=$(cat $GITHUB_WORKSPACE/VERSION) REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g' ) - echo "PACKAGE_NAME=wazuh-${{ matrix.type }}-$VERSION-$REVISION.${{matrix.system.ARCH}}.rpm" >> $GITHUB_ENV + echo "PACKAGE_NAME=wazuh-${{ matrix.type }}-${VERSION}-${REVISION}.${{matrix.system.ARCH}}.rpm" >> $GITHUB_ENV cat $GITHUB_ENV - uses: Wandalen/wretry.action@master @@ -39,11 +39,11 @@ jobs: action: dawidd6/action-download-artifact@v2 with: | workflow: build-rpm-packages.yml - workflow_conclusion: in_progress + commit: ${{ github.sha }} name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail attempt_limit: 15 - attempt_delay: 20000 + attempt_delay: 60000 - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} to the packages directory run: | From 58f5b3f476a6d669b8be9e7808702a61942eb68f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 11:51:19 +0100 Subject: [PATCH 227/316] Search for artifacts with branch instead of commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 6 +++--- .github/workflows/test-install-and-enable-rpm.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 56770a38ab..950f06761a 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -24,7 +24,7 @@ jobs: run: | VERSION=$(cat $GITHUB_WORKSPACE/VERSION) REVISION=$( echo ${{ github.head_ref }}) - echo "PACKAGE_NAME=wazuh-${{ matrix.type }}_${VERSION}-${REVISION_}${{ matrix.arch }}.deb" >> $GITHUB_ENV + echo "PACKAGE_NAME=wazuh-${{ matrix.type }}_${VERSION}-${REVISION}_${{ matrix.arch }}.deb" >> $GITHUB_ENV cat $GITHUB_ENV - uses: Wandalen/wretry.action@master @@ -32,10 +32,10 @@ jobs: with: action: dawidd6/action-download-artifact@v2 with: | - commit: ${{ github.sha }} + branch: ${{ github.head_ref }} name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail - attempt_limit: 15 + attempt_limit: 3 attempt_delay: 60000 - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} to the packages directory diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 41d259a35b..402f838a0b 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -39,10 +39,10 @@ jobs: action: dawidd6/action-download-artifact@v2 with: | workflow: build-rpm-packages.yml - commit: ${{ github.sha }} + branch: ${{ github.head_ref }} name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail - attempt_limit: 15 + attempt_limit: 3 attempt_delay: 60000 - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} to the packages directory From 03c9f25764cc520320a1cced0b647cd10a13ad92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 12:03:29 +0100 Subject: [PATCH 228/316] Check artifact with workflow name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 8 ++++---- .github/workflows/test-install-and-enable-rpm.yml | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 950f06761a..23c27d0584 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -25,18 +25,18 @@ jobs: VERSION=$(cat $GITHUB_WORKSPACE/VERSION) REVISION=$( echo ${{ github.head_ref }}) echo "PACKAGE_NAME=wazuh-${{ matrix.type }}_${VERSION}-${REVISION}_${{ matrix.arch }}.deb" >> $GITHUB_ENV - cat $GITHUB_ENV - uses: Wandalen/wretry.action@master name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} with: action: dawidd6/action-download-artifact@v2 with: | - branch: ${{ github.head_ref }} + workflow: build-deb-packages.yml + workflow_conclusion: in_progress name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail - attempt_limit: 3 - attempt_delay: 60000 + attempt_limit: 5 + attempt_delay: 40000 - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} to the packages directory run: | diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 402f838a0b..5a2ae29de2 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -31,7 +31,6 @@ jobs: VERSION=$(cat $GITHUB_WORKSPACE/VERSION) REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g' ) echo "PACKAGE_NAME=wazuh-${{ matrix.type }}-${VERSION}-${REVISION}.${{matrix.system.ARCH}}.rpm" >> $GITHUB_ENV - cat $GITHUB_ENV - uses: Wandalen/wretry.action@master name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} @@ -39,11 +38,11 @@ jobs: action: dawidd6/action-download-artifact@v2 with: | workflow: build-rpm-packages.yml - branch: ${{ github.head_ref }} + workflow_conclusion: in_progress name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail - attempt_limit: 3 - attempt_delay: 60000 + attempt_limit: 5 + attempt_delay: 40000 - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} to the packages directory run: | From e711c1b1cc0f42ba1bfdc5157545209e747735a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 12:13:25 +0100 Subject: [PATCH 229/316] Remove space in Clean runs workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/clean-worflow-runs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clean-worflow-runs.yml b/.github/workflows/clean-worflow-runs.yml index 78a169eebb..3bff57e301 100644 --- a/.github/workflows/clean-worflow-runs.yml +++ b/.github/workflows/clean-worflow-runs.yml @@ -1,5 +1,5 @@ name: Clean workflow runs -on: +on: workflow_dispatch: schedule: - cron: '0 0 * * 1' From 55978faf93d08ae5c4906984af7efdb246f70c57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 12:15:02 +0100 Subject: [PATCH 230/316] Call to clean workflow runs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/clean-worflow-runs.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/clean-worflow-runs.yml b/.github/workflows/clean-worflow-runs.yml index 3bff57e301..92a4986d05 100644 --- a/.github/workflows/clean-worflow-runs.yml +++ b/.github/workflows/clean-worflow-runs.yml @@ -5,6 +5,8 @@ on: - cron: '0 0 * * 1' pull_request: paths: + - 'rpms/SPECS/*' + - 'rpms/generate_rpm_package.sh' - '.github/workflows/clean-workflow-runs.yml' jobs: From a59e82883804d916654593c1432be8b2fc2b9be4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 12:32:49 +0100 Subject: [PATCH 231/316] Remove pull_requests call to Clean runs workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/clean-worflow-runs.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/clean-worflow-runs.yml b/.github/workflows/clean-worflow-runs.yml index 92a4986d05..4dd935097c 100644 --- a/.github/workflows/clean-worflow-runs.yml +++ b/.github/workflows/clean-worflow-runs.yml @@ -3,11 +3,6 @@ on: workflow_dispatch: schedule: - cron: '0 0 * * 1' - pull_request: - paths: - - 'rpms/SPECS/*' - - 'rpms/generate_rpm_package.sh' - - '.github/workflows/clean-workflow-runs.yml' jobs: Clean-runs: From 5773cfbf658f0f4a6b434afb5b774e8911dd3b01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 12:52:07 +0100 Subject: [PATCH 232/316] Check if artifact is available in the building package workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 9 +++++++++ .github/workflows/test-install-and-enable-deb.yml | 3 +-- .github/workflows/test-install-and-enable-rpm.yml | 3 +-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 4a0691926c..1d8c15f751 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -58,6 +58,15 @@ jobs: path: ${{github.workspace}}/rpms/output/${{ env.PACKAGE_NAME }} if-no-files-found: error + - uses: Wandalen/wretry.action@master + name: Check if artifact is uploaded + with: + action: xSAVIKx/artifact-exists-action@v0 + with: | + name: ${{env.PACKAGE_NAME}} + attempt_limit: 5 + attempt_delay: 40000 + Test-install-packages-rpm: needs: Wazuh-agent-rpm-package-builds uses: ./.github/workflows/test-install-and-enable-rpm.yml diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 23c27d0584..93cfb333f1 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -31,10 +31,9 @@ jobs: with: action: dawidd6/action-download-artifact@v2 with: | - workflow: build-deb-packages.yml - workflow_conclusion: in_progress name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail + check_artifacts: true attempt_limit: 5 attempt_delay: 40000 diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 5a2ae29de2..0ecd3381d8 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -37,10 +37,9 @@ jobs: with: action: dawidd6/action-download-artifact@v2 with: | - workflow: build-rpm-packages.yml - workflow_conclusion: in_progress name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail + check_artifacts: true attempt_limit: 5 attempt_delay: 40000 From 6deda0c0a875700c9264b9f47426ec7518cbd60a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 13:06:51 +0100 Subject: [PATCH 233/316] Change action to download artifact MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 4 +--- .github/workflows/test-install-and-enable-rpm.yml | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 93cfb333f1..4de4fda7c9 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -29,11 +29,9 @@ jobs: - uses: Wandalen/wretry.action@master name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} with: - action: dawidd6/action-download-artifact@v2 + action: aochmann/actions-download-artifact@1.0.0 with: | name: ${{env.PACKAGE_NAME}} - if_no_artifact_found: fail - check_artifacts: true attempt_limit: 5 attempt_delay: 40000 diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 0ecd3381d8..b2dc0f2dd6 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -35,11 +35,9 @@ jobs: - uses: Wandalen/wretry.action@master name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} with: - action: dawidd6/action-download-artifact@v2 + action: aochmann/actions-download-artifact@1.0.0 with: | name: ${{env.PACKAGE_NAME}} - if_no_artifact_found: fail - check_artifacts: true attempt_limit: 5 attempt_delay: 40000 From 02ca40966330237f4b1928afd952046986905a1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 13:33:02 +0100 Subject: [PATCH 234/316] Go back to previous artifact download action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 4 +++- .github/workflows/test-install-and-enable-rpm.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 4de4fda7c9..93cfb333f1 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -29,9 +29,11 @@ jobs: - uses: Wandalen/wretry.action@master name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} with: - action: aochmann/actions-download-artifact@1.0.0 + action: dawidd6/action-download-artifact@v2 with: | name: ${{env.PACKAGE_NAME}} + if_no_artifact_found: fail + check_artifacts: true attempt_limit: 5 attempt_delay: 40000 diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index b2dc0f2dd6..0ecd3381d8 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -35,9 +35,11 @@ jobs: - uses: Wandalen/wretry.action@master name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} with: - action: aochmann/actions-download-artifact@1.0.0 + action: dawidd6/action-download-artifact@v2 with: | name: ${{env.PACKAGE_NAME}} + if_no_artifact_found: fail + check_artifacts: true attempt_limit: 5 attempt_delay: 40000 From c713ab2280ebd093596fcadbed99c16f6ac65f93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 13:34:10 +0100 Subject: [PATCH 235/316] Test downloading artifact from the building package workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 1d8c15f751..23b39ab4eb 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -67,6 +67,13 @@ jobs: attempt_limit: 5 attempt_delay: 40000 + - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} + uses: dawidd6/action-download-artifact@v2 + with: + name: ${{env.PACKAGE_NAME}} + if_no_artifact_found: fail + check_artifacts: true + Test-install-packages-rpm: needs: Wazuh-agent-rpm-package-builds uses: ./.github/workflows/test-install-and-enable-rpm.yml From be6c7e44b99d4ee902c9c0a0daf23a854540e348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 13:43:49 +0100 Subject: [PATCH 236/316] Debug MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 14 +++++++++----- .github/workflows/test-install-and-enable-deb.yml | 12 +++++++++++- .github/workflows/test-install-and-enable-rpm.yml | 3 ++- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 23b39ab4eb..b70ed2b828 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -67,12 +67,16 @@ jobs: attempt_limit: 5 attempt_delay: 40000 - - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} - uses: dawidd6/action-download-artifact@v2 + - uses: Wandalen/wretry.action@master + name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} with: - name: ${{env.PACKAGE_NAME}} - if_no_artifact_found: fail - check_artifacts: true + action: dawidd6/action-download-artifact@v2 + with: | + name: ${{env.PACKAGE_NAME}} + if_no_artifact_found: fail + check_artifacts: true + attempt_limit: 5 + attempt_delay: 40000 Test-install-packages-rpm: needs: Wazuh-agent-rpm-package-builds diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 93cfb333f1..3fe68b273c 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -26,14 +26,24 @@ jobs: REVISION=$( echo ${{ github.head_ref }}) echo "PACKAGE_NAME=wazuh-${{ matrix.type }}_${VERSION}-${REVISION}_${{ matrix.arch }}.deb" >> $GITHUB_ENV + - uses: Wandalen/wretry.action@master + name: Check if artifact is uploaded + with: + action: xSAVIKx/artifact-exists-action@v0 + with: | + name: ${{env.PACKAGE_NAME}} + attempt_limit: 5 + attempt_delay: 40000 + - uses: Wandalen/wretry.action@master name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} with: action: dawidd6/action-download-artifact@v2 with: | + workflow: build-deb-packages.yml + workflow_conclusion: in_progress name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail - check_artifacts: true attempt_limit: 5 attempt_delay: 40000 diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 0ecd3381d8..5a2ae29de2 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -37,9 +37,10 @@ jobs: with: action: dawidd6/action-download-artifact@v2 with: | + workflow: build-rpm-packages.yml + workflow_conclusion: in_progress name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail - check_artifacts: true attempt_limit: 5 attempt_delay: 40000 From c19d381098f16563b8ca46505095d9e64384071a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 14:02:15 +0100 Subject: [PATCH 237/316] Add waiting time after uploading artifact MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index b70ed2b828..74068c1e11 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -59,24 +59,9 @@ jobs: if-no-files-found: error - uses: Wandalen/wretry.action@master - name: Check if artifact is uploaded - with: - action: xSAVIKx/artifact-exists-action@v0 - with: | - name: ${{env.PACKAGE_NAME}} - attempt_limit: 5 - attempt_delay: 40000 - - - uses: Wandalen/wretry.action@master - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} - with: - action: dawidd6/action-download-artifact@v2 - with: | - name: ${{env.PACKAGE_NAME}} - if_no_artifact_found: fail - check_artifacts: true - attempt_limit: 5 - attempt_delay: 40000 + name: Wait for the artifact to be uploaded + run: | + sleep 60 Test-install-packages-rpm: needs: Wazuh-agent-rpm-package-builds From f64deed567bbf51849d99059e0767d9ba65cfec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 14:03:11 +0100 Subject: [PATCH 238/316] Fix error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 74068c1e11..aa7fc5b99a 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -58,8 +58,7 @@ jobs: path: ${{github.workspace}}/rpms/output/${{ env.PACKAGE_NAME }} if-no-files-found: error - - uses: Wandalen/wretry.action@master - name: Wait for the artifact to be uploaded + - name: Wait for the artifact to be uploaded run: | sleep 60 From 0cac89f13e0271c791035c8c3fd9fa40f8501f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 14:21:08 +0100 Subject: [PATCH 239/316] Debugging MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 4 --- .../workflows/test-install-and-enable-deb.yml | 27 ++++++++----------- .../workflows/test-install-and-enable-rpm.yml | 18 ++++++++----- 3 files changed, 22 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index aa7fc5b99a..4a0691926c 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -58,10 +58,6 @@ jobs: path: ${{github.workspace}}/rpms/output/${{ env.PACKAGE_NAME }} if-no-files-found: error - - name: Wait for the artifact to be uploaded - run: | - sleep 60 - Test-install-packages-rpm: needs: Wazuh-agent-rpm-package-builds uses: ./.github/workflows/test-install-and-enable-rpm.yml diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 3fe68b273c..a1ae5a830e 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -26,26 +26,21 @@ jobs: REVISION=$( echo ${{ github.head_ref }}) echo "PACKAGE_NAME=wazuh-${{ matrix.type }}_${VERSION}-${REVISION}_${{ matrix.arch }}.deb" >> $GITHUB_ENV - - uses: Wandalen/wretry.action@master - name: Check if artifact is uploaded - with: - action: xSAVIKx/artifact-exists-action@v0 - with: | - name: ${{env.PACKAGE_NAME}} - attempt_limit: 5 - attempt_delay: 40000 - - - uses: Wandalen/wretry.action@master - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} - with: - action: dawidd6/action-download-artifact@v2 - with: | + - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} + id: download-artifact + uses: dawidd6/action-download-artifact@v2 + with: workflow: build-deb-packages.yml workflow_conclusion: in_progress name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail - attempt_limit: 5 - attempt_delay: 40000 + + - name: Retry download if it has failed + if: ${{ always() && steps.download-artifact.outcome == 'failure' }} + uses: dawidd6/action-download-artifact@v2 + with: + name: ${{env.PACKAGE_NAME}} + if_no_artifact_found: fail - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} to the packages directory run: | diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 5a2ae29de2..417155594b 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -32,17 +32,21 @@ jobs: REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g' ) echo "PACKAGE_NAME=wazuh-${{ matrix.type }}-${VERSION}-${REVISION}.${{matrix.system.ARCH}}.rpm" >> $GITHUB_ENV - - uses: Wandalen/wretry.action@master - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} - with: - action: dawidd6/action-download-artifact@v2 - with: | + - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} + id: download-artifact + uses: dawidd6/action-download-artifact@v2 + with: workflow: build-rpm-packages.yml workflow_conclusion: in_progress name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail - attempt_limit: 5 - attempt_delay: 40000 + + - name: Retry download if it has failed + if: ${{ always() && steps.download-artifact.outcome == 'failure' }} + uses: dawidd6/action-download-artifact@v2 + with: + name: ${{env.PACKAGE_NAME}} + if_no_artifact_found: fail - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} to the packages directory run: | From c30f7f83e8e304b0157ec8bcb5e88c73de49d191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 14:23:48 +0100 Subject: [PATCH 240/316] Yaml syntax fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../workflows/test-install-and-enable-deb.yml | 16 ++++++++-------- .../workflows/test-install-and-enable-rpm.yml | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index a1ae5a830e..d58cf74aa7 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -29,18 +29,18 @@ jobs: - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} id: download-artifact uses: dawidd6/action-download-artifact@v2 - with: - workflow: build-deb-packages.yml - workflow_conclusion: in_progress - name: ${{env.PACKAGE_NAME}} - if_no_artifact_found: fail + with: + workflow: build-deb-packages.yml + workflow_conclusion: in_progress + name: ${{env.PACKAGE_NAME}} + if_no_artifact_found: fail - name: Retry download if it has failed if: ${{ always() && steps.download-artifact.outcome == 'failure' }} uses: dawidd6/action-download-artifact@v2 - with: - name: ${{env.PACKAGE_NAME}} - if_no_artifact_found: fail + with: + name: ${{env.PACKAGE_NAME}} + if_no_artifact_found: fail - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} to the packages directory run: | diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 417155594b..1f02ce58a5 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -35,18 +35,18 @@ jobs: - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} id: download-artifact uses: dawidd6/action-download-artifact@v2 - with: - workflow: build-rpm-packages.yml - workflow_conclusion: in_progress - name: ${{env.PACKAGE_NAME}} - if_no_artifact_found: fail + with: + workflow: build-rpm-packages.yml + workflow_conclusion: in_progress + name: ${{env.PACKAGE_NAME}} + if_no_artifact_found: fail - name: Retry download if it has failed if: ${{ always() && steps.download-artifact.outcome == 'failure' }} uses: dawidd6/action-download-artifact@v2 - with: - name: ${{env.PACKAGE_NAME}} - if_no_artifact_found: fail + with: + name: ${{env.PACKAGE_NAME}} + if_no_artifact_found: fail - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} to the packages directory run: | From d03c3b5739c302d49233a920fb5d6a6bde64e6ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 14:38:11 +0100 Subject: [PATCH 241/316] Wait for the artifact to be uploaded if download fails MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 5 +++++ .github/workflows/test-install-and-enable-rpm.yml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index d58cf74aa7..aa410807cc 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -35,6 +35,11 @@ jobs: name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail + - name: Wait for the artifact to be uploaded + if: ${{ always() && steps.download-artifact.outcome == 'failure' }} + run: | + sleep 60 + - name: Retry download if it has failed if: ${{ always() && steps.download-artifact.outcome == 'failure' }} uses: dawidd6/action-download-artifact@v2 diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 1f02ce58a5..97a4188f8b 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -41,6 +41,11 @@ jobs: name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail + - name: Wait for the artifact to be uploaded + if: ${{ always() && steps.download-artifact.outcome == 'failure' }} + run: | + sleep 60 + - name: Retry download if it has failed if: ${{ always() && steps.download-artifact.outcome == 'failure' }} uses: dawidd6/action-download-artifact@v2 From 07a3aede9feef06102eece8d29e72524a854b82e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 14:48:00 +0100 Subject: [PATCH 242/316] Add continue_on_error to the install and enable test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 1 + .github/workflows/build-rpm-packages.yml | 1 + .github/workflows/clean-worflow-runs.yml | 3 ++- .github/workflows/test-install-and-enable-deb.yml | 1 + .github/workflows/test-install-and-enable-rpm.yml | 1 + 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 2c3902d83c..1473593062 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -18,6 +18,7 @@ jobs: - TYPE: manager ARCHITECTURE: i386 fail-fast: false + continue-on-error: true steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 4a0691926c..7b2e65a367 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -19,6 +19,7 @@ jobs: - TYPE: manager ARCHITECTURE: i386 fail-fast: false + continue-on-error: true steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/clean-worflow-runs.yml b/.github/workflows/clean-worflow-runs.yml index 4dd935097c..193f83e14a 100644 --- a/.github/workflows/clean-worflow-runs.yml +++ b/.github/workflows/clean-worflow-runs.yml @@ -15,4 +15,5 @@ jobs: run_conclusions: | cancelled skipped - save_period: 10 \ No newline at end of file + timed_out + save_period: 5 \ No newline at end of file diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index aa410807cc..c243466c46 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -17,6 +17,7 @@ jobs: - distro_name: 'ubuntu:jammy' arch: i386 fail-fast: false + continue-on-error: true steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 97a4188f8b..a82432e2fb 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -23,6 +23,7 @@ jobs: - system: {ARCH: "i386"} type: manager fail-fast: false + continue-on-error: true steps: - uses: actions/checkout@v3 From 4abcd8b9dacc887b4e4c49c7b3c8cdf0cb3f64f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 14:50:29 +0100 Subject: [PATCH 243/316] Add continue-on-error to download of artifact MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 1 - .github/workflows/build-rpm-packages.yml | 1 - .github/workflows/test-install-and-enable-deb.yml | 2 +- .github/workflows/test-install-and-enable-rpm.yml | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 1473593062..2c3902d83c 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -18,7 +18,6 @@ jobs: - TYPE: manager ARCHITECTURE: i386 fail-fast: false - continue-on-error: true steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 7b2e65a367..4a0691926c 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -19,7 +19,6 @@ jobs: - TYPE: manager ARCHITECTURE: i386 fail-fast: false - continue-on-error: true steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index c243466c46..0839030768 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -17,7 +17,6 @@ jobs: - distro_name: 'ubuntu:jammy' arch: i386 fail-fast: false - continue-on-error: true steps: - uses: actions/checkout@v3 @@ -29,6 +28,7 @@ jobs: - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} id: download-artifact + continue-on-error: true uses: dawidd6/action-download-artifact@v2 with: workflow: build-deb-packages.yml diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index a82432e2fb..081f2474c2 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -23,7 +23,6 @@ jobs: - system: {ARCH: "i386"} type: manager fail-fast: false - continue-on-error: true steps: - uses: actions/checkout@v3 @@ -35,6 +34,7 @@ jobs: - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} id: download-artifact + continue-on-error: true uses: dawidd6/action-download-artifact@v2 with: workflow: build-rpm-packages.yml From b9538f1b9652368f29a4bb52126ba8e13603b6da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 15:01:22 +0100 Subject: [PATCH 244/316] Remove unnecessary always() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 4 ++-- .github/workflows/test-install-and-enable-rpm.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 0839030768..f81caf4616 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -37,12 +37,12 @@ jobs: if_no_artifact_found: fail - name: Wait for the artifact to be uploaded - if: ${{ always() && steps.download-artifact.outcome == 'failure' }} + if: ${{ steps.download-artifact.outcome == 'failure' }} run: | sleep 60 - name: Retry download if it has failed - if: ${{ always() && steps.download-artifact.outcome == 'failure' }} + if: ${{ steps.download-artifact.outcome == 'failure' }} uses: dawidd6/action-download-artifact@v2 with: name: ${{env.PACKAGE_NAME}} diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 081f2474c2..b655821918 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -43,12 +43,12 @@ jobs: if_no_artifact_found: fail - name: Wait for the artifact to be uploaded - if: ${{ always() && steps.download-artifact.outcome == 'failure' }} + if: ${{ steps.download-artifact.outcome == 'failure' }} run: | sleep 60 - name: Retry download if it has failed - if: ${{ always() && steps.download-artifact.outcome == 'failure' }} + if: ${{ steps.download-artifact.outcome == 'failure' }} uses: dawidd6/action-download-artifact@v2 with: name: ${{env.PACKAGE_NAME}} From 7b1c9b671392d109a58c44f3e6b2c519673a6611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 31 Jan 2023 15:04:58 +0100 Subject: [PATCH 245/316] Change day cleaning of workflow runs is done MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/clean-worflow-runs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clean-worflow-runs.yml b/.github/workflows/clean-worflow-runs.yml index 193f83e14a..2ccd7739dd 100644 --- a/.github/workflows/clean-worflow-runs.yml +++ b/.github/workflows/clean-worflow-runs.yml @@ -2,7 +2,7 @@ name: Clean workflow runs on: workflow_dispatch: schedule: - - cron: '0 0 * * 1' + - cron: '0 0 * * Sunday' jobs: Clean-runs: From 791cd81f5033546fd74564f3669d4115efcfa246 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 1 Feb 2023 11:21:29 +0100 Subject: [PATCH 246/316] Syntax fixes for the ghcr pushing and pulling scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../build_and_push_image_to_ghcr.sh | 10 ++-------- .../pull_image_from_ghcr.sh | 12 ++++-------- .github/workflows/build-deb-packages.yml | 2 +- .github/workflows/build-rpm-packages.yml | 2 +- .github/workflows/upload-deb-images.yml | 2 +- .github/workflows/upload-rpm-images.yml | 2 +- 6 files changed, 10 insertions(+), 20 deletions(-) rename .github/actions/{common-tools => ghcr-pull-and-push}/build_and_push_image_to_ghcr.sh (80%) rename .github/actions/{common-tools => ghcr-pull-and-push}/pull_image_from_ghcr.sh (78%) diff --git a/.github/actions/common-tools/build_and_push_image_to_ghcr.sh b/.github/actions/ghcr-pull-and-push/build_and_push_image_to_ghcr.sh similarity index 80% rename from .github/actions/common-tools/build_and_push_image_to_ghcr.sh rename to .github/actions/ghcr-pull-and-push/build_and_push_image_to_ghcr.sh index a61d23bbf0..83b32e8fce 100644 --- a/.github/actions/common-tools/build_and_push_image_to_ghcr.sh +++ b/.github/actions/ghcr-pull-and-push/build_and_push_image_to_ghcr.sh @@ -8,19 +8,13 @@ if [ -n "$5" ]; then else DOCKER_IMAGE_TAG="latest" fi - - -# Login to GHCR -echo ${GITHUB_PUSH_SECRET} | docker login https://ghcr.io -u $GITHUB_USER --password-stdin - -# GITHUB_REPOSITORY is always org/repo syntax. Get the owner in case it is different than the actor (when working in an org) GITHUB_REPOSITORY="wazuh/wazuh-packages" GITHUB_OWNER="wazuh" - -# Set up full image with tag IMAGE_ID=ghcr.io/${GITHUB_OWNER}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} IMAGE_ID=$(echo ${IMAGE_ID} | tr '[A-Z]' '[a-z]') +# Login to GHCR +echo ${GITHUB_PUSH_SECRET} | docker login https://ghcr.io -u $GITHUB_USER --password-stdin # Build image echo build -t ${IMAGE_ID} -f ${DOCKERFILE_PATH} ${BUILD_CONTEXT} diff --git a/.github/actions/common-tools/pull_image_from_ghcr.sh b/.github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh similarity index 78% rename from .github/actions/common-tools/pull_image_from_ghcr.sh rename to .github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh index 79c2682f51..03f4e60910 100644 --- a/.github/actions/common-tools/pull_image_from_ghcr.sh +++ b/.github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh @@ -6,18 +6,14 @@ if [ -n "$4" ]; then else DOCKER_IMAGE_TAG="latest" fi - - -# Login to GHCR -echo ${GITHUB_PUSH_SECRET} | docker login https://ghcr.io -u $GITHUB_USER --password-stdin - -# GITHUB_REPOSITORY is always org/repo syntax. Get the owner in case it is different than the actor (when working in an org) GITHUB_REPOSITORY="wazuh/wazuh-packages" GITHUB_OWNER="wazuh" - -# Set up full image with tag IMAGE_ID=ghcr.io/${GITHUB_OWNER}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} IMAGE_ID=$(echo ${IMAGE_ID} | tr '[A-Z]' '[a-z]') +# Login to GHCR +echo ${GITHUB_PUSH_SECRET} | docker login https://ghcr.io -u $GITHUB_USER --password-stdin + +# Pull and rename image docker pull ${IMAGE_ID} docker image tag ghcr.io/${GITHUB_OWNER}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} ${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 2c3902d83c..5f2c92db62 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -41,7 +41,7 @@ jobs: - name: Download docker image for package building run: | - bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ env.TAG }} + bash $GITHUB_WORKSPACE/.github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ env.TAG }} - name: Build the ${{ matrix.ARCHITECTURE }} deb Wazuh ${{ matrix.TYPE }} package working-directory: ./debs diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 4a0691926c..126123e0b4 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -42,7 +42,7 @@ jobs: - name: Download docker image for package building run: | - bash $GITHUB_WORKSPACE/.github/actions/common-tools/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ env.TAG }} + bash $GITHUB_WORKSPACE/.github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ env.TAG }} - name: Build the ${{ matrix.ARCHITECTURE }} rpm Wazuh ${{ matrix.TYPE }} package working-directory: ./rpms diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index c94f3a961d..7cb1c9b3da 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -33,7 +33,7 @@ jobs: - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} with tag ${{ env.TAG }} to Github Container Registry run: - bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} + bash $GITHUB_WORKSPACE/.github/actions/ghcr-pull-and-push/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} Build-packages-rpm: needs: Upload-deb-package-building-images diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index cfbbb4844c..e48355a89a 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -33,7 +33,7 @@ jobs: - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} with tag ${{ env.TAG }} to Github Container Registry run: - bash $GITHUB_WORKSPACE/.github/actions/common-tools/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} + bash $GITHUB_WORKSPACE/.github/actions/ghcr-pull-and-push/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} Build-packages-rpm: needs: Upload-rpm-package-building-images From dbc7197a5cfedbacff4322ef6ab07f2aadd98e0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 1 Feb 2023 11:39:53 +0100 Subject: [PATCH 247/316] Add 4.5 to branches for which to create docker images on push MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-deb-images.yml | 1 + .github/workflows/upload-rpm-images.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index 7cb1c9b3da..9a67713401 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -7,6 +7,7 @@ on: push: branches: - master + - 4.5 - 4.4 paths: - 'debs/Debian/*' diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index e48355a89a..abf196ed8e 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -7,6 +7,7 @@ on: push: branches: - master + - 4.5 - 4.4 paths: - 'rpms/CentOS/*' From 36ffb4d942527e65ea761b96b701c4e4c02ff715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 1 Feb 2023 11:40:42 +0100 Subject: [PATCH 248/316] Fix cron attribute for Cleaning worfklow runs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/clean-worflow-runs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clean-worflow-runs.yml b/.github/workflows/clean-worflow-runs.yml index 2ccd7739dd..0afdb32beb 100644 --- a/.github/workflows/clean-worflow-runs.yml +++ b/.github/workflows/clean-worflow-runs.yml @@ -2,7 +2,7 @@ name: Clean workflow runs on: workflow_dispatch: schedule: - - cron: '0 0 * * Sunday' + - cron: '0 0 * * 7' jobs: Clean-runs: From 5045a01a1a7991531bac4eaa20688e20641edeae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 1 Feb 2023 11:43:02 +0100 Subject: [PATCH 249/316] Fix schedule cron for Clean runs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/clean-worflow-runs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clean-worflow-runs.yml b/.github/workflows/clean-worflow-runs.yml index 0afdb32beb..7493693765 100644 --- a/.github/workflows/clean-worflow-runs.yml +++ b/.github/workflows/clean-worflow-runs.yml @@ -1,8 +1,8 @@ name: Clean workflow runs on: - workflow_dispatch: schedule: - cron: '0 0 * * 7' + workflow_dispatch: jobs: Clean-runs: From ecbe45f5f3f3ccd1be827737655a3589466a3026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 1 Feb 2023 11:55:43 +0100 Subject: [PATCH 250/316] Difference between master and major versions when building packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 6 ++++-- .github/workflows/build-rpm-packages.yml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 5f2c92db62..4282a42241 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -36,7 +36,9 @@ jobs: - name: Set tag and container name run: | - if [ "${{ steps.changes.outputs.deb_images }}" == "true" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi + MAJOR=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION) + if [ "${{ steps.changes.outputs.deb_images }}" == "true" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$MAJOR" >> $GITHUB_ENV ; fi + if [ $MAJOR == "4.6" ]; then echo "VERSION=master" >> $GITHUB_ENV $ ; else echo "VERSION=$MAJOR" >> $GITHUB_ENV; fi echo "CONTAINER_NAME=deb_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV - name: Download docker image for package building @@ -47,7 +49,7 @@ jobs: working-directory: ./debs run: | REVISION="${{ github.head_ref }}" - bash generate_debian_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} -r $REVISION + bash generate_debian_package.sh -b ${{ env.VERSION }} -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} -r $REVISION echo "PACKAGE_NAME=$(ls ./output | grep .deb | head -n 1)" >> $GITHUB_ENV - name: Upload Wazuh ${{ matrix.TYPE }} ${{ matrix.ARCHITECTURE }} package as artifact diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 126123e0b4..26cd6b18d2 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -37,7 +37,9 @@ jobs: - name: Set tag and container name run: | - if [ "${{ steps.changes.outputs.rpm_images }}" == "true" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV ; fi + MAJOR=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION) + if [ "${{ steps.changes.outputs.rpm_images }}" == "true" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$MAJOR" >> $GITHUB_ENV ; fi + if [ $MAJOR == "4.6" ]; then echo "VERSION=master" >> $GITHUB_ENV $ ; else echo "VERSION=$MAJOR" >> $GITHUB_ENV; fi if [ "${{ matrix.ARCHITECTURE }}" == "x86_64" ]; then echo "CONTAINER_NAME=rpm_builder_x86" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=rpm_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; fi - name: Download docker image for package building @@ -48,7 +50,7 @@ jobs: working-directory: ./rpms run: | REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g' ) - bash generate_rpm_package.sh -b master -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} -r $REVISION + bash generate_rpm_package.sh -b ${{ env.VERSION }} -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} -r $REVISION echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - name: Upload Wazuh ${{ matrix.TYPE }} ${{ matrix.ARCHITECTURE }} package as artifact From 37d496bf59d4361a37d5d05e0f2ea7d4eb9f8cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 1 Feb 2023 12:37:38 +0100 Subject: [PATCH 251/316] Cancel runs of the workflow for previous commits MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-deb-images.yml | 5 ++++- .github/workflows/upload-rpm-images.yml | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index 9a67713401..0dc87475f3 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -22,6 +22,9 @@ jobs: image: [ {CONTAINER_NAME: deb_builder_amd64, DOCKERFILE_PATH: debs/Debian/amd64}, {CONTAINER_NAME: deb_builder_i386, DOCKERFILE_PATH: debs/Debian/i386}] fail-fast: false steps: + + - uses: fkirc/skip-duplicate-actions@master + - uses: actions/checkout@v3 - name: Copy build.sh to Dockerfile path @@ -29,7 +32,7 @@ jobs: cp $GITHUB_WORKSPACE/debs/build.sh $GITHUB_WORKSPACE/${{ matrix.image.DOCKERFILE_PATH }} - name: Set tag as version - run: + run: if [ "${{ github.event_name }}" == "pull_request" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} with tag ${{ env.TAG }} to Github Container Registry diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index abf196ed8e..1b6084b608 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -22,6 +22,9 @@ jobs: image: [ {CONTAINER_NAME: rpm_builder_x86, DOCKERFILE_PATH: rpms/CentOS/6/x86_64}, {CONTAINER_NAME: rpm_builder_i386, DOCKERFILE_PATH: rpms/CentOS/6/i386}] fail-fast: false steps: + + - uses: fkirc/skip-duplicate-actions@master + - uses: actions/checkout@v3 - name: Copy build.sh to Dockerfile path From 6cd61078e01b95756d1cb198055078b313ce1456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 1 Feb 2023 12:41:19 +0100 Subject: [PATCH 252/316] Set cancel to true when checking for previous runs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/clean-worflow-runs.yml | 2 +- .github/workflows/upload-deb-images.yml | 6 +++++- .github/workflows/upload-rpm-images.yml | 6 +++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/clean-worflow-runs.yml b/.github/workflows/clean-worflow-runs.yml index 7493693765..cd7ee9eb08 100644 --- a/.github/workflows/clean-worflow-runs.yml +++ b/.github/workflows/clean-worflow-runs.yml @@ -1,7 +1,7 @@ name: Clean workflow runs on: schedule: - - cron: '0 0 * * 7' + - cron: '0 0 * * 5' workflow_dispatch: jobs: diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index 0dc87475f3..b147fab90a 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -23,7 +23,11 @@ jobs: fail-fast: false steps: - - uses: fkirc/skip-duplicate-actions@master + - name: Cancel previous runs + uses: fkirc/skip-duplicate-actions@master + with: + cancel_others: 'true' + github_token: ${{ secrets.GITHUB_TOKEN }} - uses: actions/checkout@v3 diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index 1b6084b608..4dff25d6f4 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -23,7 +23,11 @@ jobs: fail-fast: false steps: - - uses: fkirc/skip-duplicate-actions@master + - name: Cancel previous runs + uses: fkirc/skip-duplicate-actions@master + with: + cancel_others: 'true' + github_token: ${{ secrets.GITHUB_TOKEN }} - uses: actions/checkout@v3 From e6ca43666531c448aad22f836615b598f6734fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 1 Feb 2023 12:44:12 +0100 Subject: [PATCH 253/316] Cancel previous runs for Build packages workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 6 ++++++ .github/workflows/build-rpm-packages.yml | 6 ++++++ .github/workflows/upload-deb-images.yml | 1 - .github/workflows/upload-rpm-images.yml | 1 - 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 4282a42241..9320ebc96a 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -20,6 +20,12 @@ jobs: fail-fast: false steps: + - name: Cancel previous runs + uses: fkirc/skip-duplicate-actions@master + with: + cancel_others: 'true' + github_token: ${{ secrets.GITHUB_TOKEN }} + - uses: actions/checkout@v3 - name: Get changed files diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 26cd6b18d2..5d352b4886 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -21,6 +21,12 @@ jobs: fail-fast: false steps: + - name: Cancel previous runs + uses: fkirc/skip-duplicate-actions@master + with: + cancel_others: 'true' + github_token: ${{ secrets.GITHUB_TOKEN }} + - uses: actions/checkout@v3 - name: Get changed files diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index b147fab90a..ef92e33eb4 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -22,7 +22,6 @@ jobs: image: [ {CONTAINER_NAME: deb_builder_amd64, DOCKERFILE_PATH: debs/Debian/amd64}, {CONTAINER_NAME: deb_builder_i386, DOCKERFILE_PATH: debs/Debian/i386}] fail-fast: false steps: - - name: Cancel previous runs uses: fkirc/skip-duplicate-actions@master with: diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index 4dff25d6f4..1c434560cf 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -22,7 +22,6 @@ jobs: image: [ {CONTAINER_NAME: rpm_builder_x86, DOCKERFILE_PATH: rpms/CentOS/6/x86_64}, {CONTAINER_NAME: rpm_builder_i386, DOCKERFILE_PATH: rpms/CentOS/6/i386}] fail-fast: false steps: - - name: Cancel previous runs uses: fkirc/skip-duplicate-actions@master with: From 13ba7e95ebf3261e7597205e23613ee2692ebcf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 1 Feb 2023 13:08:52 +0100 Subject: [PATCH 254/316] Step up waiting time for artifact download retry to 90 seconds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 3 +-- .github/workflows/test-install-and-enable-rpm.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index f81caf4616..604c037ec9 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -38,8 +38,7 @@ jobs: - name: Wait for the artifact to be uploaded if: ${{ steps.download-artifact.outcome == 'failure' }} - run: | - sleep 60 + run: sleep 90 - name: Retry download if it has failed if: ${{ steps.download-artifact.outcome == 'failure' }} diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index b655821918..6827577a76 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -44,8 +44,7 @@ jobs: - name: Wait for the artifact to be uploaded if: ${{ steps.download-artifact.outcome == 'failure' }} - run: | - sleep 60 + run: sleep 90 - name: Retry download if it has failed if: ${{ steps.download-artifact.outcome == 'failure' }} From 733537b985160d600a554f3b6bd3a3d9514bf8f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 1 Feb 2023 13:24:49 +0100 Subject: [PATCH 255/316] Add workflow name and conclusion to retry of the artifact download MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 2 ++ .github/workflows/test-install-and-enable-rpm.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 604c037ec9..f0b8b1e8d6 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -44,6 +44,8 @@ jobs: if: ${{ steps.download-artifact.outcome == 'failure' }} uses: dawidd6/action-download-artifact@v2 with: + workflow: build-deb-packages.yml + workflow_conclusion: in_progress name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 6827577a76..cd32ac5caf 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -50,6 +50,8 @@ jobs: if: ${{ steps.download-artifact.outcome == 'failure' }} uses: dawidd6/action-download-artifact@v2 with: + workflow: build-rpm-packages.yml + workflow_conclusion: in_progress name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail From bac6a0e996474774c1f969f60e8073d7f3f44e91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 1 Feb 2023 14:08:59 +0100 Subject: [PATCH 256/316] Fix to cancel previous runs step MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 1 + .github/workflows/build-rpm-packages.yml | 1 + .github/workflows/upload-deb-images.yml | 1 + .github/workflows/upload-rpm-images.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 9320ebc96a..dbfde72637 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -25,6 +25,7 @@ jobs: with: cancel_others: 'true' github_token: ${{ secrets.GITHUB_TOKEN }} + skip_after_successful_duplicate: 'false' - uses: actions/checkout@v3 diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 5d352b4886..170913048b 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -26,6 +26,7 @@ jobs: with: cancel_others: 'true' github_token: ${{ secrets.GITHUB_TOKEN }} + skip_after_successful_duplicate: 'false' - uses: actions/checkout@v3 diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index ef92e33eb4..5b707d67f9 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -27,6 +27,7 @@ jobs: with: cancel_others: 'true' github_token: ${{ secrets.GITHUB_TOKEN }} + skip_after_successful_duplicate: 'false' - uses: actions/checkout@v3 diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index 1c434560cf..7fc3624963 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -27,6 +27,7 @@ jobs: with: cancel_others: 'true' github_token: ${{ secrets.GITHUB_TOKEN }} + skip_after_successful_duplicate: 'false' - uses: actions/checkout@v3 From c5266ce086117698399bec71cf468cb0efc69a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 1 Feb 2023 14:20:17 +0100 Subject: [PATCH 257/316] Remove retry of artifact download MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 13 ------------- .github/workflows/test-install-and-enable-rpm.yml | 13 ------------- 2 files changed, 26 deletions(-) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index f0b8b1e8d6..16abbf0354 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -36,19 +36,6 @@ jobs: name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail - - name: Wait for the artifact to be uploaded - if: ${{ steps.download-artifact.outcome == 'failure' }} - run: sleep 90 - - - name: Retry download if it has failed - if: ${{ steps.download-artifact.outcome == 'failure' }} - uses: dawidd6/action-download-artifact@v2 - with: - workflow: build-deb-packages.yml - workflow_conclusion: in_progress - name: ${{env.PACKAGE_NAME}} - if_no_artifact_found: fail - - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} to the packages directory run: | mkdir $GITHUB_WORKSPACE/packages diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index cd32ac5caf..874b720c2a 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -42,19 +42,6 @@ jobs: name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail - - name: Wait for the artifact to be uploaded - if: ${{ steps.download-artifact.outcome == 'failure' }} - run: sleep 90 - - - name: Retry download if it has failed - if: ${{ steps.download-artifact.outcome == 'failure' }} - uses: dawidd6/action-download-artifact@v2 - with: - workflow: build-rpm-packages.yml - workflow_conclusion: in_progress - name: ${{env.PACKAGE_NAME}} - if_no_artifact_found: fail - - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} to the packages directory run: | mkdir $GITHUB_WORKSPACE/packages From 32e6a60a827a799e42050ef1c75a9603da75e5b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 1 Feb 2023 17:08:00 +0100 Subject: [PATCH 258/316] Try again the artifact download retry with 240 seconds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 13 +++++++++++++ .github/workflows/test-install-and-enable-rpm.yml | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 16abbf0354..fdf567ccb2 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -36,6 +36,19 @@ jobs: name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail + - name: Wait for the artifact to be uploaded + if: ${{ steps.download-artifact.outcome == 'failure' }} + run: sleep 240 + + - name: Retry download if it has failed + if: ${{ steps.download-artifact.outcome == 'failure' }} + uses: dawidd6/action-download-artifact@v2 + with: + workflow: build-deb-packages.yml + workflow_conclusion: in_progress + name: ${{env.PACKAGE_NAME}} + if_no_artifact_found: fail + - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} to the packages directory run: | mkdir $GITHUB_WORKSPACE/packages diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 874b720c2a..d0f312ce03 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -42,6 +42,19 @@ jobs: name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail + - name: Wait for the artifact to be uploaded + if: ${{ steps.download-artifact.outcome == 'failure' }} + run: sleep 240 + + - name: Retry download if it has failed + if: ${{ steps.download-artifact.outcome == 'failure' }} + uses: dawidd6/action-download-artifact@v2 + with: + workflow: build-rpm-packages.yml + workflow_conclusion: in_progress + name: ${{env.PACKAGE_NAME}} + if_no_artifact_found: fail + - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} to the packages directory run: | mkdir $GITHUB_WORKSPACE/packages From a4f477e85c76da2ba27b6b3e3734efaed007e03f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 1 Feb 2023 17:15:37 +0100 Subject: [PATCH 259/316] Debug if the workspace is the same when reusing workflows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 1 + .github/workflows/test-install-and-enable-rpm.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index fdf567ccb2..82a439408b 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -25,6 +25,7 @@ jobs: VERSION=$(cat $GITHUB_WORKSPACE/VERSION) REVISION=$( echo ${{ github.head_ref }}) echo "PACKAGE_NAME=wazuh-${{ matrix.type }}_${VERSION}-${REVISION}_${{ matrix.arch }}.deb" >> $GITHUB_ENV + ls -la $GITHUB_WORKSPACE/debs/output/ - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} id: download-artifact diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index d0f312ce03..82c1d378e8 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -31,6 +31,7 @@ jobs: VERSION=$(cat $GITHUB_WORKSPACE/VERSION) REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g' ) echo "PACKAGE_NAME=wazuh-${{ matrix.type }}-${VERSION}-${REVISION}.${{matrix.system.ARCH}}.rpm" >> $GITHUB_ENV + ls -la $GITHUB_WORKSPACE/debs/output/ - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} id: download-artifact From ac63a74eb2dbc89c1120998118a5ac223879c610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 1 Feb 2023 17:23:39 +0100 Subject: [PATCH 260/316] Test calling builder from another workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 4 ---- .github/workflows/test-call-build-rpm.yml | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/test-call-build-rpm.yml diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 170913048b..b857bcb5ae 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -1,9 +1,5 @@ name: Build Wazuh Packages - RPM - x86_64 and i386 on: - pull_request: - paths: - - 'rpms/SPECS/*' - - 'rpms/generate_rpm_package.sh' workflow_dispatch: workflow_call: diff --git a/.github/workflows/test-call-build-rpm.yml b/.github/workflows/test-call-build-rpm.yml new file mode 100644 index 0000000000..62d3b7c2bc --- /dev/null +++ b/.github/workflows/test-call-build-rpm.yml @@ -0,0 +1,21 @@ +name: Test +on: + pull_request: + paths: + - 'rpms/CentOS/**' + - 'rpms/build.sh' + push: + branches: + - master + - 4.5 + - 4.4 + paths: + - 'rpms/CentOS/*' + - 'rpms/build.sh' + workflow_dispatch: + +jobs: + Build-packages-rpm: + if: github.event_name == 'pull_request' + uses: ./.github/workflows/build-rpm-packages.yml + secrets: inherit \ No newline at end of file From 9fec45ac273d34eb3312f76f24e24a99bf4e70cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 1 Feb 2023 17:31:54 +0100 Subject: [PATCH 261/316] Remove check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 1 - .github/workflows/test-install-and-enable-rpm.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 82a439408b..fdf567ccb2 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -25,7 +25,6 @@ jobs: VERSION=$(cat $GITHUB_WORKSPACE/VERSION) REVISION=$( echo ${{ github.head_ref }}) echo "PACKAGE_NAME=wazuh-${{ matrix.type }}_${VERSION}-${REVISION}_${{ matrix.arch }}.deb" >> $GITHUB_ENV - ls -la $GITHUB_WORKSPACE/debs/output/ - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} id: download-artifact diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 82c1d378e8..d0f312ce03 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -31,7 +31,6 @@ jobs: VERSION=$(cat $GITHUB_WORKSPACE/VERSION) REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g' ) echo "PACKAGE_NAME=wazuh-${{ matrix.type }}-${VERSION}-${REVISION}.${{matrix.system.ARCH}}.rpm" >> $GITHUB_ENV - ls -la $GITHUB_WORKSPACE/debs/output/ - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} id: download-artifact From abcee78d2b2ceea8c98c8a5032edb092aed0c8ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 1 Feb 2023 18:11:12 +0100 Subject: [PATCH 262/316] Test as a different workflow and wait for the package to be created MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 9 ++----- .github/workflows/build-rpm-packages.yml | 13 +++++----- .github/workflows/test-call-build-rpm.yml | 21 ---------------- .../workflows/test-install-and-enable-deb.yml | 25 +++++++++---------- .../workflows/test-install-and-enable-rpm.yml | 25 +++++++++---------- .github/workflows/upload-deb-images.yml | 8 +++++- .github/workflows/upload-rpm-images.yml | 6 +++++ 7 files changed, 45 insertions(+), 62 deletions(-) delete mode 100644 .github/workflows/test-call-build-rpm.yml diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index dbfde72637..4fbc38ffad 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -8,7 +8,7 @@ on: workflow_call: jobs: - Wazuh-agent-deb-package-builds: + Wazuh-agent-deb-package-build: runs-on: ubuntu-latest strategy: matrix: @@ -64,9 +64,4 @@ jobs: with: name: ${{ env.PACKAGE_NAME }} path: ${{github.workspace}}/debs/output/${{ env.PACKAGE_NAME }} - if-no-files-found: error - - Test-install-packages-deb: - needs: Wazuh-agent-deb-package-builds - uses: ./.github/workflows/test-install-and-enable-deb.yml - secrets: inherit \ No newline at end of file + if-no-files-found: error \ No newline at end of file diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index b857bcb5ae..9a385478aa 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -1,11 +1,15 @@ name: Build Wazuh Packages - RPM - x86_64 and i386 on: + pull_request: + paths: + - 'rpms/SPECS/*' + - 'rpms/generate_rpm_package.sh' workflow_dispatch: workflow_call: jobs: - Wazuh-agent-rpm-package-builds: + Wazuh-agent-rpm-package-build: runs-on: ubuntu-latest strategy: matrix: @@ -61,9 +65,4 @@ jobs: with: name: ${{ env.PACKAGE_NAME }} path: ${{github.workspace}}/rpms/output/${{ env.PACKAGE_NAME }} - if-no-files-found: error - - Test-install-packages-rpm: - needs: Wazuh-agent-rpm-package-builds - uses: ./.github/workflows/test-install-and-enable-rpm.yml - secrets: inherit \ No newline at end of file + if-no-files-found: error \ No newline at end of file diff --git a/.github/workflows/test-call-build-rpm.yml b/.github/workflows/test-call-build-rpm.yml deleted file mode 100644 index 62d3b7c2bc..0000000000 --- a/.github/workflows/test-call-build-rpm.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Test -on: - pull_request: - paths: - - 'rpms/CentOS/**' - - 'rpms/build.sh' - push: - branches: - - master - - 4.5 - - 4.4 - paths: - - 'rpms/CentOS/*' - - 'rpms/build.sh' - workflow_dispatch: - -jobs: - Build-packages-rpm: - if: github.event_name == 'pull_request' - uses: ./.github/workflows/build-rpm-packages.yml - secrets: inherit \ No newline at end of file diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index fdf567ccb2..45c500b245 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -1,5 +1,9 @@ name: Test install and enable Wazuh agent and manager - DEB on: + pull_request: + paths: + - 'debs/SPECS/*' + - 'debs/generate_debian_package.sh' workflow_dispatch: workflow_call: @@ -18,6 +22,14 @@ jobs: arch: i386 fail-fast: false steps: + - name: Wait for the package to be built + uses: fountainhead/action-wait-for-check@v1.1.0 + id: wait-for-build + with: + token: ${{ secrets.GITHUB_TOKEN }} + checkName: Wazuh-agent-deb-package-build + ref: ${{ github.event.pull_request.head.sha || github.sha }} + - uses: actions/checkout@v3 - name: Setup directories and variables @@ -36,19 +48,6 @@ jobs: name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail - - name: Wait for the artifact to be uploaded - if: ${{ steps.download-artifact.outcome == 'failure' }} - run: sleep 240 - - - name: Retry download if it has failed - if: ${{ steps.download-artifact.outcome == 'failure' }} - uses: dawidd6/action-download-artifact@v2 - with: - workflow: build-deb-packages.yml - workflow_conclusion: in_progress - name: ${{env.PACKAGE_NAME}} - if_no_artifact_found: fail - - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} to the packages directory run: | mkdir $GITHUB_WORKSPACE/packages diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index d0f312ce03..d9cc0bf2e9 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -1,5 +1,9 @@ name: Test install and enable Wazuh agent and manager - RPM on: + pull_request: + paths: + - 'rpms/SPECS/*' + - 'rpms/generate_rpm_package.sh' workflow_dispatch: workflow_call: @@ -24,6 +28,14 @@ jobs: type: manager fail-fast: false steps: + - name: Wait for the package to be built + uses: fountainhead/action-wait-for-check@v1.1.0 + id: wait-for-build + with: + token: ${{ secrets.GITHUB_TOKEN }} + checkName: Wazuh-agent-rpm-package-build + ref: ${{ github.event.pull_request.head.sha || github.sha }} + - uses: actions/checkout@v3 - name: Setup directories and variables @@ -42,19 +54,6 @@ jobs: name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail - - name: Wait for the artifact to be uploaded - if: ${{ steps.download-artifact.outcome == 'failure' }} - run: sleep 240 - - - name: Retry download if it has failed - if: ${{ steps.download-artifact.outcome == 'failure' }} - uses: dawidd6/action-download-artifact@v2 - with: - workflow: build-rpm-packages.yml - workflow_conclusion: in_progress - name: ${{env.PACKAGE_NAME}} - if_no_artifact_found: fail - - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} to the packages directory run: | mkdir $GITHUB_WORKSPACE/packages diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index 5b707d67f9..7f8d5969cb 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -43,8 +43,14 @@ jobs: run: bash $GITHUB_WORKSPACE/.github/actions/ghcr-pull-and-push/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} - Build-packages-rpm: + Build-packages-deb: needs: Upload-deb-package-building-images if: github.event_name == 'pull_request' uses: ./.github/workflows/build-deb-packages.yml + secrets: inherit + + Test-packages-deb: + needs: Build-packages-deb + if: github.event_name == 'pull_request' + uses: ./.github/workflows/test-install-and-enable-deb.yml secrets: inherit \ No newline at end of file diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index 7fc3624963..a4f7cffd01 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -47,4 +47,10 @@ jobs: needs: Upload-rpm-package-building-images if: github.event_name == 'pull_request' uses: ./.github/workflows/build-rpm-packages.yml + secrets: inherit + + Test-packages-rpm: + needs: Build-packages-rpm + if: github.event_name == 'pull_request' + uses: ./.github/workflows/test-install-and-enable-rpm.yml secrets: inherit \ No newline at end of file From ed43bdc67190d099f7f4e0706b6ef96ec5acd3c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 1 Feb 2023 18:14:28 +0100 Subject: [PATCH 263/316] Change interval and timeout to wait for package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 2 ++ .github/workflows/test-install-and-enable-rpm.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 45c500b245..78e4b96501 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -29,6 +29,8 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} checkName: Wazuh-agent-deb-package-build ref: ${{ github.event.pull_request.head.sha || github.sha }} + interval: 60 + timeoutSeconds: 7200 - uses: actions/checkout@v3 diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index d9cc0bf2e9..6651682f2f 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -35,6 +35,8 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} checkName: Wazuh-agent-rpm-package-build ref: ${{ github.event.pull_request.head.sha || github.sha }} + interval: 60 + timeoutSeconds: 7200 - uses: actions/checkout@v3 From 625c62677d2798048c0a613b27b482b809f0fc5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 1 Feb 2023 18:16:03 +0100 Subject: [PATCH 264/316] Add cancel last run to the tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 7 +++++++ .github/workflows/test-install-and-enable-rpm.yml | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 78e4b96501..ba288e836f 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -22,6 +22,13 @@ jobs: arch: i386 fail-fast: false steps: + - name: Cancel previous runs + uses: fkirc/skip-duplicate-actions@master + with: + cancel_others: 'true' + github_token: ${{ secrets.GITHUB_TOKEN }} + skip_after_successful_duplicate: 'false' + - name: Wait for the package to be built uses: fountainhead/action-wait-for-check@v1.1.0 id: wait-for-build diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 6651682f2f..31762c22f4 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -28,6 +28,13 @@ jobs: type: manager fail-fast: false steps: + - name: Cancel previous runs + uses: fkirc/skip-duplicate-actions@master + with: + cancel_others: 'true' + github_token: ${{ secrets.GITHUB_TOKEN }} + skip_after_successful_duplicate: 'false' + - name: Wait for the package to be built uses: fountainhead/action-wait-for-check@v1.1.0 id: wait-for-build From e041a0212968c37e1f645e33bee34d7fdef4f9eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 1 Feb 2023 18:30:02 +0100 Subject: [PATCH 265/316] Add job to cancel and wait for the package to be built MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../workflows/test-install-and-enable-deb.yml | 27 ++++++++----- .../workflows/test-install-and-enable-rpm.yml | 38 +++++++++++-------- 2 files changed, 39 insertions(+), 26 deletions(-) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index ba288e836f..2eb467856e 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -8,18 +8,10 @@ on: workflow_call: jobs: - Test-install-and-enable-deb-systems: + + Wait-for-package-building: runs-on: ubuntu-latest strategy: - matrix: - distro_name: ['ubuntu:xenial', 'ubuntu:bionic', 'ubuntu:focal', 'ubuntu:jammy', 'debian:stretch', 'debian:buster', 'debian:bullseye'] - type: [agent, manager] - arch: [amd64, i386] - exclude: - - type: manager - arch: i386 - - distro_name: 'ubuntu:jammy' - arch: i386 fail-fast: false steps: - name: Cancel previous runs @@ -39,6 +31,21 @@ jobs: interval: 60 timeoutSeconds: 7200 + Test-install-and-enable-deb-systems: + needs: Wait-for-package-building + runs-on: ubuntu-latest + strategy: + matrix: + distro_name: ['ubuntu:xenial', 'ubuntu:bionic', 'ubuntu:focal', 'ubuntu:jammy', 'debian:stretch', 'debian:buster', 'debian:bullseye'] + type: [agent, manager] + arch: [amd64, i386] + exclude: + - type: manager + arch: i386 + - distro_name: 'ubuntu:jammy' + arch: i386 + fail-fast: false + steps: - uses: actions/checkout@v3 - name: Setup directories and variables diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 31762c22f4..c6865c3dc7 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -8,24 +8,9 @@ on: workflow_call: jobs: - Test-install-and-enable-rpm-systems: + Wait-for-package-building: runs-on: ubuntu-latest strategy: - matrix: - system: [ - {NAME: 'oraclelinux:9', ARCH: "x86_64"}, - {NAME: 'almalinux:9', ARCH: "x86_64"}, - {NAME: 'rockylinux:9', ARCH: "x86_64"}, - {NAME: 'centos:7', ARCH: "x86_64"}, - {NAME: 'centos:8', ARCH: "x86_64"}, - {NAME: 'i386/centos:7', ARCH: "i386"}, - {NAME: 'redhat/ubi8:latest', ARCH: "x86_64"}, - {NAME: 'redhat/ubi9:latest', ARCH: "x86_64"}, - {NAME: 'amazonlinux:2', ARCH: "x86_64"}] - type: [agent, manager] - exclude: - - system: {ARCH: "i386"} - type: manager fail-fast: false steps: - name: Cancel previous runs @@ -45,6 +30,27 @@ jobs: interval: 60 timeoutSeconds: 7200 + Test-install-and-enable-rpm-systems: + needs: Wait-for-package-building + runs-on: ubuntu-latest + strategy: + matrix: + system: [ + {NAME: 'oraclelinux:9', ARCH: "x86_64"}, + {NAME: 'almalinux:9', ARCH: "x86_64"}, + {NAME: 'rockylinux:9', ARCH: "x86_64"}, + {NAME: 'centos:7', ARCH: "x86_64"}, + {NAME: 'centos:8', ARCH: "x86_64"}, + {NAME: 'i386/centos:7', ARCH: "i386"}, + {NAME: 'redhat/ubi8:latest', ARCH: "x86_64"}, + {NAME: 'redhat/ubi9:latest', ARCH: "x86_64"}, + {NAME: 'amazonlinux:2', ARCH: "x86_64"}] + type: [agent, manager] + exclude: + - system: {ARCH: "i386"} + type: manager + fail-fast: false + steps: - uses: actions/checkout@v3 - name: Setup directories and variables From 01389de2dcdf69b5846c675f5e2b7819cf7b0975 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 2 Feb 2023 09:29:34 +0100 Subject: [PATCH 266/316] Test wait for one hour of package creation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 2 +- .github/workflows/test-install-and-enable-rpm.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 2eb467856e..ecd9dfd871 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -29,7 +29,7 @@ jobs: checkName: Wazuh-agent-deb-package-build ref: ${{ github.event.pull_request.head.sha || github.sha }} interval: 60 - timeoutSeconds: 7200 + timeoutSeconds: 3600 Test-install-and-enable-deb-systems: needs: Wait-for-package-building diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index c6865c3dc7..3b344d3660 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -28,7 +28,7 @@ jobs: checkName: Wazuh-agent-rpm-package-build ref: ${{ github.event.pull_request.head.sha || github.sha }} interval: 60 - timeoutSeconds: 7200 + timeoutSeconds: 3600 Test-install-and-enable-rpm-systems: needs: Wait-for-package-building From dc13d75e63d16b148f0dadbd94b9866629c9e0f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 2 Feb 2023 10:22:33 +0100 Subject: [PATCH 267/316] Try different action to wait MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-rpm.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 3b344d3660..3d2beda17a 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -21,14 +21,13 @@ jobs: skip_after_successful_duplicate: 'false' - name: Wait for the package to be built - uses: fountainhead/action-wait-for-check@v1.1.0 + uses: ArcticLampyrid/action-wait-for-workflow@v1.1.0 id: wait-for-build with: - token: ${{ secrets.GITHUB_TOKEN }} - checkName: Wazuh-agent-rpm-package-build - ref: ${{ github.event.pull_request.head.sha || github.sha }} - interval: 60 - timeoutSeconds: 3600 + github_token: ${{ secrets.GITHUB_TOKEN }} + workflow: build-rpm-packages.yml + sha: ${{ github.event.pull_request.head.sha || github.sha }} + wait-interval: 60 Test-install-and-enable-rpm-systems: needs: Wait-for-package-building From 00ad4401c317f26a4d24ba710bdb18b000566b92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 2 Feb 2023 10:23:56 +0100 Subject: [PATCH 268/316] Fix version for new waiting action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-rpm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 3d2beda17a..c200392487 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -21,7 +21,7 @@ jobs: skip_after_successful_duplicate: 'false' - name: Wait for the package to be built - uses: ArcticLampyrid/action-wait-for-workflow@v1.1.0 + uses: ArcticLampyrid/action-wait-for-workflow@v1.0.3 id: wait-for-build with: github_token: ${{ secrets.GITHUB_TOKEN }} From 8c9d4ef43dfc0259407274ddbf93ef6ab116c0a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 2 Feb 2023 10:33:44 +0100 Subject: [PATCH 269/316] Fix download artifact from success workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 6 ++++-- .github/workflows/test-install-and-enable-rpm.yml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index ecd9dfd871..c06336617c 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -28,7 +28,9 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} checkName: Wazuh-agent-deb-package-build ref: ${{ github.event.pull_request.head.sha || github.sha }} - interval: 60 + owner: ${{ github.repository_owner }} + repository: ${{ github.repository }} + intervalSeconds: 60 timeoutSeconds: 3600 Test-install-and-enable-deb-systems: @@ -60,7 +62,7 @@ jobs: uses: dawidd6/action-download-artifact@v2 with: workflow: build-deb-packages.yml - workflow_conclusion: in_progress + workflow_conclusion: success name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index c200392487..6182271a24 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -64,7 +64,7 @@ jobs: uses: dawidd6/action-download-artifact@v2 with: workflow: build-rpm-packages.yml - workflow_conclusion: in_progress + workflow_conclusion: success name: ${{env.PACKAGE_NAME}} if_no_artifact_found: fail From 2bd2bc063802fca73cfa31615ed54a75445910b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 2 Feb 2023 10:42:22 +0100 Subject: [PATCH 270/316] Change waiting action for deb too MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-deb.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index c06336617c..86e2cd9dc9 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -22,16 +22,13 @@ jobs: skip_after_successful_duplicate: 'false' - name: Wait for the package to be built - uses: fountainhead/action-wait-for-check@v1.1.0 + uses: ArcticLampyrid/action-wait-for-workflow@v1.0.3 id: wait-for-build with: - token: ${{ secrets.GITHUB_TOKEN }} - checkName: Wazuh-agent-deb-package-build - ref: ${{ github.event.pull_request.head.sha || github.sha }} - owner: ${{ github.repository_owner }} - repository: ${{ github.repository }} - intervalSeconds: 60 - timeoutSeconds: 3600 + github_token: ${{ secrets.GITHUB_TOKEN }} + workflow: build-deb-packages.yml + sha: ${{ github.event.pull_request.head.sha || github.sha }} + wait-interval: 60 Test-install-and-enable-deb-systems: needs: Wait-for-package-building From 08bd1075fac0413d8095fa31404ff6a6b0283032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 2 Feb 2023 17:07:04 +0100 Subject: [PATCH 271/316] Added CentOS 9 Stream and Fedora 34 to the orifinal fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 8b01346087..a6f44c6e8d 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -242,7 +242,7 @@ fi if [ -f /etc/os-release ]; then source /etc/os-release - if ( [ "${NAME}" = "Red Hat Enterprise Linux" ] || [ "${NAME}" = "Rocky Linux" ] || [ "${NAME}" = "AlmaLinux" ] ) && [ "$((${VERSION_ID:0:1}))" -ge 9 ]; then + if (( [ "${NAME}" = "Red Hat Enterprise Linux" ] || [ "${NAME}" = "Rocky Linux" ] || [ "${NAME}" = "AlmaLinux" ] || [ "CentOS Stream" ]) && [ "$((${VERSION_ID:0:1}))" -ge 9 ]) || ( [ "${NAME}" = "Fedora" ] && [ "$((${VERSION_ID}))" -ge 34 ] ); then rm -f %{_initrddir}/wazuh-agent fi fi diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 441258ee22..ce0bbc58e2 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -332,7 +332,7 @@ fi if [ -f /etc/os-release ]; then source /etc/os-release - if ( [ "${NAME}" = "Red Hat Enterprise Linux" ] || [ "${NAME}" = "Rocky Linux" ] || [ "${NAME}" = "AlmaLinux" ] ) && [ "$((${VERSION_ID:0:1}))" -ge 9 ]; then + if (( [ "${NAME}" = "Red Hat Enterprise Linux" ] || [ "${NAME}" = "Rocky Linux" ] || [ "${NAME}" = "AlmaLinux" ] || [ "CentOS Stream" ]) && [ "$((${VERSION_ID:0:1}))" -ge 9 ]) || ( [ "${NAME}" = "Fedora" ] && [ "$((${VERSION_ID}))" -ge 34 ] ); then rm -f %{_initrddir}/wazuh-manager fi fi diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 2bd5a3cfbe..80447077ad 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -165,7 +165,7 @@ fi if [ -f /etc/os-release ]; then source /etc/os-release - if [ "${NAME}" = "Red Hat Enterprise Linux" ] && [ "$((${VERSION_ID:0:1}))" -ge 9 ]; then + if (( [ "${NAME}" = "Red Hat Enterprise Linux" ] || [ "${NAME}" = "Rocky Linux" ] || [ "${NAME}" = "AlmaLinux" ] || [ "CentOS Stream" ]) && [ "$((${VERSION_ID:0:1}))" -ge 9 ]) || ( [ "${NAME}" = "Fedora" ] && [ "$((${VERSION_ID}))" -ge 34 ] ); then rm -f /etc/init.d/%{name} fi fi From f52d16beca387fc3994fb7abe5e0f3c69ff11d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 2 Feb 2023 17:08:31 +0100 Subject: [PATCH 272/316] Add install and enable test for fedora 34 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-rpm.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 6182271a24..9025c2e491 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -43,7 +43,8 @@ jobs: {NAME: 'i386/centos:7', ARCH: "i386"}, {NAME: 'redhat/ubi8:latest', ARCH: "x86_64"}, {NAME: 'redhat/ubi9:latest', ARCH: "x86_64"}, - {NAME: 'amazonlinux:2', ARCH: "x86_64"}] + {NAME: 'amazonlinux:2', ARCH: "x86_64"}, + {NAME: 'fedora:34', ARCH: "x86_64"}] type: [agent, manager] exclude: - system: {ARCH: "i386"} From 92232231af69c4c33cd5b2bcccd40fe8e86467eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 3 Feb 2023 10:40:08 +0100 Subject: [PATCH 273/316] Only install /etc/init.d/rc.d/* if systemd-sysv-install is not present MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- rpms/SPECS/wazuh-agent.spec | 14 +++++--------- rpms/SPECS/wazuh-manager.spec | 18 +++++++----------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 6a640ef165..26e7833f6f 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -81,14 +81,16 @@ echo 'USER_AUTO_START="n"' >> ./etc/preloaded-vars.conf %endif # Create directories -mkdir -p ${RPM_BUILD_ROOT}%{_initrddir} +if [ ! -f /usr/lib/systemd/systemd-sysv-install ]; then mkdir -p ${RPM_BUILD_ROOT}%{_initrddir}; fi mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/.ssh # Copy the installed files into RPM_BUILD_ROOT directory cp -pr %{_localstatedir}/* ${RPM_BUILD_ROOT}%{_localstatedir}/ mkdir -p ${RPM_BUILD_ROOT}/usr/lib/systemd/system/ -sed -i "s:WAZUH_HOME_TMP:%{_localstatedir}:g" src/init/templates/ossec-hids-rh.init -install -m 0755 src/init/templates/ossec-hids-rh.init ${RPM_BUILD_ROOT}%{_initrddir}/wazuh-agent +if [ ! -f /usr/lib/systemd/systemd-sysv-install ]; then + sed -i "s:WAZUH_HOME_TMP:%{_localstatedir}:g" src/init/templates/ossec-hids-rh.init + install -m 0755 src/init/templates/ossec-hids-rh.init ${RPM_BUILD_ROOT}%{_initrddir}/wazuh-agent +fi sed -i "s:WAZUH_HOME_TMP:%{_localstatedir}:g" src/init/templates/wazuh-agent.service install -m 0644 src/init/templates/wazuh-agent.service ${RPM_BUILD_ROOT}/usr/lib/systemd/system/ @@ -240,12 +242,6 @@ if [ $1 = 1 ]; then %{_localstatedir}/packages_files/agent_installation_scripts/src/init/register_configure_agent.sh %{_localstatedir} > /dev/null || : fi -if [ -f /etc/os-release ]; then - source /etc/os-release - if [ "${NAME}" = "Red Hat Enterprise Linux" ] && [ "$((${VERSION_ID:0:1}))" -ge 9 ]; then - rm -f %{_initrddir}/wazuh-agent - fi -fi # We create this fix for the operating system that deprecated the SySV. For now, this fix is for suse/openSUSE sles="" diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 544136e75c..e6b35f1eee 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -74,14 +74,17 @@ echo 'USER_CREATE_SSL_CERT="n"' >> ./etc/preloaded-vars.conf ./install.sh # Create directories -mkdir -p ${RPM_BUILD_ROOT}%{_initrddir} + +if [ ! -f /usr/lib/systemd/systemd-sysv-install ]; then mkdir -p ${RPM_BUILD_ROOT}%{_initrddir}; fi mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/.ssh # Copy the installed files into RPM_BUILD_ROOT directory cp -pr %{_localstatedir}/* ${RPM_BUILD_ROOT}%{_localstatedir}/ mkdir -p ${RPM_BUILD_ROOT}/usr/lib/systemd/system/ -sed -i "s:WAZUH_HOME_TMP:%{_localstatedir}:g" src/init/templates/ossec-hids-rh.init -install -m 0755 src/init/templates/ossec-hids-rh.init ${RPM_BUILD_ROOT}%{_initrddir}/wazuh-manager +if [ ! -f /usr/lib/systemd/systemd-sysv-install ]; then + sed -i "s:WAZUH_HOME_TMP:%{_localstatedir}:g" src/init/templates/ossec-hids-rh.init + install -m 0755 src/init/templates/ossec-hids-rh.init ${RPM_BUILD_ROOT}%{_initrddir}/wazuh-manager +fi sed -i "s:WAZUH_HOME_TMP:%{_localstatedir}:g" src/init/templates/wazuh-manager.service install -m 0644 src/init/templates/wazuh-manager.service ${RPM_BUILD_ROOT}/usr/lib/systemd/system/ @@ -326,17 +329,10 @@ fi if [ -n "$sles" ] && [ $(ps --no-headers -o comm 1) == "systemd" ]; then if [ -f /etc/init.d/wazuh-manager ]; then - rm -f /etc/init.d/wazuh-manager + rm -f %{_initrddir}//wazuh-manager fi fi -if [ -f /etc/os-release ]; then - source /etc/os-release - if [ "${NAME}" = "Red Hat Enterprise Linux" ] && [ "$((${VERSION_ID:0:1}))" -ge 9 ]; then - rm -f %{_initrddir}/wazuh-manager - fi -fi - # Generation auto-signed certificate if not exists if [ ! -f "%{_localstatedir}/etc/sslmanager.key" ] && [ ! -f "%{_localstatedir}/etc/sslmanager.cert" ]; then %{_localstatedir}/bin/wazuh-authd -C 365 -B 2048 -S "/C=US/ST=California/CN=Wazuh/" -K %{_localstatedir}/etc/sslmanager.key -X %{_localstatedir}/etc/sslmanager.cert 2>/dev/null From 24734fb12d34b2b331876e697f44ebe4ad25e0af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 3 Feb 2023 12:44:33 +0100 Subject: [PATCH 274/316] Fix typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/actions/test-install-enable/install_and_enable.sh | 2 +- unattended_installer/common_functions/common.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/test-install-enable/install_and_enable.sh b/.github/actions/test-install-enable/install_and_enable.sh index ed82e33ada..b201222253 100644 --- a/.github/actions/test-install-enable/install_and_enable.sh +++ b/.github/actions/test-install-enable/install_and_enable.sh @@ -14,7 +14,7 @@ elif [ -n "$(command -v apt-get)" ]; then apt-get update apt-get install -y systemd else - common_logger -e "Couldn'd find type of system" + common_logger -e "Couldn't find type of system" exit 1 fi diff --git a/unattended_installer/common_functions/common.sh b/unattended_installer/common_functions/common.sh index b38315b781..51e76dbe63 100644 --- a/unattended_installer/common_functions/common.sh +++ b/unattended_installer/common_functions/common.sh @@ -118,7 +118,7 @@ function common_checkSystem() { sys_type="apt-get" sep="=" else - common_logger -e "Couldn'd find type of system" + common_logger -e "Couldn't find type of system" exit 1 fi From ccd448689ee74173cca4027a712dd35f6e3842cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 3 Feb 2023 13:07:09 +0100 Subject: [PATCH 275/316] Change condition to remove /etc/init.d/wazuh-indexer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- stack/indexer/rpm/wazuh-indexer.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 2bd5a3cfbe..5b889782e1 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -163,11 +163,9 @@ if [ $1 = 1 ];then # Install fi -if [ -f /etc/os-release ]; then - source /etc/os-release - if [ "${NAME}" = "Red Hat Enterprise Linux" ] && [ "$((${VERSION_ID:0:1}))" -ge 9 ]; then + +if [ ! -f /usr/lib/systemd/systemd-sysv-install ]; then rm -f /etc/init.d/%{name} - fi fi # If is an upgrade, move the securityconfig files if they exist (4.3.x versions) From 3e69fa3ecac1bf06951a6e04f61342bdc78fb188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 3 Feb 2023 13:22:02 +0100 Subject: [PATCH 276/316] Change debug call so it only runs if the command is not run with --help MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- stack/indexer/rpm/build_package.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stack/indexer/rpm/build_package.sh b/stack/indexer/rpm/build_package.sh index 2ef8076c31..3d254e1bed 100755 --- a/stack/indexer/rpm/build_package.sh +++ b/stack/indexer/rpm/build_package.sh @@ -8,8 +8,6 @@ # License (version 2) as published by the FSF - Free Software # Foundation. -set -ex - current_path="$( cd $(dirname $0) ; pwd -P )" architecture="x86_64" outdir="${current_path}/output" @@ -158,6 +156,8 @@ main() { esac done + set -ex + build || clean 1 clean 0 From 680e61f066fe4de5ff6a83c474844926ffcecb9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 3 Feb 2023 13:49:00 +0100 Subject: [PATCH 277/316] Correct the condition for init.d deprecation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- rpms/SPECS/wazuh-agent.spec | 4 ++-- rpms/SPECS/wazuh-manager.spec | 4 ++-- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 26e7833f6f..650800a6dc 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -81,13 +81,13 @@ echo 'USER_AUTO_START="n"' >> ./etc/preloaded-vars.conf %endif # Create directories -if [ ! -f /usr/lib/systemd/systemd-sysv-install ]; then mkdir -p ${RPM_BUILD_ROOT}%{_initrddir}; fi +if [ -f /usr/lib/systemd/systemd-sysv-install ]; then mkdir -p ${RPM_BUILD_ROOT}%{_initrddir}; fi mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/.ssh # Copy the installed files into RPM_BUILD_ROOT directory cp -pr %{_localstatedir}/* ${RPM_BUILD_ROOT}%{_localstatedir}/ mkdir -p ${RPM_BUILD_ROOT}/usr/lib/systemd/system/ -if [ ! -f /usr/lib/systemd/systemd-sysv-install ]; then +if [ -f /usr/lib/systemd/systemd-sysv-install ]; then sed -i "s:WAZUH_HOME_TMP:%{_localstatedir}:g" src/init/templates/ossec-hids-rh.init install -m 0755 src/init/templates/ossec-hids-rh.init ${RPM_BUILD_ROOT}%{_initrddir}/wazuh-agent fi diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index e6b35f1eee..a7adb2c893 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -75,13 +75,13 @@ echo 'USER_CREATE_SSL_CERT="n"' >> ./etc/preloaded-vars.conf # Create directories -if [ ! -f /usr/lib/systemd/systemd-sysv-install ]; then mkdir -p ${RPM_BUILD_ROOT}%{_initrddir}; fi +if [ -f /usr/lib/systemd/systemd-sysv-install ]; then mkdir -p ${RPM_BUILD_ROOT}%{_initrddir}; fi mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/.ssh # Copy the installed files into RPM_BUILD_ROOT directory cp -pr %{_localstatedir}/* ${RPM_BUILD_ROOT}%{_localstatedir}/ mkdir -p ${RPM_BUILD_ROOT}/usr/lib/systemd/system/ -if [ ! -f /usr/lib/systemd/systemd-sysv-install ]; then +if [ -f /usr/lib/systemd/systemd-sysv-install ]; then sed -i "s:WAZUH_HOME_TMP:%{_localstatedir}:g" src/init/templates/ossec-hids-rh.init install -m 0755 src/init/templates/ossec-hids-rh.init ${RPM_BUILD_ROOT}%{_initrddir}/wazuh-manager fi diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 5b889782e1..c6e7ac0927 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -164,7 +164,7 @@ if [ $1 = 1 ];then # Install fi -if [ ! -f /usr/lib/systemd/systemd-sysv-install ]; then +if [ -f /usr/lib/systemd/systemd-sysv-install ]; then rm -f /etc/init.d/%{name} fi From 066a21d5ef361637751f0bf9a3b6dbacc326c676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 3 Feb 2023 16:26:50 +0100 Subject: [PATCH 278/316] Change the condition to a macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- rpms/SPECS/wazuh-agent.spec | 13 +++++++++---- rpms/SPECS/wazuh-manager.spec | 14 +++++++++----- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 650800a6dc..3e848d9b7b 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -35,6 +35,7 @@ log analysis, file integrity monitoring, intrusions detection and policy and com ./gen_ossec.sh conf agent centos %rhel %{_localstatedir} > etc/ossec-agent.conf %build +%define initd_valid %( if [ -f /usr/lib/systemd/systemd-sysv-install ]; then echo "1" ; else echo "0"; fi ) pushd src # Rebuild for agent make clean @@ -81,16 +82,18 @@ echo 'USER_AUTO_START="n"' >> ./etc/preloaded-vars.conf %endif # Create directories -if [ -f /usr/lib/systemd/systemd-sysv-install ]; then mkdir -p ${RPM_BUILD_ROOT}%{_initrddir}; fi +%if %initd_valid + mkdir -p ${RPM_BUILD_ROOT}%{_initrddir} +%endif mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/.ssh # Copy the installed files into RPM_BUILD_ROOT directory cp -pr %{_localstatedir}/* ${RPM_BUILD_ROOT}%{_localstatedir}/ mkdir -p ${RPM_BUILD_ROOT}/usr/lib/systemd/system/ -if [ -f /usr/lib/systemd/systemd-sysv-install ]; then +%if %initd_valid sed -i "s:WAZUH_HOME_TMP:%{_localstatedir}:g" src/init/templates/ossec-hids-rh.init install -m 0755 src/init/templates/ossec-hids-rh.init ${RPM_BUILD_ROOT}%{_initrddir}/wazuh-agent -fi +%endif sed -i "s:WAZUH_HOME_TMP:%{_localstatedir}:g" src/init/templates/wazuh-agent.service install -m 0644 src/init/templates/wazuh-agent.service ${RPM_BUILD_ROOT}/usr/lib/systemd/system/ @@ -488,7 +491,9 @@ rm -fr %{buildroot} %files %defattr(-,root,root) -%config(missingok) %{_initrddir}/wazuh-agent +%if %initd_valid + %config(missingok) %{_initrddir}/wazuh-agent +%endif %attr(640, root, wazuh) %verify(not md5 size mtime) %ghost %{_sysconfdir}/ossec-init.conf /usr/lib/systemd/system/wazuh-agent.service %dir %attr(750, root, wazuh) %{_localstatedir} diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index a7adb2c893..e3eef3d6c6 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -36,6 +36,7 @@ log analysis, file integrity monitoring, intrusions detection and policy and com ./gen_ossec.sh conf manager centos %rhel %{_localstatedir} > etc/ossec-server.conf %build +%define initd_valid %( if [ -f /usr/lib/systemd/systemd-sysv-install ]; then echo "1" ; else echo "0"; fi ) pushd src # Rebuild for server make clean @@ -74,17 +75,18 @@ echo 'USER_CREATE_SSL_CERT="n"' >> ./etc/preloaded-vars.conf ./install.sh # Create directories - -if [ -f /usr/lib/systemd/systemd-sysv-install ]; then mkdir -p ${RPM_BUILD_ROOT}%{_initrddir}; fi +%if %initd_valid + mkdir -p ${RPM_BUILD_ROOT}%{_initrddir} +%endif mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/.ssh # Copy the installed files into RPM_BUILD_ROOT directory cp -pr %{_localstatedir}/* ${RPM_BUILD_ROOT}%{_localstatedir}/ mkdir -p ${RPM_BUILD_ROOT}/usr/lib/systemd/system/ -if [ -f /usr/lib/systemd/systemd-sysv-install ]; then +%if %initd_valid sed -i "s:WAZUH_HOME_TMP:%{_localstatedir}:g" src/init/templates/ossec-hids-rh.init install -m 0755 src/init/templates/ossec-hids-rh.init ${RPM_BUILD_ROOT}%{_initrddir}/wazuh-manager -fi +%endif sed -i "s:WAZUH_HOME_TMP:%{_localstatedir}:g" src/init/templates/wazuh-manager.service install -m 0644 src/init/templates/wazuh-manager.service ${RPM_BUILD_ROOT}/usr/lib/systemd/system/ @@ -578,7 +580,9 @@ rm -fr %{buildroot} %files %defattr(-,root,wazuh) -%config(missingok) %{_initrddir}/wazuh-manager +%if %initd_valid + %config(missingok) %{_initrddir}/wazuh-agent +%endif %attr(640, root, wazuh) %verify(not md5 size mtime) %ghost %{_sysconfdir}/ossec-init.conf /usr/lib/systemd/system/wazuh-manager.service %dir %attr(750, root, wazuh) %{_localstatedir} From c61261c0d2197b2c83734c0457cdacf3a85d3115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 3 Feb 2023 16:27:12 +0100 Subject: [PATCH 279/316] Remove trailing whitespace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- rpms/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rpms/build.sh b/rpms/build.sh index b6006f30af..91c1bd9ab1 100755 --- a/rpms/build.sh +++ b/rpms/build.sh @@ -73,7 +73,7 @@ else specs_path="/specs" fi -if [[ "${future}" == "yes" ]]; then +if [[ "${future}" == "yes" ]]; then # MODIFY VARIABLES base_version=$wazuh_version MAJOR=$(echo $base_version | cut -dv -f2 | cut -d. -f1) @@ -112,6 +112,7 @@ if [ "${legacy}" = "no" ]; then fi # Building RPM +set -ex $linux $rpmbuild --define "_sysconfdir /etc" --define "_topdir ${rpm_build_dir}" \ --define "_threads ${threads}" --define "_release ${package_release}" \ --define "_localstatedir ${directory_base}" --define "_debugenabled ${debug}" \ From ad78e4b494e07a7b48c61a454968f82e1fa0b745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 3 Feb 2023 16:54:25 +0100 Subject: [PATCH 280/316] Only create the correspondent docker image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-deb-images.yml | 13 +++++++++++++ .github/workflows/upload-rpm-images.yml | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index 7f8d5969cb..d44da9c428 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -31,6 +31,18 @@ jobs: - uses: actions/checkout@v3 + - name: Get changed files + uses: dorny/paths-filter@v2 + id: changes + with: + filters: | + i386: + - 'debs/Debian/i386/**' + - 'debs/build.sh' + amd64: + - 'debs/Debian/amd64/**' + - 'debs/build.sh' + - name: Copy build.sh to Dockerfile path run: cp $GITHUB_WORKSPACE/debs/build.sh $GITHUB_WORKSPACE/${{ matrix.image.DOCKERFILE_PATH }} @@ -40,6 +52,7 @@ jobs: if [ "${{ github.event_name }}" == "pull_request" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} with tag ${{ env.TAG }} to Github Container Registry + if: ( steps.changes.outputs.i386 == 'true' && matrix.CONTAINER_NAME == "deb_builder_i386" ) || ( steps.changes.outputs.amd64 == 'true' && matrix.CONTAINER_NAME == "deb_builder_amd64" ) run: bash $GITHUB_WORKSPACE/.github/actions/ghcr-pull-and-push/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index a4f7cffd01..1368890bcf 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -31,6 +31,18 @@ jobs: - uses: actions/checkout@v3 + - name: Get changed files + uses: dorny/paths-filter@v2 + id: changes + with: + filters: | + i386: + - 'rpms/CentOS/6/i386/**' + - 'rpms/build.sh' + x86_64: + - 'rpms/CentOS/6/x86_64/**' + - 'rpms/build.sh' + - name: Copy build.sh to Dockerfile path run: cp $GITHUB_WORKSPACE/rpms/build.sh $GITHUB_WORKSPACE/${{ matrix.image.DOCKERFILE_PATH }} @@ -40,6 +52,7 @@ jobs: if [ "${{ github.event_name }}" == "pull_request" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} with tag ${{ env.TAG }} to Github Container Registry + if: ( steps.changes.outputs.i386 == 'true' && matrix.CONTAINER_NAME == "rpm_builder_i386" ) || ( steps.changes.outputs.amd64 == 'true' && matrix.CONTAINER_NAME == "rpm_builder_x86" ) run: bash $GITHUB_WORKSPACE/.github/actions/ghcr-pull-and-push/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} From 2ae6fd4a23d772bf6c5c55d3170e500faa92a30d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 3 Feb 2023 17:02:22 +0100 Subject: [PATCH 281/316] Add the changes to build_packages and fix in upload images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 7 +++++++ .github/workflows/build-rpm-packages.yml | 7 +++++++ .github/workflows/upload-deb-images.yml | 2 +- .github/workflows/upload-rpm-images.yml | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 4fbc38ffad..a4f7277f80 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -37,6 +37,12 @@ jobs: deb_images: - 'debs/Debian/**' - 'debs/build.sh' + deb_images_i386: + - 'debs/Debian/i386/**' + - 'debs/build.sh' + deb_images_amd64: + - 'debs/Debian/amd64/**' + - 'debs/build.sh' deb_packages: - 'debs/SPECS/**' - 'debs/generate_debian_package.sh' @@ -53,6 +59,7 @@ jobs: bash $GITHUB_WORKSPACE/.github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ env.TAG }} - name: Build the ${{ matrix.ARCHITECTURE }} deb Wazuh ${{ matrix.TYPE }} package + if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.deb_images_amd64 == 'true' && matrix.ARCHITECTURE == 'amd64') working-directory: ./debs run: | REVISION="${{ github.head_ref }}" diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 9a385478aa..a7b1871460 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -38,6 +38,12 @@ jobs: rpm_images: - 'rpms/CentOS/**' - 'rpms/build.sh' + rpm_images_i386: + - 'rpms/CentOS/6/i386/**' + - 'rpms/build.sh' + rpm_images_x86_64: + - 'rpms/CentOS/6/x86_64/**' + - 'rpms/build.sh' rpm_packages: - 'rpms/SPECS/**' - 'rpms/generate_rpm_package.sh' @@ -54,6 +60,7 @@ jobs: bash $GITHUB_WORKSPACE/.github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ env.TAG }} - name: Build the ${{ matrix.ARCHITECTURE }} rpm Wazuh ${{ matrix.TYPE }} package + if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.rpm_images_x86_64 == 'true' && matrix.ARCHITECTURE == 'x86_64' working-directory: ./rpms run: | REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g' ) diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index d44da9c428..a216abd904 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -52,7 +52,7 @@ jobs: if [ "${{ github.event_name }}" == "pull_request" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} with tag ${{ env.TAG }} to Github Container Registry - if: ( steps.changes.outputs.i386 == 'true' && matrix.CONTAINER_NAME == "deb_builder_i386" ) || ( steps.changes.outputs.amd64 == 'true' && matrix.CONTAINER_NAME == "deb_builder_amd64" ) + if: ( steps.changes.outputs.i386 == 'true' && matrix.CONTAINER_NAME == 'deb_builder_i386' ) || ( steps.changes.outputs.amd64 == 'true' && matrix.CONTAINER_NAME == 'deb_builder_amd64' ) run: bash $GITHUB_WORKSPACE/.github/actions/ghcr-pull-and-push/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index 1368890bcf..0a340447f9 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -52,7 +52,7 @@ jobs: if [ "${{ github.event_name }}" == "pull_request" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} with tag ${{ env.TAG }} to Github Container Registry - if: ( steps.changes.outputs.i386 == 'true' && matrix.CONTAINER_NAME == "rpm_builder_i386" ) || ( steps.changes.outputs.amd64 == 'true' && matrix.CONTAINER_NAME == "rpm_builder_x86" ) + if: ( steps.changes.outputs.i386 == 'true' && matrix.CONTAINER_NAME == 'rpm_builder_i386' ) || ( steps.changes.outputs.amd64 == 'true' && matrix.CONTAINER_NAME == 'rpm_builder_x86' ) run: bash $GITHUB_WORKSPACE/.github/actions/ghcr-pull-and-push/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} From 56790180b3f3274b97b27306981404e1d99279ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 3 Feb 2023 17:04:52 +0100 Subject: [PATCH 282/316] Add changes to test install MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../workflows/test-install-and-enable-deb.yml | 19 +++++++++++++++++++ .../workflows/test-install-and-enable-rpm.yml | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 86e2cd9dc9..60019ea788 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -30,8 +30,27 @@ jobs: sha: ${{ github.event.pull_request.head.sha || github.sha }} wait-interval: 60 + - name: Get changed files + uses: dorny/paths-filter@v2 + id: changes + with: + filters: | + deb_images: + - 'debs/Debian/**' + - 'debs/build.sh' + deb_images_i386: + - 'debs/Debian/i386/**' + - 'debs/build.sh' + deb_images_amd64: + - 'debs/Debian/amd64/**' + - 'debs/build.sh' + deb_packages: + - 'debs/SPECS/**' + - 'debs/generate_debian_package.sh' + Test-install-and-enable-deb-systems: needs: Wait-for-package-building + if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.deb_images_amd64 == 'true' && matrix.ARCHITECTURE == 'amd64') runs-on: ubuntu-latest strategy: matrix: diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 9025c2e491..f4bfd57a17 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -29,8 +29,27 @@ jobs: sha: ${{ github.event.pull_request.head.sha || github.sha }} wait-interval: 60 + - name: Get changed files + uses: dorny/paths-filter@v2 + id: changes + with: + filters: | + rpm_images: + - 'rpms/CentOS/**' + - 'rpms/build.sh' + rpm_images_i386: + - 'rpms/CentOS/6/i386/**' + - 'rpms/build.sh' + rpm_images_x86_64: + - 'rpms/CentOS/6/x86_64/**' + - 'rpms/build.sh' + rpm_packages: + - 'rpms/SPECS/**' + - 'rpms/generate_rpm_package.sh' + Test-install-and-enable-rpm-systems: needs: Wait-for-package-building + if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.rpm_images_x86_64 == 'true' && matrix.ARCHITECTURE == 'x86_64' runs-on: ubuntu-latest strategy: matrix: From 908ef357f4d2c6b3f6591f9366b4e712e3ccc0e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 3 Feb 2023 17:06:09 +0100 Subject: [PATCH 283/316] Missing parenthesis MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-rpm-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index a7b1871460..b40536fc4f 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -60,7 +60,7 @@ jobs: bash $GITHUB_WORKSPACE/.github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ env.TAG }} - name: Build the ${{ matrix.ARCHITECTURE }} rpm Wazuh ${{ matrix.TYPE }} package - if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.rpm_images_x86_64 == 'true' && matrix.ARCHITECTURE == 'x86_64' + if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.rpm_images_x86_64 == 'true' && matrix.ARCHITECTURE == 'x86_64') working-directory: ./rpms run: | REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g' ) From 39ea44e9b6e8e95a9f05f091169a50216357cb74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 3 Feb 2023 17:09:47 +0100 Subject: [PATCH 284/316] Change how the conditionals are called in the test install files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../workflows/test-install-and-enable-deb.yml | 39 ++++++++++-------- .../workflows/test-install-and-enable-rpm.yml | 41 ++++++++++--------- 2 files changed, 43 insertions(+), 37 deletions(-) diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-and-enable-deb.yml index 60019ea788..0ad0d8a5fd 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-and-enable-deb.yml @@ -30,6 +30,23 @@ jobs: sha: ${{ github.event.pull_request.head.sha || github.sha }} wait-interval: 60 + Test-install-and-enable-deb-systems: + needs: Wait-for-package-building + runs-on: ubuntu-latest + strategy: + matrix: + distro_name: ['ubuntu:xenial', 'ubuntu:bionic', 'ubuntu:focal', 'ubuntu:jammy', 'debian:stretch', 'debian:buster', 'debian:bullseye'] + type: [agent, manager] + arch: [amd64, i386] + exclude: + - type: manager + arch: i386 + - distro_name: 'ubuntu:jammy' + arch: i386 + fail-fast: false + steps: + - uses: actions/checkout@v3 + - name: Get changed files uses: dorny/paths-filter@v2 id: changes @@ -48,31 +65,15 @@ jobs: - 'debs/SPECS/**' - 'debs/generate_debian_package.sh' - Test-install-and-enable-deb-systems: - needs: Wait-for-package-building - if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.deb_images_amd64 == 'true' && matrix.ARCHITECTURE == 'amd64') - runs-on: ubuntu-latest - strategy: - matrix: - distro_name: ['ubuntu:xenial', 'ubuntu:bionic', 'ubuntu:focal', 'ubuntu:jammy', 'debian:stretch', 'debian:buster', 'debian:bullseye'] - type: [agent, manager] - arch: [amd64, i386] - exclude: - - type: manager - arch: i386 - - distro_name: 'ubuntu:jammy' - arch: i386 - fail-fast: false - steps: - - uses: actions/checkout@v3 - - name: Setup directories and variables + if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.deb_images_amd64 == 'true' && matrix.ARCHITECTURE == 'amd64') run: | VERSION=$(cat $GITHUB_WORKSPACE/VERSION) REVISION=$( echo ${{ github.head_ref }}) echo "PACKAGE_NAME=wazuh-${{ matrix.type }}_${VERSION}-${REVISION}_${{ matrix.arch }}.deb" >> $GITHUB_ENV - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} + if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.deb_images_amd64 == 'true' && matrix.ARCHITECTURE == 'amd64') id: download-artifact continue-on-error: true uses: dawidd6/action-download-artifact@v2 @@ -83,9 +84,11 @@ jobs: if_no_artifact_found: fail - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.distro_name }} to the packages directory + if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.deb_images_amd64 == 'true' && matrix.ARCHITECTURE == 'amd64') run: | mkdir $GITHUB_WORKSPACE/packages mv ${{env.PACKAGE_NAME}} $GITHUB_WORKSPACE/packages - name: Launch docker + if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.deb_images_amd64 == 'true' && matrix.ARCHITECTURE == 'amd64') run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.arch }}/${{ matrix.distro_name }} bash /tests/install_and_enable.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index f4bfd57a17..027de4d06e 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -29,27 +29,8 @@ jobs: sha: ${{ github.event.pull_request.head.sha || github.sha }} wait-interval: 60 - - name: Get changed files - uses: dorny/paths-filter@v2 - id: changes - with: - filters: | - rpm_images: - - 'rpms/CentOS/**' - - 'rpms/build.sh' - rpm_images_i386: - - 'rpms/CentOS/6/i386/**' - - 'rpms/build.sh' - rpm_images_x86_64: - - 'rpms/CentOS/6/x86_64/**' - - 'rpms/build.sh' - rpm_packages: - - 'rpms/SPECS/**' - - 'rpms/generate_rpm_package.sh' - Test-install-and-enable-rpm-systems: needs: Wait-for-package-building - if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.rpm_images_x86_64 == 'true' && matrix.ARCHITECTURE == 'x86_64' runs-on: ubuntu-latest strategy: matrix: @@ -72,13 +53,33 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Get changed files + uses: dorny/paths-filter@v2 + id: changes + with: + filters: | + rpm_images: + - 'rpms/CentOS/**' + - 'rpms/build.sh' + rpm_images_i386: + - 'rpms/CentOS/6/i386/**' + - 'rpms/build.sh' + rpm_images_x86_64: + - 'rpms/CentOS/6/x86_64/**' + - 'rpms/build.sh' + rpm_packages: + - 'rpms/SPECS/**' + - 'rpms/generate_rpm_package.sh' + - name: Setup directories and variables + if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.rpm_images_x86_64 == 'true' && matrix.ARCHITECTURE == 'x86_64' run: | VERSION=$(cat $GITHUB_WORKSPACE/VERSION) REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g' ) echo "PACKAGE_NAME=wazuh-${{ matrix.type }}-${VERSION}-${REVISION}.${{matrix.system.ARCH}}.rpm" >> $GITHUB_ENV - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} + if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.rpm_images_x86_64 == 'true' && matrix.ARCHITECTURE == 'x86_64' id: download-artifact continue-on-error: true uses: dawidd6/action-download-artifact@v2 @@ -89,9 +90,11 @@ jobs: if_no_artifact_found: fail - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} to the packages directory + if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.rpm_images_x86_64 == 'true' && matrix.ARCHITECTURE == 'x86_64' run: | mkdir $GITHUB_WORKSPACE/packages mv ${{env.PACKAGE_NAME}} $GITHUB_WORKSPACE/packages - name: Launch docker + if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.rpm_images_x86_64 == 'true' && matrix.ARCHITECTURE == 'x86_64' run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.system.NAME }} bash /tests/install_and_enable.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file From b51b44985106fbca0bcdffc2334af29cbe330c2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 3 Feb 2023 17:11:27 +0100 Subject: [PATCH 285/316] Missing parenthesis MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-rpm.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 027de4d06e..21f2bd1e30 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -72,14 +72,14 @@ jobs: - 'rpms/generate_rpm_package.sh' - name: Setup directories and variables - if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.rpm_images_x86_64 == 'true' && matrix.ARCHITECTURE == 'x86_64' + if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.rpm_images_x86_64 == 'true' && matrix.ARCHITECTURE == 'x86_64') run: | VERSION=$(cat $GITHUB_WORKSPACE/VERSION) REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g' ) echo "PACKAGE_NAME=wazuh-${{ matrix.type }}-${VERSION}-${REVISION}.${{matrix.system.ARCH}}.rpm" >> $GITHUB_ENV - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} - if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.rpm_images_x86_64 == 'true' && matrix.ARCHITECTURE == 'x86_64' + if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.rpm_images_x86_64 == 'true' && matrix.ARCHITECTURE == 'x86_64') id: download-artifact continue-on-error: true uses: dawidd6/action-download-artifact@v2 @@ -90,11 +90,11 @@ jobs: if_no_artifact_found: fail - name: Move the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} to the packages directory - if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.rpm_images_x86_64 == 'true' && matrix.ARCHITECTURE == 'x86_64' + if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.rpm_images_x86_64 == 'true' && matrix.ARCHITECTURE == 'x86_64') run: | mkdir $GITHUB_WORKSPACE/packages mv ${{env.PACKAGE_NAME}} $GITHUB_WORKSPACE/packages - name: Launch docker - if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.rpm_images_x86_64 == 'true' && matrix.ARCHITECTURE == 'x86_64' + if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.rpm_images_x86_64 == 'true' && matrix.ARCHITECTURE == 'x86_64') run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.system.NAME }} bash /tests/install_and_enable.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file From 865d0a5e1241ea10de61582f9573266bfe9b8b87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Fri, 3 Feb 2023 17:23:27 +0100 Subject: [PATCH 286/316] Changed condition for wazuh indexer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index c6e7ac0927..5b889782e1 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -164,7 +164,7 @@ if [ $1 = 1 ];then # Install fi -if [ -f /usr/lib/systemd/systemd-sysv-install ]; then +if [ ! -f /usr/lib/systemd/systemd-sysv-install ]; then rm -f /etc/init.d/%{name} fi From 378f5ec69f17367827afc26491e19904c9988c41 Mon Sep 17 00:00:00 2001 From: Gabriel Date: Wed, 11 Jan 2023 12:38:23 -0300 Subject: [PATCH 287/316] fix: Improve find command with xargs --- debs/SPECS/wazuh-manager/debian/postinst | 8 ++++---- rpms/SPECS/wazuh-manager.spec | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debs/SPECS/wazuh-manager/debian/postinst b/debs/SPECS/wazuh-manager/debian/postinst index 240754a93e..c5c84fc29e 100644 --- a/debs/SPECS/wazuh-manager/debian/postinst +++ b/debs/SPECS/wazuh-manager/debian/postinst @@ -240,17 +240,17 @@ case "$1" in # Remove old ossec user and group if exists and change ownwership of files if getent group ossec > /dev/null 2>&1; then - find ${DIR}/ -group ossec -user root -exec chown root:wazuh {} \; > /dev/null 2>&1 || true + find ${DIR}/ -group ossec -user root -print0 | xargs -0 chown root:wazuh > /dev/null 2>&1 || true if getent passwd ossec > /dev/null 2>&1; then - find ${DIR}/ -group ossec -user ossec -exec chown ${USER}:${GROUP} {} \; > /dev/null 2>&1 || true + find ${DIR}/ -group ossec -user ossec -print0 | xargs -0 chown ${USER}:${GROUP} > /dev/null 2>&1 || true deluser ossec > /dev/null 2>&1 fi if getent passwd ossecm > /dev/null 2>&1; then - find ${DIR}/ -group ossec -user ossecm -exec chown ${USER}:${GROUP} {} \; > /dev/null 2>&1 || true + find ${DIR}/ -group ossec -user ossecm -print0 | xargs -0 chown ${USER}:${GROUP} > /dev/null 2>&1 || true deluser ossecm > /dev/null 2>&1 fi if getent passwd ossecr > /dev/null 2>&1; then - find ${DIR}/ -group ossec -user ossecr -exec chown ${USER}:${GROUP} {} \; > /dev/null 2>&1 || true + find ${DIR}/ -group ossec -user ossecr -print0 | xargs -0 chown ${USER}:${GROUP} > /dev/null 2>&1 || true deluser ossecr > /dev/null 2>&1 fi if getent group ossec > /dev/null 2>&1; then diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 544136e75c..dedcc57b4f 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -451,17 +451,17 @@ rm -f %{_localstatedir}/etc/shared/default/*.rpmnew # Remove old ossec user and group if exists and change ownwership of files if getent group ossec > /dev/null 2>&1; then - find %{_localstatedir}/ -group ossec -user root -exec chown root:wazuh {} \; > /dev/null 2>&1 || true + find %{_localstatedir}/ -group ossec -user root -print0 | xargs -0 chown root:wazuh > /dev/null 2>&1 || true if getent passwd ossec > /dev/null 2>&1; then - find %{_localstatedir}/ -group ossec -user ossec -exec chown wazuh:wazuh {} \; > /dev/null 2>&1 || true + find %{_localstatedir}/ -group ossec -user ossec -print0 | xargs -0 chown wazuh:wazuh > /dev/null 2>&1 || true userdel ossec > /dev/null 2>&1 fi if getent passwd ossecm > /dev/null 2>&1; then - find %{_localstatedir}/ -group ossec -user ossecm -exec chown wazuh:wazuh {} \; > /dev/null 2>&1 || true + find %{_localstatedir}/ -group ossec -user ossecm -print0 | xargs -0 chown wazuh:wazuh > /dev/null 2>&1 || true userdel ossecm > /dev/null 2>&1 fi if getent passwd ossecr > /dev/null 2>&1; then - find %{_localstatedir}/ -group ossec -user ossecr -exec chown wazuh:wazuh {} \; > /dev/null 2>&1 || true + find %{_localstatedir}/ -group ossec -user ossecr -print0 | xargs -0 chown wazuh:wazuh > /dev/null 2>&1 || true userdel ossecr > /dev/null 2>&1 fi if getent group ossec > /dev/null 2>&1; then From 3c96231370bf0f3f9590a8502598fcd1fa27bd74 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Tue, 31 Jan 2023 16:38:51 +0100 Subject: [PATCH 288/316] Add checks previous to upgrade --- .../install_functions/checks.sh | 90 +++++++++++++++++-- .../install_functions/indexer.sh | 6 +- .../install_functions/installCommon.sh | 9 ++ .../install_functions/installMain.sh | 1 + 4 files changed, 96 insertions(+), 10 deletions(-) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index 56c367d4d4..b2c55b08e8 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -298,13 +298,6 @@ function checks_previousCertificate() { fi } -function checks_specifications() { - - cores=$(grep -c processor /proc/cpuinfo) - ram_gb=$(free -m | awk '/^Mem:/{print $2}') - -} - function checks_ports() { used_port=0 @@ -335,3 +328,86 @@ function checks_ports() { fi } + +function checks_specifications() { + + cores=$(grep -c processor /proc/cpuinfo) + ram_gb=$(free -m | awk '/^Mem:/{print $2}') + +} + +function checks_upgrade() { + + installCommon_readPasswordFileUsers + + ## Check if Wazuh indexer is working properly + + if [ -n ${indexer_installed} ] + installCommon_getPass "admin" + + if curl -s -u admin:"${u_pass}" -k -XGET "https://127.0.0.1:9200/_cluster/health?pretty" | grep -q "red"; then + common_logger -e "Cluster health is in red state. Please, check it before upgrading." + exit 1 + fi + + if curl -s -u admin:"${u_pass}" -k -XGET "https://127.0.0.1:9200/_cluster/health?pretty" | grep -q "yellow" && []; then + if [ -z "${force}" ]; then + common_logger -e "Cluster health is in yellow state. If you want to continue with the upgrade, please, run the script with the option -f|--force." + exit 1 + else + common_logger -w "Cluster health is in yellow state." + fi + fi + + if curl -s -u admin:"${u_pass}" -k -XGET "https://127.0.0.1:9200/_cat/indices?pretty" | grep -q "red"; then + common_logger -e "Some indices in the Wazuh indexer cluster are in red state. Please, check it before upgrading." + exit 1 + fi + + if curl -s -u admin:"${u_pass}" -k -XGET "https://127.0.0.1:9200/_cat/indices?pretty" | grep -q "yellow" && []; then + if [ -z "${force}" ]; then + common_logger -e "Some indices in the Wazuh indexer cluster are in yellow state. If you want to continue with the upgrade, please, run the script with the option -f|--force." + exit 1 + else + common_logger -w "Some indices in the Wazuh indexer cluster are in yellow state." + fi + fi + fi + + ## Check if Wazuh server is working properly + + if [ -n ${wazuh_installed} ] + installCommon_getAPIPass "wazuh" + + if ! curl -s -k -X GET -H "Authorization: Bearer $TOKEN_API" -H "Content-Type: application/json" "https://localhost:55000/?pretty=true" --output /dev/null + common_logger -e "Wazuh API is not working properly. Please, check it before upgrading." + exit 1 + fi + + if /var/ossec/bin/cluster_control -l ; then + if ! curl -s -k -X GET -H "Authorization: Bearer $TOKEN_API" -H "Content-Type: application/json" "https://localhost:55000/cluster/healthcheck?pretty=true" | grep "All selected nodes healthcheck information was returned" ; then + common_logger -e "Some nodes in the Wazuh manager cluster are not working properly. Please, check it before upgrading." + exit 1 + fi + fi + fi + + ## Check if Filebeat is working properly + + if [ -n ${filebeat_installed} ]; then + if ! filebeat test output > /dev/null; then + common_logger -e "Filebeat is not working properly. Please, check it before upgrading." + exit 1 + fi + fi + + ## Check if Wazuh dashboard is working properly + + if [ -n ${dashboard_installed} ]; then + if ![ "$(curl -XGET https://localhost/status -uadmin:"${u_pass}" -k -w %"{http_code}" -s -o /dev/null)" -ne "200" ]; then + common_logger -e "Wazuh dashboard is not responding properly. Please, check it before upgrading." + exit 1 + fi + fi +} + diff --git a/unattended_installer/install_functions/indexer.sh b/unattended_installer/install_functions/indexer.sh index bc494979ad..7b677e797e 100644 --- a/unattended_installer/install_functions/indexer.sh +++ b/unattended_installer/install_functions/indexer.sh @@ -112,12 +112,12 @@ function indexer_disableShardAllocation() { common_logger "Disabling shard allocation." - if [ -z "indexer_admin_pass" ]; then + if [ -z "${u_pass}" ]; then common_logger -e "Could not disable shard allocation. Admin password not found." exit 1 fi - eval "curl -XPUT https://127.0.0.1:9200/_cluster/settings -H 'Content-Type: application/json' -d '{\"persistent\": {\"cluster.routing.allocation.enable\": \"primaries\"}}' -uadmin:${indexer_admin_pass} -k --silent ${debug}" + eval "curl -XPUT https://127.0.0.1:9200/_cluster/settings -H 'Content-Type: application/json' -d '{\"persistent\": {\"cluster.routing.allocation.enable\": \"primaries\"}}' -uadmin:${u_pass} -k --silent ${debug}" if [ "${PIPESTATUS[0]}" != 0 ]; then common_logger -e "Shard allocation could not be disabled." @@ -139,7 +139,7 @@ function indexer_enableShardAllocation() { common_logger "Enabling shard allocation." - eval "curl -XPUT https://127.0.0.1:9200/_cluster/settings -H 'Content-Type: application/json' -d '{\"persistent\": {\"cluster.routing.allocation.enable\": \"all\"}}' -uadmin:${indexer_admin_pass} -k --silent ${debug}" + eval "curl -XPUT https://127.0.0.1:9200/_cluster/settings -H 'Content-Type: application/json' -d '{\"persistent\": {\"cluster.routing.allocation.enable\": \"all\"}}' -uadmin:${u_pass} -k --silent ${debug}" if [ "${PIPESTATUS[0]}" != 0 ]; then common_logger -e "Shard allocation could not be enabled." diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 50ded1d4fe..bcfc70349c 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -235,6 +235,15 @@ function installCommon_extractConfig() { } +function installCommon_getAPIPass() { + + for i in "${!api_users[@]}"; do + if [ "${api_users[i]}" == "${1}" ]; then + api_pass=${api_passwords[i]} + fi + done +} + function installCommon_getConfig() { if [ "$#" -ne 2 ]; then diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index f10e367f8b..f347410c21 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -227,6 +227,7 @@ function main() { # -------------- Upgrade case ------------------------------------ if [ -n "${upgrade}" ]; then + checks_upgrade installCommon_addWazuhRepo upgrade_upgradeInstalled exit 0 From 0a651da1fbb5da9c678db8a6a395f48eed0da0a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= <72193239+davidcr01@users.noreply.github.com> Date: Mon, 6 Feb 2023 11:00:57 +0100 Subject: [PATCH 289/316] Improval of the `curl` tool in the Installation Assistant (#2063) * Added retry params to curls of unattended * Removed unnecessary params of curl * Fix previous * Removed params of connections of dashboard and indexer * Added --retry-connrefused option * Checked simple AIO curl commands * Checked checkFilebeatURL curls * Added --fail option to offline download * Offline installation checked * Changed curls of dashboard and indexer. Improved offline installation * Deleted --retry-connrefused of the builder.sh * Removed changes of builder.sh * Added installCommon_curl and its dependencies * Changed curls to installCommon_curl * Fixed indexer_startCluster curl * Separated curls in indexer_startCluster * Fixed changePassword curls * Improval of dashboard_initialize * Import of GPG key improved * Changed indexer.sh curls * Improved comments and added blank line * Changed curl to common.sh * Changed curl check and connrefused variable * Changed curl variable * Changed invocation of check_curlVersion * Improved curl check in installPrerequisites * Improved checks of the installed dependencies * Removed installed curl check in curlVersion --- .../common_functions/common.sh | 23 ++++++++++++++- .../install_functions/checks.sh | 24 +++++++++++++++- .../install_functions/dashboard.sh | 20 ++++--------- .../install_functions/filebeat.sh | 6 ++-- .../install_functions/indexer.sh | 27 +++++++----------- .../install_functions/installCommon.sh | 24 ++++++++++------ .../install_functions/installMain.sh | 1 + .../wazuh-offline-download.sh | 16 +++++------ .../passwords_tool/passwordsFunctions.sh | 28 +++++++++---------- 9 files changed, 102 insertions(+), 67 deletions(-) diff --git a/unattended_installer/common_functions/common.sh b/unattended_installer/common_functions/common.sh index b38315b781..06186f89c6 100644 --- a/unattended_installer/common_functions/common.sh +++ b/unattended_installer/common_functions/common.sh @@ -134,8 +134,29 @@ function common_checkWazuhConfigYaml() { } +# Retries even if the --retry-connrefused is not available +function common_curl() { + + if [ -n "${curl_has_connrefused}" ]; then + eval "curl $@ --retry-connrefused" + e_code="${PIPESTATUS[0]}" + else + retries=0 + eval "curl $@" + e_code="${PIPESTATUS[0]}" + while [ "${e_code}" -eq 7 ] && [ "${retries}" -ne 12 ]; do + retries=$((retries+1)) + sleep 5 + eval "curl $@" + e_code="${PIPESTATUS[0]}" + done + fi + return "${e_code}" + +} + function common_remove_gpg_key() { - + if [ "${sys_type}" == "yum" ]; then if { rpm -q gpg-pubkey --qf '%{NAME}-%{VERSION}-%{RELEASE}\t%{SUMMARY}\n' | grep "Wazuh"; } >/dev/null ; then key=$(rpm -q gpg-pubkey --qf '%{NAME}-%{VERSION}-%{RELEASE}\t%{SUMMARY}\n' | grep "Wazuh Signing Key" | awk '{print $1}' ) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index 643299cc90..f2954a83d4 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -166,6 +166,17 @@ function checks_arguments() { } +# Checks if the --retry-connrefused is available in curl +function check_curlVersion() { + + # --retry-connrefused was added in 7.52.0 + curl_version=$(curl -V | head -n 1 | awk '{ print $2 }') + if [ $(check_versions ${curl_version} 7.52.0) == "0" ]; then + curl_has_connrefused=0 + fi + +} + function check_dist() { dist_detect if [ "${DIST_NAME}" != "centos" ] && [ "${DIST_NAME}" != "rhel" ] && [ "${DIST_NAME}" != "amzn" ] && [ "${DIST_NAME}" != "ubuntu" ]; then @@ -330,4 +341,15 @@ function checks_ports() { exit 1 fi -} \ No newline at end of file +} + +# Checks if the first version is greater equal than to second one +function check_versions() { + + if test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; then + echo 0 + else + echo 1 + fi + +} diff --git a/unattended_installer/install_functions/dashboard.sh b/unattended_installer/install_functions/dashboard.sh index bff659ff3a..9b1395775a 100644 --- a/unattended_installer/install_functions/dashboard.sh +++ b/unattended_installer/install_functions/dashboard.sh @@ -98,12 +98,7 @@ function dashboard_initialize() { print_ip="${nodes_dashboard_ip}" fi - until [ "$(curl -XGET https://"${nodes_dashboard_ip}"/status -uadmin:"${u_pass}" -k -w %"{http_code}" -s -o /dev/null)" -eq "200" ] || [ "${j}" -eq "12" ]; do - sleep 10 - j=$((j+1)) - done - - if [ ${j} -lt 12 ]; then + if [ "$(common_curl -XGET https://"${nodes_dashboard_ip}"/status -uadmin:"${u_pass}" -k -w %"{http_code}" -s -o /dev/null --max-time 300 --retry 12 --retry-delay 10 --fail)" -eq "200" ]; then if [ "${#server_node_names[@]}" -eq 1 ]; then wazuh_api_address=${server_node_ips[0]} else @@ -121,7 +116,7 @@ function dashboard_initialize() { common_logger -nl "--- Summary ---" common_logger -nl "You can access the web interface https://${print_ip}\n User: admin\n Password: ${u_pass}" - elif [ ${j} -eq 12 ]; then + else flag="-w" if [ -z "${force}" ]; then flag="-e" @@ -130,13 +125,12 @@ function dashboard_initialize() { common_logger "${flag}" "Cannot connect to Wazuh dashboard." for i in "${!indexer_node_ips[@]}"; do - curl=$(curl -XGET https://"${indexer_node_ips[i]}":9200/ -uadmin:"${u_pass}" -k -s) + curl=$(common_curl -XGET https://"${indexer_node_ips[i]}":9200/ -uadmin:"${u_pass}" -k -s --max-time 300 --retry 5 --retry-delay 5 --fail) exit_code=${PIPESTATUS[0]} if [[ "${exit_code}" -eq "7" ]]; then failed_connect=1 failed_nodes+=("${indexer_node_names[i]}") - fi - if [ "${curl}" == "OpenSearch Security not initialized." ]; then + elif [ "${exit_code}" -eq "22" ]; then sec_not_initialized=1 fi done @@ -164,11 +158,7 @@ function dashboard_initializeAIO() { common_logger "Initializing Wazuh dashboard web application." installCommon_getPass "admin" - until [ "$(curl -XGET https://localhost/status -uadmin:"${u_pass}" -k -w %"{http_code}" -s -o /dev/null)" -eq "200" ] || [ "${i}" -eq 12 ]; do - sleep 10 - i=$((i+1)) - done - if [ ${i} -eq 12 ]; then + if [ "$(common_curl -XGET https://localhost/status -uadmin:"${u_pass}" -k -w %"{http_code}" -s -o /dev/null --max-time 300 --retry 12 --retry-delay 10 --fail)" -ne "200" ]; then common_logger -e "Cannot connect to Wazuh dashboard." installCommon_rollBack exit 1 diff --git a/unattended_installer/install_functions/filebeat.sh b/unattended_installer/install_functions/filebeat.sh index 26447bd0e6..7c0e29448f 100644 --- a/unattended_installer/install_functions/filebeat.sh +++ b/unattended_installer/install_functions/filebeat.sh @@ -8,15 +8,15 @@ function filebeat_configure(){ - eval "curl -so /etc/filebeat/wazuh-template.json ${filebeat_wazuh_template} --max-time 300 ${debug}" + eval "common_curl -so /etc/filebeat/wazuh-template.json ${filebeat_wazuh_template} --max-time 300 --retry 5 --retry-delay 5 --fail ${debug}" if [ ! -f "/etc/filebeat/wazuh-template.json" ]; then common_logger -e "Error downloading wazuh-template.json file." installCommon_rollBack exit 1 fi - + eval "chmod go+r /etc/filebeat/wazuh-template.json ${debug}" - eval "curl -s ${filebeat_wazuh_module} --max-time 300 | tar -xvz -C /usr/share/filebeat/module ${debug}" + eval "common_curl -s ${filebeat_wazuh_module} --max-time 300 --retry 5 --retry-delay 5 --fail | tar -xvz -C /usr/share/filebeat/module ${debug}" if [ ! -d "/usr/share/filebeat/module" ]; then common_logger -e "Error downloading wazuh filebeat module." installCommon_rollBack diff --git a/unattended_installer/install_functions/indexer.sh b/unattended_installer/install_functions/indexer.sh index bab72864b9..542aff48b2 100644 --- a/unattended_installer/install_functions/indexer.sh +++ b/unattended_installer/install_functions/indexer.sh @@ -29,7 +29,7 @@ function indexer_configure() { pos=0 { echo "node.name: ${indxname}" - echo "network.host: ${indexer_node_ips[0]}" + echo "network.host: ${indexer_node_ips[0]}" echo "cluster.initial_master_nodes: ${indxname}" echo "plugins.security.nodes_dn:" echo ' - CN='"${indxname}"',OU=Wazuh,O=Wazuh,L=California,C=US' @@ -111,12 +111,10 @@ function indexer_copyCertificates() { function indexer_initialize() { common_logger "Initializing Wazuh indexer cluster security settings." - i=0 - until curl -XGET https://"${indexer_node_ips[pos]}":9200/ -uadmin:admin -k --max-time 120 --silent --output /dev/null || [ "${i}" -eq 12 ]; do - sleep 10 - i=$((i+1)) - done - if [ ${i} -eq 12 ]; then + eval "common_curl -XGET https://"${indexer_node_ips[pos]}":9200/ -uadmin:admin -k --max-time 120 --silent --output /dev/null" + e_code="${PIPESTATUS[0]}" + + if [ "${e_code}" -ne "0" ]; then common_logger -e "Cannot initialize Wazuh indexer cluster." installCommon_rollBack exit 1 @@ -160,21 +158,16 @@ function indexer_install() { function indexer_startCluster() { - retries=0 for ip_to_test in "${indexer_node_ips[@]}"; do - eval "curl -XGET https://"${ip_to_test}":9200/ -k -s -o /dev/null" + eval "common_curl -XGET https://"${ip_to_test}":9200/ -k -s -o /dev/null" e_code="${PIPESTATUS[0]}" - until [ "${e_code}" -ne 7 ] || [ "${retries}" -eq 12 ]; do - sleep 10 - retries=$((retries+1)) - eval "curl -XGET https://"${ip_to_test}":9200/ -k -s -o /dev/null" - e_code="${PIPESTATUS[0]}" - done - if [ ${retries} -eq 12 ]; then + + if [ "${e_code}" -eq "7" ]; then common_logger -e "Connectivity check failed on node ${ip_to_test} port 9200. Possible causes: Wazuh indexer not installed on the node, the Wazuh indexer service is not running or you have connectivity issues with that node. Please check this before trying again." exit 1 fi done + eval "wazuh_indexer_ip=( $(cat /etc/wazuh-indexer/opensearch.yml | grep network.host | sed 's/network.host:\s//') )" eval "sudo -u wazuh-indexer JAVA_HOME=/usr/share/wazuh-indexer/jdk/ OPENSEARCH_CONF_DIR=/etc/wazuh-indexer /usr/share/wazuh-indexer/plugins/opensearch-security/tools/securityadmin.sh -cd /etc/wazuh-indexer/opensearch-security -icl -p 9200 -nhnv -cacert /etc/wazuh-indexer/certs/root-ca.pem -cert /etc/wazuh-indexer/certs/admin.pem -key /etc/wazuh-indexer/certs/admin-key.pem -h ${wazuh_indexer_ip} ${debug}" if [ "${PIPESTATUS[0]}" != 0 ]; then @@ -183,7 +176,7 @@ function indexer_startCluster() { else common_logger "Wazuh indexer cluster security configuration initialized." fi - eval "curl --silent ${filebeat_wazuh_template} | curl -X PUT 'https://${indexer_node_ips[pos]}:9200/_template/wazuh' -H 'Content-Type: application/json' -d @- -uadmin:admin -k --silent ${debug}" + 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 --silent --max-time 300 --retry 5 --retry-delay 5 ${debug}" if [ "${PIPESTATUS[0]}" != 0 ]; then common_logger -e "The wazuh-alerts template could not be inserted into the Wazuh indexer cluster." exit 1 diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 644fa6bcd3..198f27fb88 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -42,10 +42,18 @@ function installCommon_addWazuhRepo() { if [ ! -f "/etc/yum.repos.d/wazuh.repo" ] && [ ! -f "/etc/zypp/repos.d/wazuh.repo" ] && [ ! -f "/etc/apt/sources.list.d/wazuh.list" ] ; then if [ "${sys_type}" == "yum" ]; then eval "rpm --import ${repogpg} ${debug}" + if [ "${PIPESTATUS[0]}" != 0 ]; then + common_logger -e "Cannot import Wazuh GPG key" + exit 1 + fi eval "echo -e '[wazuh]\ngpgcheck=1\ngpgkey=${repogpg}\nenabled=1\nname=EL-\${releasever} - Wazuh\nbaseurl='${repobaseurl}'/yum/\nprotect=1' | tee /etc/yum.repos.d/wazuh.repo ${debug}" eval "chmod 644 /etc/yum.repos.d/wazuh.repo ${debug}" elif [ "${sys_type}" == "apt-get" ]; then - eval "curl -s ${repogpg} --max-time 300 | gpg --no-default-keyring --keyring gnupg-ring:/usr/share/keyrings/wazuh.gpg --import - ${debug}" + eval "common_curl -s ${repogpg} --max-time 300 --retry 5 --retry-delay 5 --fail | gpg --no-default-keyring --keyring gnupg-ring:/usr/share/keyrings/wazuh.gpg --import - ${debug}" + if [ "${PIPESTATUS[0]}" != 0 ]; then + common_logger -e "Cannot import Wazuh GPG key" + exit 1 + fi eval "chmod 644 /usr/share/keyrings/wazuh.gpg ${debug}" eval "echo \"deb [signed-by=/usr/share/keyrings/wazuh.gpg] ${repobaseurl}/apt/ ${reporelease} main\" | tee /etc/apt/sources.list.d/wazuh.list ${debug}" eval "apt-get update -q ${debug}" @@ -97,8 +105,8 @@ function installCommon_changePasswordApi() { for i in "${!api_passwords[@]}"; do if [ -n "${wazuh}" ] || [ -n "${AIO}" ]; then passwords_getApiUserId "${api_users[i]}" - WAZUH_PASS_API='{"password":"'"${api_passwords[i]}"'"}' - eval 'curl -s -k -X PUT -H "Authorization: Bearer $TOKEN_API" -H "Content-Type: application/json" -d "$WAZUH_PASS_API" "https://localhost:55000/security/users/${user_id}" -o /dev/null' + WAZUH_PASS_API='{\"password\":\"'"${api_passwords[i]}"'\"}' + eval 'common_curl -s -k -X PUT -H \"Authorization: Bearer $TOKEN_API\" -H \"Content-Type: application/json\" -d "$WAZUH_PASS_API" "https://localhost:55000/security/users/${user_id}" -o /dev/null --max-time 300 --retry 5 --retry-delay 5 --fail' if [ "${api_users[i]}" == "${adminUser}" ]; then sleep 1 adminPassword="${api_passwords[i]}" @@ -112,8 +120,8 @@ function installCommon_changePasswordApi() { else if [ -n "${wazuh}" ] || [ -n "${AIO}" ]; then passwords_getApiUserId "${nuser}" - WAZUH_PASS_API='{"password":"'"${password}"'"}' - eval 'curl -s -k -X PUT -H "Authorization: Bearer $TOKEN_API" -H "Content-Type: application/json" -d "$WAZUH_PASS_API" "https://localhost:55000/security/users/${user_id}" -o /dev/null' + WAZUH_PASS_API='{\"password\":\"'"${password}"'\"}' + eval 'common_curl -s -k -X PUT -H \"Authorization: Bearer $TOKEN_API\" -H \"Content-Type: application/json\" -d "$WAZUH_PASS_API" "https://localhost:55000/security/users/${user_id}" -o /dev/null --max-time 300 --retry 5 --retry-delay 5 --fail' fi if [ "${nuser}" == "wazuh-wui" ] && { [ -n "${dashboard}" ] || [ -n "${AIO}" ]; }; then passwords_changeDashboardApiPassword "${password}" @@ -269,10 +277,10 @@ function installCommon_installPrerequisites() { not_installed=() for dep in "${dependencies[@]}"; do if [ "${dep}" == "openssl" ]; then - if ! yum list installed 2>/dev/null | grep -q "${dep}\.";then + if ! yum list installed 2>/dev/null | grep -q -E ^"${dep}\.";then not_installed+=("${dep}") fi - elif ! yum list installed 2>/dev/null | grep -q "${dep}";then + elif ! yum list installed 2>/dev/null | grep -q -E ^"${dep}";then not_installed+=("${dep}") fi done @@ -295,7 +303,7 @@ function installCommon_installPrerequisites() { not_installed=() for dep in "${dependencies[@]}"; do - if ! apt list --installed 2>/dev/null | grep -q "${dep}"; then + if ! apt list --installed 2>/dev/null | grep -q -E ^"${dep}"; then not_installed+=("${dep}") fi done diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index c97dcfc366..3909a73884 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -246,6 +246,7 @@ function main() { # -------------- Prerequisites and Wazuh repo ---------------------- if [ -n "${AIO}" ] || [ -n "${indexer}" ] || [ -n "${dashboard}" ] || [ -n "${wazuh}" ]; then installCommon_installPrerequisites + check_curlVersion installCommon_addWazuhRepo fi diff --git a/unattended_installer/install_functions/wazuh-offline-download.sh b/unattended_installer/install_functions/wazuh-offline-download.sh index fa8ead27b8..796e69d4df 100755 --- a/unattended_installer/install_functions/wazuh-offline-download.sh +++ b/unattended_installer/install_functions/wazuh-offline-download.sh @@ -52,7 +52,7 @@ function offline_download() { exit 1 fi - while curl -s -o /dev/null -w "%{http_code}" "${manager_base_url}/${manager_package}" | grep -q "200"; do + while common_curl -s -o /dev/null -w "%{http_code}" "${manager_base_url}/${manager_package}" --max-time 300 --retry 5 --retry-delay 5 --fail | grep -q "200"; do manager_revision=$((manager_revision+1)) if [ "${package_type}" == "rpm" ]; then manager_rpm_package="wazuh-manager-${wazuh_version}-${manager_revision}.x86_64.rpm" @@ -62,7 +62,7 @@ function offline_download() { manager_package="${manager_deb_package}" fi done - if [ "$manager_revision" -gt 1 ] && [ "$(curl -s -o /dev/null -w "%{http_code}" "${manager_base_url}/${manager_package}")" -ne "200" ]; then + if [ "$manager_revision" -gt 1 ] && [ "$(common_curl -s -o /dev/null -w "%{http_code}" "${manager_base_url}/${manager_package}" --max-time 300 --retry 5 --retry-delay 5 --fail)" -ne "200" ]; then manager_revision=$((manager_revision-1)) if [ "${package_type}" == "rpm" ]; then manager_rpm_package="wazuh-manager-${wazuh_version}-${manager_revision}.x86_64.rpm" @@ -71,7 +71,7 @@ function offline_download() { fi fi - while curl -s -o /dev/null -w "%{http_code}" "${indexer_base_url}/${indexer_package}" | grep -q "200"; do + while common_curl -s -o /dev/null -w "%{http_code}" "${indexer_base_url}/${indexer_package}" --max-time 300 --retry 5 --retry-delay 5 --fail | grep -q "200"; do indexer_revision=$((indexer_revision+1)) if [ "${package_type}" == "rpm" ]; then indexer_rpm_package="wazuh-indexer-${wazuh_version}-${indexer_revision}.x86_64.rpm" @@ -81,7 +81,7 @@ function offline_download() { indexer_package="${indexer_deb_package}" fi done - if [ "$indexer_revision" -gt 1 ] && [ "$(curl -s -o /dev/null -w "%{http_code}" "${indexer_base_url}/${indexer_package}")" -ne "200" ]; then + if [ "$indexer_revision" -gt 1 ] && [ "$(common_curl -s -o /dev/null -w "%{http_code}" "${indexer_base_url}/${indexer_package}" --max-time 300 --retry 5 --retry-delay 5 --fail)" -ne "200" ]; then indexer_revision=$((indexer_revision-1)) if [ "${package_type}" == "rpm" ]; then indexer_rpm_package="wazuh-indexer-${wazuh_version}-${indexer_revision}.x86_64.rpm" @@ -90,7 +90,7 @@ function offline_download() { fi fi - while curl -s -o /dev/null -w "%{http_code}" "${dashboard_base_url}/${dashboard_package}" | grep -q "200"; do + while common_curl -s -o /dev/null -w "%{http_code}" "${dashboard_base_url}/${dashboard_package}" --max-time 300 --retry 5 --retry-delay 5 --fail | grep -q "200"; do dashboard_revision=$((dashboard_revision+1)) if [ "${package_type}" == "rpm" ]; then dashboard_rpm_package="wazuh-dashboard-${wazuh_version}-${dashboard_revision}.x86_64.rpm" @@ -100,7 +100,7 @@ function offline_download() { dashboard_package="${dashboard_deb_package}" fi done - if [ "$dashboard_revision" -gt 1 ] && [ "$(curl -s -o /dev/null -w "%{http_code}" "${dashboard_base_url}/${dashboard_package}")" -ne "200" ]; then + if [ "$dashboard_revision" -gt 1 ] && [ "$(common_curl -s -o /dev/null -w "%{http_code}" "${dashboard_base_url}/${dashboard_package}" --max-time 300 --retry 5 --retry-delay 5 --fail)" -ne "200" ]; then dashboard_revision=$((dashboard_revision-1)) if [ "${package_type}" == "rpm" ]; then dashboard_rpm_package="wazuh-dashboard-${wazuh_version}-${dashboard_revision}.x86_64.rpm" @@ -115,7 +115,7 @@ function offline_download() { package_name="${package}_${package_type}_package" eval "package_base_url=${package}_${package_type}_base_url" - eval "curl -so ${dest_path}/${!package_name} ${!package_base_url}/${!package_name}" + eval "common_curl -so ${dest_path}/${!package_name} ${!package_base_url}/${!package_name} --max-time 300 --retry 5 --retry-delay 5 --fail" if [ "${PIPESTATUS[0]}" != 0 ]; then common_logger -e "The ${package} package could not be downloaded. Exiting." exit 1 @@ -145,7 +145,7 @@ function offline_download() { for file in "${files_to_download[@]}" do - eval "curl -sO ${file}" + eval "common_curl -sO ${file} --max-time 300 --retry 5 --retry-delay 5 --fail" if [ "${PIPESTATUS[0]}" != 0 ]; then common_logger -e "The resource ${file} could not be downloaded. Exiting." exit 1 diff --git a/unattended_installer/passwords_tool/passwordsFunctions.sh b/unattended_installer/passwords_tool/passwordsFunctions.sh index bd9e265303..ee40bfb53b 100644 --- a/unattended_installer/passwords_tool/passwordsFunctions.sh +++ b/unattended_installer/passwords_tool/passwordsFunctions.sh @@ -83,8 +83,8 @@ function passwords_changePasswordApi() { for i in "${!api_passwords[@]}"; do if [ -n "${wazuh_installed}" ]; then passwords_getApiUserId "${api_users[i]}" - WAZUH_PASS_API='{"password":"'"${api_passwords[i]}"'"}' - eval 'curl -s -k -X PUT -H "Authorization: Bearer $TOKEN_API" -H "Content-Type: application/json" -d "$WAZUH_PASS_API" "https://localhost:55000/security/users/${user_id}" -o /dev/null' + WAZUH_PASS_API='{\"password\":\"'"${api_passwords[i]}"'\"}' + eval 'common_curl -s -k -X PUT -H \"Authorization: Bearer $TOKEN_API\" -H \"Content-Type: application/json\" -d "$WAZUH_PASS_API" "https://localhost:55000/security/users/${user_id}" -o /dev/null --max-time 300 --retry 5 --retry-delay 5 --fail' if [ "${api_users[i]}" == "${adminUser}" ]; then sleep 1 adminPassword="${api_passwords[i]}" @@ -101,8 +101,8 @@ function passwords_changePasswordApi() { else if [ -n "${wazuh_installed}" ]; then passwords_getApiUserId "${nuser}" - WAZUH_PASS_API='{"password":"'"${password}"'"}' - eval 'curl -s -k -X PUT -H "Authorization: Bearer $TOKEN_API" -H "Content-Type: application/json" -d "$WAZUH_PASS_API" "https://localhost:55000/security/users/${user_id}" -o /dev/null' + WAZUH_PASS_API='{\"password\":\"'"${password}"'\"}' + eval 'common_curl -s -k -X PUT -H \"Authorization: Bearer $TOKEN_API\" -H \"Content-Type: application/json\" -d "$WAZUH_PASS_API" "https://localhost:55000/security/users/${user_id}" -o /dev/null --max-time 300 --retry 5 --retry-delay 5 --fail' if [ -z "${AIO}" ] && [ -z "${indexer}" ] && [ -z "${dashboard}" ] && [ -z "${wazuh}" ] && [ -z "${start_indexer_cluster}" ]; then common_logger -nl $"The password for Wazuh API user ${nuser} is ${password}" fi @@ -284,18 +284,18 @@ function passwords_generatePasswordFile() { for i in "${!users[@]}"; do { echo "# ${user_description[${i}]}" - echo " indexer_username: '${users[${i}]}'" - echo " indexer_password: '${passwords[${i}]}'" - echo "" + echo " indexer_username: '${users[${i}]}'" + echo " indexer_password: '${passwords[${i}]}'" + echo "" } >> "${gen_file}" done for i in "${!api_users[@]}"; do { - echo "# ${api_user_description[${i}]}" - echo " api_username: '${api_users[${i}]}'" + echo "# ${api_user_description[${i}]}" + echo " api_username: '${api_users[${i}]}'" echo " api_password: '${api_passwords[${i}]}'" - echo "" + echo "" } >> "${gen_file}" done @@ -303,7 +303,7 @@ function passwords_generatePasswordFile() { function passwords_getApiToken() { - TOKEN_API=$(curl -s -u "${adminUser}":"${adminPassword}" -k -X POST "https://localhost:55000/security/user/authenticate?raw=true") + TOKEN_API=$(common_curl -s -u "${adminUser}":"${adminPassword}" -k -X POST "https://localhost:55000/security/user/authenticate?raw=true" --max-time 300 --retry 5 --retry-delay 5) if [[ ${TOKEN_API} =~ "Invalid credentials" ]]; then common_logger -e "Invalid admin user credentials" if [[ $(type -t installCommon_rollBack) == "function" ]]; then @@ -316,13 +316,13 @@ function passwords_getApiToken() { function passwords_getApiUsers() { - mapfile -t api_users < <(curl -s -k -X GET -H "Authorization: Bearer $TOKEN_API" -H "Content-Type: application/json" "https://localhost:55000/security/users?pretty=true" | grep username | awk -F': ' '{print $2}' | sed -e "s/[\'\",]//g") + mapfile -t api_users < <(common_curl -s -k -X GET -H \"Authorization: Bearer $TOKEN_API\" -H \"Content-Type: application/json\" \"https://localhost:55000/security/users?pretty=true\" --max-time 300 --retry 5 --retry-delay 5 | grep username | awk -F': ' '{print $2}' | sed -e "s/[\'\",]//g") } function passwords_getApiIds() { - mapfile -t api_ids < <(curl -s -k -X GET -H "Authorization: Bearer $TOKEN_API" -H "Content-Type: application/json" "https://localhost:55000/security/users?pretty=true" | grep id | awk -F': ' '{print $2}' | sed -e "s/[\'\",]//g") + mapfile -t api_ids < <(common_curl -s -k -X GET -H \"Authorization: Bearer $TOKEN_API\" -H \"Content-Type: application/json\" \"https://localhost:55000/security/users?pretty=true\" --max-time 300 --retry 5 --retry-delay 5 | grep id | awk -F': ' '{print $2}' | sed -e "s/[\'\",]//g") } @@ -492,7 +492,7 @@ For Wazuh API users, the file must have this format: mapfile -t passwords < <(printf "%s\n" "${finalpasswords[@]}") mapfile -t api_users < <(printf "%s\n" "${finalapiusers[@]}") mapfile -t api_passwords < <(printf "%s\n" "${finalapipasswords[@]}") - + changeall=1 fi From 52c10552601eb6f7a730ce348fb5f5a5ee4d9ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 7 Feb 2023 10:00:11 +0100 Subject: [PATCH 290/316] Revert changes in build.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- rpms/build.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rpms/build.sh b/rpms/build.sh index 91c1bd9ab1..b6006f30af 100755 --- a/rpms/build.sh +++ b/rpms/build.sh @@ -73,7 +73,7 @@ else specs_path="/specs" fi -if [[ "${future}" == "yes" ]]; then +if [[ "${future}" == "yes" ]]; then # MODIFY VARIABLES base_version=$wazuh_version MAJOR=$(echo $base_version | cut -dv -f2 | cut -d. -f1) @@ -112,7 +112,6 @@ if [ "${legacy}" = "no" ]; then fi # Building RPM -set -ex $linux $rpmbuild --define "_sysconfdir /etc" --define "_topdir ${rpm_build_dir}" \ --define "_threads ${threads}" --define "_release ${package_release}" \ --define "_localstatedir ${directory_base}" --define "_debugenabled ${debug}" \ From 0f7526f7c85906837b9e2b0a00824f44363d755f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 7 Feb 2023 16:38:38 +0100 Subject: [PATCH 291/316] Add opensuse to the testing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/actions/test-install-enable/install_and_enable.sh | 2 ++ .github/workflows/test-install-and-enable-rpm.yml | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/actions/test-install-enable/install_and_enable.sh b/.github/actions/test-install-enable/install_and_enable.sh index b201222253..3a4338dfcc 100644 --- a/.github/actions/test-install-enable/install_and_enable.sh +++ b/.github/actions/test-install-enable/install_and_enable.sh @@ -13,6 +13,8 @@ elif [ -n "$(command -v apt-get)" ]; then sys_type="apt-get" apt-get update apt-get install -y systemd +elif [ -n "$(command -v zypper)" ]; then + sys_type="zypper" else common_logger -e "Couldn't find type of system" exit 1 diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index 21f2bd1e30..f55ed5a3e6 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -44,7 +44,10 @@ jobs: {NAME: 'redhat/ubi8:latest', ARCH: "x86_64"}, {NAME: 'redhat/ubi9:latest', ARCH: "x86_64"}, {NAME: 'amazonlinux:2', ARCH: "x86_64"}, - {NAME: 'fedora:34', ARCH: "x86_64"}] + {NAME: 'fedora:34', ARCH: "x86_64"}, + {NAME: 'opensuse/leap:latest', ARCH: "x86_64"}, + {NAME: 'opensuse/tumbleweed:latest', ARCH: "x86_64"}, + {NAME: '386/opensuse/tumbleweed:latest', ARCH: "i386"}] type: [agent, manager] exclude: - system: {ARCH: "i386"} From 9f30cfd60d704eaed81b34a269199e4b77e88f98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 7 Feb 2023 16:41:24 +0100 Subject: [PATCH 292/316] Remove installation of init.d service on manager and indexer and better removal of the service on agent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- rpms/SPECS/wazuh-agent.spec | 36 ++++++---------------------- rpms/SPECS/wazuh-manager.spec | 11 --------- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 3 files changed, 8 insertions(+), 41 deletions(-) diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 3e848d9b7b..2c8715d5d5 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -35,7 +35,6 @@ log analysis, file integrity monitoring, intrusions detection and policy and com ./gen_ossec.sh conf agent centos %rhel %{_localstatedir} > etc/ossec-agent.conf %build -%define initd_valid %( if [ -f /usr/lib/systemd/systemd-sysv-install ]; then echo "1" ; else echo "0"; fi ) pushd src # Rebuild for agent make clean @@ -82,18 +81,14 @@ echo 'USER_AUTO_START="n"' >> ./etc/preloaded-vars.conf %endif # Create directories -%if %initd_valid - mkdir -p ${RPM_BUILD_ROOT}%{_initrddir} -%endif +mkdir -p ${RPM_BUILD_ROOT}%{_initrddir} mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/.ssh # Copy the installed files into RPM_BUILD_ROOT directory cp -pr %{_localstatedir}/* ${RPM_BUILD_ROOT}%{_localstatedir}/ mkdir -p ${RPM_BUILD_ROOT}/usr/lib/systemd/system/ -%if %initd_valid - sed -i "s:WAZUH_HOME_TMP:%{_localstatedir}:g" src/init/templates/ossec-hids-rh.init - install -m 0755 src/init/templates/ossec-hids-rh.init ${RPM_BUILD_ROOT}%{_initrddir}/wazuh-agent -%endif +sed -i "s:WAZUH_HOME_TMP:%{_localstatedir}:g" src/init/templates/ossec-hids-rh.init +install -m 0755 src/init/templates/ossec-hids-rh.init ${RPM_BUILD_ROOT}%{_initrddir}/wazuh-agent sed -i "s:WAZUH_HOME_TMP:%{_localstatedir}:g" src/init/templates/wazuh-agent.service install -m 0644 src/init/templates/wazuh-agent.service ${RPM_BUILD_ROOT}/usr/lib/systemd/system/ @@ -245,24 +240,9 @@ if [ $1 = 1 ]; then %{_localstatedir}/packages_files/agent_installation_scripts/src/init/register_configure_agent.sh %{_localstatedir} > /dev/null || : fi - - # We create this fix for the operating system that deprecated the SySV. For now, this fix is for suse/openSUSE - sles="" - if [ -f /etc/SuSE-release ]; then - sles="suse" - elif [ -f /etc/os-release ]; then - if `grep -q "\"sles" /etc/os-release` ; then - sles="suse" - elif `grep -q -i "\"opensuse" /etc/os-release` ; then - sles="opensuse" - fi - fi - - if [ -n "$sles" ] && [ $(ps --no-headers -o comm 1) == "systemd" ]; then - if [ -f /etc/init.d/wazuh-agent ]; then - rm -f /etc/init.d/wazuh-agent - fi - fi +if ps -e | grep -E -q "^\ *1\ .*systemd$"; then + rm -f %{_initrddir}/wazuh-agent +fi # Delete the installation files used to configure the agent rm -rf %{_localstatedir}/packages_files @@ -491,9 +471,7 @@ rm -fr %{buildroot} %files %defattr(-,root,root) -%if %initd_valid - %config(missingok) %{_initrddir}/wazuh-agent -%endif +%config(missingok) %{_initrddir}/wazuh-agent %attr(640, root, wazuh) %verify(not md5 size mtime) %ghost %{_sysconfdir}/ossec-init.conf /usr/lib/systemd/system/wazuh-agent.service %dir %attr(750, root, wazuh) %{_localstatedir} diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 30e7ba3c43..e52afd58a4 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -36,7 +36,6 @@ log analysis, file integrity monitoring, intrusions detection and policy and com ./gen_ossec.sh conf manager centos %rhel %{_localstatedir} > etc/ossec-server.conf %build -%define initd_valid %( if [ -f /usr/lib/systemd/systemd-sysv-install ]; then echo "1" ; else echo "0"; fi ) pushd src # Rebuild for server make clean @@ -75,18 +74,11 @@ echo 'USER_CREATE_SSL_CERT="n"' >> ./etc/preloaded-vars.conf ./install.sh # Create directories -%if %initd_valid - mkdir -p ${RPM_BUILD_ROOT}%{_initrddir} -%endif mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/.ssh # Copy the installed files into RPM_BUILD_ROOT directory cp -pr %{_localstatedir}/* ${RPM_BUILD_ROOT}%{_localstatedir}/ mkdir -p ${RPM_BUILD_ROOT}/usr/lib/systemd/system/ -%if %initd_valid - sed -i "s:WAZUH_HOME_TMP:%{_localstatedir}:g" src/init/templates/ossec-hids-rh.init - install -m 0755 src/init/templates/ossec-hids-rh.init ${RPM_BUILD_ROOT}%{_initrddir}/wazuh-manager -%endif sed -i "s:WAZUH_HOME_TMP:%{_localstatedir}:g" src/init/templates/wazuh-manager.service install -m 0644 src/init/templates/wazuh-manager.service ${RPM_BUILD_ROOT}/usr/lib/systemd/system/ @@ -580,9 +572,6 @@ rm -fr %{buildroot} %files %defattr(-,root,wazuh) -%if %initd_valid - %config(missingok) %{_initrddir}/wazuh-agent -%endif %attr(640, root, wazuh) %verify(not md5 size mtime) %ghost %{_sysconfdir}/ossec-init.conf /usr/lib/systemd/system/wazuh-manager.service %dir %attr(750, root, wazuh) %{_localstatedir} diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 5b889782e1..0473be819c 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -164,7 +164,7 @@ if [ $1 = 1 ];then # Install fi -if [ ! -f /usr/lib/systemd/systemd-sysv-install ]; then +if ps -e | grep -E -q "^\ *1\ .*systemd$" ; then rm -f /etc/init.d/%{name} fi From d7dc64ea802f47c6139bbd39c6ec4fd1fa690781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 7 Feb 2023 16:56:34 +0100 Subject: [PATCH 293/316] Fix new tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../test-install-enable/install_and_enable.sh | 14 ++++++++++++-- .github/workflows/test-install-and-enable-rpm.yml | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/actions/test-install-enable/install_and_enable.sh b/.github/actions/test-install-enable/install_and_enable.sh index 3a4338dfcc..dc8d8d2676 100644 --- a/.github/actions/test-install-enable/install_and_enable.sh +++ b/.github/actions/test-install-enable/install_and_enable.sh @@ -23,8 +23,18 @@ fi $sys_type install -y "/packages/$1" echo "Enabling Wazuh $2." -systemctl enable wazuh-$2 -if [ "$?" -eq 0 ]; then +if ps -e | grep -E -q "^\ *1\ .*systemd$"; then + systemctl daemon-reload + systemctl enable wazuh-$2 + output=$(echo $?) +elif ps -e | grep -E -q "^\ *1\ .*init$"; then + chkconfig --add wazuh-$2 + output=$(echo $?) +else + /etc/rc.d/init.d/wazuh${2} start + output=$(echo $?) +fi +if [ "$output" -eq 0 ]; then echo "Wazuh $2 enabled - Test passed correctly." exit 0 else diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index f55ed5a3e6..bd79dacf7e 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -47,7 +47,7 @@ jobs: {NAME: 'fedora:34', ARCH: "x86_64"}, {NAME: 'opensuse/leap:latest', ARCH: "x86_64"}, {NAME: 'opensuse/tumbleweed:latest', ARCH: "x86_64"}, - {NAME: '386/opensuse/tumbleweed:latest', ARCH: "i386"}] + {NAME: 'i386/opensuse/tumbleweed:latest', ARCH: "i386"}] type: [agent, manager] exclude: - system: {ARCH: "i386"} From 97f03e146df7fa21ce17631303d8e6bc82f16a65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 7 Feb 2023 16:56:57 +0100 Subject: [PATCH 294/316] Remove Suse fix for the manager MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- rpms/SPECS/wazuh-manager.spec | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index e52afd58a4..6f70f0f19e 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -309,24 +309,6 @@ if [ $1 = 1 ]; then %{_localstatedir}/packages_files/manager_installation_scripts/add_localfiles.sh %{_localstatedir} >> %{_localstatedir}/etc/ossec.conf fi - # We create this fix for the operating system that decraped the SySV. For now, this fix is for suse/openSUSE - sles="" - if [ -f /etc/SuSE-release ]; then - sles="suse" - elif [ -f /etc/os-release ]; then - if `grep -q "\"sles" /etc/os-release` ; then - sles="suse" - elif `grep -q -i "\"opensuse" /etc/os-release` ; then - sles="opensuse" - fi - fi - - if [ -n "$sles" ] && [ $(ps --no-headers -o comm 1) == "systemd" ]; then - if [ -f /etc/init.d/wazuh-manager ]; then - rm -f %{_initrddir}//wazuh-manager - fi - fi - # Generation auto-signed certificate if not exists if [ ! -f "%{_localstatedir}/etc/sslmanager.key" ] && [ ! -f "%{_localstatedir}/etc/sslmanager.cert" ]; then %{_localstatedir}/bin/wazuh-authd -C 365 -B 2048 -S "/C=US/ST=California/CN=Wazuh/" -K %{_localstatedir}/etc/sslmanager.key -X %{_localstatedir}/etc/sslmanager.cert 2>/dev/null From 7997c6eca5e65ddd4b5d04aa602033527de3f009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 7 Feb 2023 17:11:15 +0100 Subject: [PATCH 295/316] Correct the way to check type of init manager used MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/actions/test-install-enable/install_and_enable.sh | 6 +++--- rpms/SPECS/wazuh-agent.spec | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 +- unattended_installer/install_functions/installCommon.sh | 4 ++-- unattended_installer/passwords_tool/passwordsFunctions.sh | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/actions/test-install-enable/install_and_enable.sh b/.github/actions/test-install-enable/install_and_enable.sh index dc8d8d2676..f53d9a3b3d 100644 --- a/.github/actions/test-install-enable/install_and_enable.sh +++ b/.github/actions/test-install-enable/install_and_enable.sh @@ -23,11 +23,11 @@ fi $sys_type install -y "/packages/$1" echo "Enabling Wazuh $2." -if ps -e | grep -E -q "^\ *1\ .*systemd$"; then +if ps -p 1 -o comm= | grep -q "systemd"; then systemctl daemon-reload systemctl enable wazuh-$2 output=$(echo $?) -elif ps -e | grep -E -q "^\ *1\ .*init$"; then +elif ps -p 1 -o comm= | grep -q "init"; then chkconfig --add wazuh-$2 output=$(echo $?) else @@ -37,7 +37,7 @@ fi if [ "$output" -eq 0 ]; then echo "Wazuh $2 enabled - Test passed correctly." exit 0 -else +else echo "Error: Wazuh $2 not enabled." exit 1 fi \ No newline at end of file diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 2c8715d5d5..721dff9993 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -240,7 +240,7 @@ if [ $1 = 1 ]; then %{_localstatedir}/packages_files/agent_installation_scripts/src/init/register_configure_agent.sh %{_localstatedir} > /dev/null || : fi -if ps -e | grep -E -q "^\ *1\ .*systemd$"; then +if [[ -d /run/systemd/system ]]; then rm -f %{_initrddir}/wazuh-agent fi diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 0473be819c..2f72d2b214 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -164,7 +164,7 @@ if [ $1 = 1 ];then # Install fi -if ps -e | grep -E -q "^\ *1\ .*systemd$" ; then +if [[ -d /run/systemd/system ]] ; then rm -f /etc/init.d/%{name} fi diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 198f27fb88..c9bf605806 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -572,7 +572,7 @@ function installCommon_startService() { common_logger "Starting service ${1}." - if ps -e | grep -E -q "^\ *1\ .*systemd$"; then + if [[ -d /run/systemd/system ]]; then eval "systemctl daemon-reload ${debug}" eval "systemctl enable ${1}.service ${debug}" eval "systemctl start ${1}.service ${debug}" @@ -586,7 +586,7 @@ function installCommon_startService() { else common_logger "${1} service started." fi - elif ps -e | grep -E -q "^\ *1\ .*init$"; then + elif ps -p 1 -o comm= | grep "init"; then eval "chkconfig ${1} on ${debug}" eval "service ${1} start ${debug}" eval "/etc/init.d/${1} start ${debug}" diff --git a/unattended_installer/passwords_tool/passwordsFunctions.sh b/unattended_installer/passwords_tool/passwordsFunctions.sh index ee40bfb53b..2633d728e5 100644 --- a/unattended_installer/passwords_tool/passwordsFunctions.sh +++ b/unattended_installer/passwords_tool/passwordsFunctions.sh @@ -512,7 +512,7 @@ function passwords_restartService() { exit 1 fi - if ps -e | grep -E -q "^\ *1\ .*systemd$"; then + if [[ -d /run/systemd/system ]]; then eval "systemctl daemon-reload ${debug}" eval "systemctl restart ${1}.service ${debug}" if [ "${PIPESTATUS[0]}" != 0 ]; then @@ -527,7 +527,7 @@ function passwords_restartService() { else common_logger -d "${1} started." fi - elif ps -e | grep -E -q "^\ *1\ .*init$"; then + elif ps -p 1 -o comm= | grep "init"; then eval "/etc/init.d/${1} restart ${debug}" if [ "${PIPESTATUS[0]}" != 0 ]; then common_logger -e "${1} could not be started." From 2a36d6626e7f1802397e210dd16deb09bb06185a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 7 Feb 2023 17:33:42 +0100 Subject: [PATCH 296/316] Fix test, ps -p 1 gi ves bash MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/actions/test-install-enable/install_and_enable.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/actions/test-install-enable/install_and_enable.sh b/.github/actions/test-install-enable/install_and_enable.sh index f53d9a3b3d..b04d6f189e 100644 --- a/.github/actions/test-install-enable/install_and_enable.sh +++ b/.github/actions/test-install-enable/install_and_enable.sh @@ -23,15 +23,16 @@ fi $sys_type install -y "/packages/$1" echo "Enabling Wazuh $2." -if ps -p 1 -o comm= | grep -q "systemd"; then +if command -v systemctl; then systemctl daemon-reload systemctl enable wazuh-$2 output=$(echo $?) -elif ps -p 1 -o comm= | grep -q "init"; then +elif command -v service; then chkconfig --add wazuh-$2 + service wazuh-$2 start output=$(echo $?) else - /etc/rc.d/init.d/wazuh${2} start + /etc/rc.d/init.d/wazuh-$2 start output=$(echo $?) fi if [ "$output" -eq 0 ]; then From cc817bdbbae7638ccd41b6a2c89c4fae4de97161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 7 Feb 2023 17:51:33 +0100 Subject: [PATCH 297/316] Add centos 5 and 6 to the tests and try to pass on systemd to the testing docker containers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-and-enable-rpm.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-and-enable-rpm.yml index bd79dacf7e..e8255554d9 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-and-enable-rpm.yml @@ -45,13 +45,17 @@ jobs: {NAME: 'redhat/ubi9:latest', ARCH: "x86_64"}, {NAME: 'amazonlinux:2', ARCH: "x86_64"}, {NAME: 'fedora:34', ARCH: "x86_64"}, - {NAME: 'opensuse/leap:latest', ARCH: "x86_64"}, - {NAME: 'opensuse/tumbleweed:latest', ARCH: "x86_64"}, - {NAME: 'i386/opensuse/tumbleweed:latest', ARCH: "i386"}] + {NAME: 'opensuse/leap:latest', ARCH: "x86_64", INIT: "initd"}, + {NAME: 'opensuse/tumbleweed:latest', ARCH: "x86_64", INIT: "initd"}, + {NAME: 'i386/opensuse/tumbleweed:latest', ARCH: "i386", INIT: "initd"}, + {NAME: 'centos:6.9', ARCH: "x86_64", INIT: "initd"}, + {NAME: 'centos:5.11', ARCH: "x86_64", INIT: "initd"}] type: [agent, manager] exclude: - system: {ARCH: "i386"} type: manager + - system: {INIT: "initd"} + type: manager fail-fast: false steps: - uses: actions/checkout@v3 @@ -100,4 +104,4 @@ jobs: - name: Launch docker if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.rpm_images_x86_64 == 'true' && matrix.ARCHITECTURE == 'x86_64') - run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.system.NAME }} bash /tests/install_and_enable.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file + run: sudo docker run --privileged -v /run/systemd/system:/run/systemd/system -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.system.NAME }} bash /tests/install_and_enable.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file From d3c42309ac1a191b9e1c88354b13609d40e0604e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 8 Feb 2023 10:49:35 +0100 Subject: [PATCH 298/316] Change back manager to accept initd with the same solution as the agent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- rpms/SPECS/wazuh-manager.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 6f70f0f19e..111816e115 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -74,10 +74,13 @@ echo 'USER_CREATE_SSL_CERT="n"' >> ./etc/preloaded-vars.conf ./install.sh # Create directories +mkdir -p ${RPM_BUILD_ROOT}%{_initrddir} mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/.ssh # Copy the installed files into RPM_BUILD_ROOT directory cp -pr %{_localstatedir}/* ${RPM_BUILD_ROOT}%{_localstatedir}/ +sed -i "s:WAZUH_HOME_TMP:%{_localstatedir}:g" src/init/templates/ossec-hids-rh.init +install -m 0755 src/init/templates/ossec-hids-rh.init ${RPM_BUILD_ROOT}%{_initrddir}/wazuh-manager mkdir -p ${RPM_BUILD_ROOT}/usr/lib/systemd/system/ sed -i "s:WAZUH_HOME_TMP:%{_localstatedir}:g" src/init/templates/wazuh-manager.service install -m 0644 src/init/templates/wazuh-manager.service ${RPM_BUILD_ROOT}/usr/lib/systemd/system/ @@ -290,6 +293,10 @@ if [ $1 = 2 ]; then fi fi +if [[ -d /run/systemd/system ]]; then + rm -f %{_initrddir}/wazuh-agent +fi + # Fresh install code block if [ $1 = 1 ]; then @@ -554,6 +561,7 @@ rm -fr %{buildroot} %files %defattr(-,root,wazuh) +%config(missingok) %{_initrddir}/wazuh-manager %attr(640, root, wazuh) %verify(not md5 size mtime) %ghost %{_sysconfdir}/ossec-init.conf /usr/lib/systemd/system/wazuh-manager.service %dir %attr(750, root, wazuh) %{_localstatedir} From 74a1dc6733922849eed3a140d9a769496efa3ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 8 Feb 2023 10:51:55 +0100 Subject: [PATCH 299/316] Remove enable test as new solution doesn't cover docker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- ...all_and_enable.sh => install_component.sh} | 23 +------------------ ...nd-enable-deb.yml => test-install-deb.yml} | 2 +- ...nd-enable-rpm.yml => test-install-rpm.yml} | 2 +- 3 files changed, 3 insertions(+), 24 deletions(-) rename .github/actions/test-install-enable/{install_and_enable.sh => install_component.sh} (56%) rename .github/workflows/{test-install-and-enable-deb.yml => test-install-deb.yml} (98%) rename .github/workflows/{test-install-and-enable-rpm.yml => test-install-rpm.yml} (94%) diff --git a/.github/actions/test-install-enable/install_and_enable.sh b/.github/actions/test-install-enable/install_component.sh similarity index 56% rename from .github/actions/test-install-enable/install_and_enable.sh rename to .github/actions/test-install-enable/install_component.sh index b04d6f189e..ee897b3a9a 100644 --- a/.github/actions/test-install-enable/install_and_enable.sh +++ b/.github/actions/test-install-enable/install_component.sh @@ -20,25 +20,4 @@ else exit 1 fi -$sys_type install -y "/packages/$1" - -echo "Enabling Wazuh $2." -if command -v systemctl; then - systemctl daemon-reload - systemctl enable wazuh-$2 - output=$(echo $?) -elif command -v service; then - chkconfig --add wazuh-$2 - service wazuh-$2 start - output=$(echo $?) -else - /etc/rc.d/init.d/wazuh-$2 start - output=$(echo $?) -fi -if [ "$output" -eq 0 ]; then - echo "Wazuh $2 enabled - Test passed correctly." - exit 0 -else - echo "Error: Wazuh $2 not enabled." - exit 1 -fi \ No newline at end of file +$sys_type install -y "/packages/$1" \ No newline at end of file diff --git a/.github/workflows/test-install-and-enable-deb.yml b/.github/workflows/test-install-deb.yml similarity index 98% rename from .github/workflows/test-install-and-enable-deb.yml rename to .github/workflows/test-install-deb.yml index 0ad0d8a5fd..3ba17620f2 100644 --- a/.github/workflows/test-install-and-enable-deb.yml +++ b/.github/workflows/test-install-deb.yml @@ -91,4 +91,4 @@ jobs: - name: Launch docker if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.deb_images_amd64 == 'true' && matrix.ARCHITECTURE == 'amd64') - run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.arch }}/${{ matrix.distro_name }} bash /tests/install_and_enable.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.arch }}/${{ matrix.distro_name }} bash /tests/install_component.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file diff --git a/.github/workflows/test-install-and-enable-rpm.yml b/.github/workflows/test-install-rpm.yml similarity index 94% rename from .github/workflows/test-install-and-enable-rpm.yml rename to .github/workflows/test-install-rpm.yml index e8255554d9..232e801d8f 100644 --- a/.github/workflows/test-install-and-enable-rpm.yml +++ b/.github/workflows/test-install-rpm.yml @@ -104,4 +104,4 @@ jobs: - name: Launch docker if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.rpm_images_x86_64 == 'true' && matrix.ARCHITECTURE == 'x86_64') - run: sudo docker run --privileged -v /run/systemd/system:/run/systemd/system -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.system.NAME }} bash /tests/install_and_enable.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.system.NAME }} bash /tests/install_component.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file From e6795ac6ba56b7ca972d4c7c1465f89c3f0f815c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= <72193239+davidcr01@users.noreply.github.com> Date: Wed, 8 Feb 2023 12:58:53 +0100 Subject: [PATCH 300/316] Improval of the curl tool in the Offline Installation (#2071) * Initial version of the Offline installation action * Improval of Offline installation action * Finished workflow * Fix workflow and filebeat installation * Starting services manually in RPM test * Action finished * Added -I to checkFilebeatURL curls * Added check_shards function to the Action * Added -I to offline curls * Improval of the offline test workflow * General improvements of the Offline installation action * Improval of the Offline installation workflow * Added common_curl to offline-download --- .../actions/offline-installation/common.sh | 311 ++++++++++++++++++ .../offline-installation.sh | 21 ++ .github/workflows/offline-installation.yml | 64 ++++ unattended_installer/builder.sh | 4 +- .../wazuh-offline-download.sh | 12 +- 5 files changed, 404 insertions(+), 8 deletions(-) create mode 100644 .github/actions/offline-installation/common.sh create mode 100644 .github/actions/offline-installation/offline-installation.sh create mode 100644 .github/workflows/offline-installation.yml diff --git a/.github/actions/offline-installation/common.sh b/.github/actions/offline-installation/common.sh new file mode 100644 index 0000000000..7042ae644d --- /dev/null +++ b/.github/actions/offline-installation/common.sh @@ -0,0 +1,311 @@ +#!/bin/bash + +function check_package() { + + if [ "${sys_type}" == "deb" ]; then + if ! apt list --installed 2>/dev/null | grep -q "${1}"; then + echo "INFO: The package "${1}" is not installed." + return 1 + fi + elif [ "${sys_type}" == "rpm" ]; then + if ! yum list installed 2>/dev/null | grep -q "${1}"; then + echo "INFO: The package "${1}" is not installed." + return 1 + fi + fi + return 0 + +} + +function check_system() { + + if [ -n "$(command -v yum)" ]; then + sys_type="rpm" + echo "INFO: RPM system detected." + elif [ -n "$(command -v apt-get)" ]; then + sys_type="deb" + echo "INFO: DEB system detected." + else + echo "ERROR: could not detect the system." + exit 1 + fi + +} + +function check_file() { + + if [ ! -f "${1}" ]; then + echo "ERROR: The ${1} file could not be downloaded." + exit 1 + fi + +} + +function check_shards() { + + retries=0 + until [ "$(curl -s -k -u admin:admin "https://localhost:9200/_template/wazuh?pretty&filter_path=wazuh.settings.index.number_of_shards" | grep "number_of_shards")" ] || [ "${retries}" -eq 5 ]; do + sleep 5 + retries=$((retries+1)) + done + + if [ ${retries} -eq 5 ]; then + echo "ERROR: Could not get the number of shards." + exit 1 + fi + curl -s -k -u admin:admin "https://localhost:9200/_template/wazuh?pretty&filter_path=wazuh.settings.index.number_of_shards" + echo "INFO: Number of shards detected." + +} + +function dashboard_installation() { + + install_package "wazuh-dashboard" + check_package "wazuh-dashboard" + + echo "INFO: Generating certificates of the Wazuh dashboard..." + NODE_NAME=dashboard + mkdir /etc/wazuh-dashboard/certs + mv -n wazuh-certificates/$NODE_NAME.pem /etc/wazuh-dashboard/certs/dashboard.pem + mv -n wazuh-certificates/$NODE_NAME-key.pem /etc/wazuh-dashboard/certs/dashboard-key.pem + cp wazuh-certificates/root-ca.pem /etc/wazuh-dashboard/certs/ + chmod 500 /etc/wazuh-dashboard/certs + chmod 400 /etc/wazuh-dashboard/certs/* + chown -R wazuh-dashboard:wazuh-dashboard /etc/wazuh-dashboard/certs + + if [ "${sys_type}" == "deb" ]; then + enable_start_service "wazuh-dashboard" + elif [ "${sys_type}" == "rpm" ]; then + /usr/share/wazuh-dashboard/bin/opensearch-dashboards "-c /etc/wazuh-dashboard/opensearch_dashboards.yml" --allow-root > /dev/null 2>&1 & + fi + + sleep 10 + # In this context, 302 HTTP code refers to SSL certificates warning: success. + if [ "$(curl -k -s -I -w "%{http_code}" https://localhost -o /dev/null --fail)" -ne "302" ]; then + echo "ERROR: The Wazuh dashboard installation has failed." + exit 1 + fi + echo "INFO: The Wazuh dashboard is ready." + +} + +function download_resources() { + + check_file "${ABSOLUTE_PATH}"/wazuh-install.sh + bash "${ABSOLUTE_PATH}"/wazuh-install.sh -dw "${sys_type}" + echo "INFO: Downloading the resources..." + + curl -sO https://packages.wazuh.com/4.3/config.yml + check_file "config.yml" + + sed -i -e '0,// s//127.0.0.1/' config.yml + sed -i -e '0,// s//127.0.0.1/' config.yml + sed -i -e '0,// s//127.0.0.1/' config.yml + + curl -sO https://packages.wazuh.com/4.3/wazuh-certs-tool.sh + check_file "wazuh-certs-tool.sh" + chmod 744 wazuh-certs-tool.sh + ./wazuh-certs-tool.sh --all + + tar xf wazuh-offline.tar.gz + echo "INFO: Download finished." + + if [ ! -d ./wazuh-offline ]; then + echo "ERROR: Could not download the resources." + exit 1 + fi + +} + +function enable_start_service() { + + systemctl daemon-reload + systemctl enable "${1}" + systemctl start "${1}" + + retries=0 + until [ "$(systemctl status "${1}" | grep "active")" ] || [ "${retries}" -eq 3 ]; do + sleep 2 + retries=$((retries+1)) + systemctl start "${1}" + done + + if [ ${retries} -eq 3 ]; then + echo "ERROR: The "${1}" service could not be started." + exit 1 + fi + +} + +function filebeat_installation() { + + install_package "filebeat" + check_package "filebeat" + + cp ./wazuh-offline/wazuh-files/filebeat.yml /etc/filebeat/ &&\ + cp ./wazuh-offline/wazuh-files/wazuh-template.json /etc/filebeat/ &&\ + chmod go+r /etc/filebeat/wazuh-template.json + + sed -i 's|\("index.number_of_shards": \)".*"|\1 "1"|' /etc/filebeat/wazuh-template.json + filebeat keystore create + echo admin | filebeat keystore add username --stdin --force + echo admin | filebeat keystore add password --stdin --force + tar -xzf ./wazuh-offline/wazuh-files/wazuh-filebeat-0.2.tar.gz -C /usr/share/filebeat/module + + echo "INFO: Generating certificates of Filebeat..." + NODE_NAME=wazuh-1 + mkdir /etc/filebeat/certs + mv -n wazuh-certificates/$NODE_NAME.pem /etc/filebeat/certs/filebeat.pem + mv -n wazuh-certificates/$NODE_NAME-key.pem /etc/filebeat/certs/filebeat-key.pem + cp wazuh-certificates/root-ca.pem /etc/filebeat/certs/ + chmod 500 /etc/filebeat/certs + chmod 400 /etc/filebeat/certs/* + chown -R root:root /etc/filebeat/certs + + if [ "${sys_type}" == "deb" ]; then + enable_start_service "filebeat" + elif [ "${sys_type}" == "rpm" ]; then + /usr/share/filebeat/bin/filebeat --environment systemd -c /etc/filebeat/filebeat.yml --path.home /usr/share/filebeat --path.config /etc/filebeat --path.data /var/lib/filebeat --path.logs /var/log/filebeat & + fi + + sleep 10 + check_shards + eval "filebeat test output" + if [ "${PIPESTATUS[0]}" != 0 ]; then + echo "ERROR: The Filebeat installation has failed." + exit 1 + fi + +} + +function indexer_initialize() { + + retries=0 + until [ "$(cat /var/log/wazuh-indexer/wazuh-cluster.log | grep "Node started")" ] || [ "${retries}" -eq 5 ]; do + sleep 5 + retries=$((retries+1)) + done + + if [ ${retries} -eq 5 ]; then + echo "ERROR: The indexer node is not started." + exit 1 + fi + /usr/share/wazuh-indexer/bin/indexer-security-init.sh + +} + +function indexer_installation() { + + if [ "${sys_type}" == "rpm" ]; then + rpm --import ./wazuh-offline/wazuh-files/GPG-KEY-WAZUH + fi + + install_package "wazuh-indexer" + check_package "wazuh-indexer" + + echo "INFO: Generating certificates of the Wazuh indexer..." + NODE_NAME=node-1 + mkdir /etc/wazuh-indexer/certs + mv -n wazuh-certificates/$NODE_NAME.pem /etc/wazuh-indexer/certs/indexer.pem + mv -n wazuh-certificates/$NODE_NAME-key.pem /etc/wazuh-indexer/certs/indexer-key.pem + mv wazuh-certificates/admin-key.pem /etc/wazuh-indexer/certs/ + mv wazuh-certificates/admin.pem /etc/wazuh-indexer/certs/ + cp wazuh-certificates/root-ca.pem /etc/wazuh-indexer/certs/ + chmod 500 /etc/wazuh-indexer/certs + chmod 400 /etc/wazuh-indexer/certs/* + chown -R wazuh-indexer:wazuh-indexer /etc/wazuh-indexer/certs + + sed -i 's|\(network.host: \)"0.0.0.0"|\1"127.0.0.1"|' /etc/wazuh-indexer/opensearch.yml + + if [ "${sys_type}" == "rpm" ]; then + runuser "wazuh-indexer" --shell="/bin/bash" --command="OPENSEARCH_PATH_CONF=/etc/wazuh-indexer /usr/share/wazuh-indexer/bin/opensearch" > /dev/null 2>&1 & + sleep 5 + elif [ "${sys_type}" == "deb" ]; then + enable_start_service "wazuh-indexer" + fi + + indexer_initialize + sleep 10 + eval "curl -s -XGET https://localhost:9200 -u admin:admin -k --fail" + if [ "${PIPESTATUS[0]}" != 0 ]; then + echo "ERROR: The Wazuh indexer installation has failed." + exit 1 + fi + +} + +function install_dependencies() { + + if [ "${sys_type}" == "rpm" ]; then + dependencies=( util-linux initscripts openssl ) + not_installed=() + for dep in "${dependencies[@]}"; do + if [ "${dep}" == "openssl" ]; then + if ! yum list installed 2>/dev/null | grep -q "${dep}\.";then + not_installed+=("${dep}") + fi + elif ! yum list installed 2>/dev/null | grep -q "${dep}";then + not_installed+=("${dep}") + fi + done + + if [ "${#not_installed[@]}" -gt 0 ]; then + echo "--- Dependencies ---" + for dep in "${not_installed[@]}"; do + echo "Installing $dep." + eval "yum install ${dep} -y" + if [ "${PIPESTATUS[0]}" != 0 ]; then + echo "ERROR: Cannot install dependency: ${dep}." + exit 1 + fi + done + fi + + elif [ "${sys_type}" == "deb" ]; then + eval "apt-get update -q > /dev/null" + dependencies=( openssl ) + not_installed=() + + for dep in "${dependencies[@]}"; do + if ! apt list --installed 2>/dev/null | grep -q "${dep}"; then + not_installed+=("${dep}") + fi + done + + if [ "${#not_installed[@]}" -gt 0 ]; then + echo "--- Dependencies ----" + for dep in "${not_installed[@]}"; do + echo "Installing $dep." + apt-get install -y "${dep}" + if [ "${install_result}" != 0 ]; then + echo "ERROR: Cannot install dependency: ${dep}." + exit 1 + fi + done + fi + fi + +} + +function install_package() { + + if [ "${sys_type}" == "deb" ]; then + dpkg -i ./wazuh-offline/wazuh-packages/"${1}"*.deb + elif [ "${sys_type}" == "rpm" ]; then + rpm -ivh ./wazuh-offline/wazuh-packages/"${1}"*.rpm + fi + +} + +function manager_installation() { + + install_package "wazuh-manager" + check_package "wazuh-manager" + + if [ "${sys_type}" == "deb" ]; then + enable_start_service "wazuh-manager" + elif [ "${sys_type}" == "rpm" ]; then + /var/ossec/bin/wazuh-control start + fi + +} diff --git a/.github/actions/offline-installation/offline-installation.sh b/.github/actions/offline-installation/offline-installation.sh new file mode 100644 index 0000000000..787b20bf66 --- /dev/null +++ b/.github/actions/offline-installation/offline-installation.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +# Gets the absolute path of the script, used to load the common.sh file +ABSOLUTE_PATH="$( cd $(dirname ${0}) ; pwd -P )" +. ${ABSOLUTE_PATH}/common.sh + +check_system +install_dependencies +download_resources + +indexer_installation +echo "INFO: Wazuh indexer installation completed." + +manager_installation +echo "INFO: Wazuh manager installation completed." + +filebeat_installation +echo "INFO: Filebeat installation completed." + +dashboard_installation +echo "INFO: Wazuh dashboard installation completed." diff --git a/.github/workflows/offline-installation.yml b/.github/workflows/offline-installation.yml new file mode 100644 index 0000000000..07b75cb45f --- /dev/null +++ b/.github/workflows/offline-installation.yml @@ -0,0 +1,64 @@ +name: Offline installation test +on: + pull_request: + paths: + - 'unattended_installer/install_functions/wazuh-offline-download.sh' + +jobs: + Build-wazuh-install-script: + runs-on: ubuntu-latest + steps: + - name: Cancel previous runs + uses: fkirc/skip-duplicate-actions@master + with: + cancel_others: 'true' + github_token: ${{ secrets.GITHUB_TOKEN }} + skip_after_successful_duplicate: 'false' + + - uses: actions/checkout@v2 + + - name: Build wazuh-install script and use pre-release packages + working-directory: ./unattended_installer + run: | + bash builder.sh -i -d + sed -i 's|wazuh_major="4\.5"|wazuh_major="4\.4"|g' wazuh-install.sh + sed -i 's|wazuh_version="4\.5\(.*\)"|wazuh_version="4\.4\1"|g' wazuh-install.sh + + - uses: actions/upload-artifact@v3 + with: + name: script + path: | + unattended_installer/wazuh-install.sh + if-no-files-found: error + + Test-offline-installation-debian: + runs-on: ubuntu-latest + needs: Build-wazuh-install-script + steps: + - uses: actions/checkout@v2 + + - uses: actions/download-artifact@v3 + with: + name: script + + - name: Move unattended script + run: cp $GITHUB_WORKSPACE/wazuh-install.sh $GITHUB_WORKSPACE/.github/actions/offline-installation/wazuh-install.sh + + - name: Run script + run: sudo bash $GITHUB_WORKSPACE/.github/actions/offline-installation/offline-installation.sh + + Test-offline-installation-rpm: + runs-on: ubuntu-latest + needs: Build-wazuh-install-script + steps: + - uses: actions/checkout@v2 + + - uses: actions/download-artifact@v3 + with: + name: script + + - name: Move unattended script + run: cp $GITHUB_WORKSPACE/wazuh-install.sh $GITHUB_WORKSPACE/.github/actions/offline-installation/wazuh-install.sh + + - name: Launch docker and run script + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/offline-installation/:/tests centos:centos7 bash /tests/offline-installation.sh diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index 86e0da54c1..14fdae8c21 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -278,9 +278,9 @@ function checkFilebeatURL() { new_filebeat_url="https://raw.githubusercontent.com/wazuh/wazuh/master/extensions/elasticsearch/7.x/wazuh-template.json" # Get the response of the URL and check it - response=$(curl --write-out '%{http_code}' --silent --output /dev/null $filebeat_wazuh_template) + response=$(curl -I --write-out '%{http_code}' --silent --output /dev/null $filebeat_wazuh_template) if [ "${response}" != "200" ]; then - response=$(curl --write-out '%{http_code}' --silent --output /dev/null $new_filebeat_url) + response=$(curl -I --write-out '%{http_code}' --silent --output /dev/null $new_filebeat_url) # Display error if both URLs do not get the resource if [ "${response}" != "200" ]; then diff --git a/unattended_installer/install_functions/wazuh-offline-download.sh b/unattended_installer/install_functions/wazuh-offline-download.sh index 796e69d4df..05c9937180 100755 --- a/unattended_installer/install_functions/wazuh-offline-download.sh +++ b/unattended_installer/install_functions/wazuh-offline-download.sh @@ -52,7 +52,7 @@ function offline_download() { exit 1 fi - while common_curl -s -o /dev/null -w "%{http_code}" "${manager_base_url}/${manager_package}" --max-time 300 --retry 5 --retry-delay 5 --fail | grep -q "200"; do + while common_curl -s -I -o /dev/null -w "%{http_code}" "${manager_base_url}/${manager_package}" --max-time 300 --retry 5 --retry-delay 5 --fail | grep -q "200"; do manager_revision=$((manager_revision+1)) if [ "${package_type}" == "rpm" ]; then manager_rpm_package="wazuh-manager-${wazuh_version}-${manager_revision}.x86_64.rpm" @@ -62,7 +62,7 @@ function offline_download() { manager_package="${manager_deb_package}" fi done - if [ "$manager_revision" -gt 1 ] && [ "$(common_curl -s -o /dev/null -w "%{http_code}" "${manager_base_url}/${manager_package}" --max-time 300 --retry 5 --retry-delay 5 --fail)" -ne "200" ]; then + if [ "$manager_revision" -gt 1 ] && [ "$(common_curl -s -I -o /dev/null -w "%{http_code}" "${manager_base_url}/${manager_package}" --max-time 300 --retry 5 --retry-delay 5 --fail)" -ne "200" ]; then manager_revision=$((manager_revision-1)) if [ "${package_type}" == "rpm" ]; then manager_rpm_package="wazuh-manager-${wazuh_version}-${manager_revision}.x86_64.rpm" @@ -71,7 +71,7 @@ function offline_download() { fi fi - while common_curl -s -o /dev/null -w "%{http_code}" "${indexer_base_url}/${indexer_package}" --max-time 300 --retry 5 --retry-delay 5 --fail | grep -q "200"; do + while common_curl -s -I -o /dev/null -w "%{http_code}" "${indexer_base_url}/${indexer_package}" --max-time 300 --retry 5 --retry-delay 5 --fail | grep -q "200"; do indexer_revision=$((indexer_revision+1)) if [ "${package_type}" == "rpm" ]; then indexer_rpm_package="wazuh-indexer-${wazuh_version}-${indexer_revision}.x86_64.rpm" @@ -81,7 +81,7 @@ function offline_download() { indexer_package="${indexer_deb_package}" fi done - if [ "$indexer_revision" -gt 1 ] && [ "$(common_curl -s -o /dev/null -w "%{http_code}" "${indexer_base_url}/${indexer_package}" --max-time 300 --retry 5 --retry-delay 5 --fail)" -ne "200" ]; then + if [ "$indexer_revision" -gt 1 ] && [ "$(common_curl -s -I -o /dev/null -w "%{http_code}" "${indexer_base_url}/${indexer_package}" --max-time 300 --retry 5 --retry-delay 5 --fail)" -ne "200" ]; then indexer_revision=$((indexer_revision-1)) if [ "${package_type}" == "rpm" ]; then indexer_rpm_package="wazuh-indexer-${wazuh_version}-${indexer_revision}.x86_64.rpm" @@ -90,7 +90,7 @@ function offline_download() { fi fi - while common_curl -s -o /dev/null -w "%{http_code}" "${dashboard_base_url}/${dashboard_package}" --max-time 300 --retry 5 --retry-delay 5 --fail | grep -q "200"; do + while common_curl -s -I -o /dev/null -w "%{http_code}" "${dashboard_base_url}/${dashboard_package}" --max-time 300 --retry 5 --retry-delay 5 --fail | grep -q "200"; do dashboard_revision=$((dashboard_revision+1)) if [ "${package_type}" == "rpm" ]; then dashboard_rpm_package="wazuh-dashboard-${wazuh_version}-${dashboard_revision}.x86_64.rpm" @@ -100,7 +100,7 @@ function offline_download() { dashboard_package="${dashboard_deb_package}" fi done - if [ "$dashboard_revision" -gt 1 ] && [ "$(common_curl -s -o /dev/null -w "%{http_code}" "${dashboard_base_url}/${dashboard_package}" --max-time 300 --retry 5 --retry-delay 5 --fail)" -ne "200" ]; then + if [ "$dashboard_revision" -gt 1 ] && [ "$(common_curl -s -I -o /dev/null -w "%{http_code}" "${dashboard_base_url}/${dashboard_package}" --max-time 300 --retry 5 --retry-delay 5 --fail)" -ne "200" ]; then dashboard_revision=$((dashboard_revision-1)) if [ "${package_type}" == "rpm" ]; then dashboard_rpm_package="wazuh-dashboard-${wazuh_version}-${dashboard_revision}.x86_64.rpm" From 41a3548ae844d11c76ef8f4b14d2a4fa2bbcc822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 8 Feb 2023 14:34:53 +0100 Subject: [PATCH 301/316] Fix zypper and wazuh-manger.spec MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/actions/test-install-enable/install_component.sh | 2 +- rpms/SPECS/wazuh-manager.spec | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/test-install-enable/install_component.sh b/.github/actions/test-install-enable/install_component.sh index ee897b3a9a..0a365d47a3 100644 --- a/.github/actions/test-install-enable/install_component.sh +++ b/.github/actions/test-install-enable/install_component.sh @@ -14,7 +14,7 @@ elif [ -n "$(command -v apt-get)" ]; then apt-get update apt-get install -y systemd elif [ -n "$(command -v zypper)" ]; then - sys_type="zypper" + sys_type="zypper --no-gpg-checks" else common_logger -e "Couldn't find type of system" exit 1 diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 111816e115..a9d87f7639 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -293,10 +293,6 @@ if [ $1 = 2 ]; then fi fi -if [[ -d /run/systemd/system ]]; then - rm -f %{_initrddir}/wazuh-agent -fi - # Fresh install code block if [ $1 = 1 ]; then @@ -316,6 +312,10 @@ if [ $1 = 1 ]; then %{_localstatedir}/packages_files/manager_installation_scripts/add_localfiles.sh %{_localstatedir} >> %{_localstatedir}/etc/ossec.conf fi +if [[ -d /run/systemd/system ]]; then + rm -f %{_initrddir}/wazuh-manager +fi + # Generation auto-signed certificate if not exists if [ ! -f "%{_localstatedir}/etc/sslmanager.key" ] && [ ! -f "%{_localstatedir}/etc/sslmanager.cert" ]; then %{_localstatedir}/bin/wazuh-authd -C 365 -B 2048 -S "/C=US/ST=California/CN=Wazuh/" -K %{_localstatedir}/etc/sslmanager.key -X %{_localstatedir}/etc/sslmanager.cert 2>/dev/null From 6e9290678f73e8a2451554b265f409fb034d1144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 8 Feb 2023 17:07:14 +0100 Subject: [PATCH 302/316] Remove zypper machines from the tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/actions/test-install-enable/install_component.sh | 2 -- .github/workflows/test-install-rpm.yml | 3 --- 2 files changed, 5 deletions(-) diff --git a/.github/actions/test-install-enable/install_component.sh b/.github/actions/test-install-enable/install_component.sh index 0a365d47a3..29ce8605cf 100644 --- a/.github/actions/test-install-enable/install_component.sh +++ b/.github/actions/test-install-enable/install_component.sh @@ -13,8 +13,6 @@ elif [ -n "$(command -v apt-get)" ]; then sys_type="apt-get" apt-get update apt-get install -y systemd -elif [ -n "$(command -v zypper)" ]; then - sys_type="zypper --no-gpg-checks" else common_logger -e "Couldn't find type of system" exit 1 diff --git a/.github/workflows/test-install-rpm.yml b/.github/workflows/test-install-rpm.yml index 232e801d8f..9848e7969f 100644 --- a/.github/workflows/test-install-rpm.yml +++ b/.github/workflows/test-install-rpm.yml @@ -45,9 +45,6 @@ jobs: {NAME: 'redhat/ubi9:latest', ARCH: "x86_64"}, {NAME: 'amazonlinux:2', ARCH: "x86_64"}, {NAME: 'fedora:34', ARCH: "x86_64"}, - {NAME: 'opensuse/leap:latest', ARCH: "x86_64", INIT: "initd"}, - {NAME: 'opensuse/tumbleweed:latest', ARCH: "x86_64", INIT: "initd"}, - {NAME: 'i386/opensuse/tumbleweed:latest', ARCH: "i386", INIT: "initd"}, {NAME: 'centos:6.9', ARCH: "x86_64", INIT: "initd"}, {NAME: 'centos:5.11', ARCH: "x86_64", INIT: "initd"}] type: [agent, manager] From 63babe9b631dbcaeca7942f0d28f99e43cb504a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 8 Feb 2023 17:43:55 +0100 Subject: [PATCH 303/316] Remove repositories if test run on centos 5 or 6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../test-install-enable/install_component.sh | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/actions/test-install-enable/install_component.sh b/.github/actions/test-install-enable/install_component.sh index 29ce8605cf..a854d386be 100644 --- a/.github/actions/test-install-enable/install_component.sh +++ b/.github/actions/test-install-enable/install_component.sh @@ -1,10 +1,19 @@ #!/bin/bash echo "Installing Wazuh $2." -source /etc/os-release -if [ "$ID" = "centos" ] && [ "$VERSION_ID" = "8" ]; then - find /etc/yum.repos.d/ -type f -exec sed -i 's/mirrorlist/#mirrorlist/g' {} \; - find /etc/yum.repos.d/ -type f -exec sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' {} \; +if [ -f /etc/os-release ]; then + source /etc/os-release + if [ "$ID" = "centos" ] && [ "$VERSION_ID" = "8" ]; then + find /etc/yum.repos.d/ -type f -exec sed -i 's/mirrorlist/#mirrorlist/g' {} \; + find /etc/yum.repos.d/ -type f -exec sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' {} \; + fi +fi + +if [ -f /etc/redhat-release ]; then + VERSION=$(cat /etc/redhat-release) + if [ "$VERSION" = "CentOS release 5.11 (Final)" ] || [ "$VERSION" = "CentOS release 6.9 (Final)" ]; then + rm -rf /etc/yum.repos.d/* + fi fi if [ -n "$(command -v yum)" ]; then From f46fc4824a1dc523565e39177a97d86ee73b3a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 8 Feb 2023 18:14:05 +0100 Subject: [PATCH 304/316] Fix repos for centos 6 instead of removing them MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/actions/test-install-enable/install_component.sh | 4 ++-- .github/workflows/test-install-rpm.yml | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/actions/test-install-enable/install_component.sh b/.github/actions/test-install-enable/install_component.sh index a854d386be..9f507d1f53 100644 --- a/.github/actions/test-install-enable/install_component.sh +++ b/.github/actions/test-install-enable/install_component.sh @@ -11,8 +11,8 @@ fi if [ -f /etc/redhat-release ]; then VERSION=$(cat /etc/redhat-release) - if [ "$VERSION" = "CentOS release 5.11 (Final)" ] || [ "$VERSION" = "CentOS release 6.9 (Final)" ]; then - rm -rf /etc/yum.repos.d/* + if [ "$VERSION" = "CentOS release 6.9 (Final)" ]; then + curl https://www.getpagespeed.com/files/centos6-eol.repo --output /etc/yum.repos.d/CentOS-Base.repo fi fi diff --git a/.github/workflows/test-install-rpm.yml b/.github/workflows/test-install-rpm.yml index 9848e7969f..2c8fbb2878 100644 --- a/.github/workflows/test-install-rpm.yml +++ b/.github/workflows/test-install-rpm.yml @@ -45,8 +45,7 @@ jobs: {NAME: 'redhat/ubi9:latest', ARCH: "x86_64"}, {NAME: 'amazonlinux:2', ARCH: "x86_64"}, {NAME: 'fedora:34', ARCH: "x86_64"}, - {NAME: 'centos:6.9', ARCH: "x86_64", INIT: "initd"}, - {NAME: 'centos:5.11', ARCH: "x86_64", INIT: "initd"}] + {NAME: 'centos:6.9', ARCH: "x86_64", INIT: "initd"}] type: [agent, manager] exclude: - system: {ARCH: "i386"} From 2ac19c6c71b00bfc8358609df035b861989ca485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 8 Feb 2023 18:21:43 +0100 Subject: [PATCH 305/316] Change file name to the install tests of github actions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .../install_component.sh | 0 .github/workflows/test-install-deb.yml | 2 +- .github/workflows/test-install-rpm.yml | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename .github/actions/{test-install-enable => test-install-components}/install_component.sh (100%) diff --git a/.github/actions/test-install-enable/install_component.sh b/.github/actions/test-install-components/install_component.sh similarity index 100% rename from .github/actions/test-install-enable/install_component.sh rename to .github/actions/test-install-components/install_component.sh diff --git a/.github/workflows/test-install-deb.yml b/.github/workflows/test-install-deb.yml index 3ba17620f2..bfffce639d 100644 --- a/.github/workflows/test-install-deb.yml +++ b/.github/workflows/test-install-deb.yml @@ -91,4 +91,4 @@ jobs: - name: Launch docker if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.deb_images_amd64 == 'true' && matrix.ARCHITECTURE == 'amd64') - run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.arch }}/${{ matrix.distro_name }} bash /tests/install_component.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-components/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.arch }}/${{ matrix.distro_name }} bash /tests/install_component.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file diff --git a/.github/workflows/test-install-rpm.yml b/.github/workflows/test-install-rpm.yml index 2c8fbb2878..03bdf545f0 100644 --- a/.github/workflows/test-install-rpm.yml +++ b/.github/workflows/test-install-rpm.yml @@ -100,4 +100,4 @@ jobs: - name: Launch docker if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.rpm_images_x86_64 == 'true' && matrix.ARCHITECTURE == 'x86_64') - run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-enable/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.system.NAME }} bash /tests/install_component.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file + run: sudo docker run -v $GITHUB_WORKSPACE/.github/actions/test-install-components/:/tests -v $GITHUB_WORKSPACE/packages/:/packages ${{ matrix.system.NAME }} bash /tests/install_component.sh $PACKAGE_NAME ${{ matrix.type }} \ No newline at end of file From 5ad28944b8a19d19eaa1b41881911c3ce59d4c9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 9 Feb 2023 09:23:36 +0100 Subject: [PATCH 306/316] Change name of installation test github action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/test-install-deb.yml | 4 ++-- .github/workflows/test-install-rpm.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-install-deb.yml b/.github/workflows/test-install-deb.yml index bfffce639d..7396c1b043 100644 --- a/.github/workflows/test-install-deb.yml +++ b/.github/workflows/test-install-deb.yml @@ -1,4 +1,4 @@ -name: Test install and enable Wazuh agent and manager - DEB +name: Test install Wazuh agent and manager - DEB on: pull_request: paths: @@ -30,7 +30,7 @@ jobs: sha: ${{ github.event.pull_request.head.sha || github.sha }} wait-interval: 60 - Test-install-and-enable-deb-systems: + Test-install-deb-systems: needs: Wait-for-package-building runs-on: ubuntu-latest strategy: diff --git a/.github/workflows/test-install-rpm.yml b/.github/workflows/test-install-rpm.yml index 03bdf545f0..a44498a53a 100644 --- a/.github/workflows/test-install-rpm.yml +++ b/.github/workflows/test-install-rpm.yml @@ -1,4 +1,4 @@ -name: Test install and enable Wazuh agent and manager - RPM +name: Test install Wazuh agent and manager - RPM on: pull_request: paths: @@ -29,7 +29,7 @@ jobs: sha: ${{ github.event.pull_request.head.sha || github.sha }} wait-interval: 60 - Test-install-and-enable-rpm-systems: + Test-install-rpm-systems: needs: Wait-for-package-building runs-on: ubuntu-latest strategy: From 39deaafc7941e1ba88e0bd3aa11393c846006857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 9 Feb 2023 13:09:27 +0100 Subject: [PATCH 307/316] Add the same changes to debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- debs/SPECS/wazuh-agent/debian/postinst | 4 ++++ debs/SPECS/wazuh-manager/debian/postinst | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/debs/SPECS/wazuh-agent/debian/postinst b/debs/SPECS/wazuh-agent/debian/postinst index d7b5538e9c..e755febd75 100644 --- a/debs/SPECS/wazuh-agent/debian/postinst +++ b/debs/SPECS/wazuh-agent/debian/postinst @@ -19,6 +19,10 @@ case "$1" in OSMYSHELL="/sbin/nologin" + if [[ -d /run/systemd/system ]]; then + rm -f %{_initrddir}/wazuh-agent + fi + if [ ! -f ${OSMYSHELL} ]; then if [ -f "/bin/false" ]; then OSMYSHELL="/bin/false" diff --git a/debs/SPECS/wazuh-manager/debian/postinst b/debs/SPECS/wazuh-manager/debian/postinst index c5c84fc29e..dd4d507de8 100644 --- a/debs/SPECS/wazuh-manager/debian/postinst +++ b/debs/SPECS/wazuh-manager/debian/postinst @@ -16,6 +16,10 @@ case "$1" in SCRIPTS_DIR="${WAZUH_GLOBAL_TMP_DIR}/manager_installation_scripts" SCA_BASE_DIR="${SCRIPTS_DIR}/sca" + if [[ -d /run/systemd/system ]]; then + rm -f %{_initrddir}/wazuh-agent + fi + if [ ! -f ${OSMYSHELL} ]; then if [ -f "/bin/false" ]; then OSMYSHELL="/bin/false" From 2b1523ad2a40b8c68016d360148e41efcf879ded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 9 Feb 2023 13:37:16 +0100 Subject: [PATCH 308/316] Change deb github actions to detect changes inside debs/SPECS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 2 +- .github/workflows/test-install-deb.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index a4f7277f80..1816c5832a 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -2,7 +2,7 @@ name: Build Wazuh Packages - DEB - amd64 and i386 on: pull_request: paths: - - 'debs/SPECS/*' + - 'debs/SPECS/**' - 'debs/generate_debian_package.sh' workflow_dispatch: workflow_call: diff --git a/.github/workflows/test-install-deb.yml b/.github/workflows/test-install-deb.yml index 7396c1b043..bd1fadc7fa 100644 --- a/.github/workflows/test-install-deb.yml +++ b/.github/workflows/test-install-deb.yml @@ -2,7 +2,7 @@ name: Test install Wazuh agent and manager - DEB on: pull_request: paths: - - 'debs/SPECS/*' + - 'debs/SPECS/**' - 'debs/generate_debian_package.sh' workflow_dispatch: workflow_call: From b225ede0464dc58d3b65118bf90df6013b469c86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 9 Feb 2023 14:13:09 +0100 Subject: [PATCH 309/316] Change Upload docker images GitHub Actions so they are called when a pull request is merged MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-deb-images.yml | 14 +++++--------- .github/workflows/upload-rpm-images.yml | 14 +++++--------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index a216abd904..be855d3998 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -4,14 +4,10 @@ on: paths: - 'debs/Debian/**' - 'debs/build.sh' - push: - branches: - - master - - 4.5 - - 4.4 - paths: - - 'debs/Debian/*' - - 'debs/build.sh' + types: + - opened + - synchronize + - merged workflow_dispatch: jobs: @@ -49,7 +45,7 @@ jobs: - name: Set tag as version run: - if [ "${{ github.event_name }}" == "pull_request" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi + if [ "${{ github.event.pull_request.merged }}" == "false" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} with tag ${{ env.TAG }} to Github Container Registry if: ( steps.changes.outputs.i386 == 'true' && matrix.CONTAINER_NAME == 'deb_builder_i386' ) || ( steps.changes.outputs.amd64 == 'true' && matrix.CONTAINER_NAME == 'deb_builder_amd64' ) diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index 0a340447f9..25d205aa0c 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -4,14 +4,10 @@ on: paths: - 'rpms/CentOS/**' - 'rpms/build.sh' - push: - branches: - - master - - 4.5 - - 4.4 - paths: - - 'rpms/CentOS/*' - - 'rpms/build.sh' + types: + - opened + - synchronize + - merged workflow_dispatch: jobs: @@ -49,7 +45,7 @@ jobs: - name: Set tag as version run: - if [ "${{ github.event_name }}" == "pull_request" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi + if [ "${{ github.event.pull_request.merged }}" == "false" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} with tag ${{ env.TAG }} to Github Container Registry if: ( steps.changes.outputs.i386 == 'true' && matrix.CONTAINER_NAME == 'rpm_builder_i386' ) || ( steps.changes.outputs.amd64 == 'true' && matrix.CONTAINER_NAME == 'rpm_builder_x86' ) From cb59438eb9903d435f26661c568cedcbcd9e4834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 9 Feb 2023 14:19:35 +0100 Subject: [PATCH 310/316] Force run of the GitHub Action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- debs/SPECS/wazuh-agent/debian/postinst | 2 +- rpms/SPECS/wazuh-agent.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debs/SPECS/wazuh-agent/debian/postinst b/debs/SPECS/wazuh-agent/debian/postinst index d7b5538e9c..805b53cc33 100644 --- a/debs/SPECS/wazuh-agent/debian/postinst +++ b/debs/SPECS/wazuh-agent/debian/postinst @@ -205,4 +205,4 @@ case "$1" in esac -exit 0 \ No newline at end of file +exit 0 \ No newline at end of file diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index a6f44c6e8d..1676de6e34 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -814,3 +814,4 @@ rm -fr %{buildroot} - Fixed daemon list for service reloading at wazuh-control. - Fixed socket waiting issue on Windows agents. - Fixed PCI_DSS definitions grouping issue at Rootcheck controls. + \ No newline at end of file From 2bcaf51c6ec0b10be663864cf7a97b34fac43a46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 9 Feb 2023 16:48:10 +0100 Subject: [PATCH 311/316] Only build packages for necessary architectures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/build-deb-packages.yml | 3 +++ .github/workflows/build-rpm-packages.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index a4f7277f80..dbee70212f 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -48,6 +48,7 @@ jobs: - 'debs/generate_debian_package.sh' - name: Set tag and container name + if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.deb_images_amd64 == 'true' && matrix.ARCHITECTURE == 'amd64') run: | MAJOR=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION) if [ "${{ steps.changes.outputs.deb_images }}" == "true" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$MAJOR" >> $GITHUB_ENV ; fi @@ -55,6 +56,7 @@ jobs: echo "CONTAINER_NAME=deb_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV - name: Download docker image for package building + if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.deb_images_amd64 == 'true' && matrix.ARCHITECTURE == 'amd64') run: | bash $GITHUB_WORKSPACE/.github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ env.TAG }} @@ -67,6 +69,7 @@ jobs: echo "PACKAGE_NAME=$(ls ./output | grep .deb | head -n 1)" >> $GITHUB_ENV - name: Upload Wazuh ${{ matrix.TYPE }} ${{ matrix.ARCHITECTURE }} package as artifact + if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.deb_images_amd64 == 'true' && matrix.ARCHITECTURE == 'amd64') uses: actions/upload-artifact@v2 with: name: ${{ env.PACKAGE_NAME }} diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index b40536fc4f..ceca955345 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -49,6 +49,7 @@ jobs: - 'rpms/generate_rpm_package.sh' - name: Set tag and container name + if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.rpm_images_x86_64 == 'true' && matrix.ARCHITECTURE == 'x86_64') run: | MAJOR=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION) if [ "${{ steps.changes.outputs.rpm_images }}" == "true" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$MAJOR" >> $GITHUB_ENV ; fi @@ -56,6 +57,7 @@ jobs: if [ "${{ matrix.ARCHITECTURE }}" == "x86_64" ]; then echo "CONTAINER_NAME=rpm_builder_x86" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=rpm_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; fi - name: Download docker image for package building + if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.rpm_images_x86_64 == 'true' && matrix.ARCHITECTURE == 'x86_64') run: | bash $GITHUB_WORKSPACE/.github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} $CONTAINER_NAME ${{ env.TAG }} @@ -68,6 +70,7 @@ jobs: echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV - name: Upload Wazuh ${{ matrix.TYPE }} ${{ matrix.ARCHITECTURE }} package as artifact + if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.rpm_images_x86_64 == 'true' && matrix.ARCHITECTURE == 'x86_64') uses: actions/upload-artifact@v2 with: name: ${{ env.PACKAGE_NAME }} From 2e152871c12bfa50fc24d46d1e2ec614fbfc4a33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 9 Feb 2023 16:48:27 +0100 Subject: [PATCH 312/316] Create and upload images when PR is merged MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/upload-deb-images.yml | 4 ++-- .github/workflows/upload-rpm-images.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index be855d3998..a0da5b8eb7 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -7,7 +7,7 @@ on: types: - opened - synchronize - - merged + - closed workflow_dispatch: jobs: @@ -48,7 +48,7 @@ jobs: if [ "${{ github.event.pull_request.merged }}" == "false" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} with tag ${{ env.TAG }} to Github Container Registry - if: ( steps.changes.outputs.i386 == 'true' && matrix.CONTAINER_NAME == 'deb_builder_i386' ) || ( steps.changes.outputs.amd64 == 'true' && matrix.CONTAINER_NAME == 'deb_builder_amd64' ) + if: ( steps.changes.outputs.i386 == 'true' && matrix.image.CONTAINER_NAME == 'deb_builder_i386' ) || ( steps.changes.outputs.amd64 == 'true' && matrix.image.CONTAINER_NAME == 'deb_builder_amd64' ) run: bash $GITHUB_WORKSPACE/.github/actions/ghcr-pull-and-push/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} diff --git a/.github/workflows/upload-rpm-images.yml b/.github/workflows/upload-rpm-images.yml index 25d205aa0c..c2392127da 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -7,7 +7,7 @@ on: types: - opened - synchronize - - merged + - closed workflow_dispatch: jobs: @@ -48,7 +48,7 @@ jobs: if [ "${{ github.event.pull_request.merged }}" == "false" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi - name: Build and push image ${{ matrix.image.CONTAINER_NAME }} with tag ${{ env.TAG }} to Github Container Registry - if: ( steps.changes.outputs.i386 == 'true' && matrix.CONTAINER_NAME == 'rpm_builder_i386' ) || ( steps.changes.outputs.amd64 == 'true' && matrix.CONTAINER_NAME == 'rpm_builder_x86' ) + if: ( steps.changes.outputs.i386 == 'true' && matrix.image.CONTAINER_NAME == 'rpm_builder_i386' ) || ( steps.changes.outputs.x86_64 == 'true' && matrix.image.CONTAINER_NAME == 'rpm_builder_x86' ) run: bash $GITHUB_WORKSPACE/.github/actions/ghcr-pull-and-push/build_and_push_image_to_ghcr.sh ${{ secrets.GITHUB_TOKEN }} ${{ github.actor}} ${{matrix.image.CONTAINER_NAME}} ${{ matrix.image.DOCKERFILE_PATH }} ${{ env.TAG }} From ed102bf5547013ea0fd7f3017b51bc513d246000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 9 Feb 2023 16:50:22 +0100 Subject: [PATCH 313/316] Force a run of the Upload Images GitHub Action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- debs/Debian/i386/Dockerfile | 1 + rpms/CentOS/6/i386/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/debs/Debian/i386/Dockerfile b/debs/Debian/i386/Dockerfile index c43803f4bf..d822f57faf 100644 --- a/debs/Debian/i386/Dockerfile +++ b/debs/Debian/i386/Dockerfile @@ -42,3 +42,4 @@ RUN chmod +x /usr/local/bin/build_package # Set the entrypoint ENTRYPOINT ["/usr/local/bin/build_package"] + \ No newline at end of file diff --git a/rpms/CentOS/6/i386/Dockerfile b/rpms/CentOS/6/i386/Dockerfile index 04cdb78fa5..9b0bb9f50a 100644 --- a/rpms/CentOS/6/i386/Dockerfile +++ b/rpms/CentOS/6/i386/Dockerfile @@ -64,3 +64,4 @@ RUN chmod +x /usr/local/bin/build_package # Set the entrypoint ENTRYPOINT ["/usr/local/bin/build_package"] + \ No newline at end of file From dca0596b1599781a0b485a20a7849135186329db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 9 Feb 2023 16:53:59 +0100 Subject: [PATCH 314/316] Modify necessary files to force the run of the action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- debs/Debian/i386/Dockerfile | 1 - debs/SPECS/wazuh-agent/debian/postinst | 2 +- debs/build.sh | 1 + rpms/CentOS/6/i386/Dockerfile | 1 - rpms/SPECS/wazuh-agent.spec | 1 - rpms/build.sh | 1 + 6 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debs/Debian/i386/Dockerfile b/debs/Debian/i386/Dockerfile index d822f57faf..c43803f4bf 100644 --- a/debs/Debian/i386/Dockerfile +++ b/debs/Debian/i386/Dockerfile @@ -42,4 +42,3 @@ RUN chmod +x /usr/local/bin/build_package # Set the entrypoint ENTRYPOINT ["/usr/local/bin/build_package"] - \ No newline at end of file diff --git a/debs/SPECS/wazuh-agent/debian/postinst b/debs/SPECS/wazuh-agent/debian/postinst index 805b53cc33..d7b5538e9c 100644 --- a/debs/SPECS/wazuh-agent/debian/postinst +++ b/debs/SPECS/wazuh-agent/debian/postinst @@ -205,4 +205,4 @@ case "$1" in esac -exit 0 \ No newline at end of file +exit 0 \ No newline at end of file diff --git a/debs/build.sh b/debs/build.sh index 4291313e50..7a9090d9a8 100755 --- a/debs/build.sh +++ b/debs/build.sh @@ -125,3 +125,4 @@ if [[ "${checksum}" == "yes" ]]; then cd ${pkg_path} && sha512sum ${deb_file} > /var/local/checksum/${deb_file}.sha512 fi mv ${pkg_path}/${deb_file} /var/local/wazuh + \ No newline at end of file diff --git a/rpms/CentOS/6/i386/Dockerfile b/rpms/CentOS/6/i386/Dockerfile index 9b0bb9f50a..04cdb78fa5 100644 --- a/rpms/CentOS/6/i386/Dockerfile +++ b/rpms/CentOS/6/i386/Dockerfile @@ -64,4 +64,3 @@ RUN chmod +x /usr/local/bin/build_package # Set the entrypoint ENTRYPOINT ["/usr/local/bin/build_package"] - \ No newline at end of file diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 1676de6e34..a6f44c6e8d 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -814,4 +814,3 @@ rm -fr %{buildroot} - Fixed daemon list for service reloading at wazuh-control. - Fixed socket waiting issue on Windows agents. - Fixed PCI_DSS definitions grouping issue at Rootcheck controls. - \ No newline at end of file diff --git a/rpms/build.sh b/rpms/build.sh index b6006f30af..036d941e0f 100755 --- a/rpms/build.sh +++ b/rpms/build.sh @@ -129,3 +129,4 @@ if [[ "${src}" == "yes" ]]; then fi find ${extract_path} -maxdepth 3 -type f -name "${file_name}*" -exec mv {} /var/local/wazuh \; + \ No newline at end of file From 87852988fa24bbd1933b176c9255cff64131a3bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 9 Feb 2023 18:24:28 +0100 Subject: [PATCH 315/316] Remove changes in debs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- debs/SPECS/wazuh-agent/debian/postinst | 4 ---- debs/SPECS/wazuh-manager/debian/postinst | 4 ---- 2 files changed, 8 deletions(-) diff --git a/debs/SPECS/wazuh-agent/debian/postinst b/debs/SPECS/wazuh-agent/debian/postinst index e755febd75..d7b5538e9c 100644 --- a/debs/SPECS/wazuh-agent/debian/postinst +++ b/debs/SPECS/wazuh-agent/debian/postinst @@ -19,10 +19,6 @@ case "$1" in OSMYSHELL="/sbin/nologin" - if [[ -d /run/systemd/system ]]; then - rm -f %{_initrddir}/wazuh-agent - fi - if [ ! -f ${OSMYSHELL} ]; then if [ -f "/bin/false" ]; then OSMYSHELL="/bin/false" diff --git a/debs/SPECS/wazuh-manager/debian/postinst b/debs/SPECS/wazuh-manager/debian/postinst index dd4d507de8..c5c84fc29e 100644 --- a/debs/SPECS/wazuh-manager/debian/postinst +++ b/debs/SPECS/wazuh-manager/debian/postinst @@ -16,10 +16,6 @@ case "$1" in SCRIPTS_DIR="${WAZUH_GLOBAL_TMP_DIR}/manager_installation_scripts" SCA_BASE_DIR="${SCRIPTS_DIR}/sca" - if [[ -d /run/systemd/system ]]; then - rm -f %{_initrddir}/wazuh-agent - fi - if [ ! -f ${OSMYSHELL} ]; then if [ -f "/bin/false" ]; then OSMYSHELL="/bin/false" From da6d7ff2b80a405d43bf0d5989ceae2b16b512e6 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Tue, 14 Feb 2023 10:54:37 +0100 Subject: [PATCH 316/316] Use common curl function for upgrade --- unattended_installer/install_functions/checks.sh | 14 +++++++------- unattended_installer/install_functions/upgrade.sh | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index 20f0684cd8..dc46b386a4 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -352,12 +352,12 @@ function checks_upgrade() { if [ -n ${indexer_installed} ] installCommon_getPass "admin" - if curl -s -u admin:"${u_pass}" -k -XGET "https://127.0.0.1:9200/_cluster/health?pretty" | grep -q "red"; then + if common_curl -s -u admin:"${u_pass}" -k -XGET "https://127.0.0.1:9200/_cluster/health?pretty" | grep -q "red"; then common_logger -e "Cluster health is in red state. Please, check it before upgrading." exit 1 fi - if curl -s -u admin:"${u_pass}" -k -XGET "https://127.0.0.1:9200/_cluster/health?pretty" | grep -q "yellow" && []; then + if common_curl -s -u admin:"${u_pass}" -k -XGET "https://127.0.0.1:9200/_cluster/health?pretty" | grep -q "yellow" && []; then if [ -z "${force}" ]; then common_logger -e "Cluster health is in yellow state. If you want to continue with the upgrade, please, run the script with the option -f|--force." exit 1 @@ -366,12 +366,12 @@ function checks_upgrade() { fi fi - if curl -s -u admin:"${u_pass}" -k -XGET "https://127.0.0.1:9200/_cat/indices?pretty" | grep -q "red"; then + if common_curl -s -u admin:"${u_pass}" -k -XGET "https://127.0.0.1:9200/_cat/indices?pretty" | grep -q "red"; then common_logger -e "Some indices in the Wazuh indexer cluster are in red state. Please, check it before upgrading." exit 1 fi - if curl -s -u admin:"${u_pass}" -k -XGET "https://127.0.0.1:9200/_cat/indices?pretty" | grep -q "yellow" && []; then + if common_curl -s -u admin:"${u_pass}" -k -XGET "https://127.0.0.1:9200/_cat/indices?pretty" | grep -q "yellow" && []; then if [ -z "${force}" ]; then common_logger -e "Some indices in the Wazuh indexer cluster are in yellow state. If you want to continue with the upgrade, please, run the script with the option -f|--force." exit 1 @@ -386,13 +386,13 @@ function checks_upgrade() { if [ -n ${wazuh_installed} ] installCommon_getAPIPass "wazuh" - if ! curl -s -k -X GET -H "Authorization: Bearer $TOKEN_API" -H "Content-Type: application/json" "https://localhost:55000/?pretty=true" --output /dev/null + if ! common_curl -s -k -X GET -H "Authorization: Bearer $TOKEN_API" -H "Content-Type: application/json" "https://localhost:55000/?pretty=true" --output /dev/null common_logger -e "Wazuh API is not working properly. Please, check it before upgrading." exit 1 fi if /var/ossec/bin/cluster_control -l ; then - if ! curl -s -k -X GET -H "Authorization: Bearer $TOKEN_API" -H "Content-Type: application/json" "https://localhost:55000/cluster/healthcheck?pretty=true" | grep "All selected nodes healthcheck information was returned" ; then + if ! common_curl -s -k -X GET -H "Authorization: Bearer $TOKEN_API" -H "Content-Type: application/json" "https://localhost:55000/cluster/healthcheck?pretty=true" | grep "All selected nodes healthcheck information was returned" ; then common_logger -e "Some nodes in the Wazuh manager cluster are not working properly. Please, check it before upgrading." exit 1 fi @@ -411,7 +411,7 @@ function checks_upgrade() { ## Check if Wazuh dashboard is working properly if [ -n ${dashboard_installed} ]; then - if ![ "$(curl -XGET https://localhost/status -uadmin:"${u_pass}" -k -w %"{http_code}" -s -o /dev/null)" -ne "200" ]; then + if ![ "$(common_curl -XGET https://localhost/status -uadmin:"${u_pass}" -k -w %"{http_code}" -s -o /dev/null)" -ne "200" ]; then common_logger -e "Wazuh dashboard is not responding properly. Please, check it before upgrading." exit 1 fi diff --git a/unattended_installer/install_functions/upgrade.sh b/unattended_installer/install_functions/upgrade.sh index 18b8725559..47b0c1e4ba 100644 --- a/unattended_installer/install_functions/upgrade.sh +++ b/unattended_installer/install_functions/upgrade.sh @@ -79,7 +79,7 @@ function upgrade_upgradeInstalled(){ if [ -n ${module_upgradable} ];then common_logger "Upgrading Filebeat module to ${filebeat_wazuh_module_version}" - eval "curl -s ${filebeat_wazuh_module} --max-time 300 | tar -xvz -C /usr/share/filebeat/module ${debug}" + eval "common_curl -s ${filebeat_wazuh_module} --max-time 300 | tar -xvz -C /usr/share/filebeat/module ${debug}" fi fi