From 3dd6aa559bc2b43886af26ab12cb144b89332f35 Mon Sep 17 00:00:00 2001 From: verdx Date: Wed, 23 Nov 2022 19:04:04 +0100 Subject: [PATCH 001/994] 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 002/994] 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 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 003/994] 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 004/994] 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 005/994] 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 006/994] 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 007/994] 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 008/994] 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 009/994] 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 010/994] 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 011/994] 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 012/994] 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 013/994] 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 014/994] 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 ac1f60ca1ea705c9f3a8e30e7ef2d5451e081e4a Mon Sep 17 00:00:00 2001 From: DFolchA Date: Fri, 18 Nov 2022 14:25:53 +0100 Subject: [PATCH 015/994] 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 016/994] 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 cf6fd202ffff0c76155e59d5adf7559858e7636a Mon Sep 17 00:00:00 2001 From: c-bordon Date: Wed, 14 Dec 2022 16:06:41 -0300 Subject: [PATCH 017/994] 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 018/994] 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 019/994] 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 020/994] 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 021/994] 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 022/994] 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 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 023/994] 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 024/994] 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 025/994] 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 026/994] 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 027/994] 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 028/994] 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 029/994] 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 030/994] 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 031/994] 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 032/994] 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 033/994] 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 034/994] 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 035/994] 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 036/994] 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 037/994] 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 038/994] 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 039/994] 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 040/994] 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 041/994] 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 042/994] 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 043/994] 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 044/994] 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 045/994] 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 046/994] 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 047/994] 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 048/994] 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 049/994] 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 050/994] 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 051/994] 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 052/994] 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 053/994] 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 054/994] 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 055/994] 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 056/994] 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 057/994] 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 058/994] 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 059/994] 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 060/994] 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 061/994] 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 062/994] 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 063/994] 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 064/994] 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 065/994] 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 066/994] 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 067/994] 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 068/994] 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 069/994] 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 070/994] 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 071/994] 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 072/994] 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 073/994] 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 074/994] 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 075/994] 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 076/994] 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 077/994] 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 078/994] 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 079/994] 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 080/994] 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 081/994] 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 082/994] 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 083/994] 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 084/994] 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 085/994] 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 086/994] 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 50d2e24fde616ee6327ee38eb905c0672b63fbce Mon Sep 17 00:00:00 2001 From: Daniel Folch Date: Fri, 20 Jan 2023 15:12:59 +0100 Subject: [PATCH 087/994] 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 088/994] 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 089/994] 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 090/994] 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 091/994] 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 092/994] 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 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 093/994] 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 094/994] 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 095/994] 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 096/994] 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 097/994] 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 098/994] 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 099/994] 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 100/994] 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 101/994] 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 102/994] 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 103/994] 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 104/994] 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 105/994] 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 106/994] 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 107/994] 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 108/994] 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 109/994] 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 110/994] 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 111/994] 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 112/994] 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 113/994] 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 114/994] 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 115/994] 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 116/994] 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 117/994] 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 118/994] 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 119/994] 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 120/994] 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 121/994] 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 122/994] 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 123/994] 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 124/994] 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 125/994] 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 126/994] 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 127/994] 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 128/994] 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 129/994] 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 130/994] 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 131/994] 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 132/994] 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 133/994] 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 134/994] 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 135/994] 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 136/994] 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 137/994] 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 138/994] 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 139/994] 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 a83e51ee31b3d71716ff19598ae250a70fe3dd4c Mon Sep 17 00:00:00 2001 From: Antonio Manuel Fresneda Rodriguez Date: Wed, 29 Dec 2021 12:29:49 +0100 Subject: [PATCH 140/994] Add libfimdb to CentOS SPECS. --- rpms/SPECS/wazuh-agent.spec | 1 + rpms/SPECS/wazuh-manager.spec | 1 + 2 files changed, 2 insertions(+) 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 From 643fa5ed47e70d07b25d19e5d25042e39fd9b089 Mon Sep 17 00:00:00 2001 From: Antonio Manuel Fresneda Rodriguez Date: Wed, 29 Dec 2021 12:42:24 +0100 Subject: [PATCH 141/994] Add libfimdb to Solaris SPECS. --- solaris/solaris11/SPECS/template_agent.json | 8 ++++++++ 1 file changed, 8 insertions(+) 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", From 2bdf721f55a4142bb648157800793908fe43fb8c Mon Sep 17 00:00:00 2001 From: Chema Martinez Date: Thu, 24 Mar 2022 17:04:00 +0100 Subject: [PATCH 142/994] Update HP-UX generate packages script to include GCC-9.4 and cmake-3.22.2 --- hp-ux/generate_wazuh_packages.sh | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/hp-ux/generate_wazuh_packages.sh b/hp-ux/generate_wazuh_packages.sh index 896808cc81..5d310ef100 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,11 @@ 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 +CXX=/home/okkam/bootstrap-gcc/gcc94_prefix/bin/g++ + build_environment() { # Resizing partitions for Site Ox boxes (used by Wazuh team) @@ -53,7 +58,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 @@ -62,9 +66,29 @@ build_environment() { /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 perl-5.10.1 /usr/local/bin/depothelper $fpt_connection -f regex /usr/local/bin/depothelper $fpt_connection -f python + cp /usr/bin/perl /tmp/perl + cp /usr/local/bin/perl5.10.1 /usr/bin/perl + + # Install GCC 9.4 + mkdir ${build_tools_path} + cd ${build_tools_path} + mkdir bootstrap-gcc + cd ${build_tools_path}/bootstrap-gcc + curl -k -SO https://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 https://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() { @@ -172,6 +196,8 @@ clean() { userdel wazuh groupdel wazuh + rm -rf ${build_tools_path} + exit ${exit_code} } From c7b82fbe9f6b36392b15267284c766cfaa5e2a6d Mon Sep 17 00:00:00 2001 From: Chema Martinez Date: Tue, 3 May 2022 18:32:41 +0200 Subject: [PATCH 143/994] Include GCC libs to HPUX agent package --- hp-ux/generate_wazuh_packages.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hp-ux/generate_wazuh_packages.sh b/hp-ux/generate_wazuh_packages.sh index 5d310ef100..d4c8454e4f 100755 --- a/hp-ux/generate_wazuh_packages.sh +++ b/hp-ux/generate_wazuh_packages.sh @@ -141,6 +141,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 } From f1253f5f08f38cadc6770da22e8c92beca9893a2 Mon Sep 17 00:00:00 2001 From: Jotacarma Date: Tue, 15 Nov 2022 12:57:38 +0100 Subject: [PATCH 144/994] Added link to use gcc 9.4 after installing --- 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 ++- 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 ++- wpk/linux/x86_64/Dockerfile | 3 ++- 13 files changed, 26 insertions(+), 13 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/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/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 0c4b0cce3c0a0dd440ed4703c538455ec42a78f5 Mon Sep 17 00:00:00 2001 From: Jotacarma Date: Thu, 22 Dec 2022 12:41:31 +0100 Subject: [PATCH 145/994] Remove perl version while provisioning environment --- hp-ux/generate_wazuh_packages.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hp-ux/generate_wazuh_packages.sh b/hp-ux/generate_wazuh_packages.sh index d4c8454e4f..0c4c55bd21 100755 --- a/hp-ux/generate_wazuh_packages.sh +++ b/hp-ux/generate_wazuh_packages.sh @@ -66,11 +66,9 @@ build_environment() { /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-5.10.1 + /usr/local/bin/depothelper $fpt_connection -f perl /usr/local/bin/depothelper $fpt_connection -f regex /usr/local/bin/depothelper $fpt_connection -f python - cp /usr/bin/perl /tmp/perl - cp /usr/local/bin/perl5.10.1 /usr/bin/perl # Install GCC 9.4 mkdir ${build_tools_path} From 9a52db685396ecf27ed05a904aeae5fb2bb0eb03 Mon Sep 17 00:00:00 2001 From: Jotacarma Date: Mon, 9 Jan 2023 13:00:42 +0100 Subject: [PATCH 146/994] Change to http protocol because can be problems in HP-UX --- hp-ux/generate_wazuh_packages.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hp-ux/generate_wazuh_packages.sh b/hp-ux/generate_wazuh_packages.sh index 0c4c55bd21..7ad1faef5b 100755 --- a/hp-ux/generate_wazuh_packages.sh +++ b/hp-ux/generate_wazuh_packages.sh @@ -75,7 +75,7 @@ build_environment() { cd ${build_tools_path} mkdir bootstrap-gcc cd ${build_tools_path}/bootstrap-gcc - curl -k -SO https://packages.wazuh.com/utils/gcc/gcc_9.4_HPUX_build.tar.gz + 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 @@ -83,7 +83,7 @@ build_environment() { # Install cmake 3.22.2 cd ${build_tools_path} - curl -k -SO https://packages.wazuh.com/utils/cmake/cmake_3.22.2_HPUX_build.tar.gz + 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 From 3b8bf189c96b272709f41f3cfeaed38f283b8b36 Mon Sep 17 00:00:00 2001 From: Jotacarma Date: Thu, 12 Jan 2023 10:05:53 +0100 Subject: [PATCH 147/994] Export LD_LIBRARY_PATH to fix compilation --- hp-ux/generate_wazuh_packages.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hp-ux/generate_wazuh_packages.sh b/hp-ux/generate_wazuh_packages.sh index 7ad1faef5b..caf58ddce6 100755 --- a/hp-ux/generate_wazuh_packages.sh +++ b/hp-ux/generate_wazuh_packages.sh @@ -21,7 +21,8 @@ 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 -CXX=/home/okkam/bootstrap-gcc/gcc94_prefix/bin/g++ +export LD_LIBRARY_PATH +CXX=${build_tools_path}/bootstrap-gcc/gcc94_prefix/bin/g++ build_environment() { 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 148/994] 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 149/994] 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 150/994] 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 151/994] 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 152/994] 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 153/994] 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 154/994] 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 155/994] 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 156/994] 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 157/994] 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 158/994] 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 159/994] 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 160/994] 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 161/994] 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 162/994] 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 163/994] 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 164/994] 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 165/994] 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 166/994] 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 167/994] 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 168/994] 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 169/994] 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 170/994] 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 171/994] 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 172/994] 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 173/994] 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 174/994] 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 175/994] 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 176/994] 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 177/994] 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 178/994] 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 179/994] 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 180/994] 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 181/994] 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 182/994] 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 183/994] 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 184/994] 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 185/994] 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 186/994] 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 187/994] 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 188/994] 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 189/994] 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 190/994] 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 191/994] 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 192/994] 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 193/994] 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 194/994] 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 195/994] 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 196/994] 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 197/994] 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 198/994] 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 199/994] 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 200/994] 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 201/994] 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 202/994] 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 203/994] 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 204/994] 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 205/994] 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 206/994] 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 207/994] 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 208/994] 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 209/994] 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 210/994] 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 211/994] 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 212/994] 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 213/994] 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 214/994] 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 215/994] 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 216/994] 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 217/994] 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 218/994] 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 219/994] 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 220/994] 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 221/994] 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 222/994] 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 223/994] 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 224/994] 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 225/994] 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 226/994] 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 227/994] 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 228/994] 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 229/994] 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 230/994] 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 231/994] 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 232/994] 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 233/994] 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 234/994] 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 235/994] 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 236/994] 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 237/994] 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 238/994] 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 fb54fd45659802c176c22646a1e62bc540923a0e Mon Sep 17 00:00:00 2001 From: DFolchA Date: Wed, 1 Feb 2023 11:22:53 +0100 Subject: [PATCH 239/994] Bump master to 4.6.0 --- CHANGELOG.md | 4 ++++ VERSION | 2 +- aix/SPECS/wazuh-agent-aix.spec | 4 +++- debs/SPECS/wazuh-agent/debian/changelog | 6 ++++++ macos/specs/wazuh-agent.pkgproj | 4 ++-- rpms/SPECS/wazuh-agent.spec | 4 +++- rpms/SPECS/wazuh-manager.spec | 4 +++- tests/unattended/unit/suites/test-common.sh | 4 ++-- tests/unattended/unit/suites/test-dashboard.sh | 2 +- unattended_installer/install_functions/installVariables.sh | 4 ++-- 10 files changed, 27 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 225322024d..6d7089a80b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Change Log All notable changes to this project will be documented in this file. +## [v4.6.0] + +- https://github.com/wazuh/wazuh-packages/releases/tag/v4.6.0 + ## [v4.5.0] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.0 diff --git a/VERSION b/VERSION index a84947d6ff..6016e8addc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.5.0 +4.6.0 diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index db705a698e..73b1dadabb 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.5.0 +Version: 4.6.0 Release: 1 License: GPL URL: https://www.wazuh.com/ @@ -290,6 +290,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog +* Mon Sep 01 2023 support - 4.6.0 +- More info: https://documentation.wazuh.com/current/release-notes/ * Fri May 05 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/ * Wed Jan 18 2023 support - 4.4.0 diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 8b53b603ab..996cddbf0b 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -1,3 +1,9 @@ +wazuh-agent (4.6.0-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/ + + -- Wazuh, Inc Mon, 03 Sep 2023 11:56:07 +0000 + wazuh-agent (4.5.0-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 72da7fbd31..eae1dac3b4 100644 --- a/macos/specs/wazuh-agent.pkgproj +++ b/macos/specs/wazuh-agent.pkgproj @@ -812,7 +812,7 @@ USE_HFS+_COMPRESSION VERSION - 4.5.0-1 + 4.6.0-1 TYPE 0 @@ -1239,7 +1239,7 @@ NAME - wazuh-agent-4.5.0-1 + wazuh-agent-4.6.0-1 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 6a640ef165..09e5e4de92 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.5.0 +Version: 4.6.0 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -622,6 +622,8 @@ rm -fr %{buildroot} %changelog +* Mon Sep 01 2023 support - 4.6.0 +- More info: https://documentation.wazuh.com/current/release-notes/ * Fri May 05 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/ * Wed Jan 18 2023 support - 4.4.0 diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 544136e75c..7a44c17973 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.5.0 +Version: 4.6.0 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -843,6 +843,8 @@ rm -fr %{buildroot} %changelog +* Mon Sep 01 2023 support - 4.6.0 +- More info: https://documentation.wazuh.com/current/release-notes/ * Fri May 05 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/ * Wed Jan 18 2023 support - 4.4.0 diff --git a/tests/unattended/unit/suites/test-common.sh b/tests/unattended/unit/suites/test-common.sh index a25a62a53d..0aa1a88b24 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.5.0-1 @wazuh + @mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.6.0-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-05-common_checkInstalled-all-installed-yum-assert() { - @echo "wazuh-manager.x86_64 4.5.0-1 @wazuh" + @echo "wazuh-manager.x86_64 4.6.0-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 37e99c0646..e6a15058a1 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.5.0" + wazuh_version="4.6.0" 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 07586ef064..8517c77115 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -7,8 +7,8 @@ # Foundation. ## Package vars -readonly wazuh_major="4.5" -readonly wazuh_version="4.5.0" +readonly wazuh_major="4.6" +readonly wazuh_version="4.6.0" readonly filebeat_version="7.10.2" readonly wazuh_install_vesion="0.1" 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 240/994] 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 241/994] 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 242/994] 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 243/994] 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 244/994] 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 245/994] 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 246/994] 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 247/994] 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 248/994] 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 249/994] 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 250/994] 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 251/994] 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 252/994] 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 253/994] 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 254/994] 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 255/994] 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 256/994] 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 257/994] 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 258/994] 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 259/994] 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 260/994] 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 261/994] 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 80d7281b1b6824a121982418b4e371eecbceaf45 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Thu, 2 Feb 2023 10:23:21 +0100 Subject: [PATCH 262/994] Fix dates in changelogs --- aix/SPECS/wazuh-agent-aix.spec | 2 +- debs/SPECS/wazuh-agent/debian/changelog | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 6 ++++++ rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 73b1dadabb..680fec33ed 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 -* Mon Sep 01 2023 support - 4.6.0 +* Mon Sep 04 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/ * Fri May 05 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/ diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 996cddbf0b..913d095327 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,7 +2,7 @@ wazuh-agent (4.6.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ - -- Wazuh, Inc Mon, 03 Sep 2023 11:56:07 +0000 + -- Wazuh, Inc Mon, 04 Sep 2023 11:56:07 +0000 wazuh-agent (4.5.0-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index 56c1498fb8..de3c009188 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -1,3 +1,9 @@ +wazuh-manager (4.6.0-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/ + + -- Wazuh, Inc Mon, 04 Sep 2023 11:56:07 +0000 + wazuh-manager (4.5.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 09e5e4de92..3e35c3ce6b 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -622,7 +622,7 @@ rm -fr %{buildroot} %changelog -* Mon Sep 01 2023 support - 4.6.0 +* Mon Sep 04 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/ * Fri May 05 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/ diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 7a44c17973..6ad54aa909 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -843,7 +843,7 @@ rm -fr %{buildroot} %changelog -* Mon Sep 01 2023 support - 4.6.0 +* Mon Sep 04 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/ * Fri May 05 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/ 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 263/994] 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 264/994] 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 265/994] 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 266/994] 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 267/994] 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 268/994] 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 269/994] 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 270/994] 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 271/994] 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 272/994] 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 273/994] 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 274/994] 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 275/994] 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 276/994] 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 277/994] 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 278/994] 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 279/994] 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 280/994] 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 281/994] 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 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 282/994] 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 283/994] 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 284/994] 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 285/994] 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 286/994] 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 287/994] 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 288/994] 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 289/994] 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 290/994] 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 291/994] 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 292/994] 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 293/994] 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 294/994] 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 295/994] 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 296/994] 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 297/994] 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 298/994] 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 299/994] 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 300/994] 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 301/994] 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 a402a1b297cead95a0fdb0e89bdb135f38301093 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 9 Feb 2023 13:56:11 +0100 Subject: [PATCH 302/994] Added installCommon_installCheckDependencies function --- .../install_functions/installCommon.sh | 57 ++++++++++++++++++- .../install_functions/installMain.sh | 4 +- 2 files changed, 58 insertions(+), 3 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 198f27fb88..ba8066425a 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -270,10 +270,63 @@ function installCommon_getPass() { done } +function installCommon_installCheckDependencies() { + + if [ "${sys_type}" == "yum" ]; then + dependencies=( systemd grep tar coreutils sed procps gawk lsof curl openssl ) + not_installed=() + for dep in "${dependencies[@]}"; do + if [ "${dep}" == "openssl" ]; 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 -E ^"${dep}";then + not_installed+=("${dep}") + fi + done + + if [ "${#not_installed[@]}" -gt 0 ]; then + common_logger "--- Dependencies ---" + for dep in "${not_installed[@]}"; do + common_logger "Installing $dep." + eval "yum install ${dep} -y ${debug}" + if [ "${PIPESTATUS[0]}" != 0 ]; then + common_logger -e "Cannot install dependency: ${dep}." + exit 1 + fi + done + fi + + elif [ "${sys_type}" == "apt-get" ]; then + eval "apt-get update -q ${debug}" + dependencies=( systemd grep tar coreutils sed procps gawk lsof curl openssl ) + not_installed=() + + for dep in "${dependencies[@]}"; do + if ! apt list --installed 2>/dev/null | grep -q -E ^"${dep}"; then + not_installed+=("${dep}") + fi + done + + if [ "${#not_installed[@]}" -gt 0 ]; then + common_logger "--- Dependencies ----" + for dep in "${not_installed[@]}"; do + common_logger "Installing $dep." + installCommon_aptInstall "${dep}" + if [ "${install_result}" != 0 ]; then + common_logger -e "Cannot install dependency: ${dep}." + exit 1 + fi + done + fi + fi + +} + function installCommon_installPrerequisites() { if [ "${sys_type}" == "yum" ]; then - dependencies=( curl libcap tar gnupg openssl lsof ) + dependencies=( libcap gnupg ) not_installed=() for dep in "${dependencies[@]}"; do if [ "${dep}" == "openssl" ]; then @@ -299,7 +352,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 lsof ) + dependencies=( apt-transport-https libcap2-bin software-properties-common gnupg ) not_installed=() for dep in "${dependencies[@]}"; do diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index 3909a73884..477a01f3c9 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -202,11 +202,13 @@ function main() { # -------------- Uninstall case ------------------------------------ + common_checkSystem + installCommon_installCheckDependencies + if [ -z "${download}" ]; then check_dist fi - common_checkSystem common_checkInstalled checks_arguments if [ -n "${uninstall}" ]; then 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 303/994] 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 304/994] 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 305/994] 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 306/994] 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 307/994] 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 308/994] 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 b891b71853192b803d583b3eb1704a4a3deabac6 Mon Sep 17 00:00:00 2001 From: Daniel Folch Date: Thu, 9 Feb 2023 18:04:58 +0100 Subject: [PATCH 309/994] Do not remove packages_files directory (#2082) --- alpine/SPECS/wazuh-agent/wazuh-agent.post-install | 2 -- 1 file changed, 2 deletions(-) diff --git a/alpine/SPECS/wazuh-agent/wazuh-agent.post-install b/alpine/SPECS/wazuh-agent/wazuh-agent.post-install index ce9615b0b7..7b581bb705 100644 --- a/alpine/SPECS/wazuh-agent/wazuh-agent.post-install +++ b/alpine/SPECS/wazuh-agent/wazuh-agent.post-install @@ -14,6 +14,4 @@ ${directory_base}/packages_files/gen_ossec.sh conf agent ${DIST_NAME} ${DIST_VER # Add default local_files to ossec.conf ${directory_base}/packages_files/add_localfiles.sh ${directory_base} >> ${directory_base}/etc/ossec.conf -rm -rf ${directory_base}/packages_files - exit 0 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 310/994] 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 23f4f5ab52b918df2920ff019518d8c392717be9 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Fri, 10 Feb 2023 11:30:15 +0100 Subject: [PATCH 311/994] Avoid installing dependencies in uninstallation --- unattended_installer/install_functions/installMain.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index 477a01f3c9..9689b7b5da 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -203,7 +203,10 @@ function main() { # -------------- Uninstall case ------------------------------------ common_checkSystem - installCommon_installCheckDependencies + + if [ -z "${uninstall}" ]; then + installCommon_installCheckDependencies + fi if [ -z "${download}" ]; then check_dist From 1349a42addd4e556b1647a32d2991a6f62d922cc Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Fri, 10 Feb 2023 13:57:24 +0100 Subject: [PATCH 312/994] Corrected names of the cert and password tools in builder.sh --- 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 14fdae8c21..36b05ff626 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -32,13 +32,13 @@ function getHelp() { echo -e " Builds the unattended installer single file wazuh-install.sh" echo -e "" echo -e " -c, --cert-tool" - echo -e " Builds the certificate creation tool cert-tool.sh" + echo -e " Builds the certificate creation tool wazuh-cert-tool.sh" echo -e "" echo -e " -d [staging], --development" echo -e " Use development repos. By default it uses pre-release. If staging is specified, it will be used" echo -e "" echo -e " -p, --password-tool" - echo -e " Builds the password creation and modification tool password-tool.sh" + echo -e " Builds the password creation and modification tool wazuh-password-tool.sh" echo -e "" echo -e " -h, --help" echo -e " Shows help." From 526c5c3e1bf5c5d5674b531d132a2dfe0e78cf40 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Fri, 10 Feb 2023 13:58:25 +0100 Subject: [PATCH 313/994] Fixed adminkey and adminpem set --- .../passwords_tool/passwordsFunctions.sh | 10 ++-------- .../passwords_tool/passwordsVariables.sh | 5 ++++- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/unattended_installer/passwords_tool/passwordsFunctions.sh b/unattended_installer/passwords_tool/passwordsFunctions.sh index ee40bfb53b..8dd011cf7c 100644 --- a/unattended_installer/passwords_tool/passwordsFunctions.sh +++ b/unattended_installer/passwords_tool/passwordsFunctions.sh @@ -365,18 +365,12 @@ function passwords_getNetworkHost() { function passwords_readAdmincerts() { - if [[ -f /etc/wazuh-indexer/certs/admin.pem ]]; then - adminpem="/etc/wazuh-indexer/certs/admin.pem" - else + if [[ ! -f "${adminpem}" ]]; then common_logger -e "No admin certificate indicated. Please run the script with the option -c ." exit 1; fi - if [[ -f /etc/wazuh-indexer/certs/admin-key.pem ]]; then - adminkey="/etc/wazuh-indexer/certs/admin-key.pem" - elif [[ -f /etc/wazuh-indexer/certs/admin.key ]]; then - adminkey="/etc/wazuh-indexer/certs/admin.key" - else + if [[ ! -f "${adminkey}" ]]; then common_logger -e "No admin certificate key indicated. Please run the script with the option -k ." exit 1; fi diff --git a/unattended_installer/passwords_tool/passwordsVariables.sh b/unattended_installer/passwords_tool/passwordsVariables.sh index b3bef21909..1548c9fc5b 100644 --- a/unattended_installer/passwords_tool/passwordsVariables.sh +++ b/unattended_installer/passwords_tool/passwordsVariables.sh @@ -5,5 +5,8 @@ # and/or modify it under the terms of the GNU General Public # License (version 2) as published by the FSF - Free Software # Foundation. + readonly logfile="/var/log/wazuh-passwords-tool.log" -debug=">> ${logfile} 2>&1" \ No newline at end of file +debug=">> ${logfile} 2>&1" +adminpem="/etc/wazuh-indexer/certs/admin.pem" +adminkey="/etc/wazuh-indexer/certs/admin-key.pem" \ No newline at end of file From cfe67026d1b7eb353fef880d30576a635966256a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 13 Feb 2023 09:48:59 +0100 Subject: [PATCH 314/994] Remove init.d service when systemd is being used 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..fd615e9c5d 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 /etc/init.d/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..7c8b994d0b 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 /etc/init.d/wazuh-agent + fi + if [ ! -f ${OSMYSHELL} ]; then if [ -f "/bin/false" ]; then OSMYSHELL="/bin/false" From 1fa36d401e5959743abdf9736d3ce3e791448d7a Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Mon, 13 Feb 2023 11:48:57 +0100 Subject: [PATCH 315/994] Added commonVariables.sh file --- unattended_installer/builder.sh | 7 +++++-- unattended_installer/cert_tool/certVariables.sh | 3 --- .../common_functions/commonVariables.sh | 14 ++++++++++++++ .../install_functions/installVariables.sh | 3 --- .../passwords_tool/passwordsVariables.sh | 2 -- 5 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 unattended_installer/common_functions/commonVariables.sh diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index 36b05ff626..044c180844 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -85,6 +85,7 @@ function buildInstaller() { echo 'readonly repository="4.x"' >> "${output_script_path}" fi echo >> "${output_script_path}" + grep -Ev '^#|^\s*$' ${resources_common}/commonVariables.sh >> "${output_script_path}" grep -Ev '^#|^\s*$' ${resources_installer}/installVariables.sh >> "${output_script_path}" echo >> "${output_script_path}" @@ -150,7 +151,8 @@ function buildPasswordsTool() { # License (version 2) as published by the FSF - Free Software # Foundation." >> "${output_script_path}" - ## Passwords tool variables + ## Common and Passwords tool variables + grep -Ev '^#|^\s*$' ${resources_common}/commonVariables.sh >> "${output_script_path}" grep -Ev '^#|^\s*$' "${resources_passwords}/passwordsVariables.sh" >> "${output_script_path}" echo >> "${output_script_path}" @@ -190,7 +192,8 @@ function buildCertsTool() { # License (version 2) as published by the FSF - Free Software # Foundation." >> "${output_script_path}" - ## Certs tool variables + ## Common and Certs tool variables + grep -Ev '^#|^\s*$' ${resources_common}/commonVariables.sh >> "${output_script_path}" grep -Ev '^#|^\s*$' "${resources_certs}/certVariables.sh" >> "${output_script_path}" echo >> "${output_script_path}" diff --git a/unattended_installer/cert_tool/certVariables.sh b/unattended_installer/cert_tool/certVariables.sh index a40717b4f3..34a715f184 100644 --- a/unattended_installer/cert_tool/certVariables.sh +++ b/unattended_installer/cert_tool/certVariables.sh @@ -6,9 +6,6 @@ # License (version 2) as published by the FSF - Free Software # Foundation. -base_path="$(dirname "$(readlink -f "$0")")" -readonly base_path -readonly config_file="${base_path}/config.yml" readonly logfile="" cert_tmp_path="/tmp/wazuh-certificates" debug=">> /dev/null 2>&1" \ No newline at end of file diff --git a/unattended_installer/common_functions/commonVariables.sh b/unattended_installer/common_functions/commonVariables.sh new file mode 100644 index 0000000000..df557d43eb --- /dev/null +++ b/unattended_installer/common_functions/commonVariables.sh @@ -0,0 +1,14 @@ +# Common variables +# 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. + +adminpem="/etc/wazuh-indexer/certs/admin.pem" +adminkey="/etc/wazuh-indexer/certs/admin-key.pem" + +base_path="$(dirname "$(readlink -f "$0")")" +readonly base_path +config_file="${base_path}/config.yml" diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index 07586ef064..d303a3519e 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -15,9 +15,6 @@ readonly wazuh_install_vesion="0.1" ## Links and paths to resources readonly resources="https://${bucket}/${wazuh_major}" readonly base_url="https://${bucket}/${repository}" -base_path="$(dirname "$(readlink -f "$0")")" -readonly base_path -config_file="${base_path}/config.yml" readonly tar_file_name="wazuh-install-files.tar" tar_file="${base_path}/${tar_file_name}" diff --git a/unattended_installer/passwords_tool/passwordsVariables.sh b/unattended_installer/passwords_tool/passwordsVariables.sh index 1548c9fc5b..201c6f6b94 100644 --- a/unattended_installer/passwords_tool/passwordsVariables.sh +++ b/unattended_installer/passwords_tool/passwordsVariables.sh @@ -8,5 +8,3 @@ readonly logfile="/var/log/wazuh-passwords-tool.log" debug=">> ${logfile} 2>&1" -adminpem="/etc/wazuh-indexer/certs/admin.pem" -adminkey="/etc/wazuh-indexer/certs/admin-key.pem" \ No newline at end of file From e9553b0732969717d490e440f5e048accc013bb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 13 Feb 2023 11:56:57 +0100 Subject: [PATCH 316/994] Fix bash condition in postinstall 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 +- debs/SPECS/wazuh-manager/debian/postinst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debs/SPECS/wazuh-agent/debian/postinst b/debs/SPECS/wazuh-agent/debian/postinst index fd615e9c5d..f415bbaf52 100644 --- a/debs/SPECS/wazuh-agent/debian/postinst +++ b/debs/SPECS/wazuh-agent/debian/postinst @@ -19,7 +19,7 @@ case "$1" in OSMYSHELL="/sbin/nologin" - if [[ -d /run/systemd/system ]]; then + if [ -d /run/systemd/system ]; then rm -f /etc/init.d/wazuh-agent fi diff --git a/debs/SPECS/wazuh-manager/debian/postinst b/debs/SPECS/wazuh-manager/debian/postinst index 7c8b994d0b..e127d68484 100644 --- a/debs/SPECS/wazuh-manager/debian/postinst +++ b/debs/SPECS/wazuh-manager/debian/postinst @@ -16,7 +16,7 @@ case "$1" in SCRIPTS_DIR="${WAZUH_GLOBAL_TMP_DIR}/manager_installation_scripts" SCA_BASE_DIR="${SCRIPTS_DIR}/sca" - if [[ -d /run/systemd/system ]]; then + if [ -d /run/systemd/system ]; then rm -f /etc/init.d/wazuh-agent fi From 72c57a91334163a9e7b7bc242d77f5a857fc31ae Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Mon, 13 Feb 2023 12:32:21 +0100 Subject: [PATCH 317/994] Reverted some variables in commonVariables.sh --- unattended_installer/cert_tool/certVariables.sh | 3 +++ unattended_installer/common_functions/commonVariables.sh | 4 ---- unattended_installer/install_functions/installVariables.sh | 3 +++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/unattended_installer/cert_tool/certVariables.sh b/unattended_installer/cert_tool/certVariables.sh index 34a715f184..a40717b4f3 100644 --- a/unattended_installer/cert_tool/certVariables.sh +++ b/unattended_installer/cert_tool/certVariables.sh @@ -6,6 +6,9 @@ # License (version 2) as published by the FSF - Free Software # Foundation. +base_path="$(dirname "$(readlink -f "$0")")" +readonly base_path +readonly config_file="${base_path}/config.yml" readonly logfile="" cert_tmp_path="/tmp/wazuh-certificates" debug=">> /dev/null 2>&1" \ No newline at end of file diff --git a/unattended_installer/common_functions/commonVariables.sh b/unattended_installer/common_functions/commonVariables.sh index df557d43eb..d43ffa892f 100644 --- a/unattended_installer/common_functions/commonVariables.sh +++ b/unattended_installer/common_functions/commonVariables.sh @@ -8,7 +8,3 @@ adminpem="/etc/wazuh-indexer/certs/admin.pem" adminkey="/etc/wazuh-indexer/certs/admin-key.pem" - -base_path="$(dirname "$(readlink -f "$0")")" -readonly base_path -config_file="${base_path}/config.yml" diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index d303a3519e..07586ef064 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -15,6 +15,9 @@ readonly wazuh_install_vesion="0.1" ## Links and paths to resources readonly resources="https://${bucket}/${wazuh_major}" readonly base_url="https://${bucket}/${repository}" +base_path="$(dirname "$(readlink -f "$0")")" +readonly base_path +config_file="${base_path}/config.yml" readonly tar_file_name="wazuh-install-files.tar" tar_file="${base_path}/${tar_file_name}" From 8ddb2d66604a1efa6db84ac90dac79c1dc9e77af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 13 Feb 2023 12:37:02 +0100 Subject: [PATCH 318/994] Add the fix for the Wazuh indexer 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-manager/debian/postinst | 2 +- stack/indexer/deb/debian/postinst | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debs/SPECS/wazuh-manager/debian/postinst b/debs/SPECS/wazuh-manager/debian/postinst index e127d68484..b4c5fb6980 100644 --- a/debs/SPECS/wazuh-manager/debian/postinst +++ b/debs/SPECS/wazuh-manager/debian/postinst @@ -17,7 +17,7 @@ case "$1" in SCA_BASE_DIR="${SCRIPTS_DIR}/sca" if [ -d /run/systemd/system ]; then - rm -f /etc/init.d/wazuh-agent + rm -f /etc/init.d/wazuh-manager fi if [ ! -f ${OSMYSHELL} ]; then diff --git a/stack/indexer/deb/debian/postinst b/stack/indexer/deb/debian/postinst index 0ce951f7bf..0972bec1d9 100644 --- a/stack/indexer/deb/debian/postinst +++ b/stack/indexer/deb/debian/postinst @@ -35,6 +35,10 @@ fi export OPENSEARCH_PATH_CONF=${OPENSEARCH_PATH_CONF:-${CONFIG_DIR}} +if [ -d /run/systemd/system ]; then + rm -f /etc/init.d/wazuh-indexer +fi + # To pick up /usr/lib/sysctl.d/wazuh-indexer.conf if command -v systemctl > /dev/null 2>&1; then systemctl restart systemd-sysctl.service > /dev/null 2>&1 || true From b6dfb5332a97d8dce5038790a356d89e2e544d4e Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Mon, 13 Feb 2023 14:08:06 +0100 Subject: [PATCH 319/994] Removed passwords_readAdmincerts function --- .../passwords_tool/passwordsFunctions.sh | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/unattended_installer/passwords_tool/passwordsFunctions.sh b/unattended_installer/passwords_tool/passwordsFunctions.sh index 8dd011cf7c..75638fb43f 100644 --- a/unattended_installer/passwords_tool/passwordsFunctions.sh +++ b/unattended_installer/passwords_tool/passwordsFunctions.sh @@ -175,9 +175,6 @@ function passwords_createBackUp() { capem=$(grep "plugins.security.ssl.transport.pemtrustedcas_filepath: " /etc/wazuh-indexer/opensearch.yml ) rcapem="plugins.security.ssl.transport.pemtrustedcas_filepath: " capem="${capem//$rcapem}" - if [[ -z "${adminpem}" ]] || [[ -z "${adminkey}" ]]; then - passwords_readAdmincerts - fi fi fi @@ -363,20 +360,6 @@ function passwords_getNetworkHost() { fi } -function passwords_readAdmincerts() { - - if [[ ! -f "${adminpem}" ]]; then - common_logger -e "No admin certificate indicated. Please run the script with the option -c ." - exit 1; - fi - - if [[ ! -f "${adminkey}" ]]; then - common_logger -e "No admin certificate key indicated. Please run the script with the option -k ." - exit 1; - fi - -} - function passwords_readFileUsers() { filecorrect=$(grep -Ev '^#|^\s*$' "${p_file}" | grep -Pzc "\A(\s*(indexer_username|api_username|indexer_password|api_password):[ \t]+[\'\"]?[\w.*+?-]+[\'\"]?)+\Z") @@ -569,9 +552,6 @@ function passwords_runSecurityAdmin() { capem=$(grep "plugins.security.ssl.transport.pemtrustedcas_filepath: " /etc/wazuh-indexer/opensearch.yml ) rcapem="plugins.security.ssl.transport.pemtrustedcas_filepath: " capem="${capem//$rcapem}" - if [[ -z "${adminpem}" ]] || [[ -z "${adminkey}" ]]; then - passwords_readAdmincerts - fi fi fi From a3604574abbfee2311760e394b353015eb53ddc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 13 Feb 2023 16:31:51 +0100 Subject: [PATCH 320/994] Don't exit on error on indexer prerm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- stack/indexer/deb/debian/prerm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/stack/indexer/deb/debian/prerm b/stack/indexer/deb/debian/prerm index 8004e9a316..863ddabea2 100644 --- a/stack/indexer/deb/debian/prerm +++ b/stack/indexer/deb/debian/prerm @@ -69,7 +69,7 @@ if [ "$STOP_REQUIRED" = "true" ]; then elif [ -x /etc/rc.d/init.d/wazuh-indexer ] ; then /etc/rc.d/init.d/wazuh-indexer stop > /dev/null 2>&1 else # Anything else - kill -15 `pgrep -f opensearch` > /dev/null 2>&1 + kill -15 `pgrep -f opensearch` > /dev/null 2>&1 || true fi echo " OK" fi @@ -87,4 +87,3 @@ if [ "$REMOVE_SERVICE" = "true" ]; then update-rc.d wazuh-indexer remove >/dev/null || true fi fi - From 11da984bcc86a9635049d7f9dc8a6ecdb0dbb96f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 14 Feb 2023 10:28:02 +0100 Subject: [PATCH 321/994] Redirect written output of commands in postrm for agent packages 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/postrm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debs/SPECS/wazuh-agent/debian/postrm b/debs/SPECS/wazuh-agent/debian/postrm index ee822e0e52..bb30d5af0a 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 wazuh ; then + if getent passwd wazuh >/dev/null 2>&1; then deluser wazuh > /dev/null 2>&1 fi - if getent group wazuh ; then + if getent group wazuh >/dev/null 2>&1; then delgroup wazuh > /dev/null 2>&1 fi rm -rf ${DIR}/* From f60dfa04387b4fd109eed128b1ee3019d07659a8 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Tue, 14 Feb 2023 13:51:49 +0100 Subject: [PATCH 322/994] Modularized the installation of dependencies --- .../install_functions/installCommon.sh | 139 +++++++----------- 1 file changed, 57 insertions(+), 82 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index ba8066425a..da2cc28205 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -98,6 +98,31 @@ function installCommon_aptInstall() { } +function installCommon_aptInstallList(){ + + dependencies=("$@") + not_installed=() + + for dep in "${dependencies[@]}"; do + if ! apt list --installed 2>/dev/null | grep -q -E ^"${dep}"; then + not_installed+=("${dep}") + fi + done + + if [ "${#not_installed[@]}" -gt 0 ]; then + common_logger "--- Dependencies ----" + for dep in "${not_installed[@]}"; do + common_logger "Installing $dep." + installCommon_aptInstall "${dep}" + if [ "${install_result}" != 0 ]; then + common_logger -e "Cannot install dependency: ${dep}." + exit 1 + fi + done + fi + +} + function installCommon_changePasswordApi() { #Change API password tool @@ -274,51 +299,12 @@ function installCommon_installCheckDependencies() { if [ "${sys_type}" == "yum" ]; then dependencies=( systemd grep tar coreutils sed procps gawk lsof curl openssl ) - not_installed=() - for dep in "${dependencies[@]}"; do - if [ "${dep}" == "openssl" ]; 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 -E ^"${dep}";then - not_installed+=("${dep}") - fi - done - - if [ "${#not_installed[@]}" -gt 0 ]; then - common_logger "--- Dependencies ---" - for dep in "${not_installed[@]}"; do - common_logger "Installing $dep." - eval "yum install ${dep} -y ${debug}" - if [ "${PIPESTATUS[0]}" != 0 ]; then - common_logger -e "Cannot install dependency: ${dep}." - exit 1 - fi - done - fi + installCommon_yumInstallList "${dependencies[@]}" elif [ "${sys_type}" == "apt-get" ]; then eval "apt-get update -q ${debug}" dependencies=( systemd grep tar coreutils sed procps gawk lsof curl openssl ) - not_installed=() - - for dep in "${dependencies[@]}"; do - if ! apt list --installed 2>/dev/null | grep -q -E ^"${dep}"; then - not_installed+=("${dep}") - fi - done - - if [ "${#not_installed[@]}" -gt 0 ]; then - common_logger "--- Dependencies ----" - for dep in "${not_installed[@]}"; do - common_logger "Installing $dep." - installCommon_aptInstall "${dep}" - if [ "${install_result}" != 0 ]; then - common_logger -e "Cannot install dependency: ${dep}." - exit 1 - fi - done - fi + installCommon_aptInstallList fi } @@ -327,51 +313,12 @@ function installCommon_installPrerequisites() { if [ "${sys_type}" == "yum" ]; then dependencies=( libcap gnupg ) - not_installed=() - for dep in "${dependencies[@]}"; do - if [ "${dep}" == "openssl" ]; 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 -E ^"${dep}";then - not_installed+=("${dep}") - fi - done - - if [ "${#not_installed[@]}" -gt 0 ]; then - common_logger "--- Dependencies ---" - for dep in "${not_installed[@]}"; do - common_logger "Installing $dep." - eval "yum install ${dep} -y ${debug}" - if [ "${PIPESTATUS[0]}" != 0 ]; then - common_logger -e "Cannot install dependency: ${dep}." - exit 1 - fi - done - fi + installCommon_yumInstallList "${dependencies[@]}" elif [ "${sys_type}" == "apt-get" ]; then eval "apt-get update -q ${debug}" dependencies=( apt-transport-https libcap2-bin software-properties-common gnupg ) - not_installed=() - - for dep in "${dependencies[@]}"; do - if ! apt list --installed 2>/dev/null | grep -q -E ^"${dep}"; then - not_installed+=("${dep}") - fi - done - - if [ "${#not_installed[@]}" -gt 0 ]; then - common_logger "--- Dependencies ----" - for dep in "${not_installed[@]}"; do - common_logger "Installing $dep." - installCommon_aptInstall "${dep}" - if [ "${install_result}" != 0 ]; then - common_logger -e "Cannot install dependency: ${dep}." - exit 1 - fi - done - fi + installCommon_aptInstallList "${dependencies[@]}" fi } @@ -670,4 +617,32 @@ function installCommon_startService() { exit 1 fi +} + +function installCommon_yumInstallList(){ + + dependencies=("$@") + not_installed=() + for dep in "${dependencies[@]}"; do + if [ "${dep}" == "openssl" ]; 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 -E ^"${dep}";then + not_installed+=("${dep}") + fi + done + + if [ "${#not_installed[@]}" -gt 0 ]; then + common_logger "--- Dependencies ---" + for dep in "${not_installed[@]}"; do + common_logger "Installing $dep." + eval "yum install ${dep} -y ${debug}" + if [ "${PIPESTATUS[0]}" != 0 ]; then + common_logger -e "Cannot install dependency: ${dep}." + exit 1 + fi + done + fi + } \ No newline at end of file From 3b4d1af93c001ef1401977df7a213e7c2f816866 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Tue, 14 Feb 2023 13:56:14 +0100 Subject: [PATCH 323/994] Forgot adding dependencies array --- unattended_installer/install_functions/installCommon.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index da2cc28205..602be5ae47 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -304,7 +304,7 @@ function installCommon_installCheckDependencies() { elif [ "${sys_type}" == "apt-get" ]; then eval "apt-get update -q ${debug}" dependencies=( systemd grep tar coreutils sed procps gawk lsof curl openssl ) - installCommon_aptInstallList + installCommon_aptInstallList "${dependencies[@]}" fi } From ff75f720e5999fef4515e7f2e984a864b630f05c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Turina?= Date: Tue, 14 Feb 2023 11:50:30 -0300 Subject: [PATCH 324/994] Remove var/db/agents directory (#2042) --- debs/SPECS/wazuh-manager/debian/postinst | 2 +- debs/SPECS/wazuh-manager/debian/preinst | 2 +- rpms/SPECS/wazuh-manager.spec | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debs/SPECS/wazuh-manager/debian/postinst b/debs/SPECS/wazuh-manager/debian/postinst index 9d334e9cea..69166b6f54 100644 --- a/debs/SPECS/wazuh-manager/debian/postinst +++ b/debs/SPECS/wazuh-manager/debian/postinst @@ -54,7 +54,7 @@ case "$1" in # Remove/relocate existing SQLite databases rm -f ${DIR}/var/db/cluster.db* || true rm -f ${DIR}/var/db/.profile.db* || true - rm -f ${DIR}/var/db/agents/* || true + rm -rf ${DIR}/var/db/agents || true if [ -f ${DIR}/var/db/global.db ]; then mv ${DIR}/var/db/global.db ${DIR}/queue/db/ diff --git a/debs/SPECS/wazuh-manager/debian/preinst b/debs/SPECS/wazuh-manager/debian/preinst index 80ee3366ac..cdd048c4af 100644 --- a/debs/SPECS/wazuh-manager/debian/preinst +++ b/debs/SPECS/wazuh-manager/debian/preinst @@ -133,7 +133,7 @@ case "$1" in fi if [ -d ${DIR}/var/db/agents ]; then - rm -f ${DIR}/var/db/agents/* + rm -rf ${DIR}/var/db/agents fi # Remove plain-text agent information if exists diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 2f6d7a6cbf..c3c5cfbafa 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -214,7 +214,7 @@ fi # Remove/relocate existing SQLite databases rm -f %{_localstatedir}/var/db/cluster.db* || true rm -f %{_localstatedir}/var/db/.profile.db* || true -rm -f %{_localstatedir}/var/db/agents/* || true +rm -rf %{_localstatedir}/var/db/agents || true if [ -f %{_localstatedir}/var/db/global.db ]; then mv %{_localstatedir}/var/db/global.db %{_localstatedir}/queue/db/ @@ -815,7 +815,6 @@ rm -fr %{buildroot} %attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/windows/* %dir %attr(750, root, wazuh) %{_localstatedir}/var %dir %attr(770, root, wazuh) %{_localstatedir}/var/db -%dir %attr(770, root, wazuh) %{_localstatedir}/var/db/agents %attr(660, root, wazuh) %{_localstatedir}/var/db/mitre.db %dir %attr(770, root, wazuh) %{_localstatedir}/var/download %dir %attr(770, wazuh, wazuh) %{_localstatedir}/var/multigroups From daeeaa51b6d7f1c60d30ccbd69e413e414fca7b0 Mon Sep 17 00:00:00 2001 From: Daniel Folch Date: Thu, 16 Feb 2023 09:53:00 +0100 Subject: [PATCH 325/994] Update solaris10 pkginfo 4.4.0 (#2101) * Do not remove packages_files directory (#2087) * Update version in pkginfo Solaris 10 --- solaris/solaris10/pkginfo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index 51597a91ea..22e6f23501 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -1,11 +1,11 @@ NAME=Wazuh - Improved OSSEC agent for Intrusion Detection, File Integrity Monitoring, Policy Monitoring and Rootkits Detection. PKG="wazuh-agent" -VERSION="3.6.0" +VERSION="4.4.0" ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="31Aug2018" +PSTAMP="20Feb2023" EMAIL="info@wazuh.com" ISTATES="S s 1 2 3" RSTATES="S s 1 2 3" From fcbb1a12226b3a68eafb70fcfd81551a208f74af Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 16 Feb 2023 10:46:19 +0100 Subject: [PATCH 326/994] Fix check of dist-detect.sh curl --- unattended_installer/builder.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index 14fdae8c21..2af53709f8 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -271,6 +271,25 @@ function builder_main() { fi } +function checkDistDetectURL() { + + retries=0 + eval "curl -s -o /dev/null 'https://raw.githubusercontent.com/wazuh/wazuh/${source_branch}/src/init/dist-detect.sh' --retry 5 --retry-delay 5 --max-time 300 --fail" + e_code="${PIPESTATUS[0]}" + while [ "${e_code}" -eq 7 ] && [ "${retries}" -ne 12 ]; do + retries=$((retries+1)) + sleep 5 + eval "curl -s -o /dev/null 'https://raw.githubusercontent.com/wazuh/wazuh/${source_branch}/src/init/dist-detect.sh' --retry 5 --retry-delay 5 --max-time 300 --fail" + e_code="${PIPESTATUS[0]}" + done + + if [[ "${retries}" -eq 12 ]] || [[ "${e_code}" -ne 0 ]]; then + echo -e "Error: Could not get the Filebeat Wazuh template. " + exit 1 + fi + +} + function checkFilebeatURL() { # Import variables From 26dc75ff445ea0449e0a987bb52ee973b3360263 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 16 Feb 2023 10:47:11 +0100 Subject: [PATCH 327/994] Calling function in buildInstaller --- unattended_installer/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index 2af53709f8..7bf4eebc39 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -48,6 +48,7 @@ function getHelp() { function buildInstaller() { + checkDistDetectURL checkFilebeatURL output_script_path="${base_path_builder}/wazuh-install.sh" From 7e2e2f3e84fee74c722ec50cbc1f9e86f7ac866d Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 16 Feb 2023 11:02:49 +0100 Subject: [PATCH 328/994] Improved the error message --- 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 7bf4eebc39..6ddf3bcdb2 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -285,7 +285,7 @@ function checkDistDetectURL() { done if [[ "${retries}" -eq 12 ]] || [[ "${e_code}" -ne 0 ]]; then - echo -e "Error: Could not get the Filebeat Wazuh template. " + echo -e "Error: Could not get the dist-detect file." exit 1 fi From 5c9f33a7c0cd00b61c75afd826d6559afc8aeb07 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 16 Feb 2023 11:07:11 +0100 Subject: [PATCH 329/994] Updated source_branch 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 044c180844..487cbcbf42 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -16,7 +16,7 @@ readonly resources_certs="${base_path_builder}/cert_tool" readonly resources_passwords="${base_path_builder}/passwords_tool" readonly resources_common="${base_path_builder}/common_functions" readonly resources_download="${base_path_builder}/downloader" -readonly source_branch="4.4" +readonly source_branch="4.5" function getHelp() { From b1247250314fdbc4db043c48b08379ddac0d8d56 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 16 Feb 2023 11:43:35 +0100 Subject: [PATCH 330/994] Removed retry arguments in the loop --- 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 6ddf3bcdb2..3f1dd68b85 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -280,7 +280,7 @@ function checkDistDetectURL() { while [ "${e_code}" -eq 7 ] && [ "${retries}" -ne 12 ]; do retries=$((retries+1)) sleep 5 - eval "curl -s -o /dev/null 'https://raw.githubusercontent.com/wazuh/wazuh/${source_branch}/src/init/dist-detect.sh' --retry 5 --retry-delay 5 --max-time 300 --fail" + eval "curl -s -o /dev/null 'https://raw.githubusercontent.com/wazuh/wazuh/${source_branch}/src/init/dist-detect.sh' --fail" e_code="${PIPESTATUS[0]}" done From 57311272adad4aba12588bc9c232f0c696fd7834 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Fri, 17 Feb 2023 14:02:00 +0100 Subject: [PATCH 331/994] Changed check of the installed packages --- .../install_functions/installCommon.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 602be5ae47..ba42cea0e6 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -104,7 +104,7 @@ function installCommon_aptInstallList(){ not_installed=() for dep in "${dependencies[@]}"; do - if ! apt list --installed 2>/dev/null | grep -q -E ^"${dep}"; then + if ! apt list --installed 2>/dev/null | grep -q -E ^"${dep}"\/; then not_installed+=("${dep}") fi done @@ -298,7 +298,7 @@ function installCommon_getPass() { function installCommon_installCheckDependencies() { if [ "${sys_type}" == "yum" ]; then - dependencies=( systemd grep tar coreutils sed procps gawk lsof curl openssl ) + dependencies=( systemd grep tar coreutils sed procps-ng gawk lsof curl openssl ) installCommon_yumInstallList "${dependencies[@]}" elif [ "${sys_type}" == "apt-get" ]; then @@ -312,7 +312,7 @@ function installCommon_installCheckDependencies() { function installCommon_installPrerequisites() { if [ "${sys_type}" == "yum" ]; then - dependencies=( libcap gnupg ) + dependencies=( libcap gnupg2 ) installCommon_yumInstallList "${dependencies[@]}" elif [ "${sys_type}" == "apt-get" ]; then @@ -624,11 +624,7 @@ function installCommon_yumInstallList(){ dependencies=("$@") not_installed=() for dep in "${dependencies[@]}"; do - if [ "${dep}" == "openssl" ]; 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 -E ^"${dep}";then + if ! yum list installed 2>/dev/null | grep -q -E ^"${dep}"\\.;then not_installed+=("${dep}") fi done From d96216ba293911f65801f8b35e577975e25995a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 28 Feb 2023 14:36:17 +0100 Subject: [PATCH 332/994] Calls to the dashboard api now use the port defined as a 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/install_functions/dashboard.sh | 4 ++-- unattended_installer/install_functions/installMain.sh | 2 +- unattended_installer/install_functions/installVariables.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/unattended_installer/install_functions/dashboard.sh b/unattended_installer/install_functions/dashboard.sh index 9b1395775a..907e3759c6 100644 --- a/unattended_installer/install_functions/dashboard.sh +++ b/unattended_installer/install_functions/dashboard.sh @@ -98,7 +98,7 @@ function dashboard_initialize() { print_ip="${nodes_dashboard_ip}" fi - 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 [ "$(common_curl -XGET https://"${nodes_dashboard_ip}":"${wazuh_dashboard_port}"/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 @@ -158,7 +158,7 @@ function dashboard_initializeAIO() { common_logger "Initializing Wazuh dashboard web application." installCommon_getPass "admin" - 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 + if [ "$(common_curl -XGET https://localhost:"${wazuh_dashboard_port}"/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/installMain.sh b/unattended_installer/install_functions/installMain.sh index 9689b7b5da..078fcd112d 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -244,7 +244,7 @@ function main() { fi if [ -n "${dashboard}" ]; then - checks_ports "${wazuh_dashboard_ports[@]}" + checks_ports "${wazuh_dashboard_port}" fi diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index 07586ef064..c827604bde 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -51,4 +51,4 @@ adminPassword="wazuh" readonly wazuh_aio_ports=( 9200 9300 1514 1515 1516 55000 443) readonly wazuh_indexer_ports=( 9200 9300 ) readonly wazuh_manager_ports=( 1514 1515 1516 55000 ) -readonly wazuh_dashboard_ports=( 443 ) +readonly wazuh_dashboard_port=443 From 8eeca7a198200963a88688c3e1811c85de683cd7 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 2 Mar 2023 10:06:45 +0100 Subject: [PATCH 333/994] Added PDF reports dependencies --- .../install_functions/dashboard.sh | 15 +++++++++++++++ .../install_functions/installCommon.sh | 14 ++++++++++++++ .../install_functions/installMain.sh | 2 ++ 3 files changed, 31 insertions(+) diff --git a/unattended_installer/install_functions/dashboard.sh b/unattended_installer/install_functions/dashboard.sh index 9b1395775a..a43b1813c1 100644 --- a/unattended_installer/install_functions/dashboard.sh +++ b/unattended_installer/install_functions/dashboard.sh @@ -188,3 +188,18 @@ function dashboard_install() { fi } + +function dashboard_installDependencies() { + + installCommon_checkChromium + + if [ "${sys_type}" == "yum" ]; then + dependencies+=( nss xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-utils xorg-x11-fonts-cyrillic xorg-x11-fonts-Type1 xorg-x11-fonts-misc fontconfig freetype ) + installCommon_yumInstallList "${dependencies[@]}" + + elif [ "${sys_type}" == "apt-get" ]; then + dependencies+=( libnss3-dev fonts-liberation libfontconfig1 ) + installCommon_aptInstallList "${dependencies[@]}" + fi + +} diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index c9bf605806..dc1a28c022 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -235,6 +235,20 @@ function installCommon_changePasswords() { } +function installCommon_checkChromium() { + + if [ "${sys_type}" == "yum" ]; then + if (! yum list installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\\.) && (yum list installed 2>/dev/null | grep -q -E ^"chromium"\\.); then + dependencies=(chromium) + fi + elif [ "${sys_type}" == "apt-get" ]; then + if (! apt list --installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\/) && (apt list --installed 2>/dev/null | grep -q -E ^"chromium-browser"\/); then + dependencies=(chromium-browser) + fi + fi + +} + function installCommon_extractConfig() { if ! tar -tf "${tar_file}" | grep -q wazuh-install-files/config.yml; then diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index 3909a73884..9a1ca8e24c 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -290,6 +290,7 @@ function main() { if [ -n "${dashboard}" ]; then common_logger "--- Wazuh dashboard ----" + dashboard_installDependencies dashboard_install dashboard_configure installCommon_startService "wazuh-dashboard" @@ -329,6 +330,7 @@ function main() { filebeat_configure installCommon_startService "filebeat" common_logger "--- Wazuh dashboard ---" + dashboard_installDependencies dashboard_install dashboard_configure installCommon_startService "wazuh-dashboard" From ef30264ce94663de1b9faac48271f56f9f7d5e13 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 2 Mar 2023 13:06:01 +0100 Subject: [PATCH 334/994] Fixed fetching chrome packages --- unattended_installer/install_functions/installCommon.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 1b02ba6de7..5b946c479c 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -263,11 +263,11 @@ function installCommon_changePasswords() { function installCommon_checkChromium() { if [ "${sys_type}" == "yum" ]; then - if (! yum list installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\\.) && (yum list installed 2>/dev/null | grep -q -E ^"chromium"\\.); then + if (! yum list installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\\.) && (! yum list installed 2>/dev/null | grep -q -E ^"chromium"\\.); then dependencies=(chromium) fi elif [ "${sys_type}" == "apt-get" ]; then - if (! apt list --installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\/) && (apt list --installed 2>/dev/null | grep -q -E ^"chromium-browser"\/); then + if (! apt list --installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\/) && (! apt list --installed 2>/dev/null | grep -q -E ^"chromium-browser"\/); then dependencies=(chromium-browser) fi fi From a0bed4720f0825130c80522398d39c6415533d53 Mon Sep 17 00:00:00 2001 From: Daniel Folch Date: Thu, 9 Feb 2023 18:11:07 +0100 Subject: [PATCH 335/994] Do not remove packages_files directory (#2087) --- alpine/SPECS/wazuh-agent/wazuh-agent.post-install | 2 -- 1 file changed, 2 deletions(-) diff --git a/alpine/SPECS/wazuh-agent/wazuh-agent.post-install b/alpine/SPECS/wazuh-agent/wazuh-agent.post-install index ce9615b0b7..7b581bb705 100644 --- a/alpine/SPECS/wazuh-agent/wazuh-agent.post-install +++ b/alpine/SPECS/wazuh-agent/wazuh-agent.post-install @@ -14,6 +14,4 @@ ${directory_base}/packages_files/gen_ossec.sh conf agent ${DIST_NAME} ${DIST_VER # Add default local_files to ossec.conf ${directory_base}/packages_files/add_localfiles.sh ${directory_base} >> ${directory_base}/etc/ossec.conf -rm -rf ${directory_base}/packages_files - exit 0 From fedc4d2889d69df65e7afdff266b0fbc22cbb191 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Wed, 15 Feb 2023 13:59:12 +0100 Subject: [PATCH 336/994] Fixed Debian expired keys in Dockerfiles --- debs/Debian/arm64/Dockerfile | 4 ++-- debs/Debian/armhf/Dockerfile | 4 ++-- debs/Debian/ppc64le/Dockerfile | 6 ++++-- stack/dashboard/deb/docker/amd64/Dockerfile | 4 ++-- stack/indexer/deb/docker/amd64/Dockerfile | 1 - windows/Dockerfile | 2 +- wpk/common/Dockerfile | 2 +- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/debs/Debian/arm64/Dockerfile b/debs/Debian/arm64/Dockerfile index 3a24ee820f..29c502a3c3 100644 --- a/debs/Debian/arm64/Dockerfile +++ b/debs/Debian/arm64/Dockerfile @@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND noninteractive # Installing necessary packages RUN echo "deb http://deb.debian.org/debian stretch contrib non-free" >> /etc/apt/sources.list && \ echo "deb-src http://deb.debian.org/debian stretch main contrib non-free" >> /etc/apt/sources.list && \ - apt-get update && apt-get install -y apt apt-utils \ + apt-get update && apt-get install -y --allow-change-held-packages apt apt-utils \ curl gcc g++ make sudo expect gnupg \ perl-base perl wget libc-bin libc6 libc6-dev \ build-essential cdbs devscripts equivs automake \ @@ -15,7 +15,7 @@ RUN echo "deb http://deb.debian.org/debian stretch contrib non-free" >> /etc/apt # Add Debian's source repository and, Install NodeJS 12 RUN apt-get update && apt-get build-dep python3.5 -y RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \ - apt-get install -y nodejs + apt-get install --allow-change-held-packages -y nodejs 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/armhf/Dockerfile b/debs/Debian/armhf/Dockerfile index 4320d43498..47ae349897 100644 --- a/debs/Debian/armhf/Dockerfile +++ b/debs/Debian/armhf/Dockerfile @@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND noninteractive # Installing necessary packages RUN echo "deb http://deb.debian.org/debian stretch contrib non-free" >> /etc/apt/sources.list && \ echo "deb-src http://deb.debian.org/debian stretch main contrib non-free" >> /etc/apt/sources.list && \ - apt-get update && apt-get install -y apt-utils \ + apt-get update && apt-get install -y --allow-change-held-packages apt-utils \ curl gcc make wget sudo expect gnupg perl-base \ perl libc-bin libc6 libc6-dev \ build-essential cdbs devscripts equivs automake autoconf libtool \ @@ -15,7 +15,7 @@ RUN echo "deb http://deb.debian.org/debian stretch contrib non-free" >> /etc/apt # Add Debian's source repository and, Install NodeJS 12 RUN apt-get build-dep python3.5 -y RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \ - apt-get install -y nodejs + apt-get install -y --allow-change-held-packages nodejs 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/ppc64le/Dockerfile b/debs/Debian/ppc64le/Dockerfile index 2fa4fe311a..a72e7127c0 100644 --- a/debs/Debian/ppc64le/Dockerfile +++ b/debs/Debian/ppc64le/Dockerfile @@ -2,11 +2,13 @@ FROM ppc64le/debian:stretch ENV DEBIAN_FRONTEND noninteractive +RUN apt-get -v + # Installing necessary packages RUN echo "deb http://deb.debian.org/debian stretch main contrib non-free" >> /etc/apt/sources.list && \ echo "deb-src http://deb.debian.org/debian stretch main contrib non-free" >> /etc/apt/sources.list && \ - apt-get update && apt-get install -y apt-utils && \ - apt-get install -y --force-yes \ + apt-get update && apt-get install -y --allow-change-held-packages apt-utils && \ + apt-get install -y --allow-change-held-packages \ curl gcc make sudo expect gnupg perl-base perl wget \ libc-bin libc6 libc6-dev build-essential \ cdbs devscripts equivs automake autoconf libtool libaudit-dev selinux-basics \ diff --git a/stack/dashboard/deb/docker/amd64/Dockerfile b/stack/dashboard/deb/docker/amd64/Dockerfile index 77d3684396..f3ca3b9811 100644 --- a/stack/dashboard/deb/docker/amd64/Dockerfile +++ b/stack/dashboard/deb/docker/amd64/Dockerfile @@ -3,8 +3,8 @@ FROM debian:10 ENV DEBIAN_FRONTEND noninteractive # Installing necessary packages -RUN apt-get update && apt-get install -y apt-utils && \ - apt-get install -y \ +RUN apt-get update && apt-get install -y --allow-change-held-packages apt-utils && \ + apt-get install -y --allow-change-held-packages \ curl sudo wget expect gnupg build-essential \ devscripts equivs selinux-basics procps gawk diff --git a/stack/indexer/deb/docker/amd64/Dockerfile b/stack/indexer/deb/docker/amd64/Dockerfile index bfbed39da9..b40740f3db 100644 --- a/stack/indexer/deb/docker/amd64/Dockerfile +++ b/stack/indexer/deb/docker/amd64/Dockerfile @@ -2,7 +2,6 @@ FROM debian:8 ENV DEBIAN_FRONTEND noninteractive -# 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 \ diff --git a/windows/Dockerfile b/windows/Dockerfile index bf17600c83..79fd0b2f0f 100644 --- a/windows/Dockerfile +++ b/windows/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:22.04 # Installing necessary packages RUN apt-get update && \ - apt-get install -y gcc g++ gcc-mingw-w64 g++-mingw-w64 nsis make wget unzip \ + apt-get install -y --allow-change-held-packages gcc g++ gcc-mingw-w64 g++-mingw-w64 nsis make wget unzip \ curl perl binutils zip libssl-dev RUN curl -OL http://packages.wazuh.com/utils/cmake/cmake-3.18.3.tar.gz && \ diff --git a/wpk/common/Dockerfile b/wpk/common/Dockerfile index 1597f882f1..eae449e527 100644 --- a/wpk/common/Dockerfile +++ b/wpk/common/Dockerfile @@ -1,7 +1,7 @@ FROM debian:9 RUN apt-get update && \ - apt-get -y install python git curl jq python3 python3-pip libffi-dev && \ + apt-get -y install --allow-change-held-packages python git curl jq python3 python3-pip libffi-dev && \ pip3 install --upgrade cryptography==2.9.2 awscli ADD wpkpack.py /usr/local/bin/wpkpack From cba9143ebfb4e0e7082496ad4340d3d371d60131 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 16 Feb 2023 13:48:37 +0100 Subject: [PATCH 337/994] Fixed Debian dockerfiles --- debs/Debian/arm64/Dockerfile | 2 +- debs/Debian/armhf/Dockerfile | 2 +- debs/Debian/ppc64le/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debs/Debian/arm64/Dockerfile b/debs/Debian/arm64/Dockerfile index 29c502a3c3..4f66d330f9 100644 --- a/debs/Debian/arm64/Dockerfile +++ b/debs/Debian/arm64/Dockerfile @@ -13,7 +13,7 @@ RUN echo "deb http://deb.debian.org/debian stretch contrib non-free" >> /etc/apt libdb5.3 libdb5.3 libssl1.0.2 gawk libsigsegv2 # Add Debian's source repository and, Install NodeJS 12 -RUN apt-get update && apt-get build-dep python3.5 -y +RUN apt-get update && apt-get build-dep python3.5 -y --allow-change-held-packages RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \ apt-get install --allow-change-held-packages -y nodejs diff --git a/debs/Debian/armhf/Dockerfile b/debs/Debian/armhf/Dockerfile index 47ae349897..83cfb20e3b 100644 --- a/debs/Debian/armhf/Dockerfile +++ b/debs/Debian/armhf/Dockerfile @@ -13,7 +13,7 @@ RUN echo "deb http://deb.debian.org/debian stretch contrib non-free" >> /etc/apt libssl1.1 libssl-dev gawk libsigsegv2 procps libc6-armel-cross g++ # Add Debian's source repository and, Install NodeJS 12 -RUN apt-get build-dep python3.5 -y +RUN apt-get build-dep python3.5 -y --allow-change-held-packages RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \ apt-get install -y --allow-change-held-packages nodejs diff --git a/debs/Debian/ppc64le/Dockerfile b/debs/Debian/ppc64le/Dockerfile index a72e7127c0..8491f3590a 100644 --- a/debs/Debian/ppc64le/Dockerfile +++ b/debs/Debian/ppc64le/Dockerfile @@ -14,7 +14,7 @@ RUN echo "deb http://deb.debian.org/debian stretch main contrib non-free" >> /et cdbs devscripts equivs automake autoconf libtool libaudit-dev selinux-basics \ libdb5.3 libdb5.3 libssl1.0.2 gawk libsigsegv2 -RUN apt-get update && apt-get build-dep python3.5 -y +RUN apt-get update && apt-get build-dep python3.5 -y --allow-change-held-packages 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/ && \ From d75baa57101ab1f2429d7db25ee79dd0709a2205 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Tue, 7 Mar 2023 11:09:25 +0100 Subject: [PATCH 338/994] Added aptInstallChrome function --- .../install_functions/installCommon.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 5b946c479c..d5648f03bc 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -268,7 +268,13 @@ function installCommon_checkChromium() { fi elif [ "${sys_type}" == "apt-get" ]; then if (! apt list --installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\/) && (! apt list --installed 2>/dev/null | grep -q -E ^"chromium-browser"\/); then - dependencies=(chromium-browser) + + # Report generation doesn't work with Chromium in Ubuntu 22 + if [ "${DIST_NAME}" == "ubuntu" ] && [ "${DIST_VER}" == "22" ]; then + installCommon_aptInstallChrome + else + dependencies=(chromium-browser) + fi fi fi @@ -323,6 +329,16 @@ function installCommon_installCheckDependencies() { } +function installCommon_aptInstallChrome() { + + chrome_package="/tmp/wazuh-install-files/chrome.deb" + curl -so "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb + + common_logger "Installing chrome" + installCommon_aptInstall "${chrome_package}" + +} + function installCommon_installPrerequisites() { if [ "${sys_type}" == "yum" ]; then From 9a78def05f22aade29349f68bbcc49606212ca34 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Tue, 7 Mar 2023 11:47:05 +0100 Subject: [PATCH 339/994] Added Ubuntu 20 in installing Chrome --- unattended_installer/install_functions/installCommon.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index d5648f03bc..a7e2e7cf79 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -270,7 +270,7 @@ function installCommon_checkChromium() { if (! apt list --installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\/) && (! apt list --installed 2>/dev/null | grep -q -E ^"chromium-browser"\/); then # Report generation doesn't work with Chromium in Ubuntu 22 - if [ "${DIST_NAME}" == "ubuntu" ] && [ "${DIST_VER}" == "22" ]; then + if [[ "${DIST_NAME}" == "ubuntu" ]] && [[ "${DIST_VER}" == "22" || "${DIST_VER}" == "20" ]]; then installCommon_aptInstallChrome else dependencies=(chromium-browser) From 0bf9b044b561168a809476390f8903237b059cb5 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Tue, 7 Mar 2023 13:13:37 +0100 Subject: [PATCH 340/994] Enabled extra repos in AmazonLinux2 --- unattended_installer/install_functions/installCommon.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index a7e2e7cf79..8d1d7137b1 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -266,6 +266,9 @@ function installCommon_checkChromium() { if (! yum list installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\\.) && (! yum list installed 2>/dev/null | grep -q -E ^"chromium"\\.); then dependencies=(chromium) fi + if [ "${DIST_NAME}" == "amzn" ]; then + eval "amazon-linux-extras install epel -y ${debug}" + fi elif [ "${sys_type}" == "apt-get" ]; then if (! apt list --installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\/) && (! apt list --installed 2>/dev/null | grep -q -E ^"chromium-browser"\/); then From bdbaadf719126542035728edc1d701eccd69c0c2 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 9 Mar 2023 10:36:18 +0100 Subject: [PATCH 341/994] Fixed comment of Chrome installation --- unattended_installer/install_functions/installCommon.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 8d1d7137b1..af9f8f6567 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -271,8 +271,8 @@ function installCommon_checkChromium() { fi elif [ "${sys_type}" == "apt-get" ]; then if (! apt list --installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\/) && (! apt list --installed 2>/dev/null | grep -q -E ^"chromium-browser"\/); then - - # Report generation doesn't work with Chromium in Ubuntu 22 + + # Report generation doesn't work with Chromium in Ubuntu 22 and Ubuntu 20 if [[ "${DIST_NAME}" == "ubuntu" ]] && [[ "${DIST_VER}" == "22" || "${DIST_VER}" == "20" ]]; then installCommon_aptInstallChrome else @@ -337,7 +337,7 @@ function installCommon_aptInstallChrome() { chrome_package="/tmp/wazuh-install-files/chrome.deb" curl -so "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb - common_logger "Installing chrome" + common_logger "Installing chrome." installCommon_aptInstall "${chrome_package}" } From 053e1387a6ce55dd2bc5ad8ff4d9d6e30ecd0980 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 9 Mar 2023 13:44:53 +0100 Subject: [PATCH 342/994] Added optional installation logic --- .../install_functions/dashboard.sh | 11 +++++++- .../install_functions/installCommon.sh | 27 +++++++++++++++---- .../install_functions/installMain.sh | 4 +-- 3 files changed, 34 insertions(+), 8 deletions(-) diff --git a/unattended_installer/install_functions/dashboard.sh b/unattended_installer/install_functions/dashboard.sh index a43b1813c1..163066294c 100644 --- a/unattended_installer/install_functions/dashboard.sh +++ b/unattended_installer/install_functions/dashboard.sh @@ -189,7 +189,11 @@ function dashboard_install() { } -function dashboard_installDependencies() { +function dashboard_installReportDependencies() { + + # Flags that indicates that is an optional installation. + optional_installation=1 + report_dependencies=1 installCommon_checkChromium @@ -202,4 +206,9 @@ function dashboard_installDependencies() { installCommon_aptInstallList "${dependencies[@]}" fi + if [ "${pdf_warning}" == 1 ]; then + common_logger -w "Dependencies skipped. PDF report generation may not work." + fi + optional_installation=0 + } diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index af9f8f6567..b9cde71ed9 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -115,8 +115,7 @@ function installCommon_aptInstallList(){ common_logger "Installing $dep." installCommon_aptInstall "${dep}" if [ "${install_result}" != 0 ]; then - common_logger -e "Cannot install dependency: ${dep}." - exit 1 + installCommon_checkOptionalInstallation fi done fi @@ -155,6 +154,20 @@ function installCommon_changePasswordApi() { } +function installCommon_checkOptionalInstallation() { + + if [ "${optional_installation}" != 1 ]; then + common_logger -e "Cannot install dependency: ${dep}." + exit 1 + else + common_logger -w "Cannot install optional dependency: ${dep}." + if [ "${report_dependencies}" == 1 ]; then + pdf_warning=1 + fi + fi + +} + function installCommon_createCertificates() { if [ -n "${AIO}" ]; then @@ -334,11 +347,16 @@ function installCommon_installCheckDependencies() { function installCommon_aptInstallChrome() { + dep="chrome" chrome_package="/tmp/wazuh-install-files/chrome.deb" curl -so "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb - common_logger "Installing chrome." + common_logger "Installing ${dep}." installCommon_aptInstall "${chrome_package}" + + if [ "${install_result}" != 0 ]; then + installCommon_checkOptionalInstallation + fi } @@ -668,8 +686,7 @@ function installCommon_yumInstallList(){ common_logger "Installing $dep." eval "yum install ${dep} -y ${debug}" if [ "${PIPESTATUS[0]}" != 0 ]; then - common_logger -e "Cannot install dependency: ${dep}." - exit 1 + installCommon_checkOptionalInstallation fi done fi diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index 1220b7ea13..f3dcbbb4b3 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -295,7 +295,7 @@ function main() { if [ -n "${dashboard}" ]; then common_logger "--- Wazuh dashboard ----" - dashboard_installDependencies + dashboard_installReportDependencies dashboard_install dashboard_configure installCommon_startService "wazuh-dashboard" @@ -335,7 +335,7 @@ function main() { filebeat_configure installCommon_startService "filebeat" common_logger "--- Wazuh dashboard ---" - dashboard_installDependencies + dashboard_installReportDependencies dashboard_install dashboard_configure installCommon_startService "wazuh-dashboard" From 56ca8c3850effed7fc30e032ed693ffd1b336f3f Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 9 Mar 2023 14:54:11 +0100 Subject: [PATCH 343/994] Added Ubuntu 18 in installing Chrome --- unattended_installer/install_functions/installCommon.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index b9cde71ed9..b7012fc7a0 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -286,7 +286,7 @@ function installCommon_checkChromium() { if (! apt list --installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\/) && (! apt list --installed 2>/dev/null | grep -q -E ^"chromium-browser"\/); then # Report generation doesn't work with Chromium in Ubuntu 22 and Ubuntu 20 - if [[ "${DIST_NAME}" == "ubuntu" ]] && [[ "${DIST_VER}" == "22" || "${DIST_VER}" == "20" ]]; then + if [[ "${DIST_NAME}" == "ubuntu" ]] && [[ "${DIST_VER}" == "22" || "${DIST_VER}" == "20" || "${DIST_VER}" == "18" ]]; then installCommon_aptInstallChrome else dependencies=(chromium-browser) From f8b5a15b0940fe21bd5b0e586ecd9c006a575a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Fri, 10 Mar 2023 10:52:50 +0100 Subject: [PATCH 344/994] Changed name of dashboard dependencies list --- unattended_installer/install_functions/dashboard.sh | 10 +++++----- .../install_functions/installCommon.sh | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/unattended_installer/install_functions/dashboard.sh b/unattended_installer/install_functions/dashboard.sh index 163066294c..66f0faa47a 100644 --- a/unattended_installer/install_functions/dashboard.sh +++ b/unattended_installer/install_functions/dashboard.sh @@ -198,16 +198,16 @@ function dashboard_installReportDependencies() { installCommon_checkChromium if [ "${sys_type}" == "yum" ]; then - dependencies+=( nss xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-utils xorg-x11-fonts-cyrillic xorg-x11-fonts-Type1 xorg-x11-fonts-misc fontconfig freetype ) - installCommon_yumInstallList "${dependencies[@]}" + dashboard_dependencies+=( nss xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-utils xorg-x11-fonts-cyrillic xorg-x11-fonts-Type1 xorg-x11-fonts-misc fontconfig freetype ) + installCommon_yumInstallList "${dashboard_dependencies[@]}" elif [ "${sys_type}" == "apt-get" ]; then - dependencies+=( libnss3-dev fonts-liberation libfontconfig1 ) - installCommon_aptInstallList "${dependencies[@]}" + dashboard_dependencies+=( libnss3-dev fonts-liberation libfontconfig1 ) + installCommon_aptInstallList "${dashboard_dependencies[@]}" fi if [ "${pdf_warning}" == 1 ]; then - common_logger -w "Dependencies skipped. PDF report generation may not work." + common_logger -w "Dashboard dependencies skipped. PDF report generation may not work." fi optional_installation=0 diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index b7012fc7a0..f5561a3c54 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -277,7 +277,7 @@ function installCommon_checkChromium() { if [ "${sys_type}" == "yum" ]; then if (! yum list installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\\.) && (! yum list installed 2>/dev/null | grep -q -E ^"chromium"\\.); then - dependencies=(chromium) + dashboard_dependencies=(chromium) fi if [ "${DIST_NAME}" == "amzn" ]; then eval "amazon-linux-extras install epel -y ${debug}" @@ -289,7 +289,7 @@ function installCommon_checkChromium() { if [[ "${DIST_NAME}" == "ubuntu" ]] && [[ "${DIST_VER}" == "22" || "${DIST_VER}" == "20" || "${DIST_VER}" == "18" ]]; then installCommon_aptInstallChrome else - dependencies=(chromium-browser) + dashboard_dependencies=(chromium-browser) fi fi fi From 2095105006b6f3e1965c387a4b89756cbf561dde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Mon, 13 Mar 2023 14:00:31 +0100 Subject: [PATCH 345/994] Added Chrome to Amazon Linux 2 --- .../install_functions/installCommon.sh | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index f5561a3c54..f9bd08e89c 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -280,14 +280,14 @@ function installCommon_checkChromium() { dashboard_dependencies=(chromium) fi if [ "${DIST_NAME}" == "amzn" ]; then - eval "amazon-linux-extras install epel -y ${debug}" + installCommon_installChrome fi elif [ "${sys_type}" == "apt-get" ]; then if (! apt list --installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\/) && (! apt list --installed 2>/dev/null | grep -q -E ^"chromium-browser"\/); then # Report generation doesn't work with Chromium in Ubuntu 22 and Ubuntu 20 if [[ "${DIST_NAME}" == "ubuntu" ]] && [[ "${DIST_VER}" == "22" || "${DIST_VER}" == "20" || "${DIST_VER}" == "18" ]]; then - installCommon_aptInstallChrome + installCommon_installChrome else dashboard_dependencies=(chromium-browser) fi @@ -345,19 +345,30 @@ function installCommon_installCheckDependencies() { } -function installCommon_aptInstallChrome() { +function installCommon_installChrome() { dep="chrome" - chrome_package="/tmp/wazuh-install-files/chrome.deb" - curl -so "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb - common_logger "Installing ${dep}." - installCommon_aptInstall "${chrome_package}" - if [ "${install_result}" != 0 ]; then - installCommon_checkOptionalInstallation + if [ "${sys_type}" == "yum" ]; then + chrome_package="/tmp/wazuh-install-files/chrome.rpm" + curl -so "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm + eval "yum install ${chrome_package} -y ${debug}" + + if [ "${PIPESTATUS[0]}" != 0 ]; then + installCommon_checkOptionalInstallation + fi + + elif [ "${sys_type}" == "apt-get" ]; then + chrome_package="/tmp/wazuh-install-files/chrome.deb" + curl -so "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb + installCommon_aptInstall "${chrome_package}" + + if [ "${install_result}" != 0 ]; then + installCommon_checkOptionalInstallation + fi fi - + } function installCommon_installPrerequisites() { From 372c835c095700ad29c123e59bd055a6b272fabb Mon Sep 17 00:00:00 2001 From: DFolchA Date: Thu, 2 Mar 2023 16:52:37 +0100 Subject: [PATCH 346/994] Add removal of indexer remaining files --- unattended_installer/install_functions/installCommon.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index c9bf605806..94abea3bd7 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -21,6 +21,7 @@ function installCommon_cleanExit() { if [[ "${rollback_conf}" =~ [N|n] ]]; then exit 1 else + common_checkInstalled installCommon_rollBack exit 1 fi From f3c83e6957fb434dc0259a15bf4d11cfbd746c4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Wed, 15 Mar 2023 10:05:46 +0100 Subject: [PATCH 347/994] Added common_curl to the Chrome package --- .../install_functions/installCommon.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index f9bd08e89c..c6a03b3862 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -277,11 +277,13 @@ function installCommon_checkChromium() { if [ "${sys_type}" == "yum" ]; then if (! yum list installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\\.) && (! yum list installed 2>/dev/null | grep -q -E ^"chromium"\\.); then - dashboard_dependencies=(chromium) - fi - if [ "${DIST_NAME}" == "amzn" ]; then - installCommon_installChrome + if [ "${DIST_NAME}" == "amzn" ]; then + installCommon_installChrome + else + dashboard_dependencies=(chromium) + fi fi + elif [ "${sys_type}" == "apt-get" ]; then if (! apt list --installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\/) && (! apt list --installed 2>/dev/null | grep -q -E ^"chromium-browser"\/); then @@ -352,7 +354,7 @@ function installCommon_installChrome() { if [ "${sys_type}" == "yum" ]; then chrome_package="/tmp/wazuh-install-files/chrome.rpm" - curl -so "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm + common_curl -so "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm --max-time 100 --retry 5 --retry-delay 5 --fail eval "yum install ${chrome_package} -y ${debug}" if [ "${PIPESTATUS[0]}" != 0 ]; then @@ -361,7 +363,7 @@ function installCommon_installChrome() { elif [ "${sys_type}" == "apt-get" ]; then chrome_package="/tmp/wazuh-install-files/chrome.deb" - curl -so "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb + common_curl -so "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb --max-time 100 --retry 5 --retry-delay 5 --fail installCommon_aptInstall "${chrome_package}" if [ "${install_result}" != 0 ]; then From ab70d44d097fc58b9e1ce59d2a3e2fe72522e915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Wed, 22 Mar 2023 17:20:35 +0100 Subject: [PATCH 348/994] Changed report generation warning --- unattended_installer/install_functions/dashboard.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/dashboard.sh b/unattended_installer/install_functions/dashboard.sh index 66f0faa47a..a4ef2bbdf1 100644 --- a/unattended_installer/install_functions/dashboard.sh +++ b/unattended_installer/install_functions/dashboard.sh @@ -207,7 +207,7 @@ function dashboard_installReportDependencies() { fi if [ "${pdf_warning}" == 1 ]; then - common_logger -w "Dashboard dependencies skipped. PDF report generation may not work." + common_logger -w "Wazuh dashboard dependencies skipped. PDF report generation may not work." fi optional_installation=0 From 1e8b4bf428fdaa3b82b3a5a042ac53f5bac2e030 Mon Sep 17 00:00:00 2001 From: Gabriel Date: Wed, 11 Jan 2023 12:38:23 -0300 Subject: [PATCH 349/994] 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 6ad54aa909..05a0c2d334 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 e325357de5e7630b7aceda73c1961df305f36ede 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 350/994] 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 3c96e3f2757e024881d5739f2dd6665feccfd3a6 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 351/994] 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 3e35c3ce6b..57b6333a93 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 05a0c2d334..71f283915a 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 337f61fceb308d9c6fcc7759e249c15f45e13909 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 352/994] 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 57b6333a93..c8c0d33322 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 71f283915a..51cbf1f343 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 3f74c8a0b78270cd1964f2e61ca16fdd0099d390 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 353/994] 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 c8c0d33322..f98b1c2d1f 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 51cbf1f343..ed131e4a23 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 3ca5963d93410dd979442e8015d65239b1020d2c 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 354/994] 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 066ff52151bac65c341710bd29b2ef66f66719c4 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 355/994] 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 cde4ff76af4ad0d6f4aa82308df32796bde0ce0c 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 356/994] 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 8e9b394e8f56011ad0135f4938359e71a52f6364 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 357/994] 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 ab553c23d96b0a75ec8e4bf20ac00dddb82fcf7d 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 358/994] 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 c27842ced9b3d60a666e1cc5b19f5a0feb4ff7db 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 359/994] 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 4da23608e35d156fc32c961326e95add5b71840e 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 360/994] 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 b3fd41e4183ad6f7b912233481338ef5461de452 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 361/994] 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 c8f248fe7f5618ce1a7c4664c2c37bd7e4f1a94a 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 362/994] 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 b374c43def60e8c4469ef7dba062022c0638749f 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 363/994] 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 fde65d65d374389f9dd51baccf0efeee261a0017 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 364/994] 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 b198c5c266b4073bb6c0b31681ff1fe7d36e6d40 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 365/994] 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 9c0186551af9fc5cc17aaad8bdafd5b1c135700e 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 366/994] 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 838b72169b40a1ec749c806b3daeb206a0d67368 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 367/994] 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 31551d03202d00f1b0bae18af7ed4f9ffe60d2cb 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 368/994] 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 b30e9c6fe815893f6592fdee8658ed2e787c2f9a 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 369/994] 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 2eb3f3937105bd6f406e4d3b9e72afca10db2468 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 370/994] 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 3aac1bfa7e6a63a98fccf50ddeda442ed1892e42 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 371/994] 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 9521491fc5255fd501bd73cecc72d3bddafe611b 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 372/994] 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 05db066ce4ec7bbc85178d6ad8f9989b0fb62e28 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 373/994] 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 fb49d34c510fc17fb63e63ed93f70728993fdf94 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 374/994] 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 7603e9dceb44a9ead6feed103c1fbdd6f7df77b9 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 375/994] 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 9aa2b722561c2937802429ffc6394bf21df01fca 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 376/994] 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 a26a8718bc22c10742ed806610c0cbdd8054f783 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 377/994] 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 5f41a5a43b24d7b5a2d26a7d00098f7178ce2561 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 378/994] 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 9d59a109fb769a1728b62b232c180a8550e6dcc0 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 379/994] 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 e9d0418d312daa9b543ccca7dbcd6b8648ad6fc9 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 380/994] 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 abdfb8c1d0c03f0c6396be3fc61e3e8cdee733df 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 381/994] 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 99bedd1e8cefe6258f959521e3bc7a15f10c2938 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 382/994] 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 2df477904262893aac54a3bf2be869e8b95d1e3e 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 383/994] 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 2b818d76cae2a1f65a1f54dfa68a3115dcef0754 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 384/994] 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 828f865915ad40f0827408992a5486ff0287161f 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 385/994] 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 ea9ef838c175fcfbdc45768b9a3a927e5a5e9ee5 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 386/994] 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 7e9158ffb14ea64f6d4ede237842201b95d69bde 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 387/994] 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 5b496179aec852d104e6359fc9ea94c735a5e09a 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 388/994] 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 fe7c57ee78ba8c2248f8155cfed591e56b64a1a5 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 389/994] 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 f0dddd1766f8eb2fbe3d31fba69c08160bb2be92 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 390/994] 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 5e2fa84a5cd1153eb66304e80d0feac9c9381240 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 391/994] 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 e4e2c91fcd87034bd4dd0a065b9f8ed7db9488a9 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 392/994] 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 729e671e7dab0e3fbf11a1ef3d02749d1145b4cb 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 393/994] 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 ac81a45cc3181558ecc60932bee8423bbd6dc5fe 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 394/994] 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 e792945d2cf0eb1a5e17484b51934514bbd8de24 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 395/994] 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 44c3df7c4019d252dedf9eced980b63b608775ae 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 396/994] 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 44aae461295062cde2e10ddc554b9c71883dd3e3 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 397/994] 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 d8ab55b09beecbe6addc08a7127bae01e93d8aae 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 398/994] 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 6bf545bf3cb849baf26d749b5e0e6f6a7a0ed215 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 399/994] 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 4a26f8125ca1d27e8cd01a016b3a3828bf0dda12 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 400/994] 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 c4f62029dd5f56183fdcb383ba41108b3a58c3a3 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 401/994] 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 f0ad16dc653a4ddbc0b84b45172e4407fdca527f 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 402/994] 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 d27f9ecdc86be6e415d6e1613206f25a65b0f1aa 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 403/994] 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 7aec8a5d0f3bf5e5c9a0b4648bf7109d1725cc03 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 404/994] 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 a02544fc5bc912f1413549c5216f4637db1a0d61 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 405/994] 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 846ed6fdafe6b392db548baddadc0a23e86b488c 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 406/994] 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 7e4f7c1ee24d3f923cdeceeadc5f7bbf5c395496 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 407/994] 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 bbe81101c929d2efa309b807d78a9f72fbf87f27 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 408/994] 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 efa80e6d3ec55f45eb8d3a3947cea54d69ee4a85 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 409/994] 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 f202eb05186a65fcde7902dae74a6f2652ab07bd 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 410/994] 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 62d4f9998cdc5a81cbfb8e158a57f4ba1065f86e 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 411/994] 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 d6d5b2f93d13b3635de73eb583ceec8c74c2b88c 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 412/994] 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 ffc9db6c0656d9352b9e08f76ebe18ae5c5807dd 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 413/994] 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 028e875f5073ca71d204c946e47bf528f583d569 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 414/994] 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 f62a16c3265dc08305df5f9dcc05880fc393e973 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 415/994] 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 1e35ea8944046f331199fbadd9f6cf846704213a 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 416/994] 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 2f0e88d6698f736b3c62e5359f639e28eaba553e 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 417/994] 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 e690e8baa8afb86b9e418fc1e4ecc3b2e6a4c49e 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 418/994] 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 bdc7df345a0faad6207e73ea044f4d8ced1a1965 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 419/994] 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 49fe089a299d4a6ee1e6eb425d6a295f96768825 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 420/994] 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 e4d51339a04c91089c2111716907ab69046d0bdd 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 421/994] 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 0560d3d49a0dfa60fbf855e502c5ad515593181b 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 422/994] 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 5a116c3ed40d16d713b4c760bfbeb132c25f4771 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 423/994] 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 c9a50570fe33b99bc3622499d95ad68bc81bdabd 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 424/994] 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 bb9831a2e89cfbee59217157e81ed5996bbbadd8 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 425/994] 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 e7fc77a4fda7e225a30c3ee08ed9c1543d9091dd 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 426/994] 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 3fd46312ce1e2646599fba73d355a6a117eae082 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 427/994] 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 565f31046a70ce4f634985c50fa33f2835b57657 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 428/994] 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 8c0692db0a83d8e9ea1e382b59e8feb592fa0c2f 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 429/994] 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 1a168e11f85720c6381c57be4a31211517a13625 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 430/994] 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 b774f520cdcbd2c4cac5f623d1b8c0bdf912d5be 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 431/994] 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 e0fbd13c595da336707bd95977ff60bdc84f3fc5 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 432/994] 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 9f7c79dbab531e7de3684ca8c65bbb2fec2627b5 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 433/994] 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 f0c8561277cd10ad60581c0cfe6ee62273c937ad 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 434/994] 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 2dbd022c01dab40ba899aa8cded1da02b1ab194c 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 435/994] 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 7da6acf4d629940d1fe61c0dac3e4bc148095d4c 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 436/994] 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 2ab7b3785e2abf8e4572ffbd5143cf8ad47b655d 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 437/994] 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 fe15f2a7080409f6264c4ba086d32c042445eef7 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 438/994] 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 74dfeac9eee0413dc64f59f2377976803c0427c0 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 439/994] 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 0624ce5a0423b966a17ad9f80d9f945d0de51f6e 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 440/994] 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 d36d120874f941c4d06e5d14b640005a26c8243c 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 441/994] 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 1b275c7943ae5a57a6164993abae0299e331a862 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 442/994] 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 2aadf7b328c9622f87ce21d435b0289818ef1e1b 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 443/994] 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 7eac97b76c60811ad66669ee08240ca26525c88c 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 444/994] 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 0e9cd11b3b6025e4edc24789809f0e2b2243ed88 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 445/994] 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 79c7cc20a04326975a05e8fc963acd1d1b096463 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 446/994] 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 506f5fdedcfdd98a2e79f7659d1d31801a59b04e 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 447/994] 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 8501c8bb55a2268b7b81288697bd89d0410e9fd9 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 448/994] 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 859df8564297fc34870819903e0591fb72d93d07 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 449/994] 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 4e7064c41a85d9abdcbf3ef4464f84f37f2bcaaf 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 450/994] 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 64cf129058cba606c42498fe89ccbaf4aa08e822 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 451/994] 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 7282a48c580075117ad2b4606b6b9c360ce98727 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 452/994] 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 3cc64fd3344b5284f93cc45e2828b0a1463b37aa 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 453/994] 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 d42c22e254fa25de941ff0ba2e7812ffc56271a9 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 454/994] 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 8242e746e1655455119e1a71419ab1f9a814424e 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 455/994] 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 f336ae118bec31410de7bb398e156976c89d2dba 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 456/994] 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 51dacac18fbdbc89e075058c0bb3f8746a699d52 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 457/994] 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 86d7c4ac8d78ecdf1d2ad2719e8ac3c988cf725c 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 458/994] 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 6c7a5dd4e3029decc5d26f5141f68232237266b9 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 459/994] 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 80341da3531948d170e8a5f4589fa37f84f47959 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 460/994] 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 c097d11e000d0b9c42717dcade772c6142aed22f 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 461/994] 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 6e2785cc2f89159e048e63e15b19238c66e96584 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 462/994] 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 3b5eb11258b22bdceb1cb264388bf531aa33801d 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 463/994] 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 583bba7447d132beddc7fdea130613d3f5cd8337 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 464/994] 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 6cd72ab26b8c8c8578e5da9f06e6b2a041ac256a 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 465/994] 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 02e4b6dc799b9cfe7dcaea5be3aa7fdbe8307f49 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 466/994] 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 7a5efdf9b28106f1350b7765a0640c8c6e0b4b89 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 467/994] 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 be42b03aa4683dd38609c639ba606e390d0b3cd4 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 468/994] 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 679ba35d297d7e418d62c3ab6511ad3559237ecc 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 469/994] 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 3adf7c00ab82c53c207fb159cdb5a7d43f65cac7 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 470/994] 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 e539fe5c65da32bf3cf2d1fef3d36e7c14ee4685 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 471/994] 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 3635b37e3d8918fded9272a3a789a4e5a336a552 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 472/994] 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 822027a9e2787fc5018d2b676af276e6bb336b92 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 473/994] 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 2ac51de1a92b918e05f1a6fcbfab597817475ad8 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 474/994] 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 3db92dd92219a11be01873a7f4ec22c975b8037e 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 475/994] 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 c3bb9b86247d818ab2cd18c0a03ead5866085cc9 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 476/994] 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 0d0cee12f1d900f47112101d3c44b6c2c0cb85c4 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 477/994] 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 63c592580c280a871a77306aba6f3e547918739f 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 478/994] 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 54c713c7653ca7af7280ba5668b95435ee85c398 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 479/994] 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 5b72c2913260f2fccdcaabdc3e90a2803e26601d 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 480/994] 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 17ad711cd100f43db9a0ca7c4a29091c6fd50405 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 481/994] 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 c3fb6a4b46950fd4031e765054c4197595e2e67d 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 482/994] 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 b68963ae35276b13dadfa46aa0c1803c06dfc703 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 483/994] 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 a7c8b3bd0b314e3dcc2948aaaefdf6e35c6fd39b 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 484/994] 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 c948c7b748cb7f58271137cb892463fb73c0194a 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 485/994] 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 d08254e3f111075aad1a2fa1ee1c8a26654123b6 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 486/994] 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 ed2986f47e8e43fff6f77083a264251371c19055 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 487/994] 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 79ff7228bc5c5df7e4ee2863ca25dd778fe32411 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 488/994] 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 39370c053f173e9f545212f4850b57993d05d49f 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 489/994] 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 62206f4d15c1a434a87b48c842587dcf10fc2121 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 490/994] 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 b903697075ff4eb2791eb0677c05d0a6b70a093f 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 491/994] 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 f6ad3852f64bf6a13b63a73b5986a96ed8ad13e1 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 492/994] 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 1e8f2b64977f4850b9ef1f1aacedb27cbc75b111 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 493/994] 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 b1172a177116e55057f0e188d0021e28dafa2396 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 494/994] 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 8a16765f8f7119b1974670ccf38bcd0f4f820735 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 495/994] 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 837cae75f21b3c371dd000342474df56c770d8aa 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 496/994] 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 c83a77aa93a6c71997b1dc039d8affaffaf82c0e 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 497/994] 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 156e7ca0fccaf803857f3fbf75e40761674df083 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 498/994] 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 f0aca0e7fba314f9b61037837094ea9f874f689d 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 499/994] 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 1841d3ece7812215904c3a0cdb3f2790366ef85a 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 500/994] 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 03b6bd079efcf8cba6aee45334d301b058989784 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 501/994] 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 a4733a52db2b6d183dc7513af4a0bed461d9b326 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 502/994] 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 f8fedae7e4967027d65b368a799ed71f96a2aced 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 503/994] 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 e7701ee09c631f06a0fe88fc54614bb55d019380 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 504/994] 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 c929de560a5f418914851cb14cd5f08fd9b9967e 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 505/994] 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 c7b327d86a0e5d2f4bdb2d7895422874c64663a9 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 506/994] 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 7faa0dfc0a92d00f47214cddd4d1ccb7b6f9b939 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 507/994] 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 01e9dbb163e4b833c15d422a38e48a55f1a16005 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 508/994] 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 a362d752b99d206dc432838f271a99b15643382a 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 509/994] 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 c1cb5ccb42a094e42b4e2e6babdf091b219766ee 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 510/994] 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 2ede9005301ca8734444c800a3fe5d7e46e36864 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 511/994] 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 af033f8de981e9591fc3de1bf44044dcbf89baf8 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 512/994] 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 5a7a3f157f6e820d99b9603192437265310f569a 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 513/994] 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 e45a91c771eddfe442182584551a6862e503e499 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 514/994] 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 aa1eb9a0765d90401bddd67436f7baeb5e086f7f 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 515/994] 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 21ef4e04102fc803b6709416b4479505b75cbae3 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 516/994] 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 a8e42fce245aa2b6d5d1e54e787374803511a460 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 517/994] 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 ad0dc83b5f27debc501bd8a7832b3a7d2fb492f8 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 518/994] 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 2d85555c238bec0cb4627019b060a26dff755183 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 519/994] 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 ac74c5ce968c12f91fd6cf54a3c13ac183da6ddc 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 520/994] 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 76a1204033e057755b0ca1fef6aaa704c0d73584 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 521/994] 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 f98b1c2d1f..a0e827b58c 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 ed131e4a23..3cbf7bafdf 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 248279ae82dd9865e385bd9a46f71114eacf7021 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 522/994] 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 7e68a4649ca6e20d4bf9a6aaabfcc10b3d1e99f5 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 523/994] 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 06186f89c6..7be078bb1a 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 6dccfb39690f62241334b094440a8655ee6d2063 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 524/994] 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 f800f18c05f9706c800c02fd79ce0dba0296aa2c 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 525/994] 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 aadae898c60b1d8ebf73a74eb62c606f2e5fded3 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 526/994] 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 4963fc964fd114e2073d98100d3e770fb2750493 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 527/994] 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 4158b7864caa8975301dea98f198468f9dd14680 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 528/994] 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 f38a072141e3dacd31a4c655683ea30e411a9949 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 529/994] 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 19a8c1a7ba794475b23b8dc6a56efd3ec4556471 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 530/994] 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 137863017e959016be45442d73a1ae3bf3a7cf1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 13 Feb 2023 09:48:59 +0100 Subject: [PATCH 531/994] Remove init.d service when systemd is being used 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..fd615e9c5d 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 /etc/init.d/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..7c8b994d0b 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 /etc/init.d/wazuh-agent + fi + if [ ! -f ${OSMYSHELL} ]; then if [ -f "/bin/false" ]; then OSMYSHELL="/bin/false" From a88fff89ae03b9a2a3ad0c909327ee3245d428e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 13 Feb 2023 11:56:57 +0100 Subject: [PATCH 532/994] Fix bash condition in postinstall 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 +- debs/SPECS/wazuh-manager/debian/postinst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debs/SPECS/wazuh-agent/debian/postinst b/debs/SPECS/wazuh-agent/debian/postinst index fd615e9c5d..f415bbaf52 100644 --- a/debs/SPECS/wazuh-agent/debian/postinst +++ b/debs/SPECS/wazuh-agent/debian/postinst @@ -19,7 +19,7 @@ case "$1" in OSMYSHELL="/sbin/nologin" - if [[ -d /run/systemd/system ]]; then + if [ -d /run/systemd/system ]; then rm -f /etc/init.d/wazuh-agent fi diff --git a/debs/SPECS/wazuh-manager/debian/postinst b/debs/SPECS/wazuh-manager/debian/postinst index 7c8b994d0b..e127d68484 100644 --- a/debs/SPECS/wazuh-manager/debian/postinst +++ b/debs/SPECS/wazuh-manager/debian/postinst @@ -16,7 +16,7 @@ case "$1" in SCRIPTS_DIR="${WAZUH_GLOBAL_TMP_DIR}/manager_installation_scripts" SCA_BASE_DIR="${SCRIPTS_DIR}/sca" - if [[ -d /run/systemd/system ]]; then + if [ -d /run/systemd/system ]; then rm -f /etc/init.d/wazuh-agent fi From e1241fa133fcdf3d2f7a09818c93e149cabacb1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 13 Feb 2023 12:37:02 +0100 Subject: [PATCH 533/994] Add the fix for the Wazuh indexer 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-manager/debian/postinst | 2 +- stack/indexer/deb/debian/postinst | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debs/SPECS/wazuh-manager/debian/postinst b/debs/SPECS/wazuh-manager/debian/postinst index e127d68484..b4c5fb6980 100644 --- a/debs/SPECS/wazuh-manager/debian/postinst +++ b/debs/SPECS/wazuh-manager/debian/postinst @@ -17,7 +17,7 @@ case "$1" in SCA_BASE_DIR="${SCRIPTS_DIR}/sca" if [ -d /run/systemd/system ]; then - rm -f /etc/init.d/wazuh-agent + rm -f /etc/init.d/wazuh-manager fi if [ ! -f ${OSMYSHELL} ]; then diff --git a/stack/indexer/deb/debian/postinst b/stack/indexer/deb/debian/postinst index 0ce951f7bf..0972bec1d9 100644 --- a/stack/indexer/deb/debian/postinst +++ b/stack/indexer/deb/debian/postinst @@ -35,6 +35,10 @@ fi export OPENSEARCH_PATH_CONF=${OPENSEARCH_PATH_CONF:-${CONFIG_DIR}} +if [ -d /run/systemd/system ]; then + rm -f /etc/init.d/wazuh-indexer +fi + # To pick up /usr/lib/sysctl.d/wazuh-indexer.conf if command -v systemctl > /dev/null 2>&1; then systemctl restart systemd-sysctl.service > /dev/null 2>&1 || true From 4fe83664097ce92b2cdca531318bfd8b9532e566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 13 Feb 2023 16:31:51 +0100 Subject: [PATCH 534/994] Don't exit on error on indexer prerm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- stack/indexer/deb/debian/prerm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/stack/indexer/deb/debian/prerm b/stack/indexer/deb/debian/prerm index 8004e9a316..863ddabea2 100644 --- a/stack/indexer/deb/debian/prerm +++ b/stack/indexer/deb/debian/prerm @@ -69,7 +69,7 @@ if [ "$STOP_REQUIRED" = "true" ]; then elif [ -x /etc/rc.d/init.d/wazuh-indexer ] ; then /etc/rc.d/init.d/wazuh-indexer stop > /dev/null 2>&1 else # Anything else - kill -15 `pgrep -f opensearch` > /dev/null 2>&1 + kill -15 `pgrep -f opensearch` > /dev/null 2>&1 || true fi echo " OK" fi @@ -87,4 +87,3 @@ if [ "$REMOVE_SERVICE" = "true" ]; then update-rc.d wazuh-indexer remove >/dev/null || true fi fi - From e5911b9558c4ee6e2caee7d565e6a50ccdb8fa50 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 535/994] 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 a0e827b58c..268c1a3c40 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" ] || [ "${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 # 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 3cbf7bafdf..269482fbe0 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" ] || [ "${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 - # 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 a99a73ee1810e531a9bc33224e1dcfbc82ff732b 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 536/994] 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 80447077ad..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" ] || [ "${NAME}" = "Rocky Linux" ] || [ "${NAME}" = "AlmaLinux" ] || [ "CentOS Stream" ]) && [ "$((${VERSION_ID:0:1}))" -ge 9 ]) || ( [ "${NAME}" = "Fedora" ] && [ "$((${VERSION_ID}))" -ge 34 ] ); 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 68d8998764891c1ec51a9d9dbc42738d89e48178 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 537/994] 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 902fd3fe1a55a60c8efc40aa0caf139c0ff90511 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 538/994] 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 268c1a3c40..fff028f4a4 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 269482fbe0..236bc21616 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 d0747c92f9287fac80f75a8ddcc63b62f933331b 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 539/994] 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 fff028f4a4..42761c0e03 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 236bc21616..4c44127f59 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 5075e8d01e24c495a2c27fc9a2893bfde20d98cc 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 540/994] 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 b7ce51c30284294995202d528336fc1e4e3349a7 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 541/994] 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 68ab0c1fc62f27aca89eb908bfa4459c598725a0 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 542/994] 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 aacd17d36d68ad9d0361b59e805b4bd2df87fc56 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 543/994] 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 f34059a4ba860c48fbcfbac15570a22bc92dbecb 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 544/994] 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 42761c0e03..782086a4ae 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 4c44127f59..3b7fbefa4b 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 aa204b621bc4131a347cf1dcc5423a02080c7b06 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 545/994] 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 cef9ddd8087e7033a406a079a9920bc8aa0a1a3d 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 546/994] 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 3b7fbefa4b..828a5c5897 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 b694b0bb01f04e98d07a1d200e8557303685d5ef 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 547/994] 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 782086a4ae..fbbce2177c 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 8e8a712ea6a842208fe7553d5b7e50b1bc5bd113 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 548/994] 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 62124b6c534ecb0e8f8ac1354b79ea7cda25528a 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 549/994] 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 e7815d29cb8cb9a7c6d80984788a6faf03cf319f 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 550/994] 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 828a5c5897..e888e30126 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 28d2d9bdef7fe4ca5aee767bf08c460d011dd5a4 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 551/994] 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 1b789f6f0ebd906be137ebc8aaed07a7ef07a64b 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 552/994] 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 e888e30126..4be1fc3f71 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 ad3ba79ec4e3371c22ebb0ce032a118f5779b016 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 553/994] 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 601bcb2256aabb4681c20d903cfdd43bd6e5bd9d 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 554/994] 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 bb4945b084928c85975a612f5842e03ce8ed9fa6 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 555/994] 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 290f52ad097cb7d4476bc9986194e63e8444a6ac 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 556/994] 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 13234b5f68ad1012521c0b26e7240a9a59d604a9 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 557/994] 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 dcdee8b5ef894813f2ee440671f35e23d7d8d590 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 558/994] 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, 4 insertions(+), 4 deletions(-) diff --git a/debs/SPECS/wazuh-agent/debian/postinst b/debs/SPECS/wazuh-agent/debian/postinst index f415bbaf52..e755febd75 100644 --- a/debs/SPECS/wazuh-agent/debian/postinst +++ b/debs/SPECS/wazuh-agent/debian/postinst @@ -19,8 +19,8 @@ case "$1" in OSMYSHELL="/sbin/nologin" - if [ -d /run/systemd/system ]; then - rm -f /etc/init.d/wazuh-agent + if [[ -d /run/systemd/system ]]; then + rm -f %{_initrddir}/wazuh-agent fi if [ ! -f ${OSMYSHELL} ]; then diff --git a/debs/SPECS/wazuh-manager/debian/postinst b/debs/SPECS/wazuh-manager/debian/postinst index b4c5fb6980..dd4d507de8 100644 --- a/debs/SPECS/wazuh-manager/debian/postinst +++ b/debs/SPECS/wazuh-manager/debian/postinst @@ -16,8 +16,8 @@ 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 /etc/init.d/wazuh-manager + if [[ -d /run/systemd/system ]]; then + rm -f %{_initrddir}/wazuh-agent fi if [ ! -f ${OSMYSHELL} ]; then From d277bb440bf30602c13016e3c61bffd957c72b25 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 559/994] 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 d76358a1b51790dbf911a6482695e7bba09bfba0 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 560/994] 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 57450666001c1b3f49628c48c7130f128cc1adaf 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 561/994] 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 aaf4dc321a266de8900d73b989d8b600b1dbff1c 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 562/994] 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 fbbce2177c..9dd03a9265 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -795,3 +795,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 50750699c88c106bb7789bd192ea11272cdb07c0 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 563/994] 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 1816c5832a..febe83870d 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 754ac9e5f7b2c49f936a4aaca5c67fbffa4ed456 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 564/994] 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 3bdbe1be3e23c116c379a62d6524db4e793cbb81 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 565/994] 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 97780c679882f68ce96cc246b193ab6102946c99 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 566/994] 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 9dd03a9265..fbbce2177c 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -795,4 +795,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 a983900b2e9dc072796b620ea0bc6e3238b6f3af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 14 Feb 2023 10:28:02 +0100 Subject: [PATCH 567/994] Redirect written output of commands in postrm for agent packages 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/postrm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debs/SPECS/wazuh-agent/debian/postrm b/debs/SPECS/wazuh-agent/debian/postrm index ee822e0e52..bb30d5af0a 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 wazuh ; then + if getent passwd wazuh >/dev/null 2>&1; then deluser wazuh > /dev/null 2>&1 fi - if getent group wazuh ; then + if getent group wazuh >/dev/null 2>&1; then delgroup wazuh > /dev/null 2>&1 fi rm -rf ${DIR}/* From 4e4a5bb7db62ec0b8e4a0beaa8295a19ec8a1037 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Fri, 10 Feb 2023 13:57:24 +0100 Subject: [PATCH 568/994] Corrected names of the cert and password tools in builder.sh --- 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 14fdae8c21..36b05ff626 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -32,13 +32,13 @@ function getHelp() { echo -e " Builds the unattended installer single file wazuh-install.sh" echo -e "" echo -e " -c, --cert-tool" - echo -e " Builds the certificate creation tool cert-tool.sh" + echo -e " Builds the certificate creation tool wazuh-cert-tool.sh" echo -e "" echo -e " -d [staging], --development" echo -e " Use development repos. By default it uses pre-release. If staging is specified, it will be used" echo -e "" echo -e " -p, --password-tool" - echo -e " Builds the password creation and modification tool password-tool.sh" + echo -e " Builds the password creation and modification tool wazuh-password-tool.sh" echo -e "" echo -e " -h, --help" echo -e " Shows help." From eee18b77772756440e09bae3ba1fe43620119884 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Fri, 10 Feb 2023 13:58:25 +0100 Subject: [PATCH 569/994] Fixed adminkey and adminpem set --- .../passwords_tool/passwordsFunctions.sh | 10 ++-------- .../passwords_tool/passwordsVariables.sh | 5 ++++- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/unattended_installer/passwords_tool/passwordsFunctions.sh b/unattended_installer/passwords_tool/passwordsFunctions.sh index 2633d728e5..c042faf2bb 100644 --- a/unattended_installer/passwords_tool/passwordsFunctions.sh +++ b/unattended_installer/passwords_tool/passwordsFunctions.sh @@ -365,18 +365,12 @@ function passwords_getNetworkHost() { function passwords_readAdmincerts() { - if [[ -f /etc/wazuh-indexer/certs/admin.pem ]]; then - adminpem="/etc/wazuh-indexer/certs/admin.pem" - else + if [[ ! -f "${adminpem}" ]]; then common_logger -e "No admin certificate indicated. Please run the script with the option -c ." exit 1; fi - if [[ -f /etc/wazuh-indexer/certs/admin-key.pem ]]; then - adminkey="/etc/wazuh-indexer/certs/admin-key.pem" - elif [[ -f /etc/wazuh-indexer/certs/admin.key ]]; then - adminkey="/etc/wazuh-indexer/certs/admin.key" - else + if [[ ! -f "${adminkey}" ]]; then common_logger -e "No admin certificate key indicated. Please run the script with the option -k ." exit 1; fi diff --git a/unattended_installer/passwords_tool/passwordsVariables.sh b/unattended_installer/passwords_tool/passwordsVariables.sh index b3bef21909..1548c9fc5b 100644 --- a/unattended_installer/passwords_tool/passwordsVariables.sh +++ b/unattended_installer/passwords_tool/passwordsVariables.sh @@ -5,5 +5,8 @@ # and/or modify it under the terms of the GNU General Public # License (version 2) as published by the FSF - Free Software # Foundation. + readonly logfile="/var/log/wazuh-passwords-tool.log" -debug=">> ${logfile} 2>&1" \ No newline at end of file +debug=">> ${logfile} 2>&1" +adminpem="/etc/wazuh-indexer/certs/admin.pem" +adminkey="/etc/wazuh-indexer/certs/admin-key.pem" \ No newline at end of file From 540458f6d352f4c7888876c757064f2bc373185d Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Mon, 13 Feb 2023 11:48:57 +0100 Subject: [PATCH 570/994] Added commonVariables.sh file --- unattended_installer/builder.sh | 7 +++++-- unattended_installer/cert_tool/certVariables.sh | 3 --- .../common_functions/commonVariables.sh | 14 ++++++++++++++ .../install_functions/installVariables.sh | 3 --- .../passwords_tool/passwordsVariables.sh | 2 -- 5 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 unattended_installer/common_functions/commonVariables.sh diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index 36b05ff626..044c180844 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -85,6 +85,7 @@ function buildInstaller() { echo 'readonly repository="4.x"' >> "${output_script_path}" fi echo >> "${output_script_path}" + grep -Ev '^#|^\s*$' ${resources_common}/commonVariables.sh >> "${output_script_path}" grep -Ev '^#|^\s*$' ${resources_installer}/installVariables.sh >> "${output_script_path}" echo >> "${output_script_path}" @@ -150,7 +151,8 @@ function buildPasswordsTool() { # License (version 2) as published by the FSF - Free Software # Foundation." >> "${output_script_path}" - ## Passwords tool variables + ## Common and Passwords tool variables + grep -Ev '^#|^\s*$' ${resources_common}/commonVariables.sh >> "${output_script_path}" grep -Ev '^#|^\s*$' "${resources_passwords}/passwordsVariables.sh" >> "${output_script_path}" echo >> "${output_script_path}" @@ -190,7 +192,8 @@ function buildCertsTool() { # License (version 2) as published by the FSF - Free Software # Foundation." >> "${output_script_path}" - ## Certs tool variables + ## Common and Certs tool variables + grep -Ev '^#|^\s*$' ${resources_common}/commonVariables.sh >> "${output_script_path}" grep -Ev '^#|^\s*$' "${resources_certs}/certVariables.sh" >> "${output_script_path}" echo >> "${output_script_path}" diff --git a/unattended_installer/cert_tool/certVariables.sh b/unattended_installer/cert_tool/certVariables.sh index a40717b4f3..34a715f184 100644 --- a/unattended_installer/cert_tool/certVariables.sh +++ b/unattended_installer/cert_tool/certVariables.sh @@ -6,9 +6,6 @@ # License (version 2) as published by the FSF - Free Software # Foundation. -base_path="$(dirname "$(readlink -f "$0")")" -readonly base_path -readonly config_file="${base_path}/config.yml" readonly logfile="" cert_tmp_path="/tmp/wazuh-certificates" debug=">> /dev/null 2>&1" \ No newline at end of file diff --git a/unattended_installer/common_functions/commonVariables.sh b/unattended_installer/common_functions/commonVariables.sh new file mode 100644 index 0000000000..df557d43eb --- /dev/null +++ b/unattended_installer/common_functions/commonVariables.sh @@ -0,0 +1,14 @@ +# Common variables +# 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. + +adminpem="/etc/wazuh-indexer/certs/admin.pem" +adminkey="/etc/wazuh-indexer/certs/admin-key.pem" + +base_path="$(dirname "$(readlink -f "$0")")" +readonly base_path +config_file="${base_path}/config.yml" diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index 8517c77115..56688920a0 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -15,9 +15,6 @@ readonly wazuh_install_vesion="0.1" ## Links and paths to resources readonly resources="https://${bucket}/${wazuh_major}" readonly base_url="https://${bucket}/${repository}" -base_path="$(dirname "$(readlink -f "$0")")" -readonly base_path -config_file="${base_path}/config.yml" readonly tar_file_name="wazuh-install-files.tar" tar_file="${base_path}/${tar_file_name}" diff --git a/unattended_installer/passwords_tool/passwordsVariables.sh b/unattended_installer/passwords_tool/passwordsVariables.sh index 1548c9fc5b..201c6f6b94 100644 --- a/unattended_installer/passwords_tool/passwordsVariables.sh +++ b/unattended_installer/passwords_tool/passwordsVariables.sh @@ -8,5 +8,3 @@ readonly logfile="/var/log/wazuh-passwords-tool.log" debug=">> ${logfile} 2>&1" -adminpem="/etc/wazuh-indexer/certs/admin.pem" -adminkey="/etc/wazuh-indexer/certs/admin-key.pem" \ No newline at end of file From ee69f98956f61ed16a5903b0bdcb6e078413a582 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Mon, 13 Feb 2023 12:32:21 +0100 Subject: [PATCH 571/994] Reverted some variables in commonVariables.sh --- unattended_installer/cert_tool/certVariables.sh | 3 +++ unattended_installer/common_functions/commonVariables.sh | 4 ---- unattended_installer/install_functions/installVariables.sh | 3 +++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/unattended_installer/cert_tool/certVariables.sh b/unattended_installer/cert_tool/certVariables.sh index 34a715f184..a40717b4f3 100644 --- a/unattended_installer/cert_tool/certVariables.sh +++ b/unattended_installer/cert_tool/certVariables.sh @@ -6,6 +6,9 @@ # License (version 2) as published by the FSF - Free Software # Foundation. +base_path="$(dirname "$(readlink -f "$0")")" +readonly base_path +readonly config_file="${base_path}/config.yml" readonly logfile="" cert_tmp_path="/tmp/wazuh-certificates" debug=">> /dev/null 2>&1" \ No newline at end of file diff --git a/unattended_installer/common_functions/commonVariables.sh b/unattended_installer/common_functions/commonVariables.sh index df557d43eb..d43ffa892f 100644 --- a/unattended_installer/common_functions/commonVariables.sh +++ b/unattended_installer/common_functions/commonVariables.sh @@ -8,7 +8,3 @@ adminpem="/etc/wazuh-indexer/certs/admin.pem" adminkey="/etc/wazuh-indexer/certs/admin-key.pem" - -base_path="$(dirname "$(readlink -f "$0")")" -readonly base_path -config_file="${base_path}/config.yml" diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index 56688920a0..8517c77115 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -15,6 +15,9 @@ readonly wazuh_install_vesion="0.1" ## Links and paths to resources readonly resources="https://${bucket}/${wazuh_major}" readonly base_url="https://${bucket}/${repository}" +base_path="$(dirname "$(readlink -f "$0")")" +readonly base_path +config_file="${base_path}/config.yml" readonly tar_file_name="wazuh-install-files.tar" tar_file="${base_path}/${tar_file_name}" From 97f8ab9067eaf7cf2c932848e35a92aa9a4711fe Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Mon, 13 Feb 2023 14:08:06 +0100 Subject: [PATCH 572/994] Removed passwords_readAdmincerts function --- .../passwords_tool/passwordsFunctions.sh | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/unattended_installer/passwords_tool/passwordsFunctions.sh b/unattended_installer/passwords_tool/passwordsFunctions.sh index c042faf2bb..63b81bed88 100644 --- a/unattended_installer/passwords_tool/passwordsFunctions.sh +++ b/unattended_installer/passwords_tool/passwordsFunctions.sh @@ -175,9 +175,6 @@ function passwords_createBackUp() { capem=$(grep "plugins.security.ssl.transport.pemtrustedcas_filepath: " /etc/wazuh-indexer/opensearch.yml ) rcapem="plugins.security.ssl.transport.pemtrustedcas_filepath: " capem="${capem//$rcapem}" - if [[ -z "${adminpem}" ]] || [[ -z "${adminkey}" ]]; then - passwords_readAdmincerts - fi fi fi @@ -363,20 +360,6 @@ function passwords_getNetworkHost() { fi } -function passwords_readAdmincerts() { - - if [[ ! -f "${adminpem}" ]]; then - common_logger -e "No admin certificate indicated. Please run the script with the option -c ." - exit 1; - fi - - if [[ ! -f "${adminkey}" ]]; then - common_logger -e "No admin certificate key indicated. Please run the script with the option -k ." - exit 1; - fi - -} - function passwords_readFileUsers() { filecorrect=$(grep -Ev '^#|^\s*$' "${p_file}" | grep -Pzc "\A(\s*(indexer_username|api_username|indexer_password|api_password):[ \t]+[\'\"]?[\w.*+?-]+[\'\"]?)+\Z") @@ -569,9 +552,6 @@ function passwords_runSecurityAdmin() { capem=$(grep "plugins.security.ssl.transport.pemtrustedcas_filepath: " /etc/wazuh-indexer/opensearch.yml ) rcapem="plugins.security.ssl.transport.pemtrustedcas_filepath: " capem="${capem//$rcapem}" - if [[ -z "${adminpem}" ]] || [[ -z "${adminkey}" ]]; then - passwords_readAdmincerts - fi fi fi From 178fa93b45344e62697757a41a29bde70ab834d0 Mon Sep 17 00:00:00 2001 From: Antonio Manuel Fresneda Rodriguez Date: Wed, 29 Dec 2021 12:29:49 +0100 Subject: [PATCH 573/994] Add libfimdb to CentOS SPECS. --- rpms/SPECS/wazuh-agent.spec | 1 + rpms/SPECS/wazuh-manager.spec | 1 + 2 files changed, 2 insertions(+) diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index fbbce2177c..751fd1ce9d 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -528,6 +528,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 4be1fc3f71..a3261a49a6 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -655,6 +655,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 From ff4ccd6824e47274c4c10f8c47571d94104b8668 Mon Sep 17 00:00:00 2001 From: Antonio Manuel Fresneda Rodriguez Date: Wed, 29 Dec 2021 12:42:24 +0100 Subject: [PATCH 574/994] Add libfimdb to Solaris SPECS. --- solaris/solaris11/SPECS/template_agent.json | 8 ++++++++ 1 file changed, 8 insertions(+) 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", From 4704d93c2fddbb91419882b9240f25b25038dfbf Mon Sep 17 00:00:00 2001 From: Chema Martinez Date: Thu, 24 Mar 2022 17:04:00 +0100 Subject: [PATCH 575/994] Update HP-UX generate packages script to include GCC-9.4 and cmake-3.22.2 --- hp-ux/generate_wazuh_packages.sh | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/hp-ux/generate_wazuh_packages.sh b/hp-ux/generate_wazuh_packages.sh index 896808cc81..5d310ef100 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,11 @@ 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 +CXX=/home/okkam/bootstrap-gcc/gcc94_prefix/bin/g++ + build_environment() { # Resizing partitions for Site Ox boxes (used by Wazuh team) @@ -53,7 +58,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 @@ -62,9 +66,29 @@ build_environment() { /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 perl-5.10.1 /usr/local/bin/depothelper $fpt_connection -f regex /usr/local/bin/depothelper $fpt_connection -f python + cp /usr/bin/perl /tmp/perl + cp /usr/local/bin/perl5.10.1 /usr/bin/perl + + # Install GCC 9.4 + mkdir ${build_tools_path} + cd ${build_tools_path} + mkdir bootstrap-gcc + cd ${build_tools_path}/bootstrap-gcc + curl -k -SO https://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 https://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() { @@ -172,6 +196,8 @@ clean() { userdel wazuh groupdel wazuh + rm -rf ${build_tools_path} + exit ${exit_code} } From 943eef91749f312ba4c9a21c315c5777c74ae5be Mon Sep 17 00:00:00 2001 From: Chema Martinez Date: Tue, 3 May 2022 18:32:41 +0200 Subject: [PATCH 576/994] Include GCC libs to HPUX agent package --- hp-ux/generate_wazuh_packages.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hp-ux/generate_wazuh_packages.sh b/hp-ux/generate_wazuh_packages.sh index 5d310ef100..d4c8454e4f 100755 --- a/hp-ux/generate_wazuh_packages.sh +++ b/hp-ux/generate_wazuh_packages.sh @@ -141,6 +141,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 } From ce454abdc3246c422d848edb423418233e217491 Mon Sep 17 00:00:00 2001 From: Jotacarma Date: Tue, 15 Nov 2022 12:57:38 +0100 Subject: [PATCH 577/994] Added link to use gcc 9.4 after installing --- 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 ++- 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 ++- wpk/linux/x86_64/Dockerfile | 3 ++- 13 files changed, 26 insertions(+), 13 deletions(-) diff --git a/debs/Debian/amd64/Dockerfile b/debs/Debian/amd64/Dockerfile index cab85b23cd..b89a783073 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 c43803f4bf..717926819b 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/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/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 2e5a606f8296551325decf9e676b21eb7e7e01e1 Mon Sep 17 00:00:00 2001 From: Jotacarma Date: Thu, 22 Dec 2022 12:41:31 +0100 Subject: [PATCH 578/994] Remove perl version while provisioning environment --- hp-ux/generate_wazuh_packages.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hp-ux/generate_wazuh_packages.sh b/hp-ux/generate_wazuh_packages.sh index d4c8454e4f..0c4c55bd21 100755 --- a/hp-ux/generate_wazuh_packages.sh +++ b/hp-ux/generate_wazuh_packages.sh @@ -66,11 +66,9 @@ build_environment() { /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-5.10.1 + /usr/local/bin/depothelper $fpt_connection -f perl /usr/local/bin/depothelper $fpt_connection -f regex /usr/local/bin/depothelper $fpt_connection -f python - cp /usr/bin/perl /tmp/perl - cp /usr/local/bin/perl5.10.1 /usr/bin/perl # Install GCC 9.4 mkdir ${build_tools_path} From eb89c63694dc8b9c736e65896f8fe9682c595f52 Mon Sep 17 00:00:00 2001 From: Jotacarma Date: Mon, 9 Jan 2023 13:00:42 +0100 Subject: [PATCH 579/994] Change to http protocol because can be problems in HP-UX --- hp-ux/generate_wazuh_packages.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hp-ux/generate_wazuh_packages.sh b/hp-ux/generate_wazuh_packages.sh index 0c4c55bd21..7ad1faef5b 100755 --- a/hp-ux/generate_wazuh_packages.sh +++ b/hp-ux/generate_wazuh_packages.sh @@ -75,7 +75,7 @@ build_environment() { cd ${build_tools_path} mkdir bootstrap-gcc cd ${build_tools_path}/bootstrap-gcc - curl -k -SO https://packages.wazuh.com/utils/gcc/gcc_9.4_HPUX_build.tar.gz + 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 @@ -83,7 +83,7 @@ build_environment() { # Install cmake 3.22.2 cd ${build_tools_path} - curl -k -SO https://packages.wazuh.com/utils/cmake/cmake_3.22.2_HPUX_build.tar.gz + 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 From 8897ffa01aec35771aa1c57506757d74dbe34aaa Mon Sep 17 00:00:00 2001 From: Jotacarma Date: Thu, 12 Jan 2023 10:05:53 +0100 Subject: [PATCH 580/994] Export LD_LIBRARY_PATH to fix compilation --- hp-ux/generate_wazuh_packages.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hp-ux/generate_wazuh_packages.sh b/hp-ux/generate_wazuh_packages.sh index 7ad1faef5b..caf58ddce6 100755 --- a/hp-ux/generate_wazuh_packages.sh +++ b/hp-ux/generate_wazuh_packages.sh @@ -21,7 +21,8 @@ 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 -CXX=/home/okkam/bootstrap-gcc/gcc94_prefix/bin/g++ +export LD_LIBRARY_PATH +CXX=${build_tools_path}/bootstrap-gcc/gcc94_prefix/bin/g++ build_environment() { From c00c8e92cd06aefd920ea5aa692f6707f7686967 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 16 Feb 2023 10:46:19 +0100 Subject: [PATCH 581/994] Fix check of dist-detect.sh curl --- unattended_installer/builder.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index 044c180844..0bcf74b831 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -274,6 +274,25 @@ function builder_main() { fi } +function checkDistDetectURL() { + + retries=0 + eval "curl -s -o /dev/null 'https://raw.githubusercontent.com/wazuh/wazuh/${source_branch}/src/init/dist-detect.sh' --retry 5 --retry-delay 5 --max-time 300 --fail" + e_code="${PIPESTATUS[0]}" + while [ "${e_code}" -eq 7 ] && [ "${retries}" -ne 12 ]; do + retries=$((retries+1)) + sleep 5 + eval "curl -s -o /dev/null 'https://raw.githubusercontent.com/wazuh/wazuh/${source_branch}/src/init/dist-detect.sh' --retry 5 --retry-delay 5 --max-time 300 --fail" + e_code="${PIPESTATUS[0]}" + done + + if [[ "${retries}" -eq 12 ]] || [[ "${e_code}" -ne 0 ]]; then + echo -e "Error: Could not get the Filebeat Wazuh template. " + exit 1 + fi + +} + function checkFilebeatURL() { # Import variables From 33ff19795a045d08f6c0d71b8a8e8364c92b0392 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 16 Feb 2023 10:47:11 +0100 Subject: [PATCH 582/994] Calling function in buildInstaller --- unattended_installer/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index 0bcf74b831..3d7afad2fc 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -48,6 +48,7 @@ function getHelp() { function buildInstaller() { + checkDistDetectURL checkFilebeatURL output_script_path="${base_path_builder}/wazuh-install.sh" From c7ea775a30798205b7e04a48ae37fb8bdcd79d35 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 16 Feb 2023 11:02:49 +0100 Subject: [PATCH 583/994] Improved the error message --- 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 3d7afad2fc..8f87b0e109 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -288,7 +288,7 @@ function checkDistDetectURL() { done if [[ "${retries}" -eq 12 ]] || [[ "${e_code}" -ne 0 ]]; then - echo -e "Error: Could not get the Filebeat Wazuh template. " + echo -e "Error: Could not get the dist-detect file." exit 1 fi From fff38351cdedc8bcdd3b93736881f2bdd530373d Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 16 Feb 2023 11:43:35 +0100 Subject: [PATCH 584/994] Removed retry arguments in the loop --- 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 8f87b0e109..e2e12d5e53 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -283,7 +283,7 @@ function checkDistDetectURL() { while [ "${e_code}" -eq 7 ] && [ "${retries}" -ne 12 ]; do retries=$((retries+1)) sleep 5 - eval "curl -s -o /dev/null 'https://raw.githubusercontent.com/wazuh/wazuh/${source_branch}/src/init/dist-detect.sh' --retry 5 --retry-delay 5 --max-time 300 --fail" + eval "curl -s -o /dev/null 'https://raw.githubusercontent.com/wazuh/wazuh/${source_branch}/src/init/dist-detect.sh' --fail" e_code="${PIPESTATUS[0]}" done From b76a33e3517cb44491b2dbd82f01209d588ea9e3 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 16 Feb 2023 11:07:11 +0100 Subject: [PATCH 585/994] Updated source_branch 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 e2e12d5e53..8ddd49b9d5 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -16,7 +16,7 @@ readonly resources_certs="${base_path_builder}/cert_tool" readonly resources_passwords="${base_path_builder}/passwords_tool" readonly resources_common="${base_path_builder}/common_functions" readonly resources_download="${base_path_builder}/downloader" -readonly source_branch="4.4" +readonly source_branch="4.5" function getHelp() { From bd96b66200261533ee3f23bf9ec0778d29930698 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 9 Feb 2023 13:56:11 +0100 Subject: [PATCH 586/994] Added installCommon_installCheckDependencies function --- .../install_functions/installCommon.sh | 57 ++++++++++++++++++- .../install_functions/installMain.sh | 4 +- 2 files changed, 58 insertions(+), 3 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index c9bf605806..81c463ec7b 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -270,10 +270,63 @@ function installCommon_getPass() { done } +function installCommon_installCheckDependencies() { + + if [ "${sys_type}" == "yum" ]; then + dependencies=( systemd grep tar coreutils sed procps gawk lsof curl openssl ) + not_installed=() + for dep in "${dependencies[@]}"; do + if [ "${dep}" == "openssl" ]; 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 -E ^"${dep}";then + not_installed+=("${dep}") + fi + done + + if [ "${#not_installed[@]}" -gt 0 ]; then + common_logger "--- Dependencies ---" + for dep in "${not_installed[@]}"; do + common_logger "Installing $dep." + eval "yum install ${dep} -y ${debug}" + if [ "${PIPESTATUS[0]}" != 0 ]; then + common_logger -e "Cannot install dependency: ${dep}." + exit 1 + fi + done + fi + + elif [ "${sys_type}" == "apt-get" ]; then + eval "apt-get update -q ${debug}" + dependencies=( systemd grep tar coreutils sed procps gawk lsof curl openssl ) + not_installed=() + + for dep in "${dependencies[@]}"; do + if ! apt list --installed 2>/dev/null | grep -q -E ^"${dep}"; then + not_installed+=("${dep}") + fi + done + + if [ "${#not_installed[@]}" -gt 0 ]; then + common_logger "--- Dependencies ----" + for dep in "${not_installed[@]}"; do + common_logger "Installing $dep." + installCommon_aptInstall "${dep}" + if [ "${install_result}" != 0 ]; then + common_logger -e "Cannot install dependency: ${dep}." + exit 1 + fi + done + fi + fi + +} + function installCommon_installPrerequisites() { if [ "${sys_type}" == "yum" ]; then - dependencies=( curl libcap tar gnupg openssl lsof ) + dependencies=( libcap gnupg ) not_installed=() for dep in "${dependencies[@]}"; do if [ "${dep}" == "openssl" ]; then @@ -299,7 +352,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 lsof ) + dependencies=( apt-transport-https libcap2-bin software-properties-common gnupg ) not_installed=() for dep in "${dependencies[@]}"; do diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index 3909a73884..477a01f3c9 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -202,11 +202,13 @@ function main() { # -------------- Uninstall case ------------------------------------ + common_checkSystem + installCommon_installCheckDependencies + if [ -z "${download}" ]; then check_dist fi - common_checkSystem common_checkInstalled checks_arguments if [ -n "${uninstall}" ]; then From aa253c98f7aac94953ea08f30887569dc2047206 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Fri, 10 Feb 2023 11:30:15 +0100 Subject: [PATCH 587/994] Avoid installing dependencies in uninstallation --- unattended_installer/install_functions/installMain.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index 477a01f3c9..9689b7b5da 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -203,7 +203,10 @@ function main() { # -------------- Uninstall case ------------------------------------ common_checkSystem - installCommon_installCheckDependencies + + if [ -z "${uninstall}" ]; then + installCommon_installCheckDependencies + fi if [ -z "${download}" ]; then check_dist From 0ec969d38d4199d813fdfb96382e6e5283005f66 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Tue, 14 Feb 2023 13:51:49 +0100 Subject: [PATCH 588/994] Modularized the installation of dependencies --- .../install_functions/installCommon.sh | 139 +++++++----------- 1 file changed, 57 insertions(+), 82 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 81c463ec7b..1dd0e1ea4f 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -98,6 +98,31 @@ function installCommon_aptInstall() { } +function installCommon_aptInstallList(){ + + dependencies=("$@") + not_installed=() + + for dep in "${dependencies[@]}"; do + if ! apt list --installed 2>/dev/null | grep -q -E ^"${dep}"; then + not_installed+=("${dep}") + fi + done + + if [ "${#not_installed[@]}" -gt 0 ]; then + common_logger "--- Dependencies ----" + for dep in "${not_installed[@]}"; do + common_logger "Installing $dep." + installCommon_aptInstall "${dep}" + if [ "${install_result}" != 0 ]; then + common_logger -e "Cannot install dependency: ${dep}." + exit 1 + fi + done + fi + +} + function installCommon_changePasswordApi() { #Change API password tool @@ -274,51 +299,12 @@ function installCommon_installCheckDependencies() { if [ "${sys_type}" == "yum" ]; then dependencies=( systemd grep tar coreutils sed procps gawk lsof curl openssl ) - not_installed=() - for dep in "${dependencies[@]}"; do - if [ "${dep}" == "openssl" ]; 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 -E ^"${dep}";then - not_installed+=("${dep}") - fi - done - - if [ "${#not_installed[@]}" -gt 0 ]; then - common_logger "--- Dependencies ---" - for dep in "${not_installed[@]}"; do - common_logger "Installing $dep." - eval "yum install ${dep} -y ${debug}" - if [ "${PIPESTATUS[0]}" != 0 ]; then - common_logger -e "Cannot install dependency: ${dep}." - exit 1 - fi - done - fi + installCommon_yumInstallList "${dependencies[@]}" elif [ "${sys_type}" == "apt-get" ]; then eval "apt-get update -q ${debug}" dependencies=( systemd grep tar coreutils sed procps gawk lsof curl openssl ) - not_installed=() - - for dep in "${dependencies[@]}"; do - if ! apt list --installed 2>/dev/null | grep -q -E ^"${dep}"; then - not_installed+=("${dep}") - fi - done - - if [ "${#not_installed[@]}" -gt 0 ]; then - common_logger "--- Dependencies ----" - for dep in "${not_installed[@]}"; do - common_logger "Installing $dep." - installCommon_aptInstall "${dep}" - if [ "${install_result}" != 0 ]; then - common_logger -e "Cannot install dependency: ${dep}." - exit 1 - fi - done - fi + installCommon_aptInstallList fi } @@ -327,51 +313,12 @@ function installCommon_installPrerequisites() { if [ "${sys_type}" == "yum" ]; then dependencies=( libcap gnupg ) - not_installed=() - for dep in "${dependencies[@]}"; do - if [ "${dep}" == "openssl" ]; 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 -E ^"${dep}";then - not_installed+=("${dep}") - fi - done - - if [ "${#not_installed[@]}" -gt 0 ]; then - common_logger "--- Dependencies ---" - for dep in "${not_installed[@]}"; do - common_logger "Installing $dep." - eval "yum install ${dep} -y ${debug}" - if [ "${PIPESTATUS[0]}" != 0 ]; then - common_logger -e "Cannot install dependency: ${dep}." - exit 1 - fi - done - fi + installCommon_yumInstallList "${dependencies[@]}" elif [ "${sys_type}" == "apt-get" ]; then eval "apt-get update -q ${debug}" dependencies=( apt-transport-https libcap2-bin software-properties-common gnupg ) - not_installed=() - - for dep in "${dependencies[@]}"; do - if ! apt list --installed 2>/dev/null | grep -q -E ^"${dep}"; then - not_installed+=("${dep}") - fi - done - - if [ "${#not_installed[@]}" -gt 0 ]; then - common_logger "--- Dependencies ----" - for dep in "${not_installed[@]}"; do - common_logger "Installing $dep." - installCommon_aptInstall "${dep}" - if [ "${install_result}" != 0 ]; then - common_logger -e "Cannot install dependency: ${dep}." - exit 1 - fi - done - fi + installCommon_aptInstallList "${dependencies[@]}" fi } @@ -670,4 +617,32 @@ function installCommon_startService() { exit 1 fi +} + +function installCommon_yumInstallList(){ + + dependencies=("$@") + not_installed=() + for dep in "${dependencies[@]}"; do + if [ "${dep}" == "openssl" ]; 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 -E ^"${dep}";then + not_installed+=("${dep}") + fi + done + + if [ "${#not_installed[@]}" -gt 0 ]; then + common_logger "--- Dependencies ---" + for dep in "${not_installed[@]}"; do + common_logger "Installing $dep." + eval "yum install ${dep} -y ${debug}" + if [ "${PIPESTATUS[0]}" != 0 ]; then + common_logger -e "Cannot install dependency: ${dep}." + exit 1 + fi + done + fi + } \ No newline at end of file From 62daaf2e906bef5d262c809e789e30fcdf0d509a Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Tue, 14 Feb 2023 13:56:14 +0100 Subject: [PATCH 589/994] Forgot adding dependencies array --- unattended_installer/install_functions/installCommon.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 1dd0e1ea4f..866cde37c6 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -304,7 +304,7 @@ function installCommon_installCheckDependencies() { elif [ "${sys_type}" == "apt-get" ]; then eval "apt-get update -q ${debug}" dependencies=( systemd grep tar coreutils sed procps gawk lsof curl openssl ) - installCommon_aptInstallList + installCommon_aptInstallList "${dependencies[@]}" fi } From 0ee355968317ed2a17e92ec8bdacd5a61ab43b7f Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Fri, 17 Feb 2023 14:02:00 +0100 Subject: [PATCH 590/994] Changed check of the installed packages --- .../install_functions/installCommon.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 866cde37c6..cf73d61b7a 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -104,7 +104,7 @@ function installCommon_aptInstallList(){ not_installed=() for dep in "${dependencies[@]}"; do - if ! apt list --installed 2>/dev/null | grep -q -E ^"${dep}"; then + if ! apt list --installed 2>/dev/null | grep -q -E ^"${dep}"\/; then not_installed+=("${dep}") fi done @@ -298,7 +298,7 @@ function installCommon_getPass() { function installCommon_installCheckDependencies() { if [ "${sys_type}" == "yum" ]; then - dependencies=( systemd grep tar coreutils sed procps gawk lsof curl openssl ) + dependencies=( systemd grep tar coreutils sed procps-ng gawk lsof curl openssl ) installCommon_yumInstallList "${dependencies[@]}" elif [ "${sys_type}" == "apt-get" ]; then @@ -312,7 +312,7 @@ function installCommon_installCheckDependencies() { function installCommon_installPrerequisites() { if [ "${sys_type}" == "yum" ]; then - dependencies=( libcap gnupg ) + dependencies=( libcap gnupg2 ) installCommon_yumInstallList "${dependencies[@]}" elif [ "${sys_type}" == "apt-get" ]; then @@ -624,11 +624,7 @@ function installCommon_yumInstallList(){ dependencies=("$@") not_installed=() for dep in "${dependencies[@]}"; do - if [ "${dep}" == "openssl" ]; 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 -E ^"${dep}";then + if ! yum list installed 2>/dev/null | grep -q -E ^"${dep}"\\.;then not_installed+=("${dep}") fi done From 809a0bcb97833727f82bd8c19b156e75dd847a2d Mon Sep 17 00:00:00 2001 From: DFolchA Date: Mon, 13 Mar 2023 14:40:26 +0100 Subject: [PATCH 591/994] Update source_branch in builder.sh --- 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 8ddd49b9d5..40953bf8c1 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -16,7 +16,7 @@ readonly resources_certs="${base_path_builder}/cert_tool" readonly resources_passwords="${base_path_builder}/passwords_tool" readonly resources_common="${base_path_builder}/common_functions" readonly resources_download="${base_path_builder}/downloader" -readonly source_branch="4.5" +readonly source_branch="4.6" function getHelp() { From fd33c19271b653dfd123cc5059beba763860d80e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 9 Mar 2023 15:46:21 +0100 Subject: [PATCH 592/994] Fixed name of called workflow in the Upload deb and rpm images action --- .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 a0da5b8eb7..5a01a68a13 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -61,5 +61,5 @@ jobs: Test-packages-deb: needs: Build-packages-deb if: github.event_name == 'pull_request' - uses: ./.github/workflows/test-install-and-enable-deb.yml + uses: ./.github/workflows/test-install-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 c2392127da..9e414a8b22 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -61,5 +61,5 @@ jobs: Test-packages-rpm: needs: Build-packages-rpm if: github.event_name == 'pull_request' - uses: ./.github/workflows/test-install-and-enable-rpm.yml + uses: ./.github/workflows/test-install-rpm.yml secrets: inherit \ No newline at end of file From fb00ceb5b4b18d5bec9afe32ac7601ba2d7c491b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Tue, 28 Feb 2023 14:36:17 +0100 Subject: [PATCH 593/994] Calls to the dashboard api now use the port defined as a 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/install_functions/dashboard.sh | 4 ++-- unattended_installer/install_functions/installMain.sh | 2 +- unattended_installer/install_functions/installVariables.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/unattended_installer/install_functions/dashboard.sh b/unattended_installer/install_functions/dashboard.sh index 9b1395775a..907e3759c6 100644 --- a/unattended_installer/install_functions/dashboard.sh +++ b/unattended_installer/install_functions/dashboard.sh @@ -98,7 +98,7 @@ function dashboard_initialize() { print_ip="${nodes_dashboard_ip}" fi - 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 [ "$(common_curl -XGET https://"${nodes_dashboard_ip}":"${wazuh_dashboard_port}"/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 @@ -158,7 +158,7 @@ function dashboard_initializeAIO() { common_logger "Initializing Wazuh dashboard web application." installCommon_getPass "admin" - 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 + if [ "$(common_curl -XGET https://localhost:"${wazuh_dashboard_port}"/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/installMain.sh b/unattended_installer/install_functions/installMain.sh index 9689b7b5da..078fcd112d 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -244,7 +244,7 @@ function main() { fi if [ -n "${dashboard}" ]; then - checks_ports "${wazuh_dashboard_ports[@]}" + checks_ports "${wazuh_dashboard_port}" fi diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index 8517c77115..18227c22f1 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -51,4 +51,4 @@ adminPassword="wazuh" readonly wazuh_aio_ports=( 9200 9300 1514 1515 1516 55000 443) readonly wazuh_indexer_ports=( 9200 9300 ) readonly wazuh_manager_ports=( 1514 1515 1516 55000 ) -readonly wazuh_dashboard_ports=( 443 ) +readonly wazuh_dashboard_port=443 From 76a6bafd8f3f70929f2673889273497930f88102 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Wed, 15 Feb 2023 13:59:12 +0100 Subject: [PATCH 594/994] Fixed Debian expired keys in Dockerfiles --- debs/Debian/arm64/Dockerfile | 4 ++-- debs/Debian/armhf/Dockerfile | 4 ++-- debs/Debian/ppc64le/Dockerfile | 6 ++++-- stack/dashboard/deb/docker/amd64/Dockerfile | 4 ++-- stack/indexer/deb/docker/amd64/Dockerfile | 1 - windows/Dockerfile | 2 +- wpk/common/Dockerfile | 2 +- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/debs/Debian/arm64/Dockerfile b/debs/Debian/arm64/Dockerfile index 3a24ee820f..29c502a3c3 100644 --- a/debs/Debian/arm64/Dockerfile +++ b/debs/Debian/arm64/Dockerfile @@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND noninteractive # Installing necessary packages RUN echo "deb http://deb.debian.org/debian stretch contrib non-free" >> /etc/apt/sources.list && \ echo "deb-src http://deb.debian.org/debian stretch main contrib non-free" >> /etc/apt/sources.list && \ - apt-get update && apt-get install -y apt apt-utils \ + apt-get update && apt-get install -y --allow-change-held-packages apt apt-utils \ curl gcc g++ make sudo expect gnupg \ perl-base perl wget libc-bin libc6 libc6-dev \ build-essential cdbs devscripts equivs automake \ @@ -15,7 +15,7 @@ RUN echo "deb http://deb.debian.org/debian stretch contrib non-free" >> /etc/apt # Add Debian's source repository and, Install NodeJS 12 RUN apt-get update && apt-get build-dep python3.5 -y RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \ - apt-get install -y nodejs + apt-get install --allow-change-held-packages -y nodejs 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/armhf/Dockerfile b/debs/Debian/armhf/Dockerfile index 4320d43498..47ae349897 100644 --- a/debs/Debian/armhf/Dockerfile +++ b/debs/Debian/armhf/Dockerfile @@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND noninteractive # Installing necessary packages RUN echo "deb http://deb.debian.org/debian stretch contrib non-free" >> /etc/apt/sources.list && \ echo "deb-src http://deb.debian.org/debian stretch main contrib non-free" >> /etc/apt/sources.list && \ - apt-get update && apt-get install -y apt-utils \ + apt-get update && apt-get install -y --allow-change-held-packages apt-utils \ curl gcc make wget sudo expect gnupg perl-base \ perl libc-bin libc6 libc6-dev \ build-essential cdbs devscripts equivs automake autoconf libtool \ @@ -15,7 +15,7 @@ RUN echo "deb http://deb.debian.org/debian stretch contrib non-free" >> /etc/apt # Add Debian's source repository and, Install NodeJS 12 RUN apt-get build-dep python3.5 -y RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \ - apt-get install -y nodejs + apt-get install -y --allow-change-held-packages nodejs 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/ppc64le/Dockerfile b/debs/Debian/ppc64le/Dockerfile index 2fa4fe311a..a72e7127c0 100644 --- a/debs/Debian/ppc64le/Dockerfile +++ b/debs/Debian/ppc64le/Dockerfile @@ -2,11 +2,13 @@ FROM ppc64le/debian:stretch ENV DEBIAN_FRONTEND noninteractive +RUN apt-get -v + # Installing necessary packages RUN echo "deb http://deb.debian.org/debian stretch main contrib non-free" >> /etc/apt/sources.list && \ echo "deb-src http://deb.debian.org/debian stretch main contrib non-free" >> /etc/apt/sources.list && \ - apt-get update && apt-get install -y apt-utils && \ - apt-get install -y --force-yes \ + apt-get update && apt-get install -y --allow-change-held-packages apt-utils && \ + apt-get install -y --allow-change-held-packages \ curl gcc make sudo expect gnupg perl-base perl wget \ libc-bin libc6 libc6-dev build-essential \ cdbs devscripts equivs automake autoconf libtool libaudit-dev selinux-basics \ diff --git a/stack/dashboard/deb/docker/amd64/Dockerfile b/stack/dashboard/deb/docker/amd64/Dockerfile index 77d3684396..f3ca3b9811 100644 --- a/stack/dashboard/deb/docker/amd64/Dockerfile +++ b/stack/dashboard/deb/docker/amd64/Dockerfile @@ -3,8 +3,8 @@ FROM debian:10 ENV DEBIAN_FRONTEND noninteractive # Installing necessary packages -RUN apt-get update && apt-get install -y apt-utils && \ - apt-get install -y \ +RUN apt-get update && apt-get install -y --allow-change-held-packages apt-utils && \ + apt-get install -y --allow-change-held-packages \ curl sudo wget expect gnupg build-essential \ devscripts equivs selinux-basics procps gawk diff --git a/stack/indexer/deb/docker/amd64/Dockerfile b/stack/indexer/deb/docker/amd64/Dockerfile index bfbed39da9..b40740f3db 100644 --- a/stack/indexer/deb/docker/amd64/Dockerfile +++ b/stack/indexer/deb/docker/amd64/Dockerfile @@ -2,7 +2,6 @@ FROM debian:8 ENV DEBIAN_FRONTEND noninteractive -# 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 \ diff --git a/windows/Dockerfile b/windows/Dockerfile index bf17600c83..79fd0b2f0f 100644 --- a/windows/Dockerfile +++ b/windows/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:22.04 # Installing necessary packages RUN apt-get update && \ - apt-get install -y gcc g++ gcc-mingw-w64 g++-mingw-w64 nsis make wget unzip \ + apt-get install -y --allow-change-held-packages gcc g++ gcc-mingw-w64 g++-mingw-w64 nsis make wget unzip \ curl perl binutils zip libssl-dev RUN curl -OL http://packages.wazuh.com/utils/cmake/cmake-3.18.3.tar.gz && \ diff --git a/wpk/common/Dockerfile b/wpk/common/Dockerfile index 1597f882f1..eae449e527 100644 --- a/wpk/common/Dockerfile +++ b/wpk/common/Dockerfile @@ -1,7 +1,7 @@ FROM debian:9 RUN apt-get update && \ - apt-get -y install python git curl jq python3 python3-pip libffi-dev && \ + apt-get -y install --allow-change-held-packages python git curl jq python3 python3-pip libffi-dev && \ pip3 install --upgrade cryptography==2.9.2 awscli ADD wpkpack.py /usr/local/bin/wpkpack From e208a18713a4f4c987e1e906fd5d8ced5b721f2b Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 16 Feb 2023 13:48:37 +0100 Subject: [PATCH 595/994] Fixed Debian dockerfiles --- debs/Debian/arm64/Dockerfile | 2 +- debs/Debian/armhf/Dockerfile | 2 +- debs/Debian/ppc64le/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debs/Debian/arm64/Dockerfile b/debs/Debian/arm64/Dockerfile index 29c502a3c3..4f66d330f9 100644 --- a/debs/Debian/arm64/Dockerfile +++ b/debs/Debian/arm64/Dockerfile @@ -13,7 +13,7 @@ RUN echo "deb http://deb.debian.org/debian stretch contrib non-free" >> /etc/apt libdb5.3 libdb5.3 libssl1.0.2 gawk libsigsegv2 # Add Debian's source repository and, Install NodeJS 12 -RUN apt-get update && apt-get build-dep python3.5 -y +RUN apt-get update && apt-get build-dep python3.5 -y --allow-change-held-packages RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \ apt-get install --allow-change-held-packages -y nodejs diff --git a/debs/Debian/armhf/Dockerfile b/debs/Debian/armhf/Dockerfile index 47ae349897..83cfb20e3b 100644 --- a/debs/Debian/armhf/Dockerfile +++ b/debs/Debian/armhf/Dockerfile @@ -13,7 +13,7 @@ RUN echo "deb http://deb.debian.org/debian stretch contrib non-free" >> /etc/apt libssl1.1 libssl-dev gawk libsigsegv2 procps libc6-armel-cross g++ # Add Debian's source repository and, Install NodeJS 12 -RUN apt-get build-dep python3.5 -y +RUN apt-get build-dep python3.5 -y --allow-change-held-packages RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \ apt-get install -y --allow-change-held-packages nodejs diff --git a/debs/Debian/ppc64le/Dockerfile b/debs/Debian/ppc64le/Dockerfile index a72e7127c0..8491f3590a 100644 --- a/debs/Debian/ppc64le/Dockerfile +++ b/debs/Debian/ppc64le/Dockerfile @@ -14,7 +14,7 @@ RUN echo "deb http://deb.debian.org/debian stretch main contrib non-free" >> /et cdbs devscripts equivs automake autoconf libtool libaudit-dev selinux-basics \ libdb5.3 libdb5.3 libssl1.0.2 gawk libsigsegv2 -RUN apt-get update && apt-get build-dep python3.5 -y +RUN apt-get update && apt-get build-dep python3.5 -y --allow-change-held-packages 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/ && \ From f594c13ae1254d08a153af22183979e0c097d835 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Thu, 2 Mar 2023 16:52:37 +0100 Subject: [PATCH 596/994] Add removal of indexer remaining files --- unattended_installer/install_functions/installCommon.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index cf73d61b7a..83f2002bcd 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -21,6 +21,7 @@ function installCommon_cleanExit() { if [[ "${rollback_conf}" =~ [N|n] ]]; then exit 1 else + common_checkInstalled installCommon_rollBack exit 1 fi From 9a435e27ce538565993edc5f68aae6466a7c54ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Turina?= Date: Tue, 14 Feb 2023 11:50:30 -0300 Subject: [PATCH 597/994] Remove var/db/agents directory (#2042) --- debs/SPECS/wazuh-manager/debian/postinst | 2 +- debs/SPECS/wazuh-manager/debian/preinst | 2 +- rpms/SPECS/wazuh-manager.spec | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debs/SPECS/wazuh-manager/debian/postinst b/debs/SPECS/wazuh-manager/debian/postinst index c5c84fc29e..df8eedd051 100644 --- a/debs/SPECS/wazuh-manager/debian/postinst +++ b/debs/SPECS/wazuh-manager/debian/postinst @@ -54,7 +54,7 @@ case "$1" in # Remove/relocate existing SQLite databases rm -f ${DIR}/var/db/cluster.db* || true rm -f ${DIR}/var/db/.profile.db* || true - rm -f ${DIR}/var/db/agents/* || true + rm -rf ${DIR}/var/db/agents || true if [ -f ${DIR}/var/db/global.db ]; then mv ${DIR}/var/db/global.db ${DIR}/queue/db/ diff --git a/debs/SPECS/wazuh-manager/debian/preinst b/debs/SPECS/wazuh-manager/debian/preinst index 80ee3366ac..cdd048c4af 100644 --- a/debs/SPECS/wazuh-manager/debian/preinst +++ b/debs/SPECS/wazuh-manager/debian/preinst @@ -133,7 +133,7 @@ case "$1" in fi if [ -d ${DIR}/var/db/agents ]; then - rm -f ${DIR}/var/db/agents/* + rm -rf ${DIR}/var/db/agents fi # Remove plain-text agent information if exists diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index a3261a49a6..5694526d7f 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -214,7 +214,7 @@ fi # Remove/relocate existing SQLite databases rm -f %{_localstatedir}/var/db/cluster.db* || true rm -f %{_localstatedir}/var/db/.profile.db* || true -rm -f %{_localstatedir}/var/db/agents/* || true +rm -rf %{_localstatedir}/var/db/agents || true if [ -f %{_localstatedir}/var/db/global.db ]; then mv %{_localstatedir}/var/db/global.db %{_localstatedir}/queue/db/ @@ -796,7 +796,6 @@ rm -fr %{buildroot} %attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/windows/* %dir %attr(750, root, wazuh) %{_localstatedir}/var %dir %attr(770, root, wazuh) %{_localstatedir}/var/db -%dir %attr(770, root, wazuh) %{_localstatedir}/var/db/agents %attr(660, root, wazuh) %{_localstatedir}/var/db/mitre.db %dir %attr(770, root, wazuh) %{_localstatedir}/var/download %dir %attr(770, wazuh, wazuh) %{_localstatedir}/var/multigroups From 260e69d784010a21eb0ccab045186af9f33ce54a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 13 Mar 2023 17:19:13 +0100 Subject: [PATCH 598/994] Remove unnecessary $ 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 febe83870d..96b22b5a98 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -52,7 +52,7 @@ jobs: 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 - if [ $MAJOR == "4.6" ]; then echo "VERSION=master" >> $GITHUB_ENV $ ; else echo "VERSION=$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 diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index ceca955345..4d8f26d3d9 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -53,7 +53,7 @@ jobs: 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 - if [ $MAJOR == "4.6" ]; then echo "VERSION=master" >> $GITHUB_ENV $ ; else echo "VERSION=$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 From 273cb7c7ead2e0f7fed5b2c1b58c8ead074b7822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Mon, 13 Mar 2023 17:31:26 +0100 Subject: [PATCH 599/994] Fix offline installation and password tool github action tests to incorporate the use of `-d staging` for the builder.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miguel Verdaguer Velázquez --- .github/workflows/offline-installation.yml | 4 +--- .github/workflows/password-tool.yml | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/offline-installation.yml b/.github/workflows/offline-installation.yml index 07b75cb45f..1219a5743c 100644 --- a/.github/workflows/offline-installation.yml +++ b/.github/workflows/offline-installation.yml @@ -20,9 +20,7 @@ jobs: - 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 + bash builder.sh -i -d staging - uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/password-tool.yml b/.github/workflows/password-tool.yml index e578c48898..26001f9be5 100644 --- a/.github/workflows/password-tool.yml +++ b/.github/workflows/password-tool.yml @@ -13,8 +13,7 @@ jobs: working-directory: ./unattended_installer run: | bash builder.sh -p - bash builder.sh -i -d - sed -i 's/pre-release/staging/g' wazuh-install.sh + bash builder.sh -i -d staging shell: bash - uses: actions/upload-artifact@v3 with: From 657687cfde62be4017fa3a7b51b40d2c869802da Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 2 Mar 2023 10:06:45 +0100 Subject: [PATCH 600/994] Added PDF reports dependencies --- .../install_functions/dashboard.sh | 15 +++++++++++++++ .../install_functions/installCommon.sh | 14 ++++++++++++++ .../install_functions/installMain.sh | 2 ++ 3 files changed, 31 insertions(+) diff --git a/unattended_installer/install_functions/dashboard.sh b/unattended_installer/install_functions/dashboard.sh index 907e3759c6..764d73de4f 100644 --- a/unattended_installer/install_functions/dashboard.sh +++ b/unattended_installer/install_functions/dashboard.sh @@ -188,3 +188,18 @@ function dashboard_install() { fi } + +function dashboard_installDependencies() { + + installCommon_checkChromium + + if [ "${sys_type}" == "yum" ]; then + dependencies+=( nss xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-utils xorg-x11-fonts-cyrillic xorg-x11-fonts-Type1 xorg-x11-fonts-misc fontconfig freetype ) + installCommon_yumInstallList "${dependencies[@]}" + + elif [ "${sys_type}" == "apt-get" ]; then + dependencies+=( libnss3-dev fonts-liberation libfontconfig1 ) + installCommon_aptInstallList "${dependencies[@]}" + fi + +} diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 83f2002bcd..d84a0693b6 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -261,6 +261,20 @@ function installCommon_changePasswords() { } +function installCommon_checkChromium() { + + if [ "${sys_type}" == "yum" ]; then + if (! yum list installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\\.) && (yum list installed 2>/dev/null | grep -q -E ^"chromium"\\.); then + dependencies=(chromium) + fi + elif [ "${sys_type}" == "apt-get" ]; then + if (! apt list --installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\/) && (apt list --installed 2>/dev/null | grep -q -E ^"chromium-browser"\/); then + dependencies=(chromium-browser) + fi + fi + +} + function installCommon_extractConfig() { if ! tar -tf "${tar_file}" | grep -q wazuh-install-files/config.yml; then diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index 078fcd112d..d2c4c02a76 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -295,6 +295,7 @@ function main() { if [ -n "${dashboard}" ]; then common_logger "--- Wazuh dashboard ----" + dashboard_installDependencies dashboard_install dashboard_configure installCommon_startService "wazuh-dashboard" @@ -334,6 +335,7 @@ function main() { filebeat_configure installCommon_startService "filebeat" common_logger "--- Wazuh dashboard ---" + dashboard_installDependencies dashboard_install dashboard_configure installCommon_startService "wazuh-dashboard" From aa657e1219a4d2d6627c7aa79d722d7d8aacdb53 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 2 Mar 2023 13:06:01 +0100 Subject: [PATCH 601/994] Fixed fetching chrome packages --- unattended_installer/install_functions/installCommon.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index d84a0693b6..b43f863443 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -264,11 +264,11 @@ function installCommon_changePasswords() { function installCommon_checkChromium() { if [ "${sys_type}" == "yum" ]; then - if (! yum list installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\\.) && (yum list installed 2>/dev/null | grep -q -E ^"chromium"\\.); then + if (! yum list installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\\.) && (! yum list installed 2>/dev/null | grep -q -E ^"chromium"\\.); then dependencies=(chromium) fi elif [ "${sys_type}" == "apt-get" ]; then - if (! apt list --installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\/) && (apt list --installed 2>/dev/null | grep -q -E ^"chromium-browser"\/); then + if (! apt list --installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\/) && (! apt list --installed 2>/dev/null | grep -q -E ^"chromium-browser"\/); then dependencies=(chromium-browser) fi fi From 8ce21442cda1597ce4ff7a373a1221963e27f83d Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Tue, 7 Mar 2023 11:09:25 +0100 Subject: [PATCH 602/994] Added aptInstallChrome function --- .../install_functions/installCommon.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index b43f863443..53fa493ec9 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -269,7 +269,13 @@ function installCommon_checkChromium() { fi elif [ "${sys_type}" == "apt-get" ]; then if (! apt list --installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\/) && (! apt list --installed 2>/dev/null | grep -q -E ^"chromium-browser"\/); then - dependencies=(chromium-browser) + + # Report generation doesn't work with Chromium in Ubuntu 22 + if [ "${DIST_NAME}" == "ubuntu" ] && [ "${DIST_VER}" == "22" ]; then + installCommon_aptInstallChrome + else + dependencies=(chromium-browser) + fi fi fi @@ -324,6 +330,16 @@ function installCommon_installCheckDependencies() { } +function installCommon_aptInstallChrome() { + + chrome_package="/tmp/wazuh-install-files/chrome.deb" + curl -so "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb + + common_logger "Installing chrome" + installCommon_aptInstall "${chrome_package}" + +} + function installCommon_installPrerequisites() { if [ "${sys_type}" == "yum" ]; then From 2e5a17cae49f9fef6af192a3cdcf120d671051d6 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Tue, 7 Mar 2023 11:47:05 +0100 Subject: [PATCH 603/994] Added Ubuntu 20 in installing Chrome --- unattended_installer/install_functions/installCommon.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 53fa493ec9..cb28d8303a 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -271,7 +271,7 @@ function installCommon_checkChromium() { if (! apt list --installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\/) && (! apt list --installed 2>/dev/null | grep -q -E ^"chromium-browser"\/); then # Report generation doesn't work with Chromium in Ubuntu 22 - if [ "${DIST_NAME}" == "ubuntu" ] && [ "${DIST_VER}" == "22" ]; then + if [[ "${DIST_NAME}" == "ubuntu" ]] && [[ "${DIST_VER}" == "22" || "${DIST_VER}" == "20" ]]; then installCommon_aptInstallChrome else dependencies=(chromium-browser) From 3b1c66e97c8d43e3d57ba20b2fe2fe2a43ab8716 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Tue, 7 Mar 2023 13:13:37 +0100 Subject: [PATCH 604/994] Enabled extra repos in AmazonLinux2 --- unattended_installer/install_functions/installCommon.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index cb28d8303a..b6e5794e45 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -267,6 +267,9 @@ function installCommon_checkChromium() { if (! yum list installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\\.) && (! yum list installed 2>/dev/null | grep -q -E ^"chromium"\\.); then dependencies=(chromium) fi + if [ "${DIST_NAME}" == "amzn" ]; then + eval "amazon-linux-extras install epel -y ${debug}" + fi elif [ "${sys_type}" == "apt-get" ]; then if (! apt list --installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\/) && (! apt list --installed 2>/dev/null | grep -q -E ^"chromium-browser"\/); then From ce7159ba94155d9205ef516f5e77d04d779f71f8 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 9 Mar 2023 10:36:18 +0100 Subject: [PATCH 605/994] Fixed comment of Chrome installation --- unattended_installer/install_functions/installCommon.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index b6e5794e45..a4ec3a042b 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -272,8 +272,8 @@ function installCommon_checkChromium() { fi elif [ "${sys_type}" == "apt-get" ]; then if (! apt list --installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\/) && (! apt list --installed 2>/dev/null | grep -q -E ^"chromium-browser"\/); then - - # Report generation doesn't work with Chromium in Ubuntu 22 + + # Report generation doesn't work with Chromium in Ubuntu 22 and Ubuntu 20 if [[ "${DIST_NAME}" == "ubuntu" ]] && [[ "${DIST_VER}" == "22" || "${DIST_VER}" == "20" ]]; then installCommon_aptInstallChrome else @@ -338,7 +338,7 @@ function installCommon_aptInstallChrome() { chrome_package="/tmp/wazuh-install-files/chrome.deb" curl -so "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb - common_logger "Installing chrome" + common_logger "Installing chrome." installCommon_aptInstall "${chrome_package}" } From 6109582a990572d28bca8fb4f6a35d21e16a200c Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 9 Mar 2023 13:44:53 +0100 Subject: [PATCH 606/994] Added optional installation logic --- .../install_functions/dashboard.sh | 11 +++++++- .../install_functions/installCommon.sh | 27 +++++++++++++++---- .../install_functions/installMain.sh | 4 +-- 3 files changed, 34 insertions(+), 8 deletions(-) diff --git a/unattended_installer/install_functions/dashboard.sh b/unattended_installer/install_functions/dashboard.sh index 764d73de4f..506d762606 100644 --- a/unattended_installer/install_functions/dashboard.sh +++ b/unattended_installer/install_functions/dashboard.sh @@ -189,7 +189,11 @@ function dashboard_install() { } -function dashboard_installDependencies() { +function dashboard_installReportDependencies() { + + # Flags that indicates that is an optional installation. + optional_installation=1 + report_dependencies=1 installCommon_checkChromium @@ -202,4 +206,9 @@ function dashboard_installDependencies() { installCommon_aptInstallList "${dependencies[@]}" fi + if [ "${pdf_warning}" == 1 ]; then + common_logger -w "Dependencies skipped. PDF report generation may not work." + fi + optional_installation=0 + } diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index a4ec3a042b..94cdc78083 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -116,8 +116,7 @@ function installCommon_aptInstallList(){ common_logger "Installing $dep." installCommon_aptInstall "${dep}" if [ "${install_result}" != 0 ]; then - common_logger -e "Cannot install dependency: ${dep}." - exit 1 + installCommon_checkOptionalInstallation fi done fi @@ -156,6 +155,20 @@ function installCommon_changePasswordApi() { } +function installCommon_checkOptionalInstallation() { + + if [ "${optional_installation}" != 1 ]; then + common_logger -e "Cannot install dependency: ${dep}." + exit 1 + else + common_logger -w "Cannot install optional dependency: ${dep}." + if [ "${report_dependencies}" == 1 ]; then + pdf_warning=1 + fi + fi + +} + function installCommon_createCertificates() { if [ -n "${AIO}" ]; then @@ -335,11 +348,16 @@ function installCommon_installCheckDependencies() { function installCommon_aptInstallChrome() { + dep="chrome" chrome_package="/tmp/wazuh-install-files/chrome.deb" curl -so "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb - common_logger "Installing chrome." + common_logger "Installing ${dep}." installCommon_aptInstall "${chrome_package}" + + if [ "${install_result}" != 0 ]; then + installCommon_checkOptionalInstallation + fi } @@ -669,8 +687,7 @@ function installCommon_yumInstallList(){ common_logger "Installing $dep." eval "yum install ${dep} -y ${debug}" if [ "${PIPESTATUS[0]}" != 0 ]; then - common_logger -e "Cannot install dependency: ${dep}." - exit 1 + installCommon_checkOptionalInstallation fi done fi diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index d2c4c02a76..81ac4d9b92 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -295,7 +295,7 @@ function main() { if [ -n "${dashboard}" ]; then common_logger "--- Wazuh dashboard ----" - dashboard_installDependencies + dashboard_installReportDependencies dashboard_install dashboard_configure installCommon_startService "wazuh-dashboard" @@ -335,7 +335,7 @@ function main() { filebeat_configure installCommon_startService "filebeat" common_logger "--- Wazuh dashboard ---" - dashboard_installDependencies + dashboard_installReportDependencies dashboard_install dashboard_configure installCommon_startService "wazuh-dashboard" From 9a06220b3bf5f9eb78eaf18ad2cd8bc6dfc09b04 Mon Sep 17 00:00:00 2001 From: davidcr01 Date: Thu, 9 Mar 2023 14:54:11 +0100 Subject: [PATCH 607/994] Added Ubuntu 18 in installing Chrome --- unattended_installer/install_functions/installCommon.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 94cdc78083..90950d83cc 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -287,7 +287,7 @@ function installCommon_checkChromium() { if (! apt list --installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\/) && (! apt list --installed 2>/dev/null | grep -q -E ^"chromium-browser"\/); then # Report generation doesn't work with Chromium in Ubuntu 22 and Ubuntu 20 - if [[ "${DIST_NAME}" == "ubuntu" ]] && [[ "${DIST_VER}" == "22" || "${DIST_VER}" == "20" ]]; then + if [[ "${DIST_NAME}" == "ubuntu" ]] && [[ "${DIST_VER}" == "22" || "${DIST_VER}" == "20" || "${DIST_VER}" == "18" ]]; then installCommon_aptInstallChrome else dependencies=(chromium-browser) From 9251909cb1b9b966d81f846b443ec56aba0b1afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Fri, 10 Mar 2023 10:52:50 +0100 Subject: [PATCH 608/994] Changed name of dashboard dependencies list --- unattended_installer/install_functions/dashboard.sh | 10 +++++----- .../install_functions/installCommon.sh | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/unattended_installer/install_functions/dashboard.sh b/unattended_installer/install_functions/dashboard.sh index 506d762606..c85c8e8ec3 100644 --- a/unattended_installer/install_functions/dashboard.sh +++ b/unattended_installer/install_functions/dashboard.sh @@ -198,16 +198,16 @@ function dashboard_installReportDependencies() { installCommon_checkChromium if [ "${sys_type}" == "yum" ]; then - dependencies+=( nss xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-utils xorg-x11-fonts-cyrillic xorg-x11-fonts-Type1 xorg-x11-fonts-misc fontconfig freetype ) - installCommon_yumInstallList "${dependencies[@]}" + dashboard_dependencies+=( nss xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-utils xorg-x11-fonts-cyrillic xorg-x11-fonts-Type1 xorg-x11-fonts-misc fontconfig freetype ) + installCommon_yumInstallList "${dashboard_dependencies[@]}" elif [ "${sys_type}" == "apt-get" ]; then - dependencies+=( libnss3-dev fonts-liberation libfontconfig1 ) - installCommon_aptInstallList "${dependencies[@]}" + dashboard_dependencies+=( libnss3-dev fonts-liberation libfontconfig1 ) + installCommon_aptInstallList "${dashboard_dependencies[@]}" fi if [ "${pdf_warning}" == 1 ]; then - common_logger -w "Dependencies skipped. PDF report generation may not work." + common_logger -w "Dashboard dependencies skipped. PDF report generation may not work." fi optional_installation=0 diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 90950d83cc..2d607bfd10 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -278,7 +278,7 @@ function installCommon_checkChromium() { if [ "${sys_type}" == "yum" ]; then if (! yum list installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\\.) && (! yum list installed 2>/dev/null | grep -q -E ^"chromium"\\.); then - dependencies=(chromium) + dashboard_dependencies=(chromium) fi if [ "${DIST_NAME}" == "amzn" ]; then eval "amazon-linux-extras install epel -y ${debug}" @@ -290,7 +290,7 @@ function installCommon_checkChromium() { if [[ "${DIST_NAME}" == "ubuntu" ]] && [[ "${DIST_VER}" == "22" || "${DIST_VER}" == "20" || "${DIST_VER}" == "18" ]]; then installCommon_aptInstallChrome else - dependencies=(chromium-browser) + dashboard_dependencies=(chromium-browser) fi fi fi From 6c2ac9c75656c0bad177528e0508ec786f2a84f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Mon, 13 Mar 2023 14:00:31 +0100 Subject: [PATCH 609/994] Added Chrome to Amazon Linux 2 --- .../install_functions/installCommon.sh | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 2d607bfd10..2ca9ff180c 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -281,14 +281,14 @@ function installCommon_checkChromium() { dashboard_dependencies=(chromium) fi if [ "${DIST_NAME}" == "amzn" ]; then - eval "amazon-linux-extras install epel -y ${debug}" + installCommon_installChrome fi elif [ "${sys_type}" == "apt-get" ]; then if (! apt list --installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\/) && (! apt list --installed 2>/dev/null | grep -q -E ^"chromium-browser"\/); then # Report generation doesn't work with Chromium in Ubuntu 22 and Ubuntu 20 if [[ "${DIST_NAME}" == "ubuntu" ]] && [[ "${DIST_VER}" == "22" || "${DIST_VER}" == "20" || "${DIST_VER}" == "18" ]]; then - installCommon_aptInstallChrome + installCommon_installChrome else dashboard_dependencies=(chromium-browser) fi @@ -346,19 +346,30 @@ function installCommon_installCheckDependencies() { } -function installCommon_aptInstallChrome() { +function installCommon_installChrome() { dep="chrome" - chrome_package="/tmp/wazuh-install-files/chrome.deb" - curl -so "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb - common_logger "Installing ${dep}." - installCommon_aptInstall "${chrome_package}" - if [ "${install_result}" != 0 ]; then - installCommon_checkOptionalInstallation + if [ "${sys_type}" == "yum" ]; then + chrome_package="/tmp/wazuh-install-files/chrome.rpm" + curl -so "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm + eval "yum install ${chrome_package} -y ${debug}" + + if [ "${PIPESTATUS[0]}" != 0 ]; then + installCommon_checkOptionalInstallation + fi + + elif [ "${sys_type}" == "apt-get" ]; then + chrome_package="/tmp/wazuh-install-files/chrome.deb" + curl -so "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb + installCommon_aptInstall "${chrome_package}" + + if [ "${install_result}" != 0 ]; then + installCommon_checkOptionalInstallation + fi fi - + } function installCommon_installPrerequisites() { From df24ac9c0398b68206fbf99439cb79b736deddbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Wed, 15 Mar 2023 10:05:46 +0100 Subject: [PATCH 610/994] Added common_curl to the Chrome package --- .../install_functions/installCommon.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 2ca9ff180c..4592c2f798 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -278,11 +278,13 @@ function installCommon_checkChromium() { if [ "${sys_type}" == "yum" ]; then if (! yum list installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\\.) && (! yum list installed 2>/dev/null | grep -q -E ^"chromium"\\.); then - dashboard_dependencies=(chromium) - fi - if [ "${DIST_NAME}" == "amzn" ]; then - installCommon_installChrome + if [ "${DIST_NAME}" == "amzn" ]; then + installCommon_installChrome + else + dashboard_dependencies=(chromium) + fi fi + elif [ "${sys_type}" == "apt-get" ]; then if (! apt list --installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\/) && (! apt list --installed 2>/dev/null | grep -q -E ^"chromium-browser"\/); then @@ -353,7 +355,7 @@ function installCommon_installChrome() { if [ "${sys_type}" == "yum" ]; then chrome_package="/tmp/wazuh-install-files/chrome.rpm" - curl -so "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm + common_curl -so "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm --max-time 100 --retry 5 --retry-delay 5 --fail eval "yum install ${chrome_package} -y ${debug}" if [ "${PIPESTATUS[0]}" != 0 ]; then @@ -362,7 +364,7 @@ function installCommon_installChrome() { elif [ "${sys_type}" == "apt-get" ]; then chrome_package="/tmp/wazuh-install-files/chrome.deb" - curl -so "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb + common_curl -so "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb --max-time 100 --retry 5 --retry-delay 5 --fail installCommon_aptInstall "${chrome_package}" if [ "${install_result}" != 0 ]; then From 0ae1a293fef9c70a1e09bced10bb1d874d4532ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Wed, 22 Mar 2023 17:20:35 +0100 Subject: [PATCH 611/994] Changed report generation warning --- unattended_installer/install_functions/dashboard.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/dashboard.sh b/unattended_installer/install_functions/dashboard.sh index c85c8e8ec3..69badbb159 100644 --- a/unattended_installer/install_functions/dashboard.sh +++ b/unattended_installer/install_functions/dashboard.sh @@ -207,7 +207,7 @@ function dashboard_installReportDependencies() { fi if [ "${pdf_warning}" == 1 ]; then - common_logger -w "Dashboard dependencies skipped. PDF report generation may not work." + common_logger -w "Wazuh dashboard dependencies skipped. PDF report generation may not work." fi optional_installation=0 From 9d3211e49ba0df07c8331ee5f5b5b10bda63a9c5 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Tue, 4 Apr 2023 16:55:06 +0200 Subject: [PATCH 612/994] Update pkg info --- solaris/solaris10/pkginfo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index 22e6f23501..268f451f75 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -1,11 +1,11 @@ NAME=Wazuh - Improved OSSEC agent for Intrusion Detection, File Integrity Monitoring, Policy Monitoring and Rootkits Detection. PKG="wazuh-agent" -VERSION="4.4.0" +VERSION="4.6.0" ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="20Feb2023" +PSTAMP="20Feb2024" EMAIL="info@wazuh.com" ISTATES="S s 1 2 3" RSTATES="S s 1 2 3" From d61f1335d45b8b85dcd3190a8e29f01a09f8aa9a Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Mon, 17 Apr 2023 18:07:07 +0200 Subject: [PATCH 613/994] Fixed changelog separation --- CHANGELOG.md | 1 + debs/SPECS/wazuh-agent/debian/changelog | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85b0337598..47952e268f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ 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 + ## [v4.4.2] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.4.2 diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 4968249684..15e9245d8f 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -3,6 +3,7 @@ wazuh-agent (4.5.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Fri, 05 May 2023 11:56:07 +0000 + wazuh-agent (4.4.2-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ From 316cf0c48aa5cae23846e3e7d16a024d3f51cd76 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Thu, 27 Apr 2023 09:24:51 +0200 Subject: [PATCH 614/994] Add archives repository to Debian Stretch --- .github/actions/test-install-components/install_component.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/actions/test-install-components/install_component.sh b/.github/actions/test-install-components/install_component.sh index 9f507d1f53..2d8ea93cc5 100644 --- a/.github/actions/test-install-components/install_component.sh +++ b/.github/actions/test-install-components/install_component.sh @@ -7,6 +7,11 @@ if [ -f /etc/os-release ]; 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 + + if [ "$ID" = "debian" ] && [ "$VERSION_ID" = "9" ]; then + echo "deb http://archive.debian.org/debian stretch contrib main non-free" > /etc/apt/sources.list + echo "deb http://archive.debian.org/debian-security stretch/updates main" >> /etc/apt/sources.list + fi fi if [ -f /etc/redhat-release ]; then From 96c4043c428e58537a315dcdaa095c6475514011 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Thu, 27 Apr 2023 09:24:51 +0200 Subject: [PATCH 615/994] Add archives repository to Debian Stretch --- .github/actions/test-install-components/install_component.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/actions/test-install-components/install_component.sh b/.github/actions/test-install-components/install_component.sh index 9f507d1f53..2d8ea93cc5 100644 --- a/.github/actions/test-install-components/install_component.sh +++ b/.github/actions/test-install-components/install_component.sh @@ -7,6 +7,11 @@ if [ -f /etc/os-release ]; 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 + + if [ "$ID" = "debian" ] && [ "$VERSION_ID" = "9" ]; then + echo "deb http://archive.debian.org/debian stretch contrib main non-free" > /etc/apt/sources.list + echo "deb http://archive.debian.org/debian-security stretch/updates main" >> /etc/apt/sources.list + fi fi if [ -f /etc/redhat-release ]; then From ba90ffbca3b797b495490c5e0e83e004d6b5c304 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Fri, 28 Apr 2023 20:06:32 +0200 Subject: [PATCH 616/994] Removed white-space --- 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 007c91864e..5515f6285c 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -27,7 +27,7 @@ wazuh-agent (4.4.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Wed, 18 Jan 2023 12:31:50 +0000 - + wazuh-agent (4.3.10-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ From caf51256c11f9b24fd6f583107bfc517daf031da Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Fri, 28 Apr 2023 20:15:31 +0200 Subject: [PATCH 617/994] Update pkginfo to 4.5.0 --- solaris/solaris10/pkginfo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index 089fe1c6d5..a9f3fdefec 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -1,11 +1,11 @@ NAME=Wazuh - Wazuh unifies historically separate functions into a single agent and platform architecture. Providing protection for public clouds, private clouds, and on-premise data centers. PKG="wazuh-agent" -VERSION="4.4.2" +VERSION="4.5.0" ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="24Apr2023" +PSTAMP="30May2023" EMAIL="info@wazuh.com" ISTATES="S s 1 2 3" RSTATES="S s 1 2 3" From c9a3391988b664dda0f9e9c3480e90b1b2bb4cc6 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Fri, 28 Apr 2023 20:39:17 +0200 Subject: [PATCH 618/994] Removed duplicated if statement --- .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 4e1de20544..ceca955345 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -53,7 +53,6 @@ jobs: 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 - if [ $MAJOR == "4.6" ]; then echo "VERSION=master" >> $GITHUB_ENV; else echo "VERSION=$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 From 7a6564a59f783455aef65103196ab4e08f45be6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Wed, 3 May 2023 16:24:41 +0200 Subject: [PATCH 619/994] Remove unnecessary $ in the 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 --- .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 febe83870d..96b22b5a98 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -52,7 +52,7 @@ jobs: 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 - if [ $MAJOR == "4.6" ]; then echo "VERSION=master" >> $GITHUB_ENV $ ; else echo "VERSION=$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 diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index ceca955345..4d8f26d3d9 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -53,7 +53,7 @@ jobs: 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 - if [ $MAJOR == "4.6" ]; then echo "VERSION=master" >> $GITHUB_ENV $ ; else echo "VERSION=$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 From b7c2eac57a78ec5c12b3a9127027bbe73c852c60 Mon Sep 17 00:00:00 2001 From: Daniel Folch Date: Tue, 23 May 2023 12:35:00 +0200 Subject: [PATCH 620/994] Merge 4.4 into 4.5 (#2215) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added Amazon Linux 2023 SCA * Fixed typo * Revert "Added Amazon Linux 2023 SCA" --------- Co-authored-by: David Correa Rodríguez Co-authored-by: Gonzalo Acuña <33964202+teddytpc1@users.noreply.github.com> From 6181e66af97ea223126f8ec7676877a054a60259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Verdaguer=20Vel=C3=A1zquez?= Date: Thu, 15 Jun 2023 10:48:05 +0200 Subject: [PATCH 621/994] docs(#17574): Update CHANGELOG.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Víctor Rebollo Pérez --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e795b9d79..a165d5d467 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ 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 + ## [v4.4.5] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.4.5 From 178a5d6700876c4e7319e0da4f7bd6dd9671efb7 Mon Sep 17 00:00:00 2001 From: wazuhci Date: Fri, 23 Jun 2023 10:32:38 +0000 Subject: [PATCH 622/994] Bump reference to 4.7.0 version --- CHANGELOG.md | 4 ++++ VERSION | 2 +- aix/SPECS/wazuh-agent-aix.spec | 4 +++- debs/SPECS/wazuh-agent/debian/changelog | 8 ++++++- debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 8 ++++++- debs/SPECS/wazuh-manager/debian/copyright | 2 +- macos/specs/wazuh-agent.pkgproj | 4 ++-- rpms/SPECS/wazuh-agent.spec | 4 +++- rpms/SPECS/wazuh-manager.spec | 4 +++- solaris/solaris10/pkginfo | 4 ++-- stack/dashboard/deb/debian/changelog | 23 ++++++++++++------- stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 ++ stack/indexer/deb/debian/changelog | 14 +++++++---- stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 ++ tests/unattended/unit/suites/test-common.sh | 4 ++-- .../unattended/unit/suites/test-dashboard.sh | 2 +- .../install_functions/installVariables.sh | 4 ++-- 20 files changed, 70 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index be7e281958..a40fa3adc0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Change Log All notable changes to this project will be documented in this file. +## [v4.7.0] + +- https://github.com/wazuh/wazuh-packages/releases/tag/v4.7.0 + ## [v4.6.0] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.6.0 diff --git a/VERSION b/VERSION index 6016e8addc..f6cdf40983 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.6.0 +4.7.0 diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 687519241c..4cea188d4a 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.6.0 +Version: 4.7.0 Release: 1 License: GPL URL: https://www.wazuh.com/ @@ -290,6 +290,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog +* Sat Oct 28 2023 support - 4.7.0 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Mon Sep 04 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html * Fri Jun 30 2023 support - 4.5.0 diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 94ee4741b6..7fc08edb70 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -1,6 +1,12 @@ +wazuh-agent (4.7.0-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html + + -- Wazuh, Inc Sat, 28 Oct 2023 10:32:24 +0000 + wazuh-agent (4.6.0-RELEASE) stable; urgency=low - * More info: https://documentation.wazuh.com/current/release-notes/ + * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html -- Wazuh, Inc Mon, 04 Sep 2023 11:56:07 +0000 diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 75adc78ae1..c3528abbfd 100644 --- a/debs/SPECS/wazuh-agent/debian/copyright +++ b/debs/SPECS/wazuh-agent/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 26 Jun 2023 12:31:50 +0000 + Wazuh, Inc on Sat, 28 Oct 2023 10:32:24 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index 8503376961..7430edd200 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -1,6 +1,12 @@ +wazuh-manager (4.7.0-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html + + -- Wazuh, Inc Sat, 28 Oct 2023 10:32:24 +0000 + wazuh-manager (4.6.0-RELEASE) stable; urgency=low - * More info: https://documentation.wazuh.com/current/release-notes/ + * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html -- Wazuh, Inc Mon, 04 Sep 2023 11:56:07 +0000 diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 75adc78ae1..c3528abbfd 100644 --- a/debs/SPECS/wazuh-manager/debian/copyright +++ b/debs/SPECS/wazuh-manager/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 26 Jun 2023 12:31:50 +0000 + Wazuh, Inc on Sat, 28 Oct 2023 10:32:24 +0000 It was downloaded from: diff --git a/macos/specs/wazuh-agent.pkgproj b/macos/specs/wazuh-agent.pkgproj index eae1dac3b4..fee0a3dc97 100644 --- a/macos/specs/wazuh-agent.pkgproj +++ b/macos/specs/wazuh-agent.pkgproj @@ -812,7 +812,7 @@ USE_HFS+_COMPRESSION VERSION - 4.6.0-1 + 4.7.0-1 TYPE 0 @@ -1239,7 +1239,7 @@ NAME - wazuh-agent-4.6.0-1 + wazuh-agent-4.7.0-1 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index ca8ea2fb06..de193fde09 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -7,7 +7,7 @@ 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.6.0 +Version: 4.7.0 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -600,6 +600,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* Sat Oct 28 2023 support - 4.7.0 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Mon Sep 04 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html * Fri Jun 30 2023 support - 4.5.0 diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 08330cc3f2..98757289f1 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -7,7 +7,7 @@ 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.6.0 +Version: 4.7.0 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -823,6 +823,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* Sat Oct 28 2023 support - 4.7.0 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Mon Sep 04 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html * Fri Jun 30 2023 support - 4.5.0 diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index 819568a8e0..80d4fddb5c 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -1,11 +1,11 @@ NAME=Wazuh - Wazuh unifies historically separate functions into a single agent and platform architecture. Providing protection for public clouds, private clouds, and on-premise data centers. PKG="wazuh-agent" -VERSION="4.6.0" +VERSION="4.7.0" ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="04Sep2023" +PSTAMP="28Oct2023" EMAIL="info@wazuh.com" ISTATES="S s 1 2 3" RSTATES="S s 1 2 3" diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index a0b0e17f8a..d2715549f8 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -1,8 +1,21 @@ -wazuh-dashboard (VERSION-RELEASE) unstable; urgency=low +wazuh-dashboard (VERSION-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html + + -- Wazuh, Inc Sat, 28 Oct 2023 10:32:24 +0000 + +wazuh-dashboard (4.6.0-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html + + -- Wazuh, Inc Mon, 04 Sep 2023 11:56:07 +0000 + +wazuh-manager (4.5.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html - -- Wazuh, Inc Fri, 30 Jun 2023 12:31:50 +0000 + -- Wazuh, Inc Fri, 30 Jun 2023 11:56:07 +0000 + wazuh-dashboard (4.4.5-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html @@ -15,12 +28,6 @@ wazuh-dashboard (4.4.4-RELEASE) stable; urgency=low -- Wazuh, Inc Tue, 13 Jun 2023 12:31:50 +0000 -wazuh-dashboard (4.5.0-RELEASE) stable; urgency=low - - * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html - - -- Wazuh, Inc Fri, 30 Jun 2023 11:56:07 +0000 - wazuh-dashboard (4.4.3-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-4-3.html diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index 0ad98be69d..d2d10dd398 100644 --- a/stack/dashboard/deb/debian/copyright +++ b/stack/dashboard/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 26 Jun 2023 12:31:50 +0000 + Wazuh, Inc on Sat, 28 Oct 2023 10:32:24 +0000 It was downloaded from: diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index fce8eda092..658c2f4246 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -400,6 +400,8 @@ rm -fr %{buildroot} %changelog * Mon Sep 04 2023 support - %{version} +- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html +* Sat Oct 28 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html * Fri Jun 30 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 46c0a89c22..271455e76f 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -1,10 +1,16 @@ -wazuh-indexer (VERSION-RELEASE) unstable; urgency=low +wazuh-dashboard (VERSION-RELEASE) stable; urgency=low - * More info: https://documentation.wazuh.com/current/release-notes/release-4-5.0.html + * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Fri, 30 Jun 2023 12:31:50 +0000 + -- Wazuh, Inc Sat, 28 Oct 2023 10:32:24 +0000 -wazuh-indexer (4.5.0-RELEASE) stable; urgency=low +wazuh-dashboard (4.6.0-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html + + -- Wazuh, Inc Mon, 04 Sep 2023 11:56:07 +0000 + +wazuh-manager (4.5.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index 486da69b0d..61014930a1 100644 --- a/stack/indexer/deb/debian/copyright +++ b/stack/indexer/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 26 Jun 2023 12:31:50 +0000 + Wazuh, Inc on Sat, 28 Oct 2023 10:32:24 +0000 It was downloaded from: diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 9aa299a739..fe28f1548b 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1395,6 +1395,8 @@ rm -fr %{buildroot} %changelog * Mon Sep 04 2023 support - %{version} +- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html +* Sat Oct 28 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html * Fri Jun 30 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html diff --git a/tests/unattended/unit/suites/test-common.sh b/tests/unattended/unit/suites/test-common.sh index 0aa1a88b24..480b702028 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.6.0-1 @wazuh + @mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.7.0-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-05-common_checkInstalled-all-installed-yum-assert() { - @echo "wazuh-manager.x86_64 4.6.0-1 @wazuh" + @echo "wazuh-manager.x86_64 4.7.0-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 e6a15058a1..6571d3f068 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.6.0" + wazuh_version="4.7.0" 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 18227c22f1..b52477db29 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -7,8 +7,8 @@ # Foundation. ## Package vars -readonly wazuh_major="4.6" -readonly wazuh_version="4.6.0" +readonly wazuh_major="4.7" +readonly wazuh_version="4.7.0" readonly filebeat_version="7.10.2" readonly wazuh_install_vesion="0.1" From 440001ad251ecdd6b22b4c5de1efc045cd29db34 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Fri, 23 Jun 2023 13:38:58 +0200 Subject: [PATCH 623/994] Update GH actions --- .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 96b22b5a98..abcf45d69c 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -52,7 +52,7 @@ jobs: 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 - if [ $MAJOR == "4.6" ]; then echo "VERSION=master" >> $GITHUB_ENV; else echo "VERSION=$MAJOR" >> $GITHUB_ENV; fi + if [ $MAJOR == "4.7" ]; 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 diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 4d8f26d3d9..85359352b7 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -53,7 +53,7 @@ jobs: 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 - if [ $MAJOR == "4.6" ]; then echo "VERSION=master" >> $GITHUB_ENV; else echo "VERSION=$MAJOR" >> $GITHUB_ENV; fi + if [ $MAJOR == "4.7" ]; 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 From d638982e01efd16ad7d7e3444aff09a9c545eab8 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Fri, 23 Jun 2023 14:36:42 +0200 Subject: [PATCH 624/994] Fix date in wazuh indexer changelog --- stack/dashboard/deb/debian/changelog | 2 +- stack/indexer/deb/debian/changelog | 6 +++--- stack/indexer/rpm/wazuh-indexer.spec | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index d2715549f8..15f532fa0c 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -10,7 +10,7 @@ wazuh-dashboard (4.6.0-RELEASE) stable; urgency=low -- Wazuh, Inc Mon, 04 Sep 2023 11:56:07 +0000 -wazuh-manager (4.5.0-RELEASE) stable; urgency=low +wazuh-dashboard (4.5.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 271455e76f..100c3fc658 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -1,16 +1,16 @@ -wazuh-dashboard (VERSION-RELEASE) stable; urgency=low +wazuh-indexer (VERSION-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html -- Wazuh, Inc Sat, 28 Oct 2023 10:32:24 +0000 -wazuh-dashboard (4.6.0-RELEASE) stable; urgency=low +wazuh-indexer (4.6.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html -- Wazuh, Inc Mon, 04 Sep 2023 11:56:07 +0000 -wazuh-manager (4.5.0-RELEASE) stable; urgency=low +wazuh-indexer (4.5.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index fe28f1548b..14f6d6e962 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1394,9 +1394,9 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/blocked.certs %changelog -* Mon Sep 04 2023 support - %{version} +* Sat Oct 28 2023 support - %{version} - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html -* Sat Oct 28 2023 support - 4.6.0 +* Mon Sep 04 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html * Fri Jun 30 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html @@ -1406,7 +1406,7 @@ rm -fr %{buildroot} - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-4.html * Thu May 25 2023 support - 4.4.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-3.html -* Mon Apr 24 2023 support - 4.4.2 +* Mon May 08 2023 support - 4.4.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-2.html * Mon Apr 17 2023 support - 4.4.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-1.html From 3f2f2627721ed8c17c0b9e536020e7c507a5c8b5 Mon Sep 17 00:00:00 2001 From: wazuhci Date: Fri, 23 Jun 2023 13:47:06 +0000 Subject: [PATCH 625/994] Bump reference to 4.6.0 version --- CHANGELOG.md | 4 ++++ VERSION | 2 +- aix/SPECS/wazuh-agent-aix.spec | 4 +++- debs/SPECS/wazuh-agent/debian/changelog | 6 ++++++ debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 6 ++++++ debs/SPECS/wazuh-manager/debian/copyright | 2 +- macos/specs/wazuh-agent.pkgproj | 4 ++-- rpms/SPECS/wazuh-agent.spec | 4 +++- rpms/SPECS/wazuh-manager.spec | 4 +++- solaris/solaris10/pkginfo | 4 ++-- stack/dashboard/deb/debian/changelog | 9 ++++++++- stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 ++ stack/indexer/deb/debian/changelog | 10 ++++++++-- stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 ++ tests/unattended/unit/suites/test-common.sh | 4 ++-- tests/unattended/unit/suites/test-dashboard.sh | 2 +- .../install_functions/installVariables.sh | 2 +- 20 files changed, 58 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a165d5d467..187b2e3627 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.6.0] + +- https://github.com/wazuh/wazuh-packages/releases/tag/v4.6.0 ## [v4.5.0] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.0 diff --git a/VERSION b/VERSION index a84947d6ff..6016e8addc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.5.0 +4.6.0 diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index f284ae176c..de69887023 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.5.0 +Version: 4.6.0 Release: 1 License: GPL URL: https://www.wazuh.com/ @@ -290,6 +290,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog +* Fri Sep 08 2023 support - 4.6.0 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html * Fri Jun 30 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html * Mon Jun 26 2023 support - 4.4.5 diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 3cbd8a8492..e26d21ce66 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -1,3 +1,9 @@ +wazuh-agent (4.6.0-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/ + + -- Wazuh, Inc Fri, 08 Sep 2023 13:46:52 +0000 + wazuh-agent (4.5.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 75adc78ae1..24ede88f96 100644 --- a/debs/SPECS/wazuh-agent/debian/copyright +++ b/debs/SPECS/wazuh-agent/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 26 Jun 2023 12:31:50 +0000 + Wazuh, Inc on Fri, 08 Sep 2023 13:46:52 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index 5db70664e7..9f8f6c13c4 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -1,3 +1,9 @@ +wazuh-manager (4.6.0-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/ + + -- Wazuh, Inc Fri, 08 Sep 2023 13:46:52 +0000 + wazuh-manager (4.5.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 75adc78ae1..24ede88f96 100644 --- a/debs/SPECS/wazuh-manager/debian/copyright +++ b/debs/SPECS/wazuh-manager/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 26 Jun 2023 12:31:50 +0000 + Wazuh, Inc on Fri, 08 Sep 2023 13:46:52 +0000 It was downloaded from: diff --git a/macos/specs/wazuh-agent.pkgproj b/macos/specs/wazuh-agent.pkgproj index 72da7fbd31..eae1dac3b4 100644 --- a/macos/specs/wazuh-agent.pkgproj +++ b/macos/specs/wazuh-agent.pkgproj @@ -812,7 +812,7 @@ USE_HFS+_COMPRESSION VERSION - 4.5.0-1 + 4.6.0-1 TYPE 0 @@ -1239,7 +1239,7 @@ NAME - wazuh-agent-4.5.0-1 + wazuh-agent-4.6.0-1 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 90b08c1616..c7275b6b59 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -7,7 +7,7 @@ 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.5.0 +Version: 4.6.0 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -600,6 +600,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* Fri Sep 08 2023 support - 4.6.0 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html * Fri Jun 30 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html * Mon Jun 26 2023 support - 4.4.5 diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 13dfb53865..7bb20ef848 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -7,7 +7,7 @@ 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.5.0 +Version: 4.6.0 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -823,6 +823,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* Fri Sep 08 2023 support - 4.6.0 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html * Fri Jun 30 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html * Mon Jun 26 2023 support - 4.4.5 diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index 72efb9ed67..3063b59ef4 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -1,11 +1,11 @@ NAME=Wazuh - Wazuh unifies historically separate functions into a single agent and platform architecture. Providing protection for public clouds, private clouds, and on-premise data centers. PKG="wazuh-agent" -VERSION="4.5.0" +VERSION="4.6.0" ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="30Jun2023" +PSTAMP="08Sep2023" EMAIL="info@wazuh.com" ISTATES="S s 1 2 3" RSTATES="S s 1 2 3" diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 3230b73202..645eb430e2 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -1,8 +1,15 @@ -wazuh-dashboard (VERSION-RELEASE) unstable; urgency=low +wazuh-dashboard (VERSION-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/ + + -- Wazuh, Inc Fri, 08 Sep 2023 13:46:52 +0000 + +wazuh-dashboard (4.5.0-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html -- Wazuh, Inc Fri, 30 Jun 2023 12:31:50 +0000 + wazuh-dashboard (4.4.5-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index 0ad98be69d..9a09b24f2b 100644 --- a/stack/dashboard/deb/debian/copyright +++ b/stack/dashboard/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 26 Jun 2023 12:31:50 +0000 + Wazuh, Inc on Fri, 08 Sep 2023 13:46:52 +0000 It was downloaded from: diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 4b06310db8..14a2848d5b 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -400,6 +400,8 @@ rm -fr %{buildroot} %changelog * Fri Jun 30 2023 support - %{version} +- More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html +* Fri Sep 08 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html * Mon Jun 26 2023 support - 4.4.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index e733990d6f..aaf3b4daa8 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -1,6 +1,12 @@ -wazuh-indexer (VERSION-RELEASE) unstable; urgency=low +wazuh-dashboard (VERSION-RELEASE) stable; urgency=low - * More info: https://documentation.wazuh.com/current/release-notes/release-4-5.0.html + * More info: https://documentation.wazuh.com/current/release-notes/ + + -- Wazuh, Inc Fri, 08 Sep 2023 13:46:52 +0000 + +wazuh-dashboard (4.5.0-RELEASE) unstable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html -- Wazuh, Inc Fri, 30 Jun 2023 12:31:50 +0000 diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index 486da69b0d..711ac05eba 100644 --- a/stack/indexer/deb/debian/copyright +++ b/stack/indexer/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 26 Jun 2023 12:31:50 +0000 + Wazuh, Inc on Fri, 08 Sep 2023 13:46:52 +0000 It was downloaded from: diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index afeac2893e..a252291a00 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1395,6 +1395,8 @@ rm -fr %{buildroot} %changelog * Fri Jun 30 2023 support - %{version} +- More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html +* Fri Sep 08 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html * Mon Jun 26 2023 support - 4.4.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html diff --git a/tests/unattended/unit/suites/test-common.sh b/tests/unattended/unit/suites/test-common.sh index a25a62a53d..0aa1a88b24 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.5.0-1 @wazuh + @mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.6.0-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-05-common_checkInstalled-all-installed-yum-assert() { - @echo "wazuh-manager.x86_64 4.5.0-1 @wazuh" + @echo "wazuh-manager.x86_64 4.6.0-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 37e99c0646..e6a15058a1 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.5.0" + wazuh_version="4.6.0" 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 c827604bde..b8e65d0348 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.5" -readonly wazuh_version="4.5.0" +readonly wazuh_version="4.6.0" readonly filebeat_version="7.10.2" readonly wazuh_install_vesion="0.1" From 085e58f54b8afff7e9d352a5ef2e98215d661157 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Fri, 23 Jun 2023 16:04:40 +0200 Subject: [PATCH 626/994] Update GH actions --- .github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh | 2 +- .github/workflows/build-deb-packages.yml | 4 ++-- .github/workflows/build-rpm-packages.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh b/.github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh index 03f4e60910..a5362d466d 100644 --- a/.github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh +++ b/.github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh @@ -16,4 +16,4 @@ echo ${GITHUB_PUSH_SECRET} | docker login https://ghcr.io -u $GITHUB_USER --pass # 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} +docker image tag ghcr.io/${GITHUB_OWNER}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} ${DOCKER_IMAGE_NAME} diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index febe83870d..fecfb7f874 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -52,7 +52,7 @@ jobs: 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 - if [ $MAJOR == "4.6" ]; then echo "VERSION=master" >> $GITHUB_ENV $ ; else echo "VERSION=$MAJOR" >> $GITHUB_ENV; fi + if [ $MAJOR == "4.7" ]; 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 @@ -65,7 +65,7 @@ jobs: working-directory: ./debs run: | REVISION="${{ github.head_ref }}" - 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 + bash generate_debian_package.sh -b ${{ env.VERSION }} -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker -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 ceca955345..39d38b77cf 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -53,7 +53,7 @@ jobs: 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 - if [ $MAJOR == "4.6" ]; then echo "VERSION=master" >> $GITHUB_ENV $ ; else echo "VERSION=$MAJOR" >> $GITHUB_ENV; fi + if [ $MAJOR == "4.7" ]; 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 @@ -66,7 +66,7 @@ jobs: working-directory: ./rpms run: | REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g' ) - 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 + bash generate_rpm_package.sh -b ${{ env.VERSION }} -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker -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 860da55e0b615bf541c6d8e451cd20710c6777ad Mon Sep 17 00:00:00 2001 From: jnasselle Date: Fri, 23 Jun 2023 15:03:58 -0300 Subject: [PATCH 627/994] Add patch number into wazuh/wazuh branch selection --- .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 fecfb7f874..8b73496e0d 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -52,7 +52,7 @@ jobs: 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 - if [ $MAJOR == "4.7" ]; then echo "VERSION=master" >> $GITHUB_ENV $ ; else echo "VERSION=$MAJOR" >> $GITHUB_ENV; fi + if [ $MAJOR == "4.7" ]; then echo "VERSION=master" >> $GITHUB_ENV $ ; else echo "VERSION=$(cat $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 39d38b77cf..68cfb23b33 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -53,7 +53,7 @@ jobs: 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 - if [ $MAJOR == "4.7" ]; then echo "VERSION=master" >> $GITHUB_ENV $ ; else echo "VERSION=$MAJOR" >> $GITHUB_ENV; fi + if [ $MAJOR == "4.7" ]; then echo "VERSION=master" >> $GITHUB_ENV $ ; else echo "VERSION=$(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 From 37ffd326e3e73cbdd4e9bcf8c4e299536cbf9d46 Mon Sep 17 00:00:00 2001 From: jnasselle Date: Fri, 23 Jun 2023 15:26:58 -0300 Subject: [PATCH 628/994] Fix typos - indexer changelog date chronological order - indexer and dashboard changelog unstable and name --- stack/dashboard/deb/debian/changelog | 4 ++-- stack/dashboard/rpm/wazuh-dashboard.spec | 4 ++-- stack/indexer/deb/debian/changelog | 4 ++-- stack/indexer/rpm/wazuh-indexer.spec | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 645eb430e2..17ab679365 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -1,4 +1,4 @@ -wazuh-dashboard (VERSION-RELEASE) stable; urgency=low +wazuh-dashboard (VERSION-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ @@ -10,7 +10,7 @@ wazuh-dashboard (4.5.0-RELEASE) unstable; urgency=low -- Wazuh, Inc Fri, 30 Jun 2023 12:31:50 +0000 -wazuh-dashboard (4.4.5-RELEASE) stable; urgency=low +wazuh-dashboard (4.4.5-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 14a2848d5b..06427d0628 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -399,9 +399,9 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog -* Fri Jun 30 2023 support - %{version} +* Fri Sep 08 2023 support - %{version} - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html -* Fri Sep 08 2023 support - 4.5.0 +* Fri Jun 30 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html * Mon Jun 26 2023 support - 4.4.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index aaf3b4daa8..0cdb2cc61c 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -1,10 +1,10 @@ -wazuh-dashboard (VERSION-RELEASE) stable; urgency=low +wazuh-indexer (VERSION-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ -- Wazuh, Inc Fri, 08 Sep 2023 13:46:52 +0000 -wazuh-dashboard (4.5.0-RELEASE) unstable; urgency=low +wazuh-indexer (4.5.0-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index a252291a00..5759a1e661 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1394,9 +1394,9 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/blocked.certs %changelog -* Fri Jun 30 2023 support - %{version} +* Fri Sep 08 2023 support - %{version} - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html -* Fri Sep 08 2023 support - 4.5.0 +* Fri Jun 30 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html * Mon Jun 26 2023 support - 4.4.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html From a0c6a6315250309434802552507fbc218ce505a3 Mon Sep 17 00:00:00 2001 From: Vikman Fernandez-Castro Date: Mon, 26 Jun 2023 10:20:50 +0200 Subject: [PATCH 629/994] Bump Stack packages' changelog to 4.6.0 --- stack/dashboard/deb/debian/changelog | 2 +- stack/indexer/deb/debian/changelog | 6 +++--- unattended_installer/install_functions/installVariables.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 17ab679365..25ba15cbf9 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -1,6 +1,6 @@ wazuh-dashboard (VERSION-RELEASE) unstable; urgency=low - * More info: https://documentation.wazuh.com/current/release-notes/ + * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html -- Wazuh, Inc Fri, 08 Sep 2023 13:46:52 +0000 diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 0cdb2cc61c..c0b6a755b0 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -1,6 +1,6 @@ wazuh-indexer (VERSION-RELEASE) unstable; urgency=low - * More info: https://documentation.wazuh.com/current/release-notes/ + * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html -- Wazuh, Inc Fri, 08 Sep 2023 13:46:52 +0000 @@ -27,7 +27,7 @@ wazuh-indexer (4.4.3-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-4-3.html -- Wazuh, Inc Thu, 25 May 2023 12:31:50 +0000 - + wazuh-indexer (4.4.2-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-4-2.html @@ -111,7 +111,7 @@ wazuh-indexer (4.3.0-RELEASE) unstable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-3-0.html -- 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/ diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index b8e65d0348..18227c22f1 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -7,7 +7,7 @@ # Foundation. ## Package vars -readonly wazuh_major="4.5" +readonly wazuh_major="4.6" readonly wazuh_version="4.6.0" readonly filebeat_version="7.10.2" readonly wazuh_install_vesion="0.1" From c55c3fa0b168aa0f607277371d248b9477dd3d4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Rebollo=20P=C3=A9rez?= Date: Mon, 3 Jul 2023 17:41:33 +0200 Subject: [PATCH 630/994] feat: update kibana app package.json path --- wazuhapp/kibana/Docker/build.sh | 13 ++++++------- wazuhapp/opensearch-dashboards/Docker/build.sh | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/wazuhapp/kibana/Docker/build.sh b/wazuhapp/kibana/Docker/build.sh index b666312559..dbfdd929a7 100755 --- a/wazuhapp/kibana/Docker/build.sh +++ b/wazuhapp/kibana/Docker/build.sh @@ -19,7 +19,7 @@ wazuh_app_clone_repo_url="https://github.com/wazuh/wazuh-kibana-app.git" wazuh_app_raw_repo_url="https://raw.githubusercontent.com/wazuh/wazuh-kibana-app" kibana_app_repo_url="https://github.com/elastic/kibana.git" kibana_app_raw_repo_url="https://raw.githubusercontent.com/elastic/kibana" -wazuh_app_package_json_url="${wazuh_app_raw_repo_url}/${wazuh_branch}/package.json" +wazuh_app_package_json_url="${wazuh_app_raw_repo_url}/${wazuh_branch}/plugins/main/package.json" # Script vars wazuh_version="" @@ -79,14 +79,14 @@ prepare_env() { } -download_kibana_sources() { +download_kibana_sources() { if ! git clone $kibana_app_repo_url --branch "v${aux_kibana_version}" --depth=1 kibana_source; then echo "Error downloading Kibana source code from elastic/kibana GitHub repository." exit 1 fi - + mkdir -p kibana_source/plugins - mv kibana_source ${kibana_dir} + mv kibana_source ${kibana_dir} } @@ -106,12 +106,12 @@ download_wazuh_app_sources() { if ! git clone $wazuh_app_clone_repo_url --branch ${wazuh_branch} --depth=1 ${kibana_dir}/plugins/wazuh ; then echo "Error downloading the source code from wazuh-kibana-app GitHub repository." exit 1 - fi + fi } build_package(){ - + cd $source_dir # Set pkg name @@ -144,4 +144,3 @@ download_kibana_sources install_dependencies download_wazuh_app_sources build_package - diff --git a/wazuhapp/opensearch-dashboards/Docker/build.sh b/wazuhapp/opensearch-dashboards/Docker/build.sh index fcf5abead2..cd7efa261a 100755 --- a/wazuhapp/opensearch-dashboards/Docker/build.sh +++ b/wazuhapp/opensearch-dashboards/Docker/build.sh @@ -19,7 +19,7 @@ wazuh_app_clone_repo_url="https://github.com/wazuh/wazuh-kibana-app.git" wazuh_app_raw_repo_url="https://raw.githubusercontent.com/wazuh/wazuh-kibana-app" plugin_platform_app_repo_url="https://github.com/opensearch-project/OpenSearch-Dashboards.git" plugin_platform_app_raw_repo_url="https://raw.githubusercontent.com/opensearch-project/OpenSearch-Dashboards" -wazuh_app_package_json_url="${wazuh_app_raw_repo_url}/${wazuh_branch}/package.json" +wazuh_app_package_json_url="${wazuh_app_raw_repo_url}/${wazuh_branch}/plugins/main/package.json" # Script vars wazuh_version="" From 1f993bce885f3dcb553a0cfe98303a5297674088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Rebollo=20P=C3=A9rez?= Date: Thu, 6 Jul 2023 10:08:14 +0100 Subject: [PATCH 631/994] fix: change plugin path for wazuhapp --- wazuhapp/kibana/Docker/build.sh | 4 +++- wazuhapp/opensearch-dashboards/Docker/build.sh | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/wazuhapp/kibana/Docker/build.sh b/wazuhapp/kibana/Docker/build.sh index dbfdd929a7..37be8052d9 100755 --- a/wazuhapp/kibana/Docker/build.sh +++ b/wazuhapp/kibana/Docker/build.sh @@ -103,10 +103,12 @@ install_dependencies () { download_wazuh_app_sources() { - if ! git clone $wazuh_app_clone_repo_url --branch ${wazuh_branch} --depth=1 ${kibana_dir}/plugins/wazuh ; then + if ! git clone $wazuh_app_clone_repo_url --branch ${wazuh_branch} --depth=1 /tmp/wazuh-app ; then echo "Error downloading the source code from wazuh-kibana-app GitHub repository." exit 1 fi + + cp -r /tmp/wazuh-app/plugins/main ${kibana_dir}/plugins/wazuh } diff --git a/wazuhapp/opensearch-dashboards/Docker/build.sh b/wazuhapp/opensearch-dashboards/Docker/build.sh index cd7efa261a..4448a1038d 100755 --- a/wazuhapp/opensearch-dashboards/Docker/build.sh +++ b/wazuhapp/opensearch-dashboards/Docker/build.sh @@ -97,12 +97,13 @@ install_dependencies () { download_wazuh_app_sources() { - if ! git clone $wazuh_app_clone_repo_url --branch ${wazuh_branch} --depth=1 ${plugin_platform_dir}/plugins/wazuh ; then - echo "Error downloading the source code from wazuh-kibana-app GitHub repository." + if ! git clone $wazuh_app_clone_repo_url --branch ${wazuh_branch} --depth=1 /tmp/wazuh-app ; then + echo "Error downloading the source code from wazuh-dashboard-app GitHub repository." exit 1 fi -} + cp -r /tmp/wazuh-app/plugins/main ${plugin_platform_dir}/plugins/wazuh +} build_package(){ From 9e1652f81f7808aa2debfba04f8c9d361bcb5bed Mon Sep 17 00:00:00 2001 From: DFolchA Date: Wed, 12 Jul 2023 13:35:19 +0200 Subject: [PATCH 632/994] Add functionality to bump rpm spec files --- bump_version.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 bump_version.py diff --git a/bump_version.py b/bump_version.py new file mode 100644 index 0000000000..8e38e2b0a1 --- /dev/null +++ b/bump_version.py @@ -0,0 +1,48 @@ +import argparse +import datetime +import glob, os +import re +from packaging.version import Version + +format_string = "%m-%d-%Y" +spec_format_string = "%a %b %d %Y" + +arg_parser = argparse.ArgumentParser() +arg_parser.add_argument('-v', '--version', action='store', dest='version', help='Version to bump to', required=True) +arg_parser.add_argument('-r', '--revision', action='store', dest='revision', help='Revision to bump to. Default: 1', default=1) +arg_parser.add_argument('-d', '--date', action='store', dest='date', help='Date to bump to. Format: %m-%d-%Y. Default: today', default=datetime.date.today().strftime('%m-%d-%Y')) +args = arg_parser.parse_args() + +date=datetime.datetime.strptime(args.date, format_string) +version=Version(args.version) + +## Find files to bump .spec, changelog, pkginfo, .pkgproj, test-*.sh, installVariables.sh, CHANGELOG.md, README.md +spec_files = glob.glob('**/*.spec', recursive=True) +changelog_files = glob.glob('**/changelog', recursive=True) +pkginfo_files = glob.glob('**/pkginfo', recursive=True) +pkgproj_files = glob.glob('**/*.pkgproj', recursive=True) +test_files = glob.glob('**/test-*.sh', recursive=True) +install_variables_files = glob.glob('**/installVariables.sh', recursive=True) +changelog_md_files = glob.glob('**/CHANGELOG.md', recursive=True) +readme_md_files = glob.glob('**/README.md', recursive=True) + +## Bump version in .spec files +spec_date=date.strftime(spec_format_string) +for spec_file in spec_files: + with open(spec_file, 'r') as file: + print('Bumping version in ' + spec_file) + filedata = file.read() + # Replace version and revision + regex = r'Version:\s*(\d+\.\d+\.\d+)' + filedata = re.sub(regex, 'Version: {}'.format(version), filedata) + regex = r'Revision:\s*(\d+)' + filedata = re.sub(regex, 'Revision: ' + str(args.revision), filedata) + # Add new version to changelog + regex = r'%changelog' + changelog_string="* {} - {}\n- More info: https://documentation.wazuh.com/current/release-notes/release-{}-{}-{}.html".format(spec_date, version, version.major, version.minor, version.micro) + filedata = re.sub(regex, '%changelog\n' + changelog_string, filedata) + + + with open(spec_file, 'w') as file: + print('Writing version to ' + spec_file) + file.write(filedata) From c407cc7c91461900676a6310975f7f4e1b52b572 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Wed, 12 Jul 2023 15:34:59 +0200 Subject: [PATCH 633/994] Add functionality to bump debian specs --- bump_version.py | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/bump_version.py b/bump_version.py index 8e38e2b0a1..63f3cd5713 100644 --- a/bump_version.py +++ b/bump_version.py @@ -5,7 +5,6 @@ from packaging.version import Version format_string = "%m-%d-%Y" -spec_format_string = "%a %b %d %Y" arg_parser = argparse.ArgumentParser() arg_parser.add_argument('-v', '--version', action='store', dest='version', help='Version to bump to', required=True) @@ -27,9 +26,10 @@ readme_md_files = glob.glob('**/README.md', recursive=True) ## Bump version in .spec files +spec_format_string = "%a %b %d %Y" spec_date=date.strftime(spec_format_string) for spec_file in spec_files: - with open(spec_file, 'r') as file: + with open(spec_file, 'r+') as file: print('Bumping version in ' + spec_file) filedata = file.read() # Replace version and revision @@ -39,10 +39,23 @@ filedata = re.sub(regex, 'Revision: ' + str(args.revision), filedata) # Add new version to changelog regex = r'%changelog' - changelog_string="* {} - {}\n- More info: https://documentation.wazuh.com/current/release-notes/release-{}-{}-{}.html".format(spec_date, version, version.major, version.minor, version.micro) + changelog_string="* {} support - {}\n- More info: https://documentation.wazuh.com/current/release-notes/release-{}-{}-{}.html".format(spec_date, version, version.major, version.minor, version.micro) filedata = re.sub(regex, '%changelog\n' + changelog_string, filedata) + with open(spec_file, 'w') as file: + file.write(filedata) - with open(spec_file, 'w') as file: - print('Writing version to ' + spec_file) - file.write(filedata) +## Bump version in deb changelog files +deb_changelog_format_string = "%a, %d %b %Y %H:%M:%S +0000" +deb_changelog_date=date.strftime(deb_changelog_format_string) +for changelog_file in changelog_files: + with open(changelog_file, 'r') as file: + print('Bumping version in ' + changelog_file) + filedata = file.read() + type=re.search(r'(wazuh-(agent|manager|indexer|dashboard))', filedata).group(1) + changelog_string="wazuh-{} ({}-RELEASE) stable; urgency=low\n\n * More info: https://documentation.wazuh.com/current/release-notes/release-{}-{}-{}.html\n\n -- Wazuh, Inc {}\n\n".format(type, version, version.major, version.minor, version.micro, deb_changelog_date) + # Add new version to changelog + filedata = changelog_string + filedata + + with open(changelog_file, 'w') as file: + file.write(filedata) From dc0bfc4113ec06fce7dbe1991395ba3d4c489787 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Wed, 12 Jul 2023 17:36:31 +0200 Subject: [PATCH 634/994] Add functionality to bump Solaris and macOS specs --- bump_version.py | 42 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/bump_version.py b/bump_version.py index 63f3cd5713..e2727454ae 100644 --- a/bump_version.py +++ b/bump_version.py @@ -29,7 +29,7 @@ spec_format_string = "%a %b %d %Y" spec_date=date.strftime(spec_format_string) for spec_file in spec_files: - with open(spec_file, 'r+') as file: + with open(spec_file, 'r') as file: print('Bumping version in ' + spec_file) filedata = file.read() # Replace version and revision @@ -42,8 +42,8 @@ changelog_string="* {} support - {}\n- More info: https://documentation.wazuh.com/current/release-notes/release-{}-{}-{}.html".format(spec_date, version, version.major, version.minor, version.micro) filedata = re.sub(regex, '%changelog\n' + changelog_string, filedata) - with open(spec_file, 'w') as file: - file.write(filedata) + with open(spec_file, 'w') as file: + file.write(filedata) ## Bump version in deb changelog files deb_changelog_format_string = "%a, %d %b %Y %H:%M:%S +0000" @@ -57,5 +57,37 @@ # Add new version to changelog filedata = changelog_string + filedata - with open(changelog_file, 'w') as file: - file.write(filedata) + with open(changelog_file, 'w') as file: + file.write(filedata) + +## Bump version in pkginfo files + +pkginfo_format_string = "%d%b%Y" + +for pkginfo_file in pkginfo_files: + with open(pkginfo_file, 'r') as file: + print('Bumping version in ' + pkginfo_file) + filedata = file.read() + # Replace version and revision + regex = r'VERSION=(\d+\.\d+\.\d+)' + filedata = re.sub(regex, 'VERSION=\"{}\"'.format(version), filedata) + regex = r'PSTAMP=(.*)' + filedata = re.sub(regex, 'PSTAMP=\"{}\"'.format(date.strftime(pkginfo_format_string)), filedata) + + with open(pkginfo_file, 'w') as file: + file.write(filedata) + +## Bump version in .pkgproj files + +for pkgproj_file in pkgproj_files: + with open(pkgproj_file, 'r') as file: + print('Bumping version in ' + pkgproj_file) + filedata = file.read() + # Replace version and revision + regex = r'(\d+\.\d+\.\d+)-(\d+)' + filedata = re.sub(regex, '{}-{}'.format(version, args.revision), filedata) + regex = r'wazuh-agent-(\d+\.\d+\.\d+)-(\d+)' + filedata = re.sub(regex, 'wazuh-agent-{}-{}'.format(version, args.revision), filedata) + + with open(pkgproj_file, 'w') as file: + file.write(filedata) From 0bd37f7a56499cacd080003e05d30a806f4c9af5 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Wed, 12 Jul 2023 17:44:13 +0200 Subject: [PATCH 635/994] Add functionality to bump tests and wazuh-install --- bump_version.py | 31 +++++++++++++++++++++ tests/unattended/unit/suites/test-common.sh | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/bump_version.py b/bump_version.py index e2727454ae..4990044782 100644 --- a/bump_version.py +++ b/bump_version.py @@ -91,3 +91,34 @@ with open(pkgproj_file, 'w') as file: file.write(filedata) + +## Bump version in test-*.sh files + +for test_file in test_files: + with open(test_file, 'r') as file: + print('Bumping version in ' + test_file) + filedata = file.read() + # Replace version and revision + regex = r'wazuh-manager.x86_64\s+(\d+\.\d+\.\d+)-(\d+)' + filedata = re.sub(regex, 'wazuh-manager.x86_64 {}-{}'.format(version, args.revision), filedata) + regex = r'wazuh_version=\"(\d+\.\d+\.\d+)\"' + filedata = re.sub(regex, 'wazuh_version=\"{}\"'.format(version), filedata) + + with open(test_file, 'w') as file: + file.write(filedata) + +## Bump version in installVariables.sh files + +for install_variables_file in install_variables_files: + with open(install_variables_file, 'r') as file: + print('Bumping version in ' + install_variables_file) + filedata = file.read() + # Replace version and revision + regex = r'wazuh_major=\"(\d+\.\d+)\"' + filedata = re.sub(regex, 'wazuh_major=\"{}.{}\"'.format(version.major,version.minor), filedata) + regex = r'wazuh_version=\"(\d+\.\d+\.\d+)\"' + filedata = re.sub(regex, 'wazuh_version=\"{}\"'.format(version), filedata) + + with open(install_variables_file, 'w') as file: + file.write(filedata) + \ No newline at end of file diff --git a/tests/unattended/unit/suites/test-common.sh b/tests/unattended/unit/suites/test-common.sh index a25a62a53d..1e75c8dae1 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.5.0-1 @wazuh + @mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.5.0-1 @wazuh @mkdir /var/ossec @mock grep wazuh-indexer === @echo wazuh-indexer.x86_64 1.13.2-1 @wazuh From ab0c4a5d5eff35bdf90776c061b29462d9df20be Mon Sep 17 00:00:00 2001 From: DFolchA Date: Wed, 12 Jul 2023 17:48:39 +0200 Subject: [PATCH 636/994] Add functionality to bump CHANGELOG.md and DEB copyright files --- bump_version.py | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/bump_version.py b/bump_version.py index 4990044782..0470caacfe 100644 --- a/bump_version.py +++ b/bump_version.py @@ -15,15 +15,15 @@ date=datetime.datetime.strptime(args.date, format_string) version=Version(args.version) -## Find files to bump .spec, changelog, pkginfo, .pkgproj, test-*.sh, installVariables.sh, CHANGELOG.md, README.md +## Find files to bump .spec, changelog, pkginfo, .pkgproj, test-*.sh, installVariables.sh, CHANGELOG.md spec_files = glob.glob('**/*.spec', recursive=True) changelog_files = glob.glob('**/changelog', recursive=True) +copyright_files = glob.glob('**/copyright', recursive=True) pkginfo_files = glob.glob('**/pkginfo', recursive=True) pkgproj_files = glob.glob('**/*.pkgproj', recursive=True) test_files = glob.glob('**/test-*.sh', recursive=True) install_variables_files = glob.glob('**/installVariables.sh', recursive=True) changelog_md_files = glob.glob('**/CHANGELOG.md', recursive=True) -readme_md_files = glob.glob('**/README.md', recursive=True) ## Bump version in .spec files spec_format_string = "%a %b %d %Y" @@ -60,6 +60,19 @@ with open(changelog_file, 'w') as file: file.write(filedata) +## Bump version in deb copyrigth files + +for copyrigth_file in copyright_files: + with open(copyrigth_file, 'r') as file: + print('Bumping version in ' + copyrigth_file) + filedata = file.read() + # Replace version and revision + regex = r'Wazuh, Inc on (\w+),\s(\d+)\s(\w+)\s(\d+)\s(\d+):(\d+):(\d+)\s\+(\d+)' + filedata = re.sub(regex, "Wazuh, Inc on {}".format(deb_changelog_date), filedata) + + with open(copyrigth_file, 'w') as file: + file.write(filedata) + ## Bump version in pkginfo files pkginfo_format_string = "%d%b%Y" @@ -121,4 +134,18 @@ with open(install_variables_file, 'w') as file: file.write(filedata) + +## Bump version in CHANGELOG.md files + +for changelog_md_file in changelog_md_files: + with open(changelog_md_file, 'r') as file: + print('Bumping version in ' + changelog_md_file) + filedata = file.read() + # Add new version to changelog + regex=r'All notable changes to this project will be documented in this file.' + changelog_string="## [{}]\n\n- https://github.com/wazuh/wazuh-packages/releases/tag/v{}\n\n".format(version, version) + filedata = re.sub(regex, regex + '\n' + changelog_string + regex, filedata) + + with open(changelog_md_file, 'w') as file: + file.write(filedata) \ No newline at end of file From fd81ae9b0d48e3c004a157832391201c7e36d1a9 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Thu, 13 Jul 2023 08:35:32 +0200 Subject: [PATCH 637/994] Fix error with date string --- bump_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bump_version.py b/bump_version.py index 0470caacfe..858788021d 100644 --- a/bump_version.py +++ b/bump_version.py @@ -9,7 +9,7 @@ arg_parser = argparse.ArgumentParser() arg_parser.add_argument('-v', '--version', action='store', dest='version', help='Version to bump to', required=True) arg_parser.add_argument('-r', '--revision', action='store', dest='revision', help='Revision to bump to. Default: 1', default=1) -arg_parser.add_argument('-d', '--date', action='store', dest='date', help='Date to bump to. Format: %m-%d-%Y. Default: today', default=datetime.date.today().strftime('%m-%d-%Y')) +arg_parser.add_argument('-d', '--date', action='store', dest='date', help='Date to bump to. Format: m-d-Y. Default: today', default=datetime.date.today().strftime(format_string)) args = arg_parser.parse_args() date=datetime.datetime.strptime(args.date, format_string) From c63aa69322767f436b53d1b0b53bb73100a05898 Mon Sep 17 00:00:00 2001 From: wazuhci Date: Mon, 26 Jun 2023 13:45:57 +0000 Subject: [PATCH 638/994] Bump reference to 4.5.0 version --- CHANGELOG.md | 5 ++++- VERSION | 2 +- aix/SPECS/wazuh-agent-aix.spec | 4 +++- debs/SPECS/wazuh-agent/debian/changelog | 8 +++++++- debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 6 ++++++ debs/SPECS/wazuh-manager/debian/copyright | 2 +- hp-ux/depothelper-2.20-ia64_64-11.31.depot | Bin 102400 -> 102400 bytes macos/specs/wazuh-agent.pkgproj | 4 ++-- rpms/SPECS/wazuh-agent.spec | 4 +++- rpms/SPECS/wazuh-manager.spec | 4 +++- solaris/solaris10/pkginfo | 4 ++-- stack/dashboard/deb/debian/changelog | 6 ++++++ stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 ++ stack/indexer/deb/debian/changelog | 8 +++++++- stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 ++ tests/unattended/unit/suites/test-common.sh | 4 ++-- .../unattended/unit/suites/test-dashboard.sh | 2 +- unattended_installer/builder.sh | 2 +- .../install_functions/installVariables.sh | 4 ++-- 22 files changed, 58 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5c5fc6497..fed898fec7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,12 @@ # 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 + ## [v4.4.5] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.4.5 - ## [v4.4.4] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.4.4 diff --git a/VERSION b/VERSION index fa1ba0458a..a84947d6ff 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.4.5 +4.5.0 diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 9dc98251b8..06b231daad 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.4.5 +Version: 4.5.0 Release: 1 License: GPL URL: https://www.wazuh.com/ @@ -290,6 +290,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog +* Wed Jul 19 2023 support - 4.5.0 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html * Mon Jul 10 2023 support - 4.4.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html * Tue Jun 13 2023 support - 4.4.4 diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index b5fd4e4d50..4edb439116 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -1,9 +1,15 @@ +wazuh-agent (4.5.0-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/ + + -- Wazuh, Inc Wed, 19 Jul 2023 13:45:36 +0000 + wazuh-agent (4.4.5-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html -- Wazuh, Inc Mon, 10 Jul 2023 12:31:50 +0000 - + wazuh-agent (4.4.4-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-4-4.html diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 0d748fb0bc..fab6cfab6b 100644 --- a/debs/SPECS/wazuh-agent/debian/copyright +++ b/debs/SPECS/wazuh-agent/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 10 Jul 2023 12:31:50 +0000 + Wazuh, Inc on Wed, 19 Jul 2023 13:45:36 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index 54640c1b94..1746e7e2f5 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -1,4 +1,10 @@ +wazuh-manager (4.5.0-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/ + + -- Wazuh, Inc Wed, 19 Jul 2023 13:45:36 +0000 + wazuh-manager (4.4.5-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 0d748fb0bc..fab6cfab6b 100644 --- a/debs/SPECS/wazuh-manager/debian/copyright +++ b/debs/SPECS/wazuh-manager/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 10 Jul 2023 12:31:50 +0000 + Wazuh, Inc on Wed, 19 Jul 2023 13:45:36 +0000 It was downloaded from: diff --git a/hp-ux/depothelper-2.20-ia64_64-11.31.depot b/hp-ux/depothelper-2.20-ia64_64-11.31.depot index 49fcf2923a52659ff8981a89bca15a1218a66bb7..880245baa2130e245d87e2c672bba8df22e6f27d 100644 GIT binary patch delta 164 zcmZozz}B#UZ9*4|o~fR}#=bx7V8-S?jz5f078f%+D@f9G@_GUF&3gsUvOp!o{%}HB s3UHPdT$>J@r3Ysjz*$CcmdT%;P*dLhNd~jF_XRORrMLHmFcw(@0Lr5^LI3~& delta 164 zcmZozz}B#UZ9*4|v5A?<#=bx7V8-S?jz5f078f%+tC@+RiRt9^0_vOh3Z7+wN{Id8 ugt8RiEG@V;9XLx5&N6_rjNmMjKRcnOy!(?3W^L~aVuVU>?+alpvIYPZJ2o%? diff --git a/macos/specs/wazuh-agent.pkgproj b/macos/specs/wazuh-agent.pkgproj index 8dc63c3dd2..72da7fbd31 100644 --- a/macos/specs/wazuh-agent.pkgproj +++ b/macos/specs/wazuh-agent.pkgproj @@ -812,7 +812,7 @@ USE_HFS+_COMPRESSION VERSION - 4.4.5-1 + 4.5.0-1 TYPE 0 @@ -1239,7 +1239,7 @@ NAME - wazuh-agent-4.4.5-1 + wazuh-agent-4.5.0-1 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 369df83f3a..18d01337c5 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -7,7 +7,7 @@ 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.4.5 +Version: 4.5.0 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -619,6 +619,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* Wed Jul 19 2023 support - 4.5.0 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html * Mon Jul 10 2023 support - 4.4.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html * Tue Jun 13 2023 support - 4.4.4 diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 66f1a1cae0..c9b07e1f29 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -7,7 +7,7 @@ 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.4.5 +Version: 4.5.0 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -841,6 +841,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* Wed Jul 19 2023 support - 4.5.0 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html * Mon Jul 10 2023 support - 4.4.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html * Tue Jun 13 2023 support - 4.4.4 diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index c0cfb40a08..5a1a960110 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -1,11 +1,11 @@ NAME=Wazuh - Wazuh unifies historically separate functions into a single agent and platform architecture. Providing protection for public clouds, private clouds, and on-premise data centers. PKG="wazuh-agent" -VERSION="4.4.5" +VERSION="4.5.0" ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="10Jul2023" +PSTAMP="19Jul2023" EMAIL="info@wazuh.com" ISTATES="S s 1 2 3" RSTATES="S s 1 2 3" diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 2871ffd23a..1a92c1f770 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -1,3 +1,9 @@ +wazuh-dashboard (4.5.0-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/ + + -- Wazuh, Inc Wed, 19 Jul 2023 13:45:36 +0000 + wazuh-dashboard (4.4.5-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index 9e0a70d55b..b0643f11e6 100644 --- a/stack/dashboard/deb/debian/copyright +++ b/stack/dashboard/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 10 Jul 2023 12:31:50 +0000 + Wazuh, Inc on Wed, 19 Jul 2023 13:45:36 +0000 It was downloaded from: diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 5eac87e44f..5c2764302c 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -397,6 +397,8 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog +* Wed Jul 19 2023 support - 4.5.0 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html * Mon Jul 10 2023 support - 4.4.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html * Tue Jun 13 2023 support - 4.4.4 diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 6b2eff0e37..6afc080d08 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -1,9 +1,15 @@ +wazuh-indexer (4.5.0-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/ + + -- Wazuh, Inc Wed, 19 Jul 2023 13:45:36 +0000 + wazuh-indexer (4.4.5-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html -- Wazuh, Inc Mon, 10 Jul 2023 12:31:50 +0000 - + wazuh-indexer (4.4.4-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-4-4.html diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index ac1b8a34a8..82c2b93991 100644 --- a/stack/indexer/deb/debian/copyright +++ b/stack/indexer/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 10 Jul 2023 12:31:50 +0000 + Wazuh, Inc on Wed, 19 Jul 2023 13:45:36 +0000 It was downloaded from: diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 44d57b4661..b81bbf6fcf 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1384,6 +1384,8 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/blocked.certs %changelog +* Wed Jul 19 2023 support - 4.5.0 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html * Mon Jul 10 2023 support - 4.4.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html * Tue Jun 13 2023 support - 4.4.4 diff --git a/tests/unattended/unit/suites/test-common.sh b/tests/unattended/unit/suites/test-common.sh index 7ad35ebeae..a25a62a53d 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.4.5-1 @wazuh + @mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.5.0-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-05-common_checkInstalled-all-installed-yum-assert() { - @echo "wazuh-manager.x86_64 4.4.5-1 @wazuh" + @echo "wazuh-manager.x86_64 4.5.0-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 0a145f4ca7..37e99c0646 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.4.5" + wazuh_version="4.5.0" elasticsearch_oss_version="7.10.2" wazuh_kibana_plugin_revision="1" repobaseurl="https://packages.wazuh.com/4.x" diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index e330a54167..74783b3541 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -16,7 +16,7 @@ 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 source_branch="4.4" +readonly source_branch="4.5" function getHelp() { diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index 701373c664..07586ef064 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -7,8 +7,8 @@ # Foundation. ## Package vars -readonly wazuh_major="4.4" -readonly wazuh_version="4.4.5" +readonly wazuh_major="4.5" +readonly wazuh_version="4.5.0" readonly filebeat_version="7.10.2" readonly wazuh_install_vesion="0.1" From a4c250362615b3ddfc0bfb1ada7c3c1983e6c74a Mon Sep 17 00:00:00 2001 From: Vikman Fernandez-Castro Date: Thu, 13 Jul 2023 09:27:18 +0200 Subject: [PATCH 639/994] Update Dashboard & Indexer compatibility table --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 298b173f86..2d9dc29b3f 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ The following table shows the references for the versions of each component. |-----------------|-----------------------| | 4.3.x | 1.2.0 | | 4.4.0 | 2.4.1 | -| 4.4.1 - 4.5.1 | 2.6.0 | +| 4.4.1 - 4.6.0 | 2.6.0 | ### Wazuh indexer @@ -44,7 +44,7 @@ The following table shows the references for the versions of each component. |-----------------|-----------------------| | 4.3.x | 1.2.4 | | 4.4.0 | 2.4.1 | -| 4.4.1 - 4.5.1 | 2.6.0 | +| 4.4.1 - 4.6.0 | 2.6.0 | ## Contribute From f3878a101d469832a10b290aac9c30ccb2d1ea9e Mon Sep 17 00:00:00 2001 From: Vikman Fernandez-Castro Date: Thu, 13 Jul 2023 09:35:39 +0200 Subject: [PATCH 640/994] Revert tag deletion in package building workflows --- .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 b4aaba5bee..2968a2eabe 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -65,7 +65,7 @@ jobs: working-directory: ./debs run: | REVISION="${{ github.head_ref }}" - bash generate_debian_package.sh -b ${{ env.VERSION }} -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker -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 a65d36a43f..b0f9177bf6 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -66,7 +66,7 @@ jobs: working-directory: ./rpms run: | REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g' ) - bash generate_rpm_package.sh -b ${{ env.VERSION }} -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker -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 90b8993c5aa5ef87141eeb966cf73cc968239052 Mon Sep 17 00:00:00 2001 From: "Victor M. Fernandez-Castro" Date: Thu, 13 Jul 2023 09:45:33 +0200 Subject: [PATCH 641/994] Update .github/workflows/build-deb-packages.yml Remove a spurious `$` sign. Co-authored-by: Daniel Folch --- .github/workflows/build-deb-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 2968a2eabe..5ad64fa1db 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -52,7 +52,7 @@ jobs: 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 - if [ $MAJOR == "4.7" ]; then echo "VERSION=master" >> $GITHUB_ENV $ ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi + if [ $MAJOR == "4.7" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi echo "CONTAINER_NAME=deb_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV - name: Download docker image for package building From 165cd1508fbd961dbec90f06754a7a5830d418fc Mon Sep 17 00:00:00 2001 From: "Victor M. Fernandez-Castro" Date: Thu, 13 Jul 2023 09:45:44 +0200 Subject: [PATCH 642/994] Update .github/workflows/build-rpm-packages.yml Remove a spurious `$` sign. Co-authored-by: Daniel Folch --- .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 b0f9177bf6..02a1a40d46 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -53,7 +53,7 @@ jobs: 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 - if [ $MAJOR == "4.7" ]; then echo "VERSION=master" >> $GITHUB_ENV $ ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi + if [ $MAJOR == "4.7" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(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 From dc6f5395b4ad0afc41e5f09344c201c514be4ef0 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Thu, 13 Jul 2023 10:05:47 +0200 Subject: [PATCH 643/994] Add set -x to pull_image_from_ghcr.sh --- .github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh b/.github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh index a5362d466d..c3cf4c0495 100644 --- a/.github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh +++ b/.github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh @@ -1,3 +1,4 @@ +set -x GITHUB_PUSH_SECRET=$1 GITHUB_USER=$2 DOCKER_IMAGE_NAME=$3 From 6d8ef02e291a19bd07fc12dfd2958ae90fb043a2 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Thu, 13 Jul 2023 10:08:43 +0200 Subject: [PATCH 644/994] Add image tag in pull_image_from_ghcr.sh --- .github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh b/.github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh index c3cf4c0495..ffc41ecce2 100644 --- a/.github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh +++ b/.github/actions/ghcr-pull-and-push/pull_image_from_ghcr.sh @@ -17,4 +17,4 @@ echo ${GITHUB_PUSH_SECRET} | docker login https://ghcr.io -u $GITHUB_USER --pass # 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 ghcr.io/${GITHUB_OWNER}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} ${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} From e170b4febbc205894d4216d94dc8442a88bed103 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Thu, 13 Jul 2023 08:35:50 +0200 Subject: [PATCH 645/994] Add GH action to bump --- .github/workflows/bump-version.yml | 66 ++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 .github/workflows/bump-version.yml diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml new file mode 100644 index 0000000000..46c12a98d0 --- /dev/null +++ b/.github/workflows/bump-version.yml @@ -0,0 +1,66 @@ + +name: Bump version - wazuh-packages +on: + workflow_dispatch: + inputs: + version: + description: 'Version to bump to' + required: true + revision: + description: 'Revision to bump to. Defalut: 1' + required: false + date: + description: 'Date to bump to. Default: today' + required: false + +jobs: + bump-version: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + token: ${{ secrets.GITHUB_TOKEN }} + ref: ${{ github.head_ref }} + + # - uses: peterjgrainger/action-create-branch@v2.2.0 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # branch: bump-version-${{ event.inputs.version }} + # sha: ${{ github.head_ref }} + + # - uses: actions/checkout@v2 + # with: + # token: ${{ secrets.GITHUB_TOKEN }} + # ref: bump-version-${{ event.inputs.version }} + + # - name: Set execution parameters + # run: | + # EXEC_PARAMS="" + # if [ -n "${{ github.event.inputs.version }}" ]; then + # echo "EXEC_PARAMS=EXEC_PARAMS+\" -v ${{ github.event.inputs.version }}\"" + # fi + # if [ -n "${{ github.event.inputs.revision }}" ]; then + # echo "EXEC_PARAMS=EXEC_PARAMS+\" -r ${{ github.event.inputs.revision }}\"" + # fi + # if [ -n "${{ github.event.inputs.date }}" ]; then + # echo "EXEC_PARAMS=EXEC_PARAMS+\" -d ${{ github.event.inputs.date }}\"" + # fi + # echo "EXEC_PARAMS" >> $GITHUB_ENV + # shell: bash + + # - name: Bump version + # run: | + # python3 ./bump_version.py $EXEC_PARAMS + # shell: bash + + # - name: "Commit changes and push" + # run: | + # git config --global user.name "wazuhci" + # git config --global user.email "wazuhci@wazuh.com" + # git add . + # git commit -m "Bump version to ${{ github.event.inputs.version }}" + # shell: bash + + + \ No newline at end of file From a35cea4b2adf81d337352747d0c15db8b305f449 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Fri, 14 Jul 2023 10:59:40 +0200 Subject: [PATCH 646/994] Adapt python script to PEP8 standard and remove trailing lines --- .github/workflows/bump-version.yml | 5 +- bump_version.py | 209 +++++++++++++++++------------ 2 files changed, 124 insertions(+), 90 deletions(-) diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index 46c12a98d0..ee847321ef 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -60,7 +60,4 @@ jobs: # git config --global user.email "wazuhci@wazuh.com" # git add . # git commit -m "Bump version to ${{ github.event.inputs.version }}" - # shell: bash - - - \ No newline at end of file + # shell: bash \ No newline at end of file diff --git a/bump_version.py b/bump_version.py index 858788021d..a6c4429041 100644 --- a/bump_version.py +++ b/bump_version.py @@ -1,151 +1,188 @@ +""" +This script is used to bump the version of the Wazuh packages repository. + Copyright (C) 2015-2020, Wazuh Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. +""" import argparse import datetime -import glob, os +import glob import re from packaging.version import Version -format_string = "%m-%d-%Y" +FORMAT_STRING="%m-%d-%Y" -arg_parser = argparse.ArgumentParser() -arg_parser.add_argument('-v', '--version', action='store', dest='version', help='Version to bump to', required=True) -arg_parser.add_argument('-r', '--revision', action='store', dest='revision', help='Revision to bump to. Default: 1', default=1) -arg_parser.add_argument('-d', '--date', action='store', dest='date', help='Date to bump to. Format: m-d-Y. Default: today', default=datetime.date.today().strftime(format_string)) -args = arg_parser.parse_args() +arg_parser=argparse.ArgumentParser() +arg_parser.add_argument('-v', '--version', action='store', dest='version', + help='Version to bump to', required=True) +arg_parser.add_argument('-r', '--revision', action='store', dest='revision', + help='Revision to bump to. Default: 1', default=1) +arg_parser.add_argument('-d', '--date', action='store', dest='date', + help='Date to bump to. Format: m-d-Y. Default: today', + default=datetime.date.today().strftime(FORMAT_STRING)) +args=arg_parser.parse_args() -date=datetime.datetime.strptime(args.date, format_string) +date=datetime.datetime.strptime(args.date, FORMAT_STRING) version=Version(args.version) -## Find files to bump .spec, changelog, pkginfo, .pkgproj, test-*.sh, installVariables.sh, CHANGELOG.md -spec_files = glob.glob('**/*.spec', recursive=True) -changelog_files = glob.glob('**/changelog', recursive=True) -copyright_files = glob.glob('**/copyright', recursive=True) -pkginfo_files = glob.glob('**/pkginfo', recursive=True) -pkgproj_files = glob.glob('**/*.pkgproj', recursive=True) -test_files = glob.glob('**/test-*.sh', recursive=True) -install_variables_files = glob.glob('**/installVariables.sh', recursive=True) -changelog_md_files = glob.glob('**/CHANGELOG.md', recursive=True) +## Find files to bump .spec, changelog, pkginfo, .pkgproj, test-*.sh, +## installVariables.sh, CHANGELOG.md +spec_files=glob.glob('**/*.spec', recursive=True) +changelog_files=glob.glob('**/changelog', recursive=True) +copyright_files=glob.glob('**/copyright', recursive=True) +pkginfo_files=glob.glob('**/pkginfo', recursive=True) +pkgproj_files=glob.glob('**/*.pkgproj', recursive=True) +test_files=glob.glob('**/test-*.sh', recursive=True) +install_variables_files=glob.glob('**/installVariables.sh', recursive=True) +changelog_md_files=glob.glob('**/CHANGELOG.md', recursive=True) ## Bump version in .spec files -spec_format_string = "%a %b %d %Y" -spec_date=date.strftime(spec_format_string) +SPEC_FORMAT_STRING="%a %b %d %Y" +spec_date=date.strftime(SPEC_FORMAT_STRING) for spec_file in spec_files: - with open(spec_file, 'r') as file: + with open(spec_file, 'r', encoding="utf-8") as file: print('Bumping version in ' + spec_file) - filedata = file.read() + filedata=file.read() # Replace version and revision - regex = r'Version:\s*(\d+\.\d+\.\d+)' - filedata = re.sub(regex, 'Version: {}'.format(version), filedata) - regex = r'Revision:\s*(\d+)' - filedata = re.sub(regex, 'Revision: ' + str(args.revision), filedata) + REGEX=r'Version:\s*(\d+\.\d+\.\d+)' + filedata=re.sub(REGEX, f"Version: {version}", filedata) + REGEX=r'Revision:\s*(\d+)' + filedata=re.sub(REGEX, 'Revision: ' + str(args.revision), + filedata) # Add new version to changelog - regex = r'%changelog' - changelog_string="* {} support - {}\n- More info: https://documentation.wazuh.com/current/release-notes/release-{}-{}-{}.html".format(spec_date, version, version.major, version.minor, version.micro) - filedata = re.sub(regex, '%changelog\n' + changelog_string, filedata) - - with open(spec_file, 'w') as file: + REGEX=r'%changelog' + changelog_string=(f"* {spec_date} support - {version}" + "\n- More info: https://documentation.wazuh.com/current/release-" + f"notes/release-{version.major}-{version.minor}-" + f"{version.micro}.html") + filedata=re.sub(REGEX, '%changelog\n' + changelog_string, filedata) + + with open(spec_file, 'w', encoding="utf-8") as file: file.write(filedata) ## Bump version in deb changelog files -deb_changelog_format_string = "%a, %d %b %Y %H:%M:%S +0000" -deb_changelog_date=date.strftime(deb_changelog_format_string) +DEB_FORMAT_STRING="%a, %d %b %Y %H:%M:%S +0000" +deb_changelog_date=date.strftime(DEB_FORMAT_STRING) for changelog_file in changelog_files: - with open(changelog_file, 'r') as file: + with open(changelog_file, 'r', encoding="utf-8") as file: print('Bumping version in ' + changelog_file) - filedata = file.read() - type=re.search(r'(wazuh-(agent|manager|indexer|dashboard))', filedata).group(1) - changelog_string="wazuh-{} ({}-RELEASE) stable; urgency=low\n\n * More info: https://documentation.wazuh.com/current/release-notes/release-{}-{}-{}.html\n\n -- Wazuh, Inc {}\n\n".format(type, version, version.major, version.minor, version.micro, deb_changelog_date) + filedata=file.read() + install_type=re.search(r'(wazuh-(agent|manager|indexer|dashboard))', + filedata).group(1) + changelog_string=(f"wazuh-{install_type} ({version}-RELEASE) stable; " + "urgency=low\n\n * More info: https://documentation.wazuh.com/" + f"current/release-notes/release-{version.major}-{version.minor}-" + f"{version.micro}.html\n\n -- " + f"Wazuh, Inc {deb_changelog_date}\n\n") # Add new version to changelog - filedata = changelog_string + filedata - - with open(changelog_file, 'w') as file: + filedata=changelog_string + filedata + + with open(changelog_file, 'w', encoding="utf-8") as file: file.write(filedata) ## Bump version in deb copyrigth files for copyrigth_file in copyright_files: - with open(copyrigth_file, 'r') as file: + with open(copyrigth_file, 'r', encoding="utf-8") as file: print('Bumping version in ' + copyrigth_file) - filedata = file.read() + filedata=file.read() # Replace version and revision - regex = r'Wazuh, Inc on (\w+),\s(\d+)\s(\w+)\s(\d+)\s(\d+):(\d+):(\d+)\s\+(\d+)' - filedata = re.sub(regex, "Wazuh, Inc on {}".format(deb_changelog_date), filedata) - - with open(copyrigth_file, 'w') as file: + REGEX=(r'Wazuh, Inc on ' + r'(\w+),\s(\d+)\s(\w+)\s(\d+)\s(\d+):(\d+):(\d+)\s\+(\d+)') + filedata=re.sub(REGEX, + f"Wazuh, Inc on {deb_changelog_date}", + filedata) + + with open(copyrigth_file, 'w', encoding="utf-8") as file: file.write(filedata) ## Bump version in pkginfo files -pkginfo_format_string = "%d%b%Y" +PKGINFO_FORMAT_STRING="%d%b%Y" for pkginfo_file in pkginfo_files: - with open(pkginfo_file, 'r') as file: + with open(pkginfo_file, 'r', encoding="utf-8") as file: print('Bumping version in ' + pkginfo_file) - filedata = file.read() + filedata=file.read() # Replace version and revision - regex = r'VERSION=(\d+\.\d+\.\d+)' - filedata = re.sub(regex, 'VERSION=\"{}\"'.format(version), filedata) - regex = r'PSTAMP=(.*)' - filedata = re.sub(regex, 'PSTAMP=\"{}\"'.format(date.strftime(pkginfo_format_string)), filedata) - - with open(pkginfo_file, 'w') as file: + REGEX=r'VERSION=\"(\d+\.\d+\.\d+)\"' + filedata=re.sub(REGEX, f'VERSION=\"{version}\"', filedata) + REGEX=r'PSTAMP=(.*)' + filedata=re.sub(REGEX, + f'PSTAMP=\"{date.strftime(PKGINFO_FORMAT_STRING)}\"', + filedata) + + with open(pkginfo_file, 'w', encoding="utf-8") as file: file.write(filedata) ## Bump version in .pkgproj files for pkgproj_file in pkgproj_files: - with open(pkgproj_file, 'r') as file: + with open(pkgproj_file, 'r', encoding="utf-8") as file: print('Bumping version in ' + pkgproj_file) - filedata = file.read() + filedata=file.read() # Replace version and revision - regex = r'(\d+\.\d+\.\d+)-(\d+)' - filedata = re.sub(regex, '{}-{}'.format(version, args.revision), filedata) - regex = r'wazuh-agent-(\d+\.\d+\.\d+)-(\d+)' - filedata = re.sub(regex, 'wazuh-agent-{}-{}'.format(version, args.revision), filedata) - - with open(pkgproj_file, 'w') as file: + REGEX=r'(\d+\.\d+\.\d+)-(\d+)' + filedata=re.sub(REGEX, f'{version}-{args.revision}', + filedata) + REGEX=r'wazuh-agent-(\d+\.\d+\.\d+)-(\d+)' + filedata=re.sub(REGEX, + f'wazuh-agent-{version}-{args.revision}', + filedata) + + with open(pkgproj_file, 'w', encoding="utf-8") as file: file.write(filedata) ## Bump version in test-*.sh files for test_file in test_files: - with open(test_file, 'r') as file: + with open(test_file, 'r', encoding="utf-8") as file: print('Bumping version in ' + test_file) - filedata = file.read() + filedata=file.read() # Replace version and revision - regex = r'wazuh-manager.x86_64\s+(\d+\.\d+\.\d+)-(\d+)' - filedata = re.sub(regex, 'wazuh-manager.x86_64 {}-{}'.format(version, args.revision), filedata) - regex = r'wazuh_version=\"(\d+\.\d+\.\d+)\"' - filedata = re.sub(regex, 'wazuh_version=\"{}\"'.format(version), filedata) - - with open(test_file, 'w') as file: + REGEX=r'wazuh-manager.x86_64\s+(\d+\.\d+\.\d+)-(\d+)' + filedata=re.sub(REGEX, + f'wazuh-manager.x86_64 {version}-{args.revision}', + filedata) + REGEX=r'wazuh_version=\"(\d+\.\d+\.\d+)\"' + filedata=re.sub(REGEX, f'wazuh_version=\"{version}\"', filedata) + + with open(test_file, 'w', encoding="utf-8") as file: file.write(filedata) ## Bump version in installVariables.sh files for install_variables_file in install_variables_files: - with open(install_variables_file, 'r') as file: + with open(install_variables_file, 'r', encoding="utf-8") as file: print('Bumping version in ' + install_variables_file) - filedata = file.read() + filedata=file.read() # Replace version and revision - regex = r'wazuh_major=\"(\d+\.\d+)\"' - filedata = re.sub(regex, 'wazuh_major=\"{}.{}\"'.format(version.major,version.minor), filedata) - regex = r'wazuh_version=\"(\d+\.\d+\.\d+)\"' - filedata = re.sub(regex, 'wazuh_version=\"{}\"'.format(version), filedata) - - with open(install_variables_file, 'w') as file: + REGEX=r'wazuh_major=\"(\d+\.\d+)\"' + filedata=re.sub(REGEX, + f'wazuh_major=\"{version.major}.{version.minor}\"', + filedata) + REGEX=r'wazuh_version=\"(\d+\.\d+\.\d+)\"' + filedata=re.sub(REGEX, f'wazuh_version=\"{version}\"', filedata) + + with open(install_variables_file, 'w', encoding="utf-8") as file: file.write(filedata) ## Bump version in CHANGELOG.md files for changelog_md_file in changelog_md_files: - with open(changelog_md_file, 'r') as file: + with open(changelog_md_file, 'r', encoding="utf-8") as file: print('Bumping version in ' + changelog_md_file) - filedata = file.read() + filedata=file.read() # Add new version to changelog - regex=r'All notable changes to this project will be documented in this file.' - changelog_string="## [{}]\n\n- https://github.com/wazuh/wazuh-packages/releases/tag/v{}\n\n".format(version, version) - filedata = re.sub(regex, regex + '\n' + changelog_string + regex, filedata) - - with open(changelog_md_file, 'w') as file: + REGEX=(r'All notable changes to this project ' + r'will be documented in this file.') + changelog_string=(f"## [{version}]\n\n- https://github.com/wazuh/" + f"wazuh-packages/releases/tag/v{version}") + filedata=re.sub(REGEX, REGEX + '\n' + changelog_string, + filedata) + + with open(changelog_md_file, 'w', encoding="utf-8") as file: file.write(filedata) - \ No newline at end of file From 71cbe5f639f8c724526d715062d1e0cb3014e445 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Fri, 14 Jul 2023 11:55:08 +0200 Subject: [PATCH 647/994] Use checkout v3 --- .github/workflows/bump-version.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index 86f9ab77eb..66f1f5b0ef 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -17,7 +17,7 @@ jobs: bump-version: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: token: ${{ secrets.GITHUB_TOKEN }} ref: ${{ github.head_ref }} @@ -29,7 +29,7 @@ jobs: # branch: bump-version-${{ event.inputs.version }} # sha: ${{ github.head_ref }} - # - uses: actions/checkout@v2 + # - uses: actions/checkout@v3 # with: # token: ${{ secrets.GITHUB_TOKEN }} # ref: bump-version-${{ event.inputs.version }} From 662ce79671dc183ba62b7c7504dff4f7a2f5848a Mon Sep 17 00:00:00 2001 From: wazuhci Date: Mon, 17 Jul 2023 07:06:09 +0000 Subject: [PATCH 648/994] Bump version to 4.8.0 --- .github/workflows/build-deb-packages.yml | 2 +- .github/workflows/build-rpm-packages.yml | 2 +- CHANGELOG.md | 3 +++ README.md | 4 ++-- VERSION | 2 +- aix/SPECS/wazuh-agent-aix.spec | 4 +++- debs/SPECS/wazuh-agent/debian/changelog | 6 ++++++ debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 6 ++++++ debs/SPECS/wazuh-manager/debian/copyright | 2 +- macos/specs/wazuh-agent.pkgproj | 4 ++-- rpms/SPECS/wazuh-agent.spec | 4 +++- rpms/SPECS/wazuh-manager.spec | 4 +++- solaris/solaris10/pkginfo | 4 ++-- stack/dashboard/deb/debian/changelog | 6 ++++++ stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 ++ stack/indexer/deb/debian/changelog | 6 ++++++ stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 ++ tests/unattended/unit/suites/test-common.sh | 4 ++-- tests/unattended/unit/suites/test-dashboard.sh | 10 +++++----- tests/unattended/unit/suites/test-indexer.sh | 8 ++++---- .../install_functions/installVariables.sh | 4 ++-- 24 files changed, 66 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 5ad64fa1db..72b892111a 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -52,7 +52,7 @@ jobs: 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 - if [ $MAJOR == "4.7" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi + if [ $MAJOR == "4.8" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $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 02a1a40d46..8e180534a3 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -53,7 +53,7 @@ jobs: 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 - if [ $MAJOR == "4.7" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi + if [ $MAJOR == "4.8" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(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 diff --git a/CHANGELOG.md b/CHANGELOG.md index f833fe5ef0..b2118d8fc3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Change Log All notable changes to this project will be documented in this file. +## [4.8.0] + +- https://github.com/wazuh/wazuh-packages/releases/tag/v4.8.0 ## [v4.7.0] diff --git a/README.md b/README.md index 2d9dc29b3f..5d80867994 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ The following table shows the references for the versions of each component. |-----------------|-----------------------| | 4.3.x | 1.2.0 | | 4.4.0 | 2.4.1 | -| 4.4.1 - 4.6.0 | 2.6.0 | +| 4.4.1 - 4.8.0 | 2.6.0 | ### Wazuh indexer @@ -44,7 +44,7 @@ The following table shows the references for the versions of each component. |-----------------|-----------------------| | 4.3.x | 1.2.4 | | 4.4.0 | 2.4.1 | -| 4.4.1 - 4.6.0 | 2.6.0 | +| 4.4.1 - 4.8.0 | 2.6.0 | ## Contribute diff --git a/VERSION b/VERSION index f6cdf40983..88f181192c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.7.0 +4.8.0 diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 3b361726b6..a363f0fe6b 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.7.0 +Version: 4.8.0 Release: 1 License: GPL URL: https://www.wazuh.com/ @@ -290,6 +290,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog +* Fri Dec 15 2023 support - 4.8.0 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Sat Oct 28 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Mon Sep 04 2023 support - 4.6.0 diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index e269b0446f..7fd305bc64 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -1,3 +1,9 @@ +wazuh-agent (4.8.0-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html + + -- Wazuh, Inc Fri, 15 Dec 2023 00:00:00 +0000 + wazuh-agent (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index c3528abbfd..071af79317 100644 --- a/debs/SPECS/wazuh-agent/debian/copyright +++ b/debs/SPECS/wazuh-agent/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Sat, 28 Oct 2023 10:32:24 +0000 + Wazuh, Inc on Fri, 15 Dec 2023 00:00:00 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index b45a4fd6f5..c881ac456b 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -1,3 +1,9 @@ +wazuh-manager (4.8.0-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html + + -- Wazuh, Inc Fri, 15 Dec 2023 00:00:00 +0000 + wazuh-manager (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index c3528abbfd..071af79317 100644 --- a/debs/SPECS/wazuh-manager/debian/copyright +++ b/debs/SPECS/wazuh-manager/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Sat, 28 Oct 2023 10:32:24 +0000 + Wazuh, Inc on Fri, 15 Dec 2023 00:00:00 +0000 It was downloaded from: diff --git a/macos/specs/wazuh-agent.pkgproj b/macos/specs/wazuh-agent.pkgproj index fee0a3dc97..96c48d9ded 100644 --- a/macos/specs/wazuh-agent.pkgproj +++ b/macos/specs/wazuh-agent.pkgproj @@ -812,7 +812,7 @@ USE_HFS+_COMPRESSION VERSION - 4.7.0-1 + 4.8.0-1 TYPE 0 @@ -1239,7 +1239,7 @@ NAME - wazuh-agent-4.7.0-1 + wazuh-agent-4.8.0-1 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index d0bd63dccc..22d44001e3 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -7,7 +7,7 @@ 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.7.0 +Version: 4.8.0 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -599,6 +599,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* Fri Dec 15 2023 support - 4.8.0 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Sat Oct 28 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Mon Sep 04 2023 support - 4.6.0 diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 87ddb14f7a..2c6ad6dea4 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -7,7 +7,7 @@ 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.7.0 +Version: 4.8.0 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -822,6 +822,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* Fri Dec 15 2023 support - 4.8.0 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Sat Oct 28 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Mon Sep 04 2023 support - 4.6.0 diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index 80d4fddb5c..d167f45048 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -1,11 +1,11 @@ NAME=Wazuh - Wazuh unifies historically separate functions into a single agent and platform architecture. Providing protection for public clouds, private clouds, and on-premise data centers. PKG="wazuh-agent" -VERSION="4.7.0" +VERSION="4.8.0" ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="28Oct2023" +PSTAMP="15Dec2023" EMAIL="info@wazuh.com" ISTATES="S s 1 2 3" RSTATES="S s 1 2 3" diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 7c8d08e6b5..7948565754 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -1,3 +1,9 @@ +wazuh-dashboard (4.8.0-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html + + -- Wazuh, Inc Fri, 15 Dec 2023 00:00:00 +0000 + wazuh-dashboard (VERSION-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index 61014930a1..bdb2e34731 100644 --- a/stack/dashboard/deb/debian/copyright +++ b/stack/dashboard/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Sat, 28 Oct 2023 10:32:24 +0000 + Wazuh, Inc on Fri, 15 Dec 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 7241e3ef47..2940c301c7 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 Dec 15 2023 support - 4.8.0 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Mon Sep 04 2023 support - %{version} - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Sat Oct 28 2023 support - 4.6.0 diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 9ad03ff0ae..235866aee7 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -1,3 +1,9 @@ +wazuh-indexer (4.8.0-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html + + -- Wazuh, Inc Fri, 15 Dec 2023 00:00:00 +0000 + wazuh-indexer (VERSION-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index 61014930a1..bdb2e34731 100644 --- a/stack/indexer/deb/debian/copyright +++ b/stack/indexer/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Sat, 28 Oct 2023 10:32:24 +0000 + Wazuh, Inc on Fri, 15 Dec 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index b723fc06d8..2ac66648ab 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1394,6 +1394,8 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/blocked.certs %changelog +* Fri Dec 15 2023 support - 4.8.0 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Sat Oct 28 2023 support - %{version} - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Mon Sep 04 2023 support - 4.6.0 diff --git a/tests/unattended/unit/suites/test-common.sh b/tests/unattended/unit/suites/test-common.sh index c3275a040a..5273d80a21 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.7.0-1 @wazuh + @mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.8.0-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-05-common_checkInstalled-all-installed-yum-assert() { - @echo "wazuh-manager.x86_64 4.7.0-1 @wazuh" + @echo "wazuh-manager.x86_64 4.8.0-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 28f57ec0eb..79324f4fbe 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.7.0" + wazuh_version="4.8.0" elasticsearch_oss_version="7.10.2" wazuh_kibana_plugin_revision="1" repobaseurl="https://packages.wazuh.com/4.x" @@ -55,7 +55,7 @@ test-03-dashboard_install-yum() { load-dashboard_install sys_type="yum" sep="-" - wazuh_version="1.13.2" + wazuh_version="4.8.0" wazuh_revision="1" dashboard_install } @@ -68,7 +68,7 @@ test-ASSERT-FAIL-04-dashboard_install-yum-error() { load-dashboard_install sys_type="yum" sep="-" - wazuh_version="1.13.2" + wazuh_version="4.8.0" wazuh_revision="1" @mockfalse yum install wazuh-dashboard-1.13.2-1 -y dashboard_install @@ -78,7 +78,7 @@ test-05-dashboard_install-apt() { load-dashboard_install sys_type="apt-get" sep="=" - wazuh_version="1.13.2" + wazuh_version="4.8.0" wazuh_revision="1" dashboard_install } @@ -91,7 +91,7 @@ test-ASSERT-FAIL-06-dashboard_install-apt-error() { load-dashboard_install sys_type="apt-get" sep="=" - wazuh_version="1.13.2" + wazuh_version="4.8.0" wazuh_revision="1" @mockfalse apt install wazuh-dashboard=1.13.2-1 -y dashboard_install diff --git a/tests/unattended/unit/suites/test-indexer.sh b/tests/unattended/unit/suites/test-indexer.sh index 0feaf4ca3f..0fd85961f7 100644 --- a/tests/unattended/unit/suites/test-indexer.sh +++ b/tests/unattended/unit/suites/test-indexer.sh @@ -49,7 +49,7 @@ test-03-indexer_install-yum() { load-indexer_install sys_type="yum" sep="-" - wazuh_version="1.13.2" + wazuh_version="4.8.0" wazuh_revision="1" indexer_install } @@ -63,7 +63,7 @@ test-ASSERT-FAIL-04-indexer_install-yum-error() { load-indexer_install sys_type="yum" sep="-" - wazuh_version="1.13.2" + wazuh_version="4.8.0" wazuh_revision="1" @mockfalse yum install wazuh-indexer-1.13.2-1 -y indexer_install @@ -73,7 +73,7 @@ test-05-indexer_install-apt() { load-indexer_install sys_type="apt-get" sep="=" - wazuh_version="1.13.2" + wazuh_version="4.8.0" wazuh_revision="1" indexer_install } @@ -87,7 +87,7 @@ test-ASSERT-FAIL-06-indexer_install-apt-error() { load-indexer_install sys_type="apt-get" sep="=" - wazuh_version="1.13.2" + wazuh_version="4.8.0" wazuh_revision="1" @mockfalse apt install wazuh-indexer=1.13.2-1 -y indexer_install diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index b52477db29..7320ebf25f 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -7,8 +7,8 @@ # Foundation. ## Package vars -readonly wazuh_major="4.7" -readonly wazuh_version="4.7.0" +readonly wazuh_major="4.8" +readonly wazuh_version="4.8.0" readonly filebeat_version="7.10.2" readonly wazuh_install_vesion="0.1" From 109d8e7ab74105603b120e8849e450db296ae234 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Tue, 18 Jul 2023 11:17:09 +0200 Subject: [PATCH 649/994] Add rocky linux 8 SCA files --- debs/SPECS/wazuh-manager/debian/rules | 3 +++ rpms/SPECS/wazuh-agent.spec | 7 ++++++- rpms/SPECS/wazuh-manager.spec | 7 ++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/debs/SPECS/wazuh-manager/debian/rules b/debs/SPECS/wazuh-manager/debian/rules index e0dddd9ec4..cb30cc0dea 100644 --- a/debs/SPECS/wazuh-manager/debian/rules +++ b/debs/SPECS/wazuh-manager/debian/rules @@ -152,6 +152,7 @@ override_dh_install: mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/ubuntu/22/04 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/windows mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sunos/5/11 + mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/rocky/8 cp -r ruleset/sca/* ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca @@ -205,6 +206,8 @@ override_dh_install: cp etc/templates/config/ubuntu/20/04/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/ubuntu/20/04 cp etc/templates/config/ubuntu/22/04/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/ubuntu/22/04 + cp etc/templates/config/rocky/8/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/rocky/8 + override_dh_fixperms: dh_fixperms # Fix Python permissions diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 4b5d5b9900..50eb38984f 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -109,8 +109,9 @@ mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/rh mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/sles/{11,12,15} mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/suse/{11,12} mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/fedora/{29,30,31,32,33,34} +mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/rocky/{8} -cp -r ruleset/sca/{generic,centos,rhel,sles,amazon} ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp +cp -r ruleset/sca/{generic,centos,rhel,sles,amazon,rocky} ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp cp etc/templates/config/generic/sca.files ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/generic @@ -147,6 +148,8 @@ cp etc/templates/config/fedora/32/sca.files ${RPM_BUILD_ROOT}%{_localstatedir}/t cp etc/templates/config/fedora/33/sca.files ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/fedora/33 cp etc/templates/config/fedora/34/sca.files ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/fedora/34 +cp etc/templates/config/rocky/8/sca.files ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/rocky/8 + # Add configuration scripts mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/packages_files/agent_installation_scripts/ cp gen_ossec.sh ${RPM_BUILD_ROOT}%{_localstatedir}/packages_files/agent_installation_scripts/ @@ -599,6 +602,8 @@ rm -fr %{buildroot} %attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amazon/* %dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/fedora %attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/fedora/* +%dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/rocky +%attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/rocky/* %dir %attr(1770, root, wazuh) %{_localstatedir}/tmp %dir %attr(750, root, wazuh) %{_localstatedir}/var %dir %attr(770, root, wazuh) %{_localstatedir}/var/incoming diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 4ab8e784cc..5857321e1a 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -124,8 +124,9 @@ mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/su mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/sunos mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/windows mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/fedora/{29,30,31,32,33,34} +mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/rocky/{8} -cp -r ruleset/sca/{applications,generic,mongodb,nginx,oracledb,centos,darwin,debian,rhel,sles,sunos,windows,amazon,ubuntu} ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp +cp -r ruleset/sca/{applications,generic,mongodb,nginx,oracledb,centos,darwin,debian,rhel,sles,sunos,windows,amazon,ubuntu,rocky} ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp cp etc/templates/config/generic/{sca.files,sca.manager.files} ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/generic @@ -162,6 +163,8 @@ cp etc/templates/config/fedora/32/sca.files ${RPM_BUILD_ROOT}%{_localstatedir}/t cp etc/templates/config/fedora/33/sca.files ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/fedora/33 cp etc/templates/config/fedora/34/sca.files ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/fedora/34 +cp etc/templates/config/rocky/8/sca.files ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/rocky/8 + # Add SUSE initscript sed -i "s:WAZUH_HOME_TMP:%{_localstatedir}:g" src/init/templates/ossec-hids-suse.init cp -rp src/init/templates/ossec-hids-suse.init ${RPM_BUILD_ROOT}%{_localstatedir}/packages_files/manager_installation_scripts/src/init/ @@ -819,6 +822,8 @@ rm -fr %{buildroot} %attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/fedora/* %dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/windows %attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/windows/* +%dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/rocky +%attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/rocky/* %dir %attr(750, root, wazuh) %{_localstatedir}/var %dir %attr(770, root, wazuh) %{_localstatedir}/var/db %attr(660, root, wazuh) %{_localstatedir}/var/db/mitre.db From 2fb3b38eea63ad414d8d320f788ed2cf4e37d3f5 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Wed, 19 Jul 2023 10:18:58 +0200 Subject: [PATCH 650/994] Add Alma and Rocky linux to system check --- rpms/SPECS/wazuh-agent.spec | 26 ++++++++++++++++++++++---- rpms/SPECS/wazuh-manager.spec | 28 +++++++++++++++++++++++----- 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 50eb38984f..7d008078d7 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -109,7 +109,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/rh mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/sles/{11,12,15} mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/suse/{11,12} mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/fedora/{29,30,31,32,33,34} -mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/rocky/{8} +mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/rocky/{8,9} cp -r ruleset/sca/{generic,centos,rhel,sles,amazon,rocky} ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp @@ -277,9 +277,23 @@ rm -rf %{_localstatedir}/packages_files # Remove unnecessary files from shared directory rm -f %{_localstatedir}/etc/shared/*.rpmnew +#AlmaLinux +if [ -r "/etc/almalinux-release" ]; then + DIST_NAME=almalinux + DIST_VER=`sed -rn 's/.* ([0-9]{1,2})\.*[0-9]{0,2}.*/\1/p' /etc/almalinux-release` +#Rocky +elif [ -r "/etc/rocky-release" ]; then + DIST_NAME=rocky + DIST_VER=`sed -rn 's/.* ([0-9]{1,2})\.*[0-9]{0,2}.*/\1/p' /etc/rocky-release` # CentOS -if [ -r "/etc/centos-release" ]; then - DIST_NAME="centos" +elif [ -r "/etc/centos-release" ]; then + if grep -q "AlmaLinux" /etc/centos-release; then + DIST_NAME=almalinux + elif grep -q "Rocky" /etc/centos-release; then + DIST_NAME=almalinux + else + DIST_NAME="centos" + fi DIST_VER=`sed -rn 's/.* ([0-9]{1,2})\.*[0-9]{0,2}.*/\1/p' /etc/centos-release` # Fedora elif [ -r "/etc/fedora-release" ]; then @@ -287,7 +301,11 @@ elif [ -r "/etc/fedora-release" ]; then DIST_VER=`sed -rn 's/.* ([0-9]{1,2})\.*[0-9]{0,2}.*/\1/p' /etc/fedora-release` # RedHat elif [ -r "/etc/redhat-release" ]; then - if grep -q "CentOS" /etc/redhat-release; then + if grep -q "AlmaLinux" /etc/redhat-release; then + DIST_NAME=almalinux + elif grep -q "Rocky" /etc/redhat-release; then + DIST_NAME=almalinux + elif grep -q "CentOS" /etc/redhat-release; then DIST_NAME="centos" else DIST_NAME="rhel" diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 5857321e1a..d4f977906c 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -124,7 +124,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/su mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/sunos mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/windows mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/fedora/{29,30,31,32,33,34} -mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/rocky/{8} +mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/rocky/{8,9} cp -r ruleset/sca/{applications,generic,mongodb,nginx,oracledb,centos,darwin,debian,rhel,sles,sunos,windows,amazon,ubuntu,rocky} ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp @@ -319,7 +319,7 @@ 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 + # We create this fix for the operating system that deprecated SySV. For now, this fix is for suse/openSUSE sles="" if [ -f /etc/SuSE-release ]; then sles="suse" @@ -354,9 +354,23 @@ fi rm -f %{_localstatedir}/etc/shared/ar.conf >/dev/null 2>&1 rm -f %{_localstatedir}/etc/shared/merged.mg >/dev/null 2>&1 +#AlmaLinux +if [ -r "/etc/almalinux-release" ]; then + DIST_NAME=almalinux + DIST_VER=`sed -rn 's/.* ([0-9]{1,2})\.*[0-9]{0,2}.*/\1/p' /etc/almalinux-release` +#Rocky +elif [ -r "/etc/rocky-release" ]; then + DIST_NAME=rocky + DIST_VER=`sed -rn 's/.* ([0-9]{1,2})\.*[0-9]{0,2}.*/\1/p' /etc/rocky-release` # CentOS -if [ -r "/etc/centos-release" ]; then - DIST_NAME="centos" +elif [ -r "/etc/centos-release" ]; then + if grep -q "AlmaLinux" /etc/centos-release; then + DIST_NAME=almalinux + elif grep -q "Rocky" /etc/centos-release; then + DIST_NAME=almalinux + else + DIST_NAME="centos" + fi DIST_VER=`sed -rn 's/.* ([0-9]{1,2})\.*[0-9]{0,2}.*/\1/p' /etc/centos-release` # Fedora elif [ -r "/etc/fedora-release" ]; then @@ -364,7 +378,11 @@ elif [ -r "/etc/fedora-release" ]; then DIST_VER=`sed -rn 's/.* ([0-9]{1,2})\.*[0-9]{0,2}.*/\1/p' /etc/fedora-release` # RedHat elif [ -r "/etc/redhat-release" ]; then - if grep -q "CentOS" /etc/redhat-release; then + if grep -q "AlmaLinux" /etc/redhat-release; then + DIST_NAME=almalinux + elif grep -q "Rocky" /etc/redhat-release; then + DIST_NAME=almalinux + elif grep -q "CentOS" /etc/redhat-release; then DIST_NAME="centos" else DIST_NAME="rhel" From 3511e14acbec2b2f85ebfe3bc05b0357056bc3d4 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Wed, 19 Jul 2023 13:07:49 +0200 Subject: [PATCH 651/994] Update version to 4.5.2 --- CHANGELOG.md | 3 +++ README.md | 2 +- VERSION | 2 +- aix/SPECS/wazuh-agent-aix.spec | 4 +++- debs/SPECS/wazuh-agent/debian/changelog | 6 ++++++ debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 6 ++++++ debs/SPECS/wazuh-manager/debian/copyright | 2 +- macos/specs/wazuh-agent.pkgproj | 4 ++-- rpms/SPECS/wazuh-agent.spec | 4 +++- rpms/SPECS/wazuh-manager.spec | 4 +++- solaris/solaris10/pkginfo | 4 ++-- stack/dashboard/deb/debian/changelog | 6 ++++++ stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 ++ stack/indexer/deb/debian/changelog | 6 ++++++ stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 ++ tests/unattended/unit/suites/test-common.sh | 4 ++-- tests/unattended/unit/suites/test-dashboard.sh | 10 +++++----- tests/unattended/unit/suites/test-indexer.sh | 8 ++++---- .../install_functions/installVariables.sh | 2 +- 22 files changed, 62 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d948e15bb..be850d9a68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Change Log All notable changes to this project will be documented in this file. +## [4.5.2] + +- https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.2 ## [v4.5.1] diff --git a/README.md b/README.md index 298b173f86..0c74d32329 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ The following table shows the references for the versions of each component. |-----------------|-----------------------| | 4.3.x | 1.2.4 | | 4.4.0 | 2.4.1 | -| 4.4.1 - 4.5.1 | 2.6.0 | +| 4.4.1 - 4.5.2 | 2.6.0 | ## Contribute diff --git a/VERSION b/VERSION index 4404a17bae..6cedcff630 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.5.1 +4.5.2 diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 10040e1f7b..f271cc6b2a 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.5.1 +Version: 4.5.2 Release: 1 License: GPL URL: https://www.wazuh.com/ @@ -290,6 +290,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog +* Fri Aug 04 2023 support - 4.5.2 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html * Tue Aug 01 2023 support - 4.5.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html * Wed Jul 19 2023 support - 4.5.0 diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index beefffdbd6..71e63a6869 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -1,3 +1,9 @@ +wazuh-agent (4.5.2-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html + + -- Wazuh, Inc Fri, 04 Aug 2023 00:00:00 +0000 + wazuh-agent (4.5.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-1.html diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 3d783aefb6..a5186dcb46 100644 --- a/debs/SPECS/wazuh-agent/debian/copyright +++ b/debs/SPECS/wazuh-agent/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 01 Aug 2023 15:56:43 +0000 + Wazuh, Inc on Fri, 04 Aug 2023 00:00:00 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index 55c234b74c..93603de74c 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -1,3 +1,9 @@ +wazuh-manager (4.5.2-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html + + -- Wazuh, Inc Fri, 04 Aug 2023 00:00:00 +0000 + wazuh-manager (4.5.1-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 3d783aefb6..a5186dcb46 100644 --- a/debs/SPECS/wazuh-manager/debian/copyright +++ b/debs/SPECS/wazuh-manager/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 01 Aug 2023 15:56:43 +0000 + Wazuh, Inc on Fri, 04 Aug 2023 00:00:00 +0000 It was downloaded from: diff --git a/macos/specs/wazuh-agent.pkgproj b/macos/specs/wazuh-agent.pkgproj index f7e4169d10..55ad88fe47 100644 --- a/macos/specs/wazuh-agent.pkgproj +++ b/macos/specs/wazuh-agent.pkgproj @@ -812,7 +812,7 @@ USE_HFS+_COMPRESSION VERSION - 4.5.1-1 + 4.5.2-1 TYPE 0 @@ -1239,7 +1239,7 @@ NAME - wazuh-agent-4.5.1-1 + wazuh-agent-4.5.2-1 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 4b5d5b9900..7b630a0191 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -7,7 +7,7 @@ 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.5.1 +Version: 4.5.2 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -619,6 +619,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* Fri Aug 04 2023 support - 4.5.2 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html * Tue Aug 01 2023 support - 4.5.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html * Wed Jul 19 2023 support - 4.5.0 diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 4ab8e784cc..1a5c692d33 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -7,7 +7,7 @@ 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.5.1 +Version: 4.5.2 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -841,6 +841,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* Fri Aug 04 2023 support - 4.5.2 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html * Tue Aug 01 2023 support - 4.5.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html * Wed Jul 19 2023 support - 4.5.0 diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index 60e15665e6..a765a5c2be 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -1,11 +1,11 @@ NAME=Wazuh - Wazuh unifies historically separate functions into a single agent and platform architecture. Providing protection for public clouds, private clouds, and on-premise data centers. PKG="wazuh-agent" -VERSION="4.5.1" +VERSION="4.5.2" ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="26Jun2023" +PSTAMP="04Aug2023" EMAIL="info@wazuh.com" ISTATES="S s 1 2 3" RSTATES="S s 1 2 3" diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 2940b0b2e3..5a2a9d94c9 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -1,3 +1,9 @@ +wazuh-dashboard (4.5.2-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html + + -- Wazuh, Inc Fri, 04 Aug 2023 00:00:00 +0000 + wazuh-dashboard (4.5.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-1.html diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index 177faa0cdd..0eb63a62a6 100644 --- a/stack/dashboard/deb/debian/copyright +++ b/stack/dashboard/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 01 Aug 2023 15:56:43 +0000 + Wazuh, Inc on Fri, 04 Aug 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index a5f1f045f6..4acf31969b 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -397,6 +397,8 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog +* Fri Aug 04 2023 support - 4.5.2 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html * Tue Aug 01 2023 support - 4.5.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html * Wed Jul 19 2023 support - 4.5.0 diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 5e9b93c25a..fc662bdabe 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -1,3 +1,9 @@ +wazuh-indexer (4.5.2-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html + + -- Wazuh, Inc Fri, 04 Aug 2023 00:00:00 +0000 + wazuh-indexer (4.5.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index 177faa0cdd..0eb63a62a6 100644 --- a/stack/indexer/deb/debian/copyright +++ b/stack/indexer/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 01 Aug 2023 15:56:43 +0000 + Wazuh, Inc on Fri, 04 Aug 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index ff50e0d0f7..afe43dcbf3 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1384,6 +1384,8 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/blocked.certs %changelog +* Fri Aug 04 2023 support - 4.5.2 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html * Tue Aug 01 2023 support - 4.5.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html * Wed Jul 19 2023 support - 4.5.0 diff --git a/tests/unattended/unit/suites/test-common.sh b/tests/unattended/unit/suites/test-common.sh index 656ae13075..d19a50e134 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.5.1-1 @wazuh + @mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.5.2-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-05-common_checkInstalled-all-installed-yum-assert() { - @echo "wazuh-manager.x86_64 4.5.1-1 @wazuh" + @echo "wazuh-manager.x86_64 4.5.2-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 bf59d944af..6738f1226a 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.5.1" + wazuh_version="4.5.2" elasticsearch_oss_version="7.10.2" wazuh_kibana_plugin_revision="1" repobaseurl="https://packages.wazuh.com/4.x" @@ -55,7 +55,7 @@ test-03-dashboard_install-yum() { load-dashboard_install sys_type="yum" sep="-" - wazuh_version="1.13.2" + wazuh_version="4.5.2" wazuh_revision="1" dashboard_install } @@ -68,7 +68,7 @@ test-ASSERT-FAIL-04-dashboard_install-yum-error() { load-dashboard_install sys_type="yum" sep="-" - wazuh_version="1.13.2" + wazuh_version="4.5.2" wazuh_revision="1" @mockfalse yum install wazuh-dashboard-1.13.2-1 -y dashboard_install @@ -78,7 +78,7 @@ test-05-dashboard_install-apt() { load-dashboard_install sys_type="apt-get" sep="=" - wazuh_version="1.13.2" + wazuh_version="4.5.2" wazuh_revision="1" dashboard_install } @@ -91,7 +91,7 @@ test-ASSERT-FAIL-06-dashboard_install-apt-error() { load-dashboard_install sys_type="apt-get" sep="=" - wazuh_version="1.13.2" + wazuh_version="4.5.2" wazuh_revision="1" @mockfalse apt install wazuh-dashboard=1.13.2-1 -y dashboard_install diff --git a/tests/unattended/unit/suites/test-indexer.sh b/tests/unattended/unit/suites/test-indexer.sh index 0feaf4ca3f..27c2ab05f6 100644 --- a/tests/unattended/unit/suites/test-indexer.sh +++ b/tests/unattended/unit/suites/test-indexer.sh @@ -49,7 +49,7 @@ test-03-indexer_install-yum() { load-indexer_install sys_type="yum" sep="-" - wazuh_version="1.13.2" + wazuh_version="4.5.2" wazuh_revision="1" indexer_install } @@ -63,7 +63,7 @@ test-ASSERT-FAIL-04-indexer_install-yum-error() { load-indexer_install sys_type="yum" sep="-" - wazuh_version="1.13.2" + wazuh_version="4.5.2" wazuh_revision="1" @mockfalse yum install wazuh-indexer-1.13.2-1 -y indexer_install @@ -73,7 +73,7 @@ test-05-indexer_install-apt() { load-indexer_install sys_type="apt-get" sep="=" - wazuh_version="1.13.2" + wazuh_version="4.5.2" wazuh_revision="1" indexer_install } @@ -87,7 +87,7 @@ test-ASSERT-FAIL-06-indexer_install-apt-error() { load-indexer_install sys_type="apt-get" sep="=" - wazuh_version="1.13.2" + wazuh_version="4.5.2" wazuh_revision="1" @mockfalse apt install wazuh-indexer=1.13.2-1 -y indexer_install diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index b61aa9ed48..006da6cd65 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.5" -readonly wazuh_version="4.5.1" +readonly wazuh_version="4.5.2" readonly filebeat_version="7.10.2" readonly wazuh_install_vesion="0.1" From 73e6f56960383d79211f9fcaaab5fd933c8c702f Mon Sep 17 00:00:00 2001 From: DFolchA Date: Mon, 24 Jul 2023 08:47:28 +0200 Subject: [PATCH 652/994] Update version in GH action --- .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 5ad64fa1db..72b892111a 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -52,7 +52,7 @@ jobs: 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 - if [ $MAJOR == "4.7" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi + if [ $MAJOR == "4.8" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $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 02a1a40d46..8e180534a3 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -53,7 +53,7 @@ jobs: 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 - if [ $MAJOR == "4.7" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi + if [ $MAJOR == "4.8" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(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 From 8397e21a7473d59e7a31960c9648e8acfc6c2010 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 25 Jul 2023 11:12:20 -0300 Subject: [PATCH 653/994] change os base for OVA --- ova/Vagrantfile | 9 ++++++--- ova/assets/custom/messages.sh | 7 ++++--- ova/assets/steps.sh | 19 +++++++++++-------- ova/generate_ova.sh | 11 +++++------ ova/provision.sh | 2 ++ 5 files changed, 28 insertions(+), 20 deletions(-) diff --git a/ova/Vagrantfile b/ova/Vagrantfile index 1dabeaec6c..4a3409ab1c 100755 --- a/ova/Vagrantfile +++ b/ova/Vagrantfile @@ -3,7 +3,8 @@ Vagrant.configure("2") do |config| - config.vm.box = "centos/7" + config.vm.box_url = "https://packages-dev.wazuh.com/vms/ova/amazonlinux-2.box" + config.vm.box = "amazonlinux-2" config.vm.hostname = "wazuh-server" config.vm.provider "virtualbox" do |vb| vb.name = "vm_wazuh" @@ -11,13 +12,15 @@ Vagrant.configure("2") do |config| vb.cpus = "4" end + config.ssh.username = "wazuh-user" + config.ssh.password = "wazuh" + config.ssh.insert_key = true + # Synced folder configuration config.vm.synced_folder ".", "/vagrant", disabled: true config.vm.synced_folder ".", "/tmp", type: "rsync", :rsync__exclude => ['output'] # Provision stage config.vm.provision :shell, path: "provision.sh", :args => "#{ENV['PACKAGES_REPOSITORY']} #{ENV['DEBUG']}" - # Provision cleanup stage - config.vm.provision :shell, path: "assets/postProvision.sh", :args => "#{ENV['DEBUG']}" end diff --git a/ova/assets/custom/messages.sh b/ova/assets/custom/messages.sh index 24cc05aa5c..5f9b3cc28b 100644 --- a/ova/assets/custom/messages.sh +++ b/ova/assets/custom/messages.sh @@ -12,15 +12,16 @@ cat > /etc/issue < /etc/motd < /etc/update-motd.d/30-banner < wazuh) - adduser ${SYSTEM_USER} - sed -i "s/${SYSTEM_USER}:!!/${SYSTEM_USER}:\$1\$pNjjEA7K\$USjdNwjfh7A\.vHCf8suK41/g" /etc/shadow - - gpasswd -a ${SYSTEM_USER} wheel hostname ${HOSTNAME} # AWS instance has this enabled @@ -66,4 +58,15 @@ clean() { rm -f /securityadmin_demo.sh yum clean all + systemctl daemon-reload + + # Clear synced files + rm -rf ${CURRENT_PATH}/* ${CURRENT_PATH}/.gitignore + + # Remove logs + find /var/log/ -type f -exec bash -c 'cat /dev/null > {}' \; + find /var/ossec/logs/ -type f -exec bash -c 'cat /dev/null > {}' \; + + cat /dev/null > ~/.bash_history && history -c + } diff --git a/ova/generate_ova.sh b/ova/generate_ova.sh index deb3883013..840a2e33cc 100755 --- a/ova/generate_ova.sh +++ b/ova/generate_ova.sh @@ -41,7 +41,7 @@ help () { echo -e "DESCRIPTION" echo -e " -r, --repository" echo -e " Use development or production repository." - echo -e " Values: [prod|dev]. By default: ${PACKAGES_REPOSITORY}." + echo -e " Values: [prod|dev|staging]. By default: ${PACKAGES_REPOSITORY}." echo -e "" echo -e " -s, --store" echo -e " Set the destination absolute path where the OVA file will be stored." @@ -141,14 +141,14 @@ main() { "-r" | "--repository") if [ -n "$2" ]; then - if [ "$2" != "prod" ] && [ "$2" != "dev" ]; then - echo "ERROR: Repository must be: [prod/dev]" + if [ "$2" != "prod" ] && [ "$2" != "dev" ] && [ "$2" != "staging" ]; then + echo "ERROR: Repository must be: [prod/dev/staging]" help 1 fi PACKAGES_REPOSITORY="$2" shift 2 else - echo "ERROR: Value must be: [prod/dev]" + echo "ERROR: Value must be: [prod/dev/staging]" help 1 fi ;; @@ -230,5 +230,4 @@ main() { } -main "$@" - +main "$@" \ No newline at end of file diff --git a/ova/provision.sh b/ova/provision.sh index 4fec68fd37..96ebd8abdd 100755 --- a/ova/provision.sh +++ b/ova/provision.sh @@ -17,6 +17,8 @@ INSTALL_ARGS="-a" if [[ "${PACKAGES_REPOSITORY}" == "dev" ]]; then BUILDER_ARGS+=" -d" +elif [[ "${PACKAGES_REPOSITORY}" == "staging" ]]; then + BUILDER_ARGS+=" -d staging" fi if [[ "${DEBUG}" = "yes" ]]; then From 2a74fbf9991605bf717766fbead3dfb99270e9e9 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 25 Jul 2023 15:56:25 -0300 Subject: [PATCH 654/994] add script for enable fips --- ova/assets/custom/enable_fips.sh | 9 +++++++++ ova/assets/steps.sh | 5 +++++ 2 files changed, 14 insertions(+) create mode 100644 ova/assets/custom/enable_fips.sh diff --git a/ova/assets/custom/enable_fips.sh b/ova/assets/custom/enable_fips.sh new file mode 100644 index 0000000000..4de398dd0f --- /dev/null +++ b/ova/assets/custom/enable_fips.sh @@ -0,0 +1,9 @@ +# Update the Operating System (OS) packages to ensure the OS is up to date +sudo yum update -y + +# Install and enable the FIPS module +sudo yum install -y dracut-fips +sudo dracut -f + +# Enable FIPS mode by adding kernel argument: +sudo /sbin/grubby --update-kernel=ALL --args="fips=1" \ No newline at end of file diff --git a/ova/assets/steps.sh b/ova/assets/steps.sh index 7a0b7bd92d..db10698474 100644 --- a/ova/assets/steps.sh +++ b/ova/assets/steps.sh @@ -13,6 +13,11 @@ systemConfig() { mv ${CUSTOM_PATH}/grub/grub /etc/default/ grub2-mkconfig -o /boot/grub2/grub.cfg > /dev/null 2>&1 + # Enable fips + mv ${CUSTOM_PATH}/enable_fips.sh /tmp/ + chmod 755 /tmp/enable_fips.sh + bash /tmp/enable_fips.sh + # Update Wazuh indexer jvm heap mv ${CUSTOM_PATH}/automatic_set_ram.sh /etc/ chmod 755 /etc/automatic_set_ram.sh From 7372e9e7547dd55767bb073c1bddd54ddb9577d5 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Fri, 2 Jun 2023 11:32:16 +0200 Subject: [PATCH 655/994] Add check for apple silicon architecture to SPECS --- macos/generate_wazuh_packages.sh | 4 ++++ macos/specs/wazuh-agent.pkgproj | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/macos/generate_wazuh_packages.sh b/macos/generate_wazuh_packages.sh index af9ef12b49..5962b409ca 100755 --- a/macos/generate_wazuh_packages.sh +++ b/macos/generate_wazuh_packages.sh @@ -236,6 +236,10 @@ function install_deps() { echo "Something went wrong installing packagesbuild." fi + if [ "$(uname -m)" = "arm64" ]; then + echo "Installing dependencies for arm64 architecture" + brew install gcc binutils autoconf automake libtool cmake + fi exit 0 } diff --git a/macos/specs/wazuh-agent.pkgproj b/macos/specs/wazuh-agent.pkgproj index f7e4169d10..4b3dbda7cd 100644 --- a/macos/specs/wazuh-agent.pkgproj +++ b/macos/specs/wazuh-agent.pkgproj @@ -1000,9 +1000,9 @@ DICTIONARY IC_REQUIREMENT_CPU_ARCHITECTURE_FAMILY - 2 + 3 IC_REQUIREMENT_CPU_INTEL_ARCHITECTURE_TYPE - 2 + 0 IC_REQUIREMENT_CPU_MINIMUM_CPU_CORES_COUNT 1 IC_REQUIREMENT_CPU_MINIMUM_FREQUENCY @@ -1022,9 +1022,10 @@ SECONDARY_VALUE VALUE - This installer has been built for 64-bit Intel architecture. It won't install in other platforms. + This installer has been built for Apple Silicon architecture. It won't install in other platforms. + NAME Processor STATE From 278988b1a92ed69fd5f4d424e124112cba0cd8a7 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Fri, 2 Jun 2023 12:41:03 +0200 Subject: [PATCH 656/994] Add SPECS for intel and apple silicon architectures --- macos/generate_wazuh_packages.sh | 18 +- ...gent.pkgproj => wazuh-agent-arm64.pkgproj} | 0 macos/specs/wazuh-agent-intel64.pkgproj | 1254 +++++++++++++++++ 3 files changed, 1271 insertions(+), 1 deletion(-) rename macos/specs/{wazuh-agent.pkgproj => wazuh-agent-arm64.pkgproj} (100%) create mode 100644 macos/specs/wazuh-agent-intel64.pkgproj diff --git a/macos/generate_wazuh_packages.sh b/macos/generate_wazuh_packages.sh index 5962b409ca..a05548e63a 100755 --- a/macos/generate_wazuh_packages.sh +++ b/macos/generate_wazuh_packages.sh @@ -15,6 +15,7 @@ WAZUH_SOURCE_REPOSITORY="https://github.com/wazuh/wazuh" AGENT_PKG_FILE="${CURRENT_PATH}/package_files/wazuh-agent.pkgproj" export CONFIG="${WAZUH_PATH}/etc/preloaded-vars.conf" ENTITLEMENTS_PATH="${CURRENT_PATH}/entitlements.plist" +ARCH="intel64" INSTALLATION_PATH="/Library/Ossec" # Installation path VERSION="" # Default VERSION (branch/tag) REVISION="1" # Package revision. @@ -170,6 +171,7 @@ function help() { echo "Usage: $0 [OPTIONS]" echo echo " Build options:" + echo " -a, --architecture [Optional] Select architecture to build (intel64 or arm64). Default: intel64" echo " -b, --branch [Required] Select Git branch or tag e.g. $BRANCH" echo " -s, --store-path [Optional] Set the destination absolute path of package." echo " -j, --jobs [Optional] Number of parallel jobs when compiling." @@ -196,7 +198,7 @@ function get_pkgproj_specs() { VERSION=$(< "${WAZUH_PATH}/src/VERSION" cut -d "-" -f1 | cut -c 2-) - pkg_file="specs/wazuh-agent.pkgproj" + pkg_file="specs/wazuh-agent-${arch}.pkgproj" if [ ! -f "${pkg_file}" ]; then echo "Warning: the file ${pkg_file} does not exists. Check the version selected." @@ -266,6 +268,14 @@ function main() { while [ -n "$1" ] do case "$1" in + "-a"|"--architecture") + if [ -n "$2" ]; then + ARCH="$2" + shift 2 + else + help 1 + fi + ;; "-b"|"--branch") if [ -n "$2" ]; then BRANCH_TAG="$2" @@ -386,6 +396,12 @@ function main() { testdep + if [ "${ARCH}" != "intel64" ] && [ "${ARCH}" != "arm64" ]; then + echo "Error: architecture not supported." + echo "Supported architectures: intel64, arm64" + exit 1 + fi + if [ -z "${CHECKSUMDIR}" ]; then CHECKSUMDIR="${DESTINATION}" fi diff --git a/macos/specs/wazuh-agent.pkgproj b/macos/specs/wazuh-agent-arm64.pkgproj similarity index 100% rename from macos/specs/wazuh-agent.pkgproj rename to macos/specs/wazuh-agent-arm64.pkgproj diff --git a/macos/specs/wazuh-agent-intel64.pkgproj b/macos/specs/wazuh-agent-intel64.pkgproj new file mode 100644 index 0000000000..64f2b10262 --- /dev/null +++ b/macos/specs/wazuh-agent-intel64.pkgproj @@ -0,0 +1,1254 @@ + + + + + PACKAGES + + + MUST-CLOSE-APPLICATION-ITEMS + + MUST-CLOSE-APPLICATIONS + + PACKAGE_FILES + + DEFAULT_INSTALL_LOCATION + / + HIERARCHY + + CHILDREN + + + CHILDREN + + GID + 80 + PATH + Applications + PATH_TYPE + 0 + PERMISSIONS + 509 + TYPE + 1 + UID + 0 + + + CHILDREN + + + CHILDREN + + GID + 80 + PATH + Application Support + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 1 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + Automator + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 1 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + Documentation + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 1 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + Extensions + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 1 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + Filesystems + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 1 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + Frameworks + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 1 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + Input Methods + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 1 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + Internet Plug-Ins + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 1 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + LaunchAgents + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 1 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + LaunchDaemons + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 1 + UID + 0 + + + CHILDREN + + + CHILDREN + + GID + 0 + PATH + /Library/Ossec/.ssh + PATH_TYPE + 0 + PERMISSIONS + 448 + TYPE + 3 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + /Library/Ossec/active-response + PATH_TYPE + 0 + PERMISSIONS + 488 + TYPE + 3 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + /Library/Ossec/agentless + PATH_TYPE + 0 + PERMISSIONS + 488 + TYPE + 3 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + /Library/Ossec/bin + PATH_TYPE + 0 + PERMISSIONS + 488 + TYPE + 3 + UID + 0 + + + CHILDREN + + + CHILDREN + + GID + 0 + PATH + /Library/Ossec/etc/internal_options.conf + PATH_TYPE + 0 + PERMISSIONS + 416 + TYPE + 3 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + /Library/Ossec/etc/localtime + PATH_TYPE + 0 + PERMISSIONS + 416 + TYPE + 3 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + /Library/Ossec/etc/client.keys + PATH_TYPE + 0 + PERMISSIONS + 416 + TYPE + 3 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + /Library/Ossec/etc/local_internal_options.conf + PATH_TYPE + 0 + PERMISSIONS + 416 + TYPE + 3 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + /Library/Ossec/etc/ossec.conf + PATH_TYPE + 0 + PERMISSIONS + 416 + TYPE + 3 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + /Library/Ossec/etc/shared + PATH_TYPE + 0 + PERMISSIONS + 504 + TYPE + 3 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + /Library/Ossec/etc/wpk_root.pem + PATH_TYPE + 0 + PERMISSIONS + 416 + TYPE + 3 + UID + 0 + + + EXPANDED + + GID + 0 + PATH + /Library/Ossec/etc + PATH_TYPE + 0 + PERMISSIONS + 504 + TYPE + 3 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + /Library/Ossec/lib + PATH_TYPE + 0 + PERMISSIONS + 488 + TYPE + 3 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + /Library/Ossec/logs + PATH_TYPE + 0 + PERMISSIONS + 488 + TYPE + 3 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + /Library/Ossec/queue + PATH_TYPE + 0 + PERMISSIONS + 488 + TYPE + 3 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + /Library/Ossec/tmp + PATH_TYPE + 0 + PERMISSIONS + 1000 + TYPE + 3 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + /Library/Ossec/packages_files + PATH_TYPE + 0 + PERMISSIONS + 488 + TYPE + 3 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + /Library/Ossec/var + PATH_TYPE + 0 + PERMISSIONS + 488 + TYPE + 3 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + /Library/Ossec/wodles + PATH_TYPE + 0 + PERMISSIONS + 488 + TYPE + 3 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + /Library/Ossec/ruleset + PATH_TYPE + 0 + PERMISSIONS + 488 + TYPE + 3 + UID + 0 + + + EXPANDED + + GID + 0 + PATH + /Library/Ossec + PATH_TYPE + 0 + PERMISSIONS + 488 + TYPE + 3 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + PreferencePanes + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 1 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + Preferences + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 1 + UID + 0 + + + CHILDREN + + GID + 80 + PATH + Printers + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 1 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + PrivilegedHelperTools + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 1 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + QuickLook + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 1 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + QuickTime + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 1 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + Screen Savers + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 1 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + Scripts + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 1 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + Services + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 1 + UID + 0 + + + CHILDREN + + GID + 0 + PATH + Widgets + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 1 + UID + 0 + + + GID + 0 + PATH + Library + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 1 + UID + 0 + + + CHILDREN + + + CHILDREN + + GID + 0 + PATH + Shared + PATH_TYPE + 0 + PERMISSIONS + 1023 + TYPE + 1 + UID + 0 + + + GID + 80 + PATH + Users + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 1 + UID + 0 + + + GID + 0 + PATH + / + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 1 + UID + 0 + + PAYLOAD_TYPE + 0 + SHOW_INVISIBLE + + SPLIT_FORKS + + TREAT_MISSING_FILES_AS_WARNING + + VERSION + 4 + + PACKAGE_SCRIPTS + + POSTINSTALL_PATH + + PATH + postinstall.sh + PATH_TYPE + 1 + + PREINSTALL_PATH + + PATH + preinstall.sh + PATH_TYPE + 1 + + RESOURCES + + + PACKAGE_SETTINGS + + AUTHENTICATION + 1 + CONCLUSION_ACTION + 0 + FOLLOW_SYMBOLIC_LINKS + + IDENTIFIER + com.wazuh.pkg.wazuh-agent + LOCATION + 0 + NAME + agent + OVERWRITE_PERMISSIONS + + PAYLOAD_SIZE + -1 + RELOCATABLE + + USE_HFS+_COMPRESSION + + VERSION + 4.4.4-1 + + TYPE + 0 + UUID + 7BC88EDC-74AB-498A-992B-DE940686D898 + + + PROJECT + + PROJECT_COMMENTS + + NOTES + + PCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBIVE1M + IDQuMDEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvVFIvaHRtbDQv + c3RyaWN0LmR0ZCI+CjxodG1sPgo8aGVhZD4KPG1ldGEgaHR0cC1l + cXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7 + IGNoYXJzZXQ9VVRGLTgiPgo8bWV0YSBodHRwLWVxdWl2PSJDb250 + ZW50LVN0eWxlLVR5cGUiIGNvbnRlbnQ9InRleHQvY3NzIj4KPHRp + dGxlPjwvdGl0bGU+CjxtZXRhIG5hbWU9IkdlbmVyYXRvciIgY29u + dGVudD0iQ29jb2EgSFRNTCBXcml0ZXIiPgo8bWV0YSBuYW1lPSJD + b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjE1MDQuODMiPgo8c3R5bGUg + dHlwZT0idGV4dC9jc3MiPgo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5 + Pgo8L2JvZHk+CjwvaHRtbD4K + + + PROJECT_PRESENTATION + + BACKGROUND + + INSTALLATION TYPE + + HIERARCHIES + + INSTALLER + + LIST + + + DESCRIPTION + + OPTIONS + + HIDDEN + + STATE + 0 + + PACKAGE_UUID + 7BC88EDC-74AB-498A-992B-DE940686D898 + REQUIREMENTS + + TITLE + + + LANGUAGE + English + VALUE + Wazuh Agent + + + TOOLTIP + + TYPE + 0 + UUID + B5127C49-7EF4-4B73-97D7-2819981073A4 + + + REMOVED + + + + MODE + 0 + + INSTALLATION_STEPS + + + ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS + ICPresentationViewIntroductionController + INSTALLER_PLUGIN + Introduction + LIST_TITLE_KEY + InstallerSectionTitle + + + ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS + ICPresentationViewReadMeController + INSTALLER_PLUGIN + ReadMe + LIST_TITLE_KEY + InstallerSectionTitle + + + ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS + ICPresentationViewLicenseController + INSTALLER_PLUGIN + License + LIST_TITLE_KEY + InstallerSectionTitle + + + ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS + ICPresentationViewDestinationSelectController + INSTALLER_PLUGIN + TargetSelect + LIST_TITLE_KEY + InstallerSectionTitle + + + ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS + ICPresentationViewInstallationTypeController + INSTALLER_PLUGIN + PackageSelection + LIST_TITLE_KEY + InstallerSectionTitle + + + ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS + ICPresentationViewInstallationController + INSTALLER_PLUGIN + Install + LIST_TITLE_KEY + InstallerSectionTitle + + + ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS + ICPresentationViewSummaryController + INSTALLER_PLUGIN + Summary + LIST_TITLE_KEY + InstallerSectionTitle + + + INTRODUCTION + + LOCALIZATIONS + + + LANGUAGE + English + VALUE + + PATH + introduction.txt + PATH_TYPE + 1 + + + + + LICENSE + + LOCALIZATIONS + + MODE + 0 + + README + + LOCALIZATIONS + + + TITLE + + LOCALIZATIONS + + + LANGUAGE + English + VALUE + Wazuh Agent + + + + + PROJECT_REQUIREMENTS + + LIST + + + BEHAVIOR + 3 + DICTIONARY + + IC_REQUIREMENT_CPU_ARCHITECTURE_FAMILY + 2 + IC_REQUIREMENT_CPU_INTEL_ARCHITECTURE_TYPE + 2 + IC_REQUIREMENT_CPU_MINIMUM_CPU_CORES_COUNT + 1 + IC_REQUIREMENT_CPU_MINIMUM_FREQUENCY + 866666 + IC_REQUIREMENT_CPU_POWERPC_ARCHITECTURE_TYPE + 0 + + IC_REQUIREMENT_CHECK_TYPE + 0 + IDENTIFIER + fr.whitebox.Packages.requirement.cpu + MESSAGE + + + LANGUAGE + English + SECONDARY_VALUE + + VALUE + This installer has been built for 64-bit Intel architecture. It won't install in other platforms. + + + NAME + Processor + STATE + + + + BEHAVIOR + 3 + DICTIONARY + + IC_REQUIREMENT_OS_DISK_TYPE + 0 + IC_REQUIREMENT_OS_DISTRIBUTION_TYPE + 0 + IC_REQUIREMENT_OS_MINIMUM_VERSION + 100800 + + IC_REQUIREMENT_CHECK_TYPE + 1 + IDENTIFIER + fr.whitebox.Packages.requirement.os + MESSAGE + + NAME + Operating System + STATE + + + + RESOURCES + + ROOT_VOLUME_ONLY + + + PROJECT_SETTINGS + + BUILD_FORMAT + 0 + BUILD_PATH + + PATH + build + PATH_TYPE + 1 + + EXCLUDED_FILES + + + PATTERNS_ARRAY + + + REGULAR_EXPRESSION + + STRING + .DS_Store + TYPE + 0 + + + PROTECTED + + PROXY_NAME + Remove .DS_Store files + PROXY_TOOLTIP + Remove ".DS_Store" files created by the Finder. + STATE + + + + PATTERNS_ARRAY + + + REGULAR_EXPRESSION + + STRING + .pbdevelopment + TYPE + 0 + + + PROTECTED + + PROXY_NAME + Remove .pbdevelopment files + PROXY_TOOLTIP + Remove ".pbdevelopment" files created by ProjectBuilder or Xcode. + STATE + + + + PATTERNS_ARRAY + + + REGULAR_EXPRESSION + + STRING + CVS + TYPE + 1 + + + REGULAR_EXPRESSION + + STRING + .cvsignore + TYPE + 0 + + + REGULAR_EXPRESSION + + STRING + .cvspass + TYPE + 0 + + + REGULAR_EXPRESSION + + STRING + .svn + TYPE + 1 + + + REGULAR_EXPRESSION + + STRING + .git + TYPE + 1 + + + REGULAR_EXPRESSION + + STRING + .gitignore + TYPE + 0 + + + PROTECTED + + PROXY_NAME + Remove SCM metadata + PROXY_TOOLTIP + Remove helper files and folders used by the CVS, SVN or Git Source Code Management systems. + STATE + + + + PATTERNS_ARRAY + + + REGULAR_EXPRESSION + + STRING + classes.nib + TYPE + 0 + + + REGULAR_EXPRESSION + + STRING + designable.db + TYPE + 0 + + + REGULAR_EXPRESSION + + STRING + info.nib + TYPE + 0 + + + PROTECTED + + PROXY_NAME + Optimize nib files + PROXY_TOOLTIP + Remove "classes.nib", "info.nib" and "designable.nib" files within .nib bundles. + STATE + + + + PATTERNS_ARRAY + + + REGULAR_EXPRESSION + + STRING + Resources Disabled + TYPE + 1 + + + PROTECTED + + PROXY_NAME + Remove Resources Disabled folders + PROXY_TOOLTIP + Remove "Resources Disabled" folders. + STATE + + + + SEPARATOR + + + + NAME + wazuh-agent-4.4.4-1 + PAYLOAD_ONLY + + TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING + + + + TYPE + 0 + VERSION + 2 + + From 3681aff70d64ac140026c0356c85391118cbc402 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Mon, 5 Jun 2023 09:22:30 +0200 Subject: [PATCH 657/994] Change package name depending on ARCH --- macos/generate_wazuh_packages.sh | 4 ++-- macos/specs/wazuh-agent-arm64.pkgproj | 2 +- macos/specs/wazuh-agent-intel64.pkgproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/macos/generate_wazuh_packages.sh b/macos/generate_wazuh_packages.sh index a05548e63a..d4938c202a 100755 --- a/macos/generate_wazuh_packages.sh +++ b/macos/generate_wazuh_packages.sh @@ -12,7 +12,6 @@ CURRENT_PATH="$( cd $(dirname ${0}) ; pwd -P )" SOURCES_DIRECTORY="${CURRENT_PATH}/repository" WAZUH_PATH="${SOURCES_DIRECTORY}/wazuh" WAZUH_SOURCE_REPOSITORY="https://github.com/wazuh/wazuh" -AGENT_PKG_FILE="${CURRENT_PATH}/package_files/wazuh-agent.pkgproj" export CONFIG="${WAZUH_PATH}/etc/preloaded-vars.conf" ENTITLEMENTS_PATH="${CURRENT_PATH}/entitlements.plist" ARCH="intel64" @@ -152,7 +151,7 @@ function build_package() { # create package if packagesbuild ${AGENT_PKG_FILE} --build-folder ${DESTINATION} ; then echo "The wazuh agent package for MacOS X has been successfully built." - pkg_name="wazuh-agent-${VERSION}-${REVISION}.pkg" + pkg_name="wazuh-agent-${VERSION}-${REVISION}.${ARCH}.pkg" sign_pkg notarize_pkg if [[ "${CHECKSUM}" == "yes" ]]; then @@ -408,6 +407,7 @@ function main() { if [[ "$BUILD" != "no" ]]; then check_root + AGENT_PKG_FILE="${CURRENT_PATH}/package_files/wazuh-agent-${ARCH}.pkgproj" build_package "${CURRENT_PATH}/uninstall.sh" else diff --git a/macos/specs/wazuh-agent-arm64.pkgproj b/macos/specs/wazuh-agent-arm64.pkgproj index 4b3dbda7cd..b176b3e90b 100644 --- a/macos/specs/wazuh-agent-arm64.pkgproj +++ b/macos/specs/wazuh-agent-arm64.pkgproj @@ -1240,7 +1240,7 @@ NAME - wazuh-agent-4.5.1-1 + wazuh-agent-4.5.1-1.arm64 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/macos/specs/wazuh-agent-intel64.pkgproj b/macos/specs/wazuh-agent-intel64.pkgproj index 64f2b10262..04e104964f 100644 --- a/macos/specs/wazuh-agent-intel64.pkgproj +++ b/macos/specs/wazuh-agent-intel64.pkgproj @@ -1239,7 +1239,7 @@ NAME - wazuh-agent-4.4.4-1 + wazuh-agent-4.4.4.intel64-1 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING From ca3b307708cb469428f4a4f88f26834899531c36 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Thu, 27 Jul 2023 12:04:13 +0200 Subject: [PATCH 658/994] Fix wrong variable name --- 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 d4938c202a..377ec3876d 100755 --- a/macos/generate_wazuh_packages.sh +++ b/macos/generate_wazuh_packages.sh @@ -197,7 +197,7 @@ function get_pkgproj_specs() { VERSION=$(< "${WAZUH_PATH}/src/VERSION" cut -d "-" -f1 | cut -c 2-) - pkg_file="specs/wazuh-agent-${arch}.pkgproj" + pkg_file="specs/wazuh-agent-${ARCH}.pkgproj" if [ ! -f "${pkg_file}" ]; then echo "Warning: the file ${pkg_file} does not exists. Check the version selected." From 5c52c3678f34c566c0af2a0f362870cd84d31660 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Thu, 27 Jul 2023 12:07:18 +0200 Subject: [PATCH 659/994] Update version in macos intel specs --- macos/specs/wazuh-agent-intel64.pkgproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/macos/specs/wazuh-agent-intel64.pkgproj b/macos/specs/wazuh-agent-intel64.pkgproj index 04e104964f..5de6f6053a 100644 --- a/macos/specs/wazuh-agent-intel64.pkgproj +++ b/macos/specs/wazuh-agent-intel64.pkgproj @@ -812,7 +812,7 @@ USE_HFS+_COMPRESSION VERSION - 4.4.4-1 + 4.5.1-1 TYPE 0 @@ -1239,7 +1239,7 @@ NAME - wazuh-agent-4.4.4.intel64-1 + wazuh-agent-4.5.1-1.intel64 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING From e197d5774dd338a15e67fb1f660fbd067639edcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Rebollo=20P=C3=A9rez?= Date: Thu, 27 Jul 2023 17:34:42 +0100 Subject: [PATCH 660/994] Refactor download_wazuh_app_sources function Co-authored-by: Juan Nicolas Asselle --- wazuhapp/kibana/Docker/build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wazuhapp/kibana/Docker/build.sh b/wazuhapp/kibana/Docker/build.sh index 37be8052d9..14bcb5dde9 100755 --- a/wazuhapp/kibana/Docker/build.sh +++ b/wazuhapp/kibana/Docker/build.sh @@ -13,6 +13,7 @@ source_dir="${kibana_dir}/plugins/wazuh" build_dir="${source_dir}/build" destination_dir="/wazuh_app" checksum_dir="/var/local/checksum" +git_clone_tmp_dir="/tmp/wazuh-app" # Repositories URLs wazuh_app_clone_repo_url="https://github.com/wazuh/wazuh-kibana-app.git" @@ -103,12 +104,12 @@ install_dependencies () { download_wazuh_app_sources() { - if ! git clone $wazuh_app_clone_repo_url --branch ${wazuh_branch} --depth=1 /tmp/wazuh-app ; then + if ! git clone $wazuh_app_clone_repo_url --branch ${wazuh_branch} --depth=1 ${git_clone_tmp_dir} ; then echo "Error downloading the source code from wazuh-kibana-app GitHub repository." exit 1 fi - cp -r /tmp/wazuh-app/plugins/main ${kibana_dir}/plugins/wazuh + cp -r ${git_clone_tmp_dir}/plugins/main ${kibana_dir}/plugins/wazuh } From 86805542ae3bc011d5797e167e9eb99b9fb8f0e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Rebollo=20P=C3=A9rez?= Date: Thu, 27 Jul 2023 17:35:36 +0100 Subject: [PATCH 661/994] Refactor download_wazuh_app_sources method Co-authored-by: Juan Nicolas Asselle --- wazuhapp/opensearch-dashboards/Docker/build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wazuhapp/opensearch-dashboards/Docker/build.sh b/wazuhapp/opensearch-dashboards/Docker/build.sh index 4448a1038d..cd04bc11f3 100755 --- a/wazuhapp/opensearch-dashboards/Docker/build.sh +++ b/wazuhapp/opensearch-dashboards/Docker/build.sh @@ -13,6 +13,7 @@ source_dir="${plugin_platform_dir}/plugins/wazuh" build_dir="${source_dir}/build" destination_dir="/wazuh_app" checksum_dir="/var/local/checksum" +git_clone_tmp_dir="/tmp/wazuh-app" # Repositories URLs wazuh_app_clone_repo_url="https://github.com/wazuh/wazuh-kibana-app.git" @@ -97,12 +98,12 @@ install_dependencies () { download_wazuh_app_sources() { - if ! git clone $wazuh_app_clone_repo_url --branch ${wazuh_branch} --depth=1 /tmp/wazuh-app ; then + if ! git clone $wazuh_app_clone_repo_url --branch ${wazuh_branch} --depth=1 ${git_clone_tmp_dir}; then echo "Error downloading the source code from wazuh-dashboard-app GitHub repository." exit 1 fi - cp -r /tmp/wazuh-app/plugins/main ${plugin_platform_dir}/plugins/wazuh + cp -r ${git_clone_tmp_dir}/plugins/main ${source_dir} } build_package(){ From 924da20f38ffc0ce78a0998825a8616e98325a28 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Tue, 1 Aug 2023 18:10:27 +0200 Subject: [PATCH 662/994] Remove check for architecture --- macos/specs/wazuh-agent-arm64.pkgproj | 4 ++-- macos/specs/wazuh-agent-intel64.pkgproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/macos/specs/wazuh-agent-arm64.pkgproj b/macos/specs/wazuh-agent-arm64.pkgproj index b176b3e90b..4450983299 100644 --- a/macos/specs/wazuh-agent-arm64.pkgproj +++ b/macos/specs/wazuh-agent-arm64.pkgproj @@ -999,8 +999,8 @@ 3 DICTIONARY - IC_REQUIREMENT_CPU_ARCHITECTURE_FAMILY - 3 + IC_REQUIREMENT_CPU_INTEL_ARCHITECTURE_TYPE 0 IC_REQUIREMENT_CPU_MINIMUM_CPU_CORES_COUNT diff --git a/macos/specs/wazuh-agent-intel64.pkgproj b/macos/specs/wazuh-agent-intel64.pkgproj index 5de6f6053a..8df5f70d21 100644 --- a/macos/specs/wazuh-agent-intel64.pkgproj +++ b/macos/specs/wazuh-agent-intel64.pkgproj @@ -999,8 +999,8 @@ 3 DICTIONARY - IC_REQUIREMENT_CPU_ARCHITECTURE_FAMILY - 2 + IC_REQUIREMENT_CPU_INTEL_ARCHITECTURE_TYPE 2 IC_REQUIREMENT_CPU_MINIMUM_CPU_CORES_COUNT From 6f8367ea021633c8ac1441514e16b40331322a02 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Tue, 1 Aug 2023 18:24:19 +0200 Subject: [PATCH 663/994] Revert "Remove check for architecture" This reverts commit 924da20f38ffc0ce78a0998825a8616e98325a28. --- macos/specs/wazuh-agent-arm64.pkgproj | 4 ++-- macos/specs/wazuh-agent-intel64.pkgproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/macos/specs/wazuh-agent-arm64.pkgproj b/macos/specs/wazuh-agent-arm64.pkgproj index 4450983299..b176b3e90b 100644 --- a/macos/specs/wazuh-agent-arm64.pkgproj +++ b/macos/specs/wazuh-agent-arm64.pkgproj @@ -999,8 +999,8 @@ 3 DICTIONARY - + IC_REQUIREMENT_CPU_ARCHITECTURE_FAMILY + 3 IC_REQUIREMENT_CPU_INTEL_ARCHITECTURE_TYPE 0 IC_REQUIREMENT_CPU_MINIMUM_CPU_CORES_COUNT diff --git a/macos/specs/wazuh-agent-intel64.pkgproj b/macos/specs/wazuh-agent-intel64.pkgproj index 8df5f70d21..5de6f6053a 100644 --- a/macos/specs/wazuh-agent-intel64.pkgproj +++ b/macos/specs/wazuh-agent-intel64.pkgproj @@ -999,8 +999,8 @@ 3 DICTIONARY - + IC_REQUIREMENT_CPU_ARCHITECTURE_FAMILY + 2 IC_REQUIREMENT_CPU_INTEL_ARCHITECTURE_TYPE 2 IC_REQUIREMENT_CPU_MINIMUM_CPU_CORES_COUNT From f8796b029fd29c8e4fc8e30f2f1f72f671eb7906 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Tue, 1 Aug 2023 18:58:24 +0200 Subject: [PATCH 664/994] Remove checks from ARM package --- macos/specs/wazuh-agent-arm64.pkgproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/macos/specs/wazuh-agent-arm64.pkgproj b/macos/specs/wazuh-agent-arm64.pkgproj index b176b3e90b..15ee80e336 100644 --- a/macos/specs/wazuh-agent-arm64.pkgproj +++ b/macos/specs/wazuh-agent-arm64.pkgproj @@ -990,7 +990,7 @@ - PROJECT_REQUIREMENTS + PROJECT_SETTINGS BUILD_FORMAT From 76e77631a178065fb9dc718f429be74eecc152a0 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Tue, 1 Aug 2023 19:35:01 +0200 Subject: [PATCH 665/994] Add set -x --- macos/generate_wazuh_packages.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/macos/generate_wazuh_packages.sh b/macos/generate_wazuh_packages.sh index 377ec3876d..71c0d30aa0 100755 --- a/macos/generate_wazuh_packages.sh +++ b/macos/generate_wazuh_packages.sh @@ -7,6 +7,7 @@ # and/or modify it under the terms of the GNU General Public # License (version 2) as published by the FSF - Free Software # Foundation. +set -x CURRENT_PATH="$( cd $(dirname ${0}) ; pwd -P )" SOURCES_DIRECTORY="${CURRENT_PATH}/repository" @@ -150,8 +151,10 @@ function build_package() { # create package if packagesbuild ${AGENT_PKG_FILE} --build-folder ${DESTINATION} ; then - echo "The wazuh agent package for MacOS X has been successfully built." + echo "The wazuh agent package for MacOS has been successfully built." pkg_name="wazuh-agent-${VERSION}-${REVISION}.${ARCH}.pkg" + ls -l ${DESTINATION}/${pkg_name} + ls -l ${DESTINATION}/wazuh-agent-${VERSION}-${REVISION}* sign_pkg notarize_pkg if [[ "${CHECKSUM}" == "yes" ]]; then From 6e0e205f57de208aeaf7349a6f76c1a0eb241212 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Wed, 2 Aug 2023 11:51:50 +0200 Subject: [PATCH 666/994] Add ARCH when modifying revison --- macos/generate_wazuh_packages.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/macos/generate_wazuh_packages.sh b/macos/generate_wazuh_packages.sh index 71c0d30aa0..506b5be714 100755 --- a/macos/generate_wazuh_packages.sh +++ b/macos/generate_wazuh_packages.sh @@ -153,14 +153,14 @@ function build_package() { if packagesbuild ${AGENT_PKG_FILE} --build-folder ${DESTINATION} ; then echo "The wazuh agent package for MacOS has been successfully built." pkg_name="wazuh-agent-${VERSION}-${REVISION}.${ARCH}.pkg" - ls -l ${DESTINATION}/${pkg_name} - ls -l ${DESTINATION}/wazuh-agent-${VERSION}-${REVISION}* sign_pkg notarize_pkg if [[ "${CHECKSUM}" == "yes" ]]; then mkdir -p ${CHECKSUMDIR} cd ${DESTINATION} && shasum -a512 "${pkg_name}" > "${CHECKSUMDIR}/${pkg_name}.sha512" fi + ls -l ${DESTINATION}/${pkg_name} + ls -l ${DESTINATION}/wazuh-agent-${VERSION}-${REVISION}* clean_and_exit 0 else echo "ERROR: something went wrong while building the package." @@ -207,7 +207,7 @@ function get_pkgproj_specs() { exit 1 else echo "Modifiying ${pkg_file} to match revision." - sed -i -e "s:${VERSION}-.*<:${VERSION}-${REVISION}<:g" "${pkg_file}" + sed -i -e "s:${VERSION}-.*<:${VERSION}-${REVISION}.${ARCH}<:g" "${pkg_file}" cp "${pkg_file}" "${AGENT_PKG_FILE}" fi From 90741545d81ef21bad5fb5a7be0e26437138d60f Mon Sep 17 00:00:00 2001 From: DFolchA Date: Wed, 2 Aug 2023 16:06:40 +0200 Subject: [PATCH 667/994] Set proccesor requirements --- macos/specs/wazuh-agent-arm64.pkgproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/macos/specs/wazuh-agent-arm64.pkgproj b/macos/specs/wazuh-agent-arm64.pkgproj index 15ee80e336..b176b3e90b 100644 --- a/macos/specs/wazuh-agent-arm64.pkgproj +++ b/macos/specs/wazuh-agent-arm64.pkgproj @@ -990,7 +990,7 @@ - + PROJECT_SETTINGS BUILD_FORMAT From 96094fa21f16bf209286ee56c01b57a334a1554e Mon Sep 17 00:00:00 2001 From: jnasselle Date: Wed, 2 Aug 2023 11:27:53 -0300 Subject: [PATCH 668/994] Fix `rbac_control` group ownership for RPM package --- 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 e782e6e9aa..70e37a4850 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -613,7 +613,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 +%attr(750, root, wazuh) %{_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 5d5e9ab82dd3467a406dab32c8f05115a4329a36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 3 Aug 2023 10:33:52 +0200 Subject: [PATCH 669/994] Added public IPs check --- .../cert_tool/certFunctions.sh | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/unattended_installer/cert_tool/certFunctions.sh b/unattended_installer/cert_tool/certFunctions.sh index 2bf889999c..cb910e5ca9 100644 --- a/unattended_installer/cert_tool/certFunctions.sh +++ b/unattended_installer/cert_tool/certFunctions.sh @@ -293,6 +293,22 @@ function cert_parseYaml() { } +function cert_checkPrivateIp() { + local ip=$1 + + # Check private IPv4 ranges + if [[ $ip =~ ^10\.|^192\.168\.|^172\.(1[6-9]|2[0-9]|3[0-1])\.|^(127\.) ]]; then + return 0 + fi + + # Check private IPv6 ranges (fc00::/7 prefix) + if [[ $ip =~ ^fc ]]; then + return 0 + fi + + return 1 + +} function cert_readConfig() { @@ -311,6 +327,14 @@ function cert_readConfig() { eval "dashboard_node_ips=( $(cert_parseYaml "${config_file}" | grep -E "nodes[_]+dashboard[_]+[0-9]+[_]+ip=" | cut -d = -f 2 ) )" eval "server_node_types=( $(cert_parseYaml "${config_file}" | grep -E "nodes[_]+server[_]+[0-9]+[_]+node_type=" | cut -d = -f 2 ) )" eval "number_server_ips=( $(cert_parseYaml "${config_file}" | grep -o -E 'nodes[_]+server[_]+[0-9]+[_]+ip' | sort -u | wc -l) )" + all_ips=("${indexer_node_ips[@]}" "${server_node_ips[@]}" "${dashboard_node_ips[@]}") + + for ip in "${all_ips[@]}"; do + if ! cert_checkPrivateIp "$ip"; then + common_logger -e "The IP ${ip} is public." + exit 1 + fi + done for i in $(seq 1 "${number_server_ips}"); do nodes_server="nodes[_]+server[_]+${i}[_]+ip" From 81517b5d178e7ba2fe969033d30ce0703d6d6e1e Mon Sep 17 00:00:00 2001 From: DFolchA Date: Thu, 3 Aug 2023 13:35:38 +0200 Subject: [PATCH 670/994] Remove set -x --- macos/generate_wazuh_packages.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/macos/generate_wazuh_packages.sh b/macos/generate_wazuh_packages.sh index 506b5be714..843f1fc32f 100755 --- a/macos/generate_wazuh_packages.sh +++ b/macos/generate_wazuh_packages.sh @@ -7,7 +7,6 @@ # and/or modify it under the terms of the GNU General Public # License (version 2) as published by the FSF - Free Software # Foundation. -set -x CURRENT_PATH="$( cd $(dirname ${0}) ; pwd -P )" SOURCES_DIRECTORY="${CURRENT_PATH}/repository" From 435f532eab82ee88641ab4f58679052dedf24ef0 Mon Sep 17 00:00:00 2001 From: Vikman Fernandez-Castro Date: Thu, 3 Aug 2023 16:38:01 +0200 Subject: [PATCH 671/994] Remove unnecessary `ls` command in generate_wazuh_packages.sh --- macos/generate_wazuh_packages.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/macos/generate_wazuh_packages.sh b/macos/generate_wazuh_packages.sh index 843f1fc32f..5c6513c301 100755 --- a/macos/generate_wazuh_packages.sh +++ b/macos/generate_wazuh_packages.sh @@ -158,8 +158,6 @@ function build_package() { mkdir -p ${CHECKSUMDIR} cd ${DESTINATION} && shasum -a512 "${pkg_name}" > "${CHECKSUMDIR}/${pkg_name}.sha512" fi - ls -l ${DESTINATION}/${pkg_name} - ls -l ${DESTINATION}/wazuh-agent-${VERSION}-${REVISION}* clean_and_exit 0 else echo "ERROR: something went wrong while building the package." @@ -239,7 +237,7 @@ function install_deps() { echo "Something went wrong installing packagesbuild." fi - if [ "$(uname -m)" = "arm64" ]; then + if [ "$(uname -m)" = "arm64" ]; then echo "Installing dependencies for arm64 architecture" brew install gcc binutils autoconf automake libtool cmake fi From adb63729f07cb82712c6f250c24dc339a2ba1665 Mon Sep 17 00:00:00 2001 From: Vikman Fernandez-Castro Date: Thu, 3 Aug 2023 16:40:14 +0200 Subject: [PATCH 672/994] Fix the help message for option `-a` in generate_wazuh_packages.sh --- 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 5c6513c301..08f683ff7e 100755 --- a/macos/generate_wazuh_packages.sh +++ b/macos/generate_wazuh_packages.sh @@ -170,7 +170,7 @@ function help() { echo "Usage: $0 [OPTIONS]" echo echo " Build options:" - echo " -a, --architecture [Optional] Select architecture to build (intel64 or arm64). Default: intel64" + echo " -a, --architecture [Optional] Target architecture of the package [intel64/arm64]. By Default: intel64." echo " -b, --branch [Required] Select Git branch or tag e.g. $BRANCH" echo " -s, --store-path [Optional] Set the destination absolute path of package." echo " -j, --jobs [Optional] Number of parallel jobs when compiling." From 24fda07b45fa91dfd687a49bc23711b56aa0a4a7 Mon Sep 17 00:00:00 2001 From: Vikman Fernandez-Castro Date: Thu, 3 Aug 2023 16:40:52 +0200 Subject: [PATCH 673/994] Fix macOS name in generate_wazuh_packages.sh --- 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 08f683ff7e..7dfcb88a93 100755 --- a/macos/generate_wazuh_packages.sh +++ b/macos/generate_wazuh_packages.sh @@ -150,7 +150,7 @@ function build_package() { # create package if packagesbuild ${AGENT_PKG_FILE} --build-folder ${DESTINATION} ; then - echo "The wazuh agent package for MacOS has been successfully built." + echo "The wazuh agent package for macOS has been successfully built." pkg_name="wazuh-agent-${VERSION}-${REVISION}.${ARCH}.pkg" sign_pkg notarize_pkg From f0603f12f982241e200ab76cb417c3eaa35e72d4 Mon Sep 17 00:00:00 2001 From: Vikman Fernandez-Castro Date: Thu, 3 Aug 2023 16:41:49 +0200 Subject: [PATCH 674/994] Fix a dependency installation log in generate_wazuh_packages.sh --- 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 7dfcb88a93..04e5385ec9 100755 --- a/macos/generate_wazuh_packages.sh +++ b/macos/generate_wazuh_packages.sh @@ -238,7 +238,7 @@ function install_deps() { fi if [ "$(uname -m)" = "arm64" ]; then - echo "Installing dependencies for arm64 architecture" + echo "Installing build dependencies for arm64 architecture" brew install gcc binutils autoconf automake libtool cmake fi exit 0 From c3789a679ce26343177120d8f02dd422fead56e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Mon, 7 Aug 2023 11:40:50 +0200 Subject: [PATCH 675/994] Added port option --- unattended_installer/install_functions/checks.sh | 9 +++++++++ .../install_functions/installMain.sh | 13 +++++++++++++ .../install_functions/installVariables.sh | 5 +++-- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index cdd7fe0126..e804f7be3b 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -18,6 +18,15 @@ function checks_arch() { function checks_arguments() { + # -------------- Port option validation --------------------- + + if [ -n "${port}" ]; then + if [ -z "${AIO}" ] && [ -z "${dashboard}" ]; then + common_logger -e "The argument -p|--port can only be used with -a|--all-in-one or -wd|--wazuh-dashboard." + exit 1 + fi + fi + # -------------- Configurations --------------------------------- if [ -f "${tar_file}" ]; then diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index 92dae05475..acb7dbc3b5 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -40,6 +40,9 @@ function getHelp() { echo -e " -o, --overwrite" echo -e " Overwrites previously installed components. This will erase all the existing configuration and data." echo -e "" + echo -e " -p, --port" + echo -e " Specifies the Wazuh web user interface port. By default is the 443 TCP port." + echo -e "" echo -e " -s, --start-cluster" echo -e " Initialize Wazuh indexer cluster security settings." echo -e "" @@ -111,6 +114,16 @@ function main() { overwrite=1 shift 1 ;; + "-p"|"--port") + if [ -z "${2}" ]; then + common_logger -e "Error on arguments. Probably missing after -p|--port" + getHelp + exit 1 + fi + port=1 + port_number="${2}" + shift 2 + ;; "-s"|"--start-cluster") start_indexer_cluster=1 shift 1 diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index 006da6cd65..dd0811c2e0 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -48,7 +48,8 @@ readonly filebeat_config_file="${resources}/tpl/wazuh/filebeat/filebeat.yml" adminUser="wazuh" adminPassword="wazuh" -readonly wazuh_aio_ports=( 9200 9300 1514 1515 1516 55000 443) +readonly http_port=443 +readonly wazuh_aio_ports=( 9200 9300 1514 1515 1516 55000 "${http_port}") readonly wazuh_indexer_ports=( 9200 9300 ) readonly wazuh_manager_ports=( 1514 1515 1516 55000 ) -readonly wazuh_dashboard_ports=( 443 ) +readonly wazuh_dashboard_ports=( "${http_port}" ) From cdeb68bd7ac287e1ebe1a1dddaadfad48386a5b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Mon, 7 Aug 2023 14:40:37 +0200 Subject: [PATCH 676/994] Added port change --- unattended_installer/install_functions/checks.sh | 15 +++++++++++++++ .../install_functions/dashboard.sh | 16 +++++++++++++--- .../install_functions/installMain.sh | 10 ++++++++-- 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index e804f7be3b..c4285ab58c 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -340,3 +340,18 @@ function checks_ports() { fi } + +function checks_available_port() { + chosen_port="$1" + shift + ports_list=("$@") + + if [ "$chosen_port" -ne "${http_port}" ]; then + for port in "${ports_list[@]}"; do + if [ "$chosen_port" -eq "$port" ]; then + common_logger -e "Port ${chosen_port} is reserved by Wazuh. Please, choose another port." + exit 1 + fi + done + fi +} diff --git a/unattended_installer/install_functions/dashboard.sh b/unattended_installer/install_functions/dashboard.sh index 123b2ad90c..cb6f22ad5a 100644 --- a/unattended_installer/install_functions/dashboard.sh +++ b/unattended_installer/install_functions/dashboard.sh @@ -6,6 +6,16 @@ # License (version 2) as published by the FSF - Free Software # Foundation. +function dashboard_changePort() { + + chosen_port="$1" + + sed -i "s/^readonly http_port=.*/readonly http_port=${chosen_port}/" "$0" + sed -i 's/server\.port: [0-9]\+$/server.port: '"${chosen_port}"'/' "$0" + + common_logger "Port changed to ${chosen_port}." +} + function dashboard_configure() { if [ -n "${AIO}" ]; then @@ -98,7 +108,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 + until [ "$(curl -XGET https://"${nodes_dashboard_ip}":"${http_port}"/status -uadmin:"${u_pass}" -k -w %"{http_code}" -s -o /dev/null)" -eq "200" ] || [ "${j}" -eq "12" ]; do sleep 10 j=$((j+1)) done @@ -164,12 +174,12 @@ function dashboard_initializeAIO() { common_logger "Initializing Wazuh dashboard web application." installCommon_getPass "admin" - http_code=$(curl -XGET https://localhost/status -uadmin:"${u_pass}" -k -w %"{http_code}" -s -o /dev/null) + http_code=$(curl -XGET https://localhost:"${http_port}"/status -uadmin:"${u_pass}" -k -w %"{http_code}" -s -o /dev/null) retries=0 max_dashboard_initialize_retries=20 while [ "${http_code}" -ne "200" ] && [ "${retries}" -lt "${max_dashboard_initialize_retries}" ] do - http_code=$(curl -XGET https://localhost/status -uadmin:"${u_pass}" -k -w %"{http_code}" -s -o /dev/null) + http_code=$(curl -XGET https://localhost:"${http_port}"/status -uadmin:"${u_pass}" -k -w %"{http_code}" -s -o /dev/null) common_logger "Wazuh dashboard web application not yet initialized. Waiting..." retries=$((retries+1)) sleep 15 diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index acb7dbc3b5..ec3930dc61 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -120,7 +120,7 @@ function main() { getHelp exit 1 fi - port=1 + port_specified=1 port_number="${2}" shift 2 ;; @@ -243,7 +243,13 @@ function main() { else checks_health fi - if [ -n "${AIO}" ] ; then + + if [ -n "${port_specified}" ]; then + checks_available_port "${port_number}" "${wazuh_aio_ports[@]}" + dashboard_changePort "${port_number}" + fi + + if [ -n "${AIO}" ]; then rm -f "${tar_file}" checks_ports "${wazuh_aio_ports[@]}" fi From 41bbfe0eb72f1857f3b2f32a0db03487a7b16e64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Mon, 7 Aug 2023 15:08:02 +0200 Subject: [PATCH 677/994] Changed access message --- unattended_installer/install_functions/dashboard.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unattended_installer/install_functions/dashboard.sh b/unattended_installer/install_functions/dashboard.sh index cb6f22ad5a..bf650fe765 100644 --- a/unattended_installer/install_functions/dashboard.sh +++ b/unattended_installer/install_functions/dashboard.sh @@ -129,7 +129,7 @@ function dashboard_initialize() { common_logger "Wazuh dashboard web application initialized." common_logger -nl "--- Summary ---" - common_logger -nl "You can access the web interface https://${print_ip}\n User: admin\n Password: ${u_pass}" + common_logger -nl "You can access the web interface https://${print_ip}:${http_port}\n User: admin\n Password: ${u_pass}" elif [ ${j} -eq 12 ]; then flag="-w" @@ -187,7 +187,7 @@ function dashboard_initializeAIO() { if [ "${http_code}" -eq "200" ]; then common_logger "Wazuh dashboard web application initialized." common_logger -nl "--- Summary ---" - common_logger -nl "You can access the web interface https://\n User: admin\n Password: ${u_pass}" + common_logger -nl "You can access the web interface https://:${http_port}\n User: admin\n Password: ${u_pass}" else common_logger -e "Wazuh dashboard installation failed." installCommon_rollBack From 0b8b9b21e66efadc518102a22e402e020ddcabaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Mon, 7 Aug 2023 15:34:09 +0200 Subject: [PATCH 678/994] Forcing changing port in openseach_dashboard.yml --- unattended_installer/install_functions/dashboard.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/unattended_installer/install_functions/dashboard.sh b/unattended_installer/install_functions/dashboard.sh index bf650fe765..3d312704f8 100644 --- a/unattended_installer/install_functions/dashboard.sh +++ b/unattended_installer/install_functions/dashboard.sh @@ -52,6 +52,10 @@ function dashboard_configure() { fi fi + if [ -n "${port_specified}" ]; then + sed -i 's/server\.port: [0-9]\+$/server.port: '"${chosen_port}"'/' /etc/wazuh-dashboard/opensearch_dashboards.yml + fi + common_logger "Wazuh dashboard post-install configuration finished." } From 5af6dc1785162e86d425f335620ebcfe12232154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 8 Aug 2023 13:44:39 +0200 Subject: [PATCH 679/994] Fixed bugs in AIO --- unattended_installer/install_functions/dashboard.sh | 9 +++------ unattended_installer/install_functions/installMain.sh | 4 +++- .../install_functions/installVariables.sh | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/unattended_installer/install_functions/dashboard.sh b/unattended_installer/install_functions/dashboard.sh index 3d312704f8..d2011b9557 100644 --- a/unattended_installer/install_functions/dashboard.sh +++ b/unattended_installer/install_functions/dashboard.sh @@ -9,11 +9,10 @@ function dashboard_changePort() { chosen_port="$1" + http_port="${chosen_port}" - sed -i "s/^readonly http_port=.*/readonly http_port=${chosen_port}/" "$0" sed -i 's/server\.port: [0-9]\+$/server.port: '"${chosen_port}"'/' "$0" - - common_logger "Port changed to ${chosen_port}." + common_logger "Wazuh web interface port will be ${chosen_port}." } function dashboard_configure() { @@ -52,9 +51,7 @@ function dashboard_configure() { fi fi - if [ -n "${port_specified}" ]; then - sed -i 's/server\.port: [0-9]\+$/server.port: '"${chosen_port}"'/' /etc/wazuh-dashboard/opensearch_dashboards.yml - fi + sed -i 's/server\.port: [0-9]\+$/server.port: '"${chosen_port}"'/' /etc/wazuh-dashboard/opensearch_dashboards.yml common_logger "Wazuh dashboard post-install configuration finished." diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index ec3930dc61..260227f819 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -41,7 +41,7 @@ function getHelp() { echo -e " Overwrites previously installed components. This will erase all the existing configuration and data." echo -e "" echo -e " -p, --port" - echo -e " Specifies the Wazuh web user interface port. By default is the 443 TCP port." + echo -e " Specifies the Wazuh web user interface port. By default is the 443 TCP port. Recommended ports are: 8443, 8444, 8080, 8888, 9000." echo -e "" echo -e " -s, --start-cluster" echo -e " Initialize Wazuh indexer cluster security settings." @@ -247,6 +247,8 @@ function main() { if [ -n "${port_specified}" ]; then checks_available_port "${port_number}" "${wazuh_aio_ports[@]}" dashboard_changePort "${port_number}" + else + dashboard_changePort "${http_port}" fi if [ -n "${AIO}" ]; then diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index dd0811c2e0..94667acf0e 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -48,7 +48,7 @@ readonly filebeat_config_file="${resources}/tpl/wazuh/filebeat/filebeat.yml" adminUser="wazuh" adminPassword="wazuh" -readonly http_port=443 +http_port=443 readonly wazuh_aio_ports=( 9200 9300 1514 1515 1516 55000 "${http_port}") readonly wazuh_indexer_ports=( 9200 9300 ) readonly wazuh_manager_ports=( 1514 1515 1516 55000 ) From 26e8736296a0dab74dc6dc6c3733935df631e791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 8 Aug 2023 14:07:14 +0200 Subject: [PATCH 680/994] Improved specified port check --- unattended_installer/install_functions/checks.sh | 2 +- unattended_installer/install_functions/installMain.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index c4285ab58c..ae397cb937 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -20,7 +20,7 @@ function checks_arguments() { # -------------- Port option validation --------------------- - if [ -n "${port}" ]; then + if [ -n "${port_specified}" ]; then if [ -z "${AIO}" ] && [ -z "${dashboard}" ]; then common_logger -e "The argument -p|--port can only be used with -a|--all-in-one or -wd|--wazuh-dashboard." exit 1 diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index 260227f819..75657a1ccb 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -247,7 +247,7 @@ function main() { if [ -n "${port_specified}" ]; then checks_available_port "${port_number}" "${wazuh_aio_ports[@]}" dashboard_changePort "${port_number}" - else + elif [ -n "${AIO}" ] || [ -n "${dashboard}" ]; then dashboard_changePort "${http_port}" fi From c1a34059f931b0da46d0bd8b80d542e86c21e50a Mon Sep 17 00:00:00 2001 From: DFolchA Date: Thu, 10 Aug 2023 21:17:26 +0200 Subject: [PATCH 681/994] Remove check for intel pkg --- macos/specs/wazuh-agent.pkgproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/macos/specs/wazuh-agent.pkgproj b/macos/specs/wazuh-agent.pkgproj index 72da7fbd31..fc26e6af5e 100644 --- a/macos/specs/wazuh-agent.pkgproj +++ b/macos/specs/wazuh-agent.pkgproj @@ -999,8 +999,6 @@ 3 DICTIONARY - IC_REQUIREMENT_CPU_ARCHITECTURE_FAMILY - 2 IC_REQUIREMENT_CPU_INTEL_ARCHITECTURE_TYPE 2 IC_REQUIREMENT_CPU_MINIMUM_CPU_CORES_COUNT From f546de26c662d970fd04beb79dba708dee0fd332 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Thu, 10 Aug 2023 22:54:38 +0200 Subject: [PATCH 682/994] Remove processor check completely --- macos/specs/wazuh-agent.pkgproj | 34 --------------------------------- 1 file changed, 34 deletions(-) diff --git a/macos/specs/wazuh-agent.pkgproj b/macos/specs/wazuh-agent.pkgproj index fc26e6af5e..a20b16e5f1 100644 --- a/macos/specs/wazuh-agent.pkgproj +++ b/macos/specs/wazuh-agent.pkgproj @@ -994,40 +994,6 @@ LIST - - BEHAVIOR - 3 - DICTIONARY - - IC_REQUIREMENT_CPU_INTEL_ARCHITECTURE_TYPE - 2 - IC_REQUIREMENT_CPU_MINIMUM_CPU_CORES_COUNT - 1 - IC_REQUIREMENT_CPU_MINIMUM_FREQUENCY - 866666 - IC_REQUIREMENT_CPU_POWERPC_ARCHITECTURE_TYPE - 0 - - IC_REQUIREMENT_CHECK_TYPE - 0 - IDENTIFIER - fr.whitebox.Packages.requirement.cpu - MESSAGE - - - LANGUAGE - English - SECONDARY_VALUE - - VALUE - This installer has been built for 64-bit Intel architecture. It won't install in other platforms. - - - NAME - Processor - STATE - - BEHAVIOR 3 From 942d13334cafff1ab1613c97344a7438383d50d7 Mon Sep 17 00:00:00 2001 From: Juan Cabrera Date: Fri, 11 Aug 2023 10:40:57 +0200 Subject: [PATCH 683/994] Updated wazuh-agent-arm64 for macos --- macos/specs/wazuh-agent-arm64.pkgproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macos/specs/wazuh-agent-arm64.pkgproj b/macos/specs/wazuh-agent-arm64.pkgproj index cf421f8bcf..e170f7622f 100644 --- a/macos/specs/wazuh-agent-arm64.pkgproj +++ b/macos/specs/wazuh-agent-arm64.pkgproj @@ -1240,7 +1240,7 @@ NAME - wazuh-agent-4.5.2-1 + wazuh-agent-4.5.2-1.arm64 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING From 4e155b33bcf141ee0eb974147d1bf2220c14d37e Mon Sep 17 00:00:00 2001 From: Tomas Turina Date: Fri, 11 Aug 2023 14:31:18 +0000 Subject: [PATCH 684/994] Fix macos spec version for intel - 4.5.2 --- macos/specs/wazuh-agent-intel64.pkgproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macos/specs/wazuh-agent-intel64.pkgproj b/macos/specs/wazuh-agent-intel64.pkgproj index c815180113..b089429c2f 100644 --- a/macos/specs/wazuh-agent-intel64.pkgproj +++ b/macos/specs/wazuh-agent-intel64.pkgproj @@ -1203,7 +1203,7 @@ NAME - wazuh-agent-4.5.1-1.intel64 + wazuh-agent-4.5.2-1.intel64 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING From 40da63e7b2e6144023681f128652a306a1ad6a60 Mon Sep 17 00:00:00 2001 From: Tomas Turina Date: Fri, 11 Aug 2023 14:32:22 +0000 Subject: [PATCH 685/994] Fix macos spec version for intel - 4.6.0 --- macos/specs/wazuh-agent-intel64.pkgproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macos/specs/wazuh-agent-intel64.pkgproj b/macos/specs/wazuh-agent-intel64.pkgproj index c815180113..82961a9726 100644 --- a/macos/specs/wazuh-agent-intel64.pkgproj +++ b/macos/specs/wazuh-agent-intel64.pkgproj @@ -1203,7 +1203,7 @@ NAME - wazuh-agent-4.5.1-1.intel64 + wazuh-agent-4.6.0-1.intel64 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING From 2042a8b881b8f836586ebcbc7115220017090ce4 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 15 Aug 2023 10:36:28 -0300 Subject: [PATCH 686/994] Fixed root user password --- ova/assets/steps.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ova/assets/steps.sh b/ova/assets/steps.sh index db10698474..2a76dcbc3f 100644 --- a/ova/assets/steps.sh +++ b/ova/assets/steps.sh @@ -25,6 +25,10 @@ systemConfig() { systemctl daemon-reload systemctl enable updateIndexerHeap.service + + # Change root password (root:wazuh) + sed -i "s/root:.*:/root:\$1\$pNjjEA7K\$USjdNwjfh7A\.vHCf8suK41::0:99999:7:::/g" /etc/shadow + hostname ${HOSTNAME} # AWS instance has this enabled From 4d83da9826835649d7c2b48b4cd46852bbf74310 Mon Sep 17 00:00:00 2001 From: jnasselle Date: Thu, 17 Aug 2023 11:16:58 -0300 Subject: [PATCH 687/994] Update release dates for 4.5.0 and 4.5.1 --- aix/SPECS/wazuh-agent-aix.spec | 4 ++-- debs/SPECS/wazuh-agent/debian/changelog | 4 ++-- debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 6 +++--- debs/SPECS/wazuh-manager/debian/copyright | 2 +- rpms/SPECS/wazuh-agent.spec | 4 ++-- rpms/SPECS/wazuh-manager.spec | 4 ++-- stack/dashboard/deb/debian/changelog | 6 +++--- stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 4 ++-- stack/indexer/deb/debian/changelog | 4 ++-- stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 4 ++-- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index d436355f9d..2729aa8d87 100644 --- a/aix/SPECS/wazuh-agent-aix.spec +++ b/aix/SPECS/wazuh-agent-aix.spec @@ -290,9 +290,9 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog -* Tue Aug 01 2023 support - 4.5.1 +* Tue Aug 24 2023 support - 4.5.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html -* Wed Jul 19 2023 support - 4.5.0 +* Tue Aug 10 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html * Mon Jul 10 2023 support - 4.4.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index fce0326aed..d8dbcab4c4 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,13 +2,13 @@ wazuh-agent (4.5.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-1.html - -- Wazuh, Inc Tue, 01 Aug 2023 15:56:43 +0000 + -- Wazuh, Inc Tue, 24 Aug 2023 15:56:43 +0000 wazuh-agent (4.5.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html - -- Wazuh, Inc Wed, 19 Jul 2023 15:56:43 +0000 + -- Wazuh, Inc Tue, 10 Aug 2023 15:56:43 +0000 wazuh-agent (4.4.5-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 3d783aefb6..8c56d00287 100644 --- a/debs/SPECS/wazuh-agent/debian/copyright +++ b/debs/SPECS/wazuh-agent/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 01 Aug 2023 15:56:43 +0000 + Wazuh, Inc on Tue, 24 Aug 2023 15:56:43 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index 71f29068fa..4b7e1eb94e 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -3,19 +3,19 @@ wazuh-manager (4.5.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-1.html - -- Wazuh, Inc Tue, 01 Aug 2023 15:56:43 +0000 + -- Wazuh, Inc Tue, 24 Aug 2023 15:56:43 +0000 wazuh-manager (4.5.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html - -- Wazuh, Inc Wed, 19 Jul 2023 13:45:36 +0000 + -- Wazuh, Inc Tue, 10 Aug 2023 13:45:36 +0000 wazuh-manager (4.4.5-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html - -- Wazuh, Inc Wed, 19 Jul 2023 15:56:43 +0000 + -- Wazuh, Inc Mon, 10 Jul 2023 15:56:43 +0000 wazuh-manager (4.4.4-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 3d783aefb6..8c56d00287 100644 --- a/debs/SPECS/wazuh-manager/debian/copyright +++ b/debs/SPECS/wazuh-manager/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 01 Aug 2023 15:56:43 +0000 + Wazuh, Inc on Tue, 24 Aug 2023 15:56:43 +0000 It was downloaded from: diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 5f5436950b..9b9576c080 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -619,9 +619,9 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Tue Aug 01 2023 support - 4.5.1 +* Tue Aug 24 2023 support - 4.5.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html -* Wed Jul 19 2023 support - 4.5.0 +* Tue Aug 10 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html * Mon Jul 10 2023 support - 4.4.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 23f77324c5..956a2303f0 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -841,9 +841,9 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Tue Aug 01 2023 support - 4.5.1 +* Tue Aug 24 2023 support - 4.5.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html -* Wed Jul 19 2023 support - 4.5.0 +* Tue Aug 10 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html * Mon Jul 10 2023 support - 4.4.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index fc5b243540..d743ebc89c 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,19 +2,19 @@ wazuh-dashboard (4.5.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-1.html - -- Wazuh, Inc Tue, 01 Aug 2023 15:56:43 +0000 + -- Wazuh, Inc Tue, 24 Aug 2023 15:56:43 +0000 wazuh-dashboard (4.5.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html - -- Wazuh, Inc Wed, 19 Jul 2023 13:45:36 +0000 + -- Wazuh, Inc Tue, 10 Aug 2023 13:45:36 +0000 wazuh-dashboard (4.4.5-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html - -- Wazuh, Inc Wed, 19 Jul 2023 13:45:36 +0000 + -- Wazuh, Inc Mon, 10 Jul 2023 13:45:36 +0000 wazuh-dashboard (4.4.4-RELEASE) stable; urgency=low diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index 177faa0cdd..884e5d4828 100644 --- a/stack/dashboard/deb/debian/copyright +++ b/stack/dashboard/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 01 Aug 2023 15:56:43 +0000 + Wazuh, Inc on Tue, 24 Aug 2023 15:56:43 +0000 It was downloaded from: diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 7a0938a9a5..ce8de14817 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -397,9 +397,9 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog -* Tue Aug 01 2023 support - 4.5.1 +* Tue Aug 24 2023 support - 4.5.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html -* Wed Jul 19 2023 support - 4.5.0 +* Tue Aug 10 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html * Mon Jul 10 2023 support - 4.4.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index a20806885e..107c6f0c7e 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,13 +2,13 @@ wazuh-indexer (4.5.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html - -- Wazuh, Inc Tue, 01 Aug 2023 15:56:43 +0000 + -- Wazuh, Inc Tue, 24 Aug 2023 15:56:43 +0000 wazuh-indexer (4.5.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html - -- Wazuh, Inc Wed, 19 Jul 2023 15:56:43 +0000 + -- Wazuh, Inc Tue, 10 Aug 2023 15:56:43 +0000 wazuh-indexer (4.4.5-RELEASE) stable; urgency=low diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index 177faa0cdd..884e5d4828 100644 --- a/stack/indexer/deb/debian/copyright +++ b/stack/indexer/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 01 Aug 2023 15:56:43 +0000 + Wazuh, Inc on Tue, 24 Aug 2023 15:56:43 +0000 It was downloaded from: diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 4dff5727fe..d893681ae9 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1384,9 +1384,9 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/blocked.certs %changelog -* Tue Aug 01 2023 support - 4.5.1 +* Tue Aug 24 2023 support - 4.5.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html -* Wed Jul 19 2023 support - 4.5.0 +* Tue Aug 10 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html * Mon Jul 10 2023 support - 4.4.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html From d8b5f0aa66f91fdd4da929378d6513d4625159d7 Mon Sep 17 00:00:00 2001 From: jnasselle Date: Thu, 17 Aug 2023 11:42:17 -0300 Subject: [PATCH 688/994] Fix release date day typo --- aix/SPECS/wazuh-agent-aix.spec | 4 ++-- debs/SPECS/wazuh-agent/debian/changelog | 4 ++-- debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 4 ++-- debs/SPECS/wazuh-manager/debian/copyright | 2 +- rpms/SPECS/wazuh-agent.spec | 4 ++-- rpms/SPECS/wazuh-manager.spec | 4 ++-- stack/dashboard/deb/debian/changelog | 4 ++-- stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 4 ++-- stack/indexer/deb/debian/changelog | 4 ++-- stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 4 ++-- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 2729aa8d87..9e1bf444c8 100644 --- a/aix/SPECS/wazuh-agent-aix.spec +++ b/aix/SPECS/wazuh-agent-aix.spec @@ -290,9 +290,9 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog -* Tue Aug 24 2023 support - 4.5.1 +* Thu Aug 24 2023 support - 4.5.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html -* Tue Aug 10 2023 support - 4.5.0 +* Thu Aug 10 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html * Mon Jul 10 2023 support - 4.4.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index d8dbcab4c4..2341439216 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,13 +2,13 @@ wazuh-agent (4.5.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-1.html - -- Wazuh, Inc Tue, 24 Aug 2023 15:56:43 +0000 + -- Wazuh, Inc Thu, 24 Aug 2023 15:56:43 +0000 wazuh-agent (4.5.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html - -- Wazuh, Inc Tue, 10 Aug 2023 15:56:43 +0000 + -- Wazuh, Inc Thu, 10 Aug 2023 15:56:43 +0000 wazuh-agent (4.4.5-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 8c56d00287..5bad71f3ac 100644 --- a/debs/SPECS/wazuh-agent/debian/copyright +++ b/debs/SPECS/wazuh-agent/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 24 Aug 2023 15:56:43 +0000 + Wazuh, Inc on Thu, 24 Aug 2023 15:56:43 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index 4b7e1eb94e..695af9e12d 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -3,13 +3,13 @@ wazuh-manager (4.5.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-1.html - -- Wazuh, Inc Tue, 24 Aug 2023 15:56:43 +0000 + -- Wazuh, Inc Thu, 24 Aug 2023 15:56:43 +0000 wazuh-manager (4.5.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html - -- Wazuh, Inc Tue, 10 Aug 2023 13:45:36 +0000 + -- Wazuh, Inc Thu, 10 Aug 2023 13:45:36 +0000 wazuh-manager (4.4.5-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 8c56d00287..5bad71f3ac 100644 --- a/debs/SPECS/wazuh-manager/debian/copyright +++ b/debs/SPECS/wazuh-manager/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 24 Aug 2023 15:56:43 +0000 + Wazuh, Inc on Thu, 24 Aug 2023 15:56:43 +0000 It was downloaded from: diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 9b9576c080..8940a1724c 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -619,9 +619,9 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Tue Aug 24 2023 support - 4.5.1 +* Thu Aug 24 2023 support - 4.5.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html -* Tue Aug 10 2023 support - 4.5.0 +* Thu Aug 10 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html * Mon Jul 10 2023 support - 4.4.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 956a2303f0..e8bfad2003 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -841,9 +841,9 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Tue Aug 24 2023 support - 4.5.1 +* Thu Aug 24 2023 support - 4.5.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html -* Tue Aug 10 2023 support - 4.5.0 +* Thu Aug 10 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html * Mon Jul 10 2023 support - 4.4.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index d743ebc89c..5db4375779 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,13 +2,13 @@ wazuh-dashboard (4.5.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-1.html - -- Wazuh, Inc Tue, 24 Aug 2023 15:56:43 +0000 + -- Wazuh, Inc Thu, 24 Aug 2023 15:56:43 +0000 wazuh-dashboard (4.5.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html - -- Wazuh, Inc Tue, 10 Aug 2023 13:45:36 +0000 + -- Wazuh, Inc Thu, 10 Aug 2023 13:45:36 +0000 wazuh-dashboard (4.4.5-RELEASE) stable; urgency=low diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index 884e5d4828..4316980251 100644 --- a/stack/dashboard/deb/debian/copyright +++ b/stack/dashboard/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 24 Aug 2023 15:56:43 +0000 + Wazuh, Inc on Thu, 24 Aug 2023 15:56:43 +0000 It was downloaded from: diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index ce8de14817..8caa64a4c2 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -397,9 +397,9 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog -* Tue Aug 24 2023 support - 4.5.1 +* Thu Aug 24 2023 support - 4.5.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html -* Tue Aug 10 2023 support - 4.5.0 +* Thu Aug 10 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html * Mon Jul 10 2023 support - 4.4.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 107c6f0c7e..18628c079f 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,13 +2,13 @@ wazuh-indexer (4.5.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html - -- Wazuh, Inc Tue, 24 Aug 2023 15:56:43 +0000 + -- Wazuh, Inc Thu, 24 Aug 2023 15:56:43 +0000 wazuh-indexer (4.5.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html - -- Wazuh, Inc Tue, 10 Aug 2023 15:56:43 +0000 + -- Wazuh, Inc Thu, 10 Aug 2023 15:56:43 +0000 wazuh-indexer (4.4.5-RELEASE) stable; urgency=low diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index 884e5d4828..4316980251 100644 --- a/stack/indexer/deb/debian/copyright +++ b/stack/indexer/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 24 Aug 2023 15:56:43 +0000 + Wazuh, Inc on Thu, 24 Aug 2023 15:56:43 +0000 It was downloaded from: diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index d893681ae9..953499597d 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1384,9 +1384,9 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/blocked.certs %changelog -* Tue Aug 24 2023 support - 4.5.1 +* Thu Aug 24 2023 support - 4.5.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html -* Tue Aug 10 2023 support - 4.5.0 +* Thu Aug 10 2023 support - 4.5.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html * Mon Jul 10 2023 support - 4.4.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html From 7d7bf9447f0961a72882c47606d7affd386071ba Mon Sep 17 00:00:00 2001 From: jnasselle Date: Thu, 17 Aug 2023 11:43:55 -0300 Subject: [PATCH 689/994] Update Solaris 10 release date --- solaris/solaris10/pkginfo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index 60e15665e6..9d04513859 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -5,7 +5,7 @@ ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="26Jun2023" +PSTAMP="24Aug2023" EMAIL="info@wazuh.com" ISTATES="S s 1 2 3" RSTATES="S s 1 2 3" From 65c6c4d1aaf06c4e39ddab59b913a344911b0e85 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 17 Aug 2023 15:25:21 -0300 Subject: [PATCH 690/994] change OS name --- ova/wazuh_ovf_template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ova/wazuh_ovf_template b/ova/wazuh_ovf_template index 893216b01d..f7d78ca651 100644 --- a/ova/wazuh_ovf_template +++ b/ova/wazuh_ovf_template @@ -28,9 +28,9 @@ A human-readable annotation 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. - + The kind of installed guest operating system - Linux -CentOS Linux release 7.7 + Linux - Amazon Linux 2 Virtual hardware requirements From 8e44733f8cf99191173ce15f08896a53e318c030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Fri, 18 Aug 2023 12:21:12 +0200 Subject: [PATCH 691/994] Improved offline_download curl --- .../wazuh-offline-download.sh | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/unattended_installer/install_functions/wazuh-offline-download.sh b/unattended_installer/install_functions/wazuh-offline-download.sh index 05c9937180..e7c9bd72a7 100755 --- a/unattended_installer/install_functions/wazuh-offline-download.sh +++ b/unattended_installer/install_functions/wazuh-offline-download.sh @@ -111,18 +111,19 @@ function offline_download() { for package in "${packages_to_download[@]}" do - + package_name="${package}_${package_type}_package" eval "package_base_url=${package}_${package_type}_base_url" - 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 + if output=$(common_curl -sSo "${dest_path}/${!package_name}" "${!package_base_url}/${!package_name}" --max-time 300 --retry 5 --retry-delay 5 --fail 2>&1); then + common_logger "The ${package} package was downloaded." else - common_logger "The ${package} package was downloaded." + common_logger -e "The ${package} package could not be downloaded. Exiting." + eval "echo \${output} ${debug}" + exit 1 fi + done common_logger "The packages are in ${dest_path}" @@ -145,12 +146,12 @@ function offline_download() { for file in "${files_to_download[@]}" do - eval "common_curl -sO ${file} --max-time 300 --retry 5 --retry-delay 5 --fail" - if [ "${PIPESTATUS[0]}" != 0 ]; then + if output=$(common_curl -sSO ${file} --max-time 300 --retry 5 --retry-delay 5 --fail 2>&1); then + common_logger "The resource ${file} was downloaded." + else common_logger -e "The resource ${file} could not be downloaded. Exiting." + eval "echo \${output} ${debug}" exit 1 - else - common_logger "The resource ${file} was downloaded." fi done From 23883754913d977bb26f4b3769fc689dbb6b1ebc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 22 Aug 2023 10:52:47 +0200 Subject: [PATCH 692/994] Fixed filebeat and Chrome curls --- unattended_installer/install_functions/filebeat.sh | 6 +++--- unattended_installer/install_functions/installCommon.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/unattended_installer/install_functions/filebeat.sh b/unattended_installer/install_functions/filebeat.sh index 7c0e29448f..568f5f6b3e 100644 --- a/unattended_installer/install_functions/filebeat.sh +++ b/unattended_installer/install_functions/filebeat.sh @@ -8,7 +8,7 @@ function filebeat_configure(){ - eval "common_curl -so /etc/filebeat/wazuh-template.json ${filebeat_wazuh_template} --max-time 300 --retry 5 --retry-delay 5 --fail ${debug}" + eval "common_curl -sSo /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 @@ -16,7 +16,7 @@ function filebeat_configure(){ fi eval "chmod go+r /etc/filebeat/wazuh-template.json ${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}" + eval "common_curl -sS ${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 @@ -55,7 +55,7 @@ function filebeat_copyCertificates() { if ! tar -tvf "${tar_file}" | grep -q "${server_node_names[0]}" ; then common_logger -e "Tar file does not contain certificate for the node ${server_node_names[0]}." installCommon_rollBack - exit 1; + exit 1 fi eval "sed -i s/filebeat.pem/${server_node_names[0]}.pem/ /etc/filebeat/filebeat.yml ${debug}" eval "sed -i s/filebeat-key.pem/${server_node_names[0]}-key.pem/ /etc/filebeat/filebeat.yml ${debug}" diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 083dc38218..a34384dde6 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -355,7 +355,7 @@ function installCommon_installChrome() { if [ "${sys_type}" == "yum" ]; then chrome_package="/tmp/wazuh-install-files/chrome.rpm" - common_curl -so "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm --max-time 100 --retry 5 --retry-delay 5 --fail + common_curl -sSo "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm --max-time 100 --retry 5 --retry-delay 5 --fail "${debug}" eval "yum install ${chrome_package} -y ${debug}" if [ "${PIPESTATUS[0]}" != 0 ]; then @@ -364,7 +364,7 @@ function installCommon_installChrome() { elif [ "${sys_type}" == "apt-get" ]; then chrome_package="/tmp/wazuh-install-files/chrome.deb" - common_curl -so "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb --max-time 100 --retry 5 --retry-delay 5 --fail + common_curl -sSo "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb --max-time 100 --retry 5 --retry-delay 5 --fail "${debug}" installCommon_aptInstall "${chrome_package}" if [ "${install_result}" != 0 ]; then From 5acc300f809df2f3fd46c8fe9ad20e7c0c181eb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 22 Aug 2023 11:00:10 +0200 Subject: [PATCH 693/994] Removed semicolons in filebeat function --- unattended_installer/install_functions/filebeat.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unattended_installer/install_functions/filebeat.sh b/unattended_installer/install_functions/filebeat.sh index 568f5f6b3e..4604d601ff 100644 --- a/unattended_installer/install_functions/filebeat.sh +++ b/unattended_installer/install_functions/filebeat.sh @@ -67,7 +67,7 @@ function filebeat_copyCertificates() { if ! tar -tvf "${tar_file}" | grep -q "${winame}" ; then common_logger -e "Tar file does not contain certificate for the node ${winame}." installCommon_rollBack - exit 1; + exit 1 fi eval "sed -i s/filebeat.pem/${winame}.pem/ /etc/filebeat/filebeat.yml ${debug}" eval "sed -i s/filebeat-key.pem/${winame}-key.pem/ /etc/filebeat/filebeat.yml ${debug}" @@ -81,7 +81,7 @@ function filebeat_copyCertificates() { eval "chown root:root ${filebeat_cert_path}/* ${debug}" else common_logger -e "No certificates found. Could not initialize Filebeat" - exit 1; + exit 1 fi } From 10df36c9791a8383924af96131fef81e6e578fca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 22 Aug 2023 12:13:05 +0200 Subject: [PATCH 694/994] Deleted whitespaces --- .../install_functions/wazuh-offline-download.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/wazuh-offline-download.sh b/unattended_installer/install_functions/wazuh-offline-download.sh index e7c9bd72a7..61b85b9de3 100755 --- a/unattended_installer/install_functions/wazuh-offline-download.sh +++ b/unattended_installer/install_functions/wazuh-offline-download.sh @@ -111,7 +111,7 @@ function offline_download() { for package in "${packages_to_download[@]}" do - + package_name="${package}_${package_type}_package" eval "package_base_url=${package}_${package_type}_base_url" From 2b655b40492e6e4d23750d09a14e6fa000f22154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 22 Aug 2023 12:14:34 +0200 Subject: [PATCH 695/994] Deleted blank line --- unattended_installer/install_functions/wazuh-offline-download.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/unattended_installer/install_functions/wazuh-offline-download.sh b/unattended_installer/install_functions/wazuh-offline-download.sh index 61b85b9de3..24fe2f221b 100755 --- a/unattended_installer/install_functions/wazuh-offline-download.sh +++ b/unattended_installer/install_functions/wazuh-offline-download.sh @@ -123,7 +123,6 @@ function offline_download() { exit 1 fi - done common_logger "The packages are in ${dest_path}" From 3224325fa21c41120e1274392692e04b36df4afa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 22 Aug 2023 16:40:32 +0200 Subject: [PATCH 696/994] Deleted `postProvision.sh` script --- ova/assets/postProvision.sh | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 ova/assets/postProvision.sh diff --git a/ova/assets/postProvision.sh b/ova/assets/postProvision.sh deleted file mode 100644 index 886fa199cb..0000000000 --- a/ova/assets/postProvision.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -DEBUG=$1 -[[ ${DEBUG} = "yes" ]] && set -ex || set -e - -CURRENT_PATH="$( cd $(dirname $0) ; pwd -P )" -ASSETS_PATH="${CURRENT_PATH}/assets" -CUSTOM_PATH="${ASSETS_PATH}/custom" -SYSTEM_USER="wazuh-user" - -systemctl stop wazuh-manager wazuh-indexer filebeat wazuh-dashboard - -# Remove everything related to vagrant -mv ${CUSTOM_PATH}/removeVagrant.service /etc/systemd/system/ -sed -i "s/USER/${SYSTEM_USER}/g" /etc/systemd/system/removeVagrant.service -mv ${CUSTOM_PATH}/removeVagrant.sh /home/${SYSTEM_USER}/ -sed -i "s/USER/${SYSTEM_USER}/g" /home/${SYSTEM_USER}/removeVagrant.sh -chmod 755 /home/${SYSTEM_USER}/removeVagrant.sh -systemctl daemon-reload -systemctl enable removeVagrant.service - -# Clear synced files -rm -rf ${CURRENT_PATH}/* ${CURRENT_PATH}/.gitignore - -# Remove logs -find /var/log/ -type f -exec bash -c 'cat /dev/null > {}' \; -find /var/ossec/logs/ -type f -exec bash -c 'cat /dev/null > {}' \; - -rm /root/anaconda-ks.cfg -rm /root/original-ks.cfg - -history -c -shutdown -r now > /dev/null 2>&1 From 5c67c01117912d63f856ced808254b37eeb03479 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 24 Aug 2023 10:18:01 +0200 Subject: [PATCH 697/994] Updated source_branch 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 5289ec4969..9ccf181ce4 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -16,7 +16,7 @@ readonly resources_certs="${base_path_builder}/cert_tool" readonly resources_passwords="${base_path_builder}/passwords_tool" readonly resources_common="${base_path_builder}/common_functions" readonly resources_download="${base_path_builder}/downloader" -readonly source_branch="4.5" +readonly source_branch="4.6" function getHelp() { From 1947b620a041ec9d057a1a2f8d8c3570518e7df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 24 Aug 2023 10:18:27 +0200 Subject: [PATCH 698/994] Updated source_branch 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 9ccf181ce4..87238f139b 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -16,7 +16,7 @@ readonly resources_certs="${base_path_builder}/cert_tool" readonly resources_passwords="${base_path_builder}/passwords_tool" readonly resources_common="${base_path_builder}/common_functions" readonly resources_download="${base_path_builder}/downloader" -readonly source_branch="4.6" +readonly source_branch="4.7" function getHelp() { From dd7237a049abb72043b9be17b6df21b32a143738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 24 Aug 2023 10:19:34 +0200 Subject: [PATCH 699/994] Updated source_branch 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 9ccf181ce4..a1371a504d 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -16,7 +16,7 @@ readonly resources_certs="${base_path_builder}/cert_tool" readonly resources_passwords="${base_path_builder}/passwords_tool" readonly resources_common="${base_path_builder}/common_functions" readonly resources_download="${base_path_builder}/downloader" -readonly source_branch="4.6" +readonly source_branch="4.8" function getHelp() { From 7187a92fcf96d16fc2cf4337f715d55a9d6bcc94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Fri, 25 Aug 2023 10:28:17 +0200 Subject: [PATCH 700/994] Changed regex to fetch DNS --- unattended_installer/cert_tool/certFunctions.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/unattended_installer/cert_tool/certFunctions.sh b/unattended_installer/cert_tool/certFunctions.sh index cb910e5ca9..b97a9322a6 100644 --- a/unattended_installer/cert_tool/certFunctions.sh +++ b/unattended_installer/cert_tool/certFunctions.sh @@ -99,7 +99,7 @@ function cert_generateCertificateconfiguration() { sed -i '/IP.1/d' "${cert_tmp_path}/${1}.conf" for (( i=2; i<=${#@}; i++ )); do isIP=$(echo "${!i}" | grep -P "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$") - isDNS=$(echo "${!i}" | grep -P "^[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9](?:\.[a-zA-Z-]{2,})+$" ) + isDNS=$(echo "${!i}" | grep -P "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])\.([A-Za-z]{2,})$" ) j=$((i-1)) if [ "${isIP}" ]; then printf '%s\n' " IP.${j} = ${!i}" >> "${cert_tmp_path}/${1}.conf" @@ -330,9 +330,12 @@ function cert_readConfig() { all_ips=("${indexer_node_ips[@]}" "${server_node_ips[@]}" "${dashboard_node_ips[@]}") for ip in "${all_ips[@]}"; do - if ! cert_checkPrivateIp "$ip"; then - common_logger -e "The IP ${ip} is public." - exit 1 + isIP=$(echo "${ip}" | grep -P "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$") + if [[ -n "${isIP}" ]]; then + if ! cert_checkPrivateIp "$ip"; then + common_logger -e "The IP ${ip} is public." + exit 1 + fi fi done From 811ed42f91c2b85f4383c120c86f82ab4996a2fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Fri, 25 Aug 2023 10:29:45 +0200 Subject: [PATCH 701/994] Fixed source_branch variable in master branch --- 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 a1371a504d..7c063195f8 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -16,7 +16,7 @@ readonly resources_certs="${base_path_builder}/cert_tool" readonly resources_passwords="${base_path_builder}/passwords_tool" readonly resources_common="${base_path_builder}/common_functions" readonly resources_download="${base_path_builder}/downloader" -readonly source_branch="4.8" +readonly source_branch="master" function getHelp() { From 6f1fbb8c1ccb24f21359ab526888d4459e5ceb2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Fri, 25 Aug 2023 10:33:02 +0200 Subject: [PATCH 702/994] Fixed source_branch 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 9ccf181ce4..4e4a7d87b7 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -16,7 +16,7 @@ readonly resources_certs="${base_path_builder}/cert_tool" readonly resources_passwords="${base_path_builder}/passwords_tool" readonly resources_common="${base_path_builder}/common_functions" readonly resources_download="${base_path_builder}/downloader" -readonly source_branch="4.6" +readonly source_branch="4.6.0" function getHelp() { From 770aa3ff7fcb1d3e967aec5102f5c61233d2c918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Fri, 25 Aug 2023 10:33:28 +0200 Subject: [PATCH 703/994] Fixed source_branch 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 87238f139b..1bf613c227 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -16,7 +16,7 @@ readonly resources_certs="${base_path_builder}/cert_tool" readonly resources_passwords="${base_path_builder}/passwords_tool" readonly resources_common="${base_path_builder}/common_functions" readonly resources_download="${base_path_builder}/downloader" -readonly source_branch="4.7" +readonly source_branch="4.7.0" function getHelp() { From add38d04b2e2084798a04d7b9eee840472ed63c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Fri, 25 Aug 2023 12:51:19 +0200 Subject: [PATCH 704/994] Updated source_branch in master branch --- 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 7c063195f8..2bb14249b8 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -16,7 +16,7 @@ readonly resources_certs="${base_path_builder}/cert_tool" readonly resources_passwords="${base_path_builder}/passwords_tool" readonly resources_common="${base_path_builder}/common_functions" readonly resources_download="${base_path_builder}/downloader" -readonly source_branch="master" +readonly source_branch="4.8.0" function getHelp() { From ec6532cfade1abe9cffb46f4640001dc95754ee7 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Tue, 29 Aug 2023 12:37:39 +0200 Subject: [PATCH 705/994] Bump version to 4.5.3 --- CHANGELOG.md | 3 +++ VERSION | 2 +- aix/SPECS/wazuh-agent-aix.spec | 4 +++- debs/SPECS/wazuh-agent/debian/changelog | 6 ++++++ debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 6 ++++++ debs/SPECS/wazuh-manager/debian/copyright | 2 +- macos/specs/wazuh-agent-arm64.pkgproj | 4 ++-- macos/specs/wazuh-agent-intel64.pkgproj | 4 ++-- rpms/SPECS/wazuh-agent.spec | 4 +++- rpms/SPECS/wazuh-manager.spec | 4 +++- solaris/solaris10/pkginfo | 4 ++-- stack/dashboard/deb/debian/changelog | 6 ++++++ stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 ++ stack/indexer/deb/debian/changelog | 6 ++++++ stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 ++ tests/unattended/unit/suites/test-common.sh | 4 ++-- tests/unattended/unit/suites/test-dashboard.sh | 10 +++++----- tests/unattended/unit/suites/test-indexer.sh | 8 ++++---- .../install_functions/installVariables.sh | 2 +- 22 files changed, 63 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31cd974888..e1d07ffc09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Change Log All notable changes to this project will be documented in this file. +## [4.5.3] + +- https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.3 ## [4.5.2] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.2 diff --git a/VERSION b/VERSION index 6cedcff630..4e298cc965 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.5.2 +4.5.3 diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 8343b00963..7f04ae94a0 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.5.2 +Version: 4.5.3 Release: 1 License: GPL URL: https://www.wazuh.com/ @@ -290,6 +290,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog +* Thu Sep 28 2023 support - 4.5.3 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html * Thu Aug 24 2023 support - 4.5.1 diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 344fdbbd51..091aaa1c59 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -1,3 +1,9 @@ +wazuh-agent (4.5.3-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html + + -- Wazuh, Inc Thu, 28 Sep 2023 00:00:00 +0000 + wazuh-agent (4.5.2-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 6335634cd3..77cc28d2fe 100644 --- a/debs/SPECS/wazuh-agent/debian/copyright +++ b/debs/SPECS/wazuh-agent/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Thu, 31 Aug 2023 00:00:00 +0000 + Wazuh, Inc on Thu, 28 Sep 2023 00:00:00 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index d166ff9ed7..24a4976350 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -1,3 +1,9 @@ +wazuh-manager (4.5.3-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html + + -- Wazuh, Inc Thu, 28 Sep 2023 00:00:00 +0000 + wazuh-manager (4.5.2-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 6335634cd3..77cc28d2fe 100644 --- a/debs/SPECS/wazuh-manager/debian/copyright +++ b/debs/SPECS/wazuh-manager/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Thu, 31 Aug 2023 00:00:00 +0000 + Wazuh, Inc on Thu, 28 Sep 2023 00:00:00 +0000 It was downloaded from: diff --git a/macos/specs/wazuh-agent-arm64.pkgproj b/macos/specs/wazuh-agent-arm64.pkgproj index e170f7622f..592e7f8a0e 100644 --- a/macos/specs/wazuh-agent-arm64.pkgproj +++ b/macos/specs/wazuh-agent-arm64.pkgproj @@ -812,7 +812,7 @@ USE_HFS+_COMPRESSION VERSION - 4.5.2-1 + 4.5.3-1 TYPE 0 @@ -1240,7 +1240,7 @@ NAME - wazuh-agent-4.5.2-1.arm64 + wazuh-agent-4.5.3-1.arm64 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/macos/specs/wazuh-agent-intel64.pkgproj b/macos/specs/wazuh-agent-intel64.pkgproj index b089429c2f..744eba8bf0 100644 --- a/macos/specs/wazuh-agent-intel64.pkgproj +++ b/macos/specs/wazuh-agent-intel64.pkgproj @@ -812,7 +812,7 @@ USE_HFS+_COMPRESSION VERSION - 4.5.1-1 + 4.5.3-1 TYPE 0 @@ -1203,7 +1203,7 @@ NAME - wazuh-agent-4.5.2-1.intel64 + wazuh-agent-4.5.3-1.intel64 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 8d0cb4c034..5a5e002408 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -7,7 +7,7 @@ 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.5.2 +Version: 4.5.3 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -619,6 +619,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* Thu Sep 28 2023 support - 4.5.3 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html * Thu Aug 24 2023 support - 4.5.1 diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 05f3267ecd..f6f28b81c6 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -7,7 +7,7 @@ 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.5.2 +Version: 4.5.3 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -841,6 +841,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* Thu Sep 28 2023 support - 4.5.3 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html * Thu Aug 24 2023 support - 4.5.1 diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index cd5724079e..e13d825342 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -1,11 +1,11 @@ NAME=Wazuh - Wazuh unifies historically separate functions into a single agent and platform architecture. Providing protection for public clouds, private clouds, and on-premise data centers. PKG="wazuh-agent" -VERSION="4.5.2" +VERSION="4.5.3" ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="31Aug2023" +PSTAMP="28Sep2023" EMAIL="info@wazuh.com" ISTATES="S s 1 2 3" RSTATES="S s 1 2 3" diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 4ddfafea59..ddfa5a233d 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -1,3 +1,9 @@ +wazuh-dashboard (4.5.3-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html + + -- Wazuh, Inc Thu, 28 Sep 2023 00:00:00 +0000 + wazuh-dashboard (4.5.2-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index 754c66c793..f5cb42a7f0 100644 --- a/stack/dashboard/deb/debian/copyright +++ b/stack/dashboard/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Thu, 31 Aug 2023 00:00:00 +0000 + Wazuh, Inc on Thu, 28 Sep 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 5ca99324f4..974e4ee876 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -397,6 +397,8 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog +* Thu Sep 28 2023 support - 4.5.3 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html * Thu Aug 24 2023 support - 4.5.1 diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 21890477c8..9cde7d337a 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -1,3 +1,9 @@ +wazuh-indexer (4.5.3-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html + + -- Wazuh, Inc Thu, 28 Sep 2023 00:00:00 +0000 + wazuh-indexer (4.5.2-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index 754c66c793..f5cb42a7f0 100644 --- a/stack/indexer/deb/debian/copyright +++ b/stack/indexer/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Thu, 31 Aug 2023 00:00:00 +0000 + Wazuh, Inc on Thu, 28 Sep 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 4375fd0a7a..88d18d1c31 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1384,6 +1384,8 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/blocked.certs %changelog +* Thu Sep 28 2023 support - 4.5.3 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html * Thu Aug 24 2023 support - 4.5.1 diff --git a/tests/unattended/unit/suites/test-common.sh b/tests/unattended/unit/suites/test-common.sh index d19a50e134..2a46d5b570 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.5.2-1 @wazuh + @mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.5.3-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-05-common_checkInstalled-all-installed-yum-assert() { - @echo "wazuh-manager.x86_64 4.5.2-1 @wazuh" + @echo "wazuh-manager.x86_64 4.5.3-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 6738f1226a..ea847e88fa 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.5.2" + wazuh_version="4.5.3" elasticsearch_oss_version="7.10.2" wazuh_kibana_plugin_revision="1" repobaseurl="https://packages.wazuh.com/4.x" @@ -55,7 +55,7 @@ test-03-dashboard_install-yum() { load-dashboard_install sys_type="yum" sep="-" - wazuh_version="4.5.2" + wazuh_version="4.5.3" wazuh_revision="1" dashboard_install } @@ -68,7 +68,7 @@ test-ASSERT-FAIL-04-dashboard_install-yum-error() { load-dashboard_install sys_type="yum" sep="-" - wazuh_version="4.5.2" + wazuh_version="4.5.3" wazuh_revision="1" @mockfalse yum install wazuh-dashboard-1.13.2-1 -y dashboard_install @@ -78,7 +78,7 @@ test-05-dashboard_install-apt() { load-dashboard_install sys_type="apt-get" sep="=" - wazuh_version="4.5.2" + wazuh_version="4.5.3" wazuh_revision="1" dashboard_install } @@ -91,7 +91,7 @@ test-ASSERT-FAIL-06-dashboard_install-apt-error() { load-dashboard_install sys_type="apt-get" sep="=" - wazuh_version="4.5.2" + wazuh_version="4.5.3" wazuh_revision="1" @mockfalse apt install wazuh-dashboard=1.13.2-1 -y dashboard_install diff --git a/tests/unattended/unit/suites/test-indexer.sh b/tests/unattended/unit/suites/test-indexer.sh index 27c2ab05f6..c706f17101 100644 --- a/tests/unattended/unit/suites/test-indexer.sh +++ b/tests/unattended/unit/suites/test-indexer.sh @@ -49,7 +49,7 @@ test-03-indexer_install-yum() { load-indexer_install sys_type="yum" sep="-" - wazuh_version="4.5.2" + wazuh_version="4.5.3" wazuh_revision="1" indexer_install } @@ -63,7 +63,7 @@ test-ASSERT-FAIL-04-indexer_install-yum-error() { load-indexer_install sys_type="yum" sep="-" - wazuh_version="4.5.2" + wazuh_version="4.5.3" wazuh_revision="1" @mockfalse yum install wazuh-indexer-1.13.2-1 -y indexer_install @@ -73,7 +73,7 @@ test-05-indexer_install-apt() { load-indexer_install sys_type="apt-get" sep="=" - wazuh_version="4.5.2" + wazuh_version="4.5.3" wazuh_revision="1" indexer_install } @@ -87,7 +87,7 @@ test-ASSERT-FAIL-06-indexer_install-apt-error() { load-indexer_install sys_type="apt-get" sep="=" - wazuh_version="4.5.2" + wazuh_version="4.5.3" wazuh_revision="1" @mockfalse apt install wazuh-indexer=1.13.2-1 -y indexer_install diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index 94667acf0e..357c775e17 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.5" -readonly wazuh_version="4.5.2" +readonly wazuh_version="4.5.3" readonly filebeat_version="7.10.2" readonly wazuh_install_vesion="0.1" From f3412c4b8272d78f4dc72f8e6b12ca4cbc069803 Mon Sep 17 00:00:00 2001 From: Deblintrake09 Date: Wed, 30 Aug 2023 14:16:28 -0300 Subject: [PATCH 706/994] bump wazuh indexer to 2.8.0 --- stack/indexer/base/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/indexer/base/builder.sh b/stack/indexer/base/builder.sh index 14c413e603..e656a12a0a 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.6.0" +opensearch_version="2.8.0" base_dir=/opt/wazuh-indexer-base # ----------------------------------------------------------------------------- From 1f2e4520f9424330f7b36c416c9052abdf02a88a Mon Sep 17 00:00:00 2001 From: Tostti Date: Wed, 30 Aug 2023 15:21:48 -0300 Subject: [PATCH 707/994] Fix builder --- wazuhapp/opensearch-dashboards/Docker/build.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/wazuhapp/opensearch-dashboards/Docker/build.sh b/wazuhapp/opensearch-dashboards/Docker/build.sh index cd04bc11f3..d0f2cf2bed 100755 --- a/wazuhapp/opensearch-dashboards/Docker/build.sh +++ b/wazuhapp/opensearch-dashboards/Docker/build.sh @@ -21,6 +21,7 @@ wazuh_app_raw_repo_url="https://raw.githubusercontent.com/wazuh/wazuh-kibana-app plugin_platform_app_repo_url="https://github.com/opensearch-project/OpenSearch-Dashboards.git" plugin_platform_app_raw_repo_url="https://raw.githubusercontent.com/opensearch-project/OpenSearch-Dashboards" wazuh_app_package_json_url="${wazuh_app_raw_repo_url}/${wazuh_branch}/plugins/main/package.json" +wazuh_app_nvmrc_url="${wazuh_app_raw_repo_url}/${wazuh_branch}/.nvmrc" # Script vars wazuh_version="" @@ -46,12 +47,16 @@ change_node_version () { prepare_env() { - echo "Downloading package.json from wazuh-kibana-app repository" + echo "Downloading package.json and .nvmrc from wazuh-kibana-app repository" if ! curl $wazuh_app_package_json_url -o "/tmp/package.json" ; then echo "Error downloading package.json from GitHub." exit 1 fi + if ! curl $wazuh_app_nvmrc_url -o "/tmp/.nvmrc" ; then + echo "Error downloading package.json from GitHub." + exit 1 + fi wazuh_version=$(python -c 'import json, os; f=open("/tmp/package.json"); pkg=json.load(f); f.close();\ print(pkg["version"])') plugin_platform_version=$(python -c 'import json, os; f=open("/tmp/package.json"); pkg=json.load(f); f.close();\ @@ -66,11 +71,11 @@ prepare_env() { exit 1 fi - plugin_platform_node_version=$(python -c 'import json, os; f=open("/tmp/package.json"); pkg=json.load(f); f.close();\ - print(pkg["engines"]["node"])') + plugin_platform_node_version=$(python -c 'import json, os; f=open("/tmp/.nvmrc"); pkg=f.readline(); f.close();\ + print(pkg)') plugin_platform_yarn_version=$(python -c 'import json, os; f=open("/tmp/package.json"); pkg=json.load(f); f.close();\ - print(pkg["engines"]["yarn"])') + print(str(pkg["engines"]["yarn"]).replace("^",""))') } @@ -135,4 +140,4 @@ prepare_env download_plugin_platform_sources install_dependencies download_wazuh_app_sources -build_package +build_package \ No newline at end of file From 1a51dabec47075bd9fc22c78bba58cbe9ce0499e Mon Sep 17 00:00:00 2001 From: Deblintrake09 Date: Wed, 30 Aug 2023 17:20:54 -0300 Subject: [PATCH 708/994] bump version to 2.8.0 in debian rules --- stack/indexer/deb/debian/rules | 214 ++++++++++++++++----------------- 1 file changed, 107 insertions(+), 107 deletions(-) diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index 9759cd1907..fc64a2e6d7 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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/performance-analyzer-rca-2.8.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 @@ -193,7 +193,7 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-transport-4.1.86.Final.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-transport-native-unix-common-4.1.86.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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/performance-analyzer-rca-2.8.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/protobuf-java-3.21.12.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,29 +226,29 @@ 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.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-cli-2.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-common-2.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/java-version-checker-2.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-geo-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-cli-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-common-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/java-version-checker-2.8.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/log4j-api-2.17.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-x-content-2.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-plugin-classloader-2.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-x-content-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-plugin-classloader-2.8.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/log4j-jul-2.17.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-launchers-2.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-secure-sm-2.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-launchers-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-secure-sm-2.8.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/opensearch-plugin-cli-2.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/plugin-cli/opensearch-plugin-cli-2.8.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/opensearch-upgrade-cli-2.8.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/keystore-cli/keystore-cli-2.8.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jts-core-1.15.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-2.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-2.8.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/t-digest-3.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-core-2.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-core-2.8.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/spatial4j-0.7.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-core-2.14.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-dataformat-cbor-2.14.2.jar @@ -316,8 +316,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.6.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/common-utils-2.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/opensearch-observability-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/common-utils-2.8.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 @@ -331,12 +331,12 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/json-flattener-0.15.1.jar 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/common-utils-2.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/common-utils-2.8.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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/opensearch-reports-scheduler-2.8.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 @@ -347,19 +347,19 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/json-base-2.2.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/json-flattener-0.15.1.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/geo-2.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/geo-2.8.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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/core-2.8.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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/protocol-2.8.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/slf4j-api-1.7.36.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.6.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-2.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/sql-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-2.8.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/reindex-client-2.8.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 @@ -371,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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/parent-join-client-2.8.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-rest-client-2.8.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.6.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-ssl-config-2.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/legacy-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-ssl-config-2.8.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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-sql-2.8.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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/ppl-2.8.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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/common-2.8.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 @@ -396,7 +396,7 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/jackson-annotations-2.14.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/jackson-databind-2.14.2.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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-ml-client-2.8.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 @@ -404,7 +404,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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/sql-2.8.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 @@ -413,13 +413,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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/prometheus-2.8.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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/common-utils-2.8.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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/opensearch-cross-cluster-replication-2.8.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 @@ -427,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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/opensearch-knn-2.8.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 @@ -441,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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/common-utils-2.8.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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/opensearch-index-management-2.8.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 @@ -453,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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/opensearch-index-management-spi-2.8.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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/opensearch-performance-analyzer-2.8.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 @@ -498,14 +498,14 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-transport-4.1.87.Final.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-transport-native-unix-common-4.1.87.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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/performanceanalyzer-rca-2.8.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/protobuf-java-3.21.12.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/proto-google-common-protos-2.9.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/protobuf-java-3.21.12.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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler/opensearch-job-scheduler-spi-2.8.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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler/opensearch-job-scheduler-2.8.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 @@ -515,10 +515,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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/aggs-matrix-stats-client-2.8.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/lang-mustache-client-2.8.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.5.5.jar @@ -531,7 +531,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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/mapper-extras-client-2.8.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 @@ -540,14 +540,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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/rank-eval-client-2.8.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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensearch-security-2.8.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/parent-join-client-2.8.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 @@ -560,14 +560,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.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensearch-rest-client-2.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/transport-netty4-client-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensearch-rest-client-2.8.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensearch-rest-high-level-client-2.8.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/cxf-rt-security-3.5.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 @@ -608,7 +608,7 @@ override_dh_fixperms: 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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/common-utils-2.8.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 @@ -618,21 +618,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.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/opensearch-security-analytics-2.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/opensearch-rest-client-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/opensearch-security-analytics-2.8.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.6.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/opensearch-neural-search-2.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/opensearch-ml-client-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/opensearch-neural-search-2.8.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.6.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search/common-utils-2.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search/opensearch-asynchronous-search-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search/common-utils-2.8.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 @@ -641,15 +641,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.6.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/opensearch-anomaly-detection-2.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/common-utils-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/opensearch-anomaly-detection-2.8.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/opensearch-rest-client-2.8.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 @@ -672,10 +672,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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/opensearch-geospatial-2.8.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.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/h3-2.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/geo-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/h3-2.8.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 @@ -684,7 +684,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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/common-utils-2.8.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 @@ -693,13 +693,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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/alerting-core-2.8.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/opensearch-rest-client-2.8.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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/opensearch-alerting-2.8.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 @@ -712,10 +712,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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/percolator-client-2.8.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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/common-utils-2.8.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 @@ -747,10 +747,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.6.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-ml-algorithms-2.6.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-ml-common-2.6.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-rest-client-2.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-ml-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-ml-algorithms-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-ml-common-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-rest-client-2.8.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.21.9.jar @@ -804,34 +804,34 @@ override_dh_fixperms: 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.6.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/opensearch-notifications-core-spi-2.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/opensearch-notifications-core-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/opensearch-notifications-core-spi-2.8.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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/common-utils-2.8.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.6.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/opensearch-notifications-2.8.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.58.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/opensearch-grok-2.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/opensearch-dissect-2.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/opensearch-grok-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/opensearch-dissect-2.8.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/ingest-common-2.8.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/joni-2.1.44.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/geo/geo-2.8.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/maxmind-db-2.1.0.jar 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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/ingest-geoip-2.8.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 @@ -840,29 +840,29 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/jackson-databind-2.14.2.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/percolator/percolator-client-2.8.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/analysis-common/analysis-common-2.8.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/aggs-matrix-stats/aggs-matrix-stats-client-2.8.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/repository-url/repository-url-2.8.0.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-mustache - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-mustache/lang-mustache-client-2.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-mustache/lang-mustache-client-2.8.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/systemd/systemd-2.8.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/transport-netty4-client-2.8.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.87.Final.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-codec-4.1.87.Final.jar @@ -873,7 +873,7 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-transport-4.1.87.Final.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-transport-native-unix-common-4.1.87.Final.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/lang-expression-2.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/lang-expression-2.8.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.11.1.jar @@ -883,9 +883,9 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/lucene-expressions-9.5.0.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/lang-painless-2.8.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/opensearch-scripting-painless-spi-2.8.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/antlr4-runtime-4.11.1.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 @@ -894,37 +894,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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/rank-eval/rank-eval-client-2.8.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/reindex-client-2.8.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/opensearch-rest-client-2.8.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.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/opensearch-ssl-config-2.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/opensearch-dashboards-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/opensearch-ssl-config-2.8.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-user-agent/ingest-user-agent-2.8.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/mapper-extras/mapper-extras-client-2.8.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/parent-join/parent-join-client-2.8.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/reindex-client-2.8.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/opensearch-rest-client-2.8.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.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/opensearch-ssl-config-2.8.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 From a9bc7328450a91afbb94046cadc8360ada14a9e0 Mon Sep 17 00:00:00 2001 From: Deblintrake09 Date: Wed, 30 Aug 2023 17:49:18 -0300 Subject: [PATCH 709/994] bump sqlite-jbdc version in debian rules --- stack/indexer/deb/debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index fc64a2e6d7..36d0263541 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -154,7 +154,7 @@ override_dh_fixperms: 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.8.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/sqlite-jdbc-3.41.2.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 chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/commons-lang3-3.9.jar From 6922a2acf1037604a47ecf6747c4f181558de40b Mon Sep 17 00:00:00 2001 From: Deblintrake09 Date: Wed, 30 Aug 2023 21:18:55 -0300 Subject: [PATCH 710/994] update debian rules for all files --- stack/indexer/deb/debian/rules | 2026 ++++++++++++++++---------------- 1 file changed, 1044 insertions(+), 982 deletions(-) diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index 36d0263541..8033c3ca7d 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -147,1070 +147,1132 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(SYS_DIR)/tmpfiles.d/$(NAME).conf chown root:root $(TARGET_DIR)$(SYS_DIR)/tmpfiles.d/$(NAME).conf - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR) - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/bin - 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.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/sqlite-jdbc-3.41.2.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 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/commons-lang3-3.9.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/jsr305-3.0.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/log4j-core-2.17.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/annotations-4.1.1.4.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/javax.annotation-api-1.3.2.jar - 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/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/grpc-api-1.52.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-context-1.52.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-core-1.52.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-netty-1.52.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-protobuf-1.52.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-protobuf-lite-1.52.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-stub-1.52.1.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.14.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/jackson-core-2.14.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/jackson-databind-2.14.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-buffer-4.1.86.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-codec-4.1.86.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-codec-http-4.1.86.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-codec-http2-4.1.86.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-codec-socks-4.1.86.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-common-4.1.86.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-handler-4.1.86.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-handler-proxy-4.1.86.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-resolver-4.1.86.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-transport-4.1.86.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-transport-native-unix-common-4.1.86.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.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/protobuf-java-3.21.12.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 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/opensearch_security.policy - 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_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 - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-node - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-keystore - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-plugin - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-cli - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-env - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-env-from-file - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-upgrade - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/systemd-entrypoint - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/indexer-security-init.sh - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-performance-analyzer - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-performance-analyzer/performance-analyzer-agent - 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.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-cli-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-common-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/java-version-checker-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/log4j-api-2.17.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-x-content-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-plugin-classloader-2.8.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/log4j-jul-2.17.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-launchers-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-secure-sm-2.8.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/opensearch-plugin-cli-2.8.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.8.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.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jts-core-1.15.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/t-digest-3.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-core-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/spatial4j-0.7.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-core-2.14.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-dataformat-cbor-2.14.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-dataformat-smile-2.14.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-dataformat-yaml-2.14.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/joda-time-2.12.2.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.5.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-backward-codecs-9.5.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-core-9.5.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-grouping-9.5.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-highlighter-9.5.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-join-9.5.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-memory-9.5.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-misc-9.5.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-queries-9.5.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-queryparser-9.5.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-sandbox-9.5.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-spatial-extras-9.5.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-spatial3d-9.5.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-suggest-9.5.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/snakeyaml-1.33.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/plugin-cli/bcpg-fips-1.0.7.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/jackson-annotations-2.14.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/jackson-core-2.14.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/jackson-databind-2.14.2.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 - chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-reports-scheduler/reports-scheduler.yml - chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/jvm.options - chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/opensearch.yml - chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-notifications-core - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-notifications-core/notifications-core.yml - chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-notifications - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-notifications/notifications.yml - chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/agent-stats-metadata - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/log4j2.xml - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/opensearch_security.policy - 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_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 - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/audit.yml - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/config.yml - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/internal_users.yml - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/nodes_dn.yml - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/opensearch.yml.example - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/roles.yml - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/roles_mapping.yml - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/tenants.yml - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/whitelist.yml - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/allowlist.yml - chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/jvm.options.d - chmod 440 $(TARGET_DIR)$(INSTALLATION_DIR)/VERSION - chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/log4j2.properties + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/usr/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/usr/lib/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/usr/lib/tmpfiles.d/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/usr/lib/tmpfiles.d/wazuh-indexer.conf + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/usr/lib/sysctl.d/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/usr/lib/sysctl.d/wazuh-indexer.conf + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/usr/lib/systemd/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/usr/lib/systemd/system/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/usr/lib/systemd/system/wazuh-indexer.service + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/usr/lib/systemd/system/wazuh-indexer-performance-analyzer.service chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/NOTICE.txt - 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.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/common-utils-2.8.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 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/guava-31.0.1-jre.jar - 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 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/jackson-annotations-2.14.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/jackson-databind-2.14.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/json-20220924.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/json-base-2.2.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/json-flattener-0.15.1.jar - 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/common-utils-2.8.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.8.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 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/jackson-annotations-2.14.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/jackson-databind-2.14.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/json-base-2.2.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/json-flattener-0.15.1.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/geo-2.8.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.8.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.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/slf4j-api-1.7.36.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.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-2.8.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.8.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 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/antlr4-runtime-4.7.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/json-20180813.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/NOTICE.txt - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/resilience4j-retry-1.5.0.jar - 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.8.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.8.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.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-ssl-config-2.8.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.8.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.8.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.8.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 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/checker-qual-3.12.0.jar - 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.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/jackson-databind-2.14.2.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.8.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 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/spring-context-5.3.22.jar - 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.8.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.8.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.8.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.8.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 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/kotlin-stdlib-jdk8-1.6.0.jar - 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.8.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 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/LICENSE.txt - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/NOTICE.txt - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/guava-30.0-jre.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/lib - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/lib/libgomp.so.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/lib/libopensearchknn_common.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/lib/libopensearchknn_faiss.so - 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.8.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.8.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 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/httpcore-4.4.15.jar - 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.8.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.8.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 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/javax.annotation-api-1.3.2.jar - 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.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.29.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.52.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/grpc-context-1.52.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/grpc-core-1.52.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/grpc-netty-1.52.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/grpc-protobuf-1.52.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/grpc-protobuf-lite-1.52.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/grpc-stub-1.52.1.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-31.1-jre.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/jackson-annotations-2.14.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/jackson-databind-2.14.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/jackson-module-paranamer-2.14.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-buffer-4.1.87.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-codec-4.1.87.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-codec-http-4.1.87.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-codec-http2-4.1.87.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-codec-socks-4.1.87.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-common-4.1.87.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-handler-4.1.87.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-handler-proxy-4.1.87.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-resolver-4.1.87.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-transport-4.1.87.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-transport-native-unix-common-4.1.87.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.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/protobuf-java-3.21.12.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/proto-google-common-protos-2.9.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/protobuf-java-3.21.12.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler/opensearch-job-scheduler-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler/failureaccess-1.0.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler/opensearch-job-scheduler-spi-2.8.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.8.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 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/java-saml-2.5.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler/guava-31.0.1-jre.jar + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/common-utils-2.8.0.0.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/tokenizers-0.19.0.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/opensearch-ml-algorithms-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jline-reader-3.21.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-ml-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/randomcutforest-parkservices-3.0-rc3.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/reflections-0.9.12.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-common-libsvm-4.2.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/protostuff-core-1.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/api-0.19.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/j2objc-annotations-1.3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/gson-2.9.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/randomcutforest-testutils-3.0-rc3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-rest-client-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-anomaly-core-4.2.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/tribuo-regression-core-4.2.1.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/protostuff-runtime-1.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jsr305-3.0.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jansi-2.4.0.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/commons-beanutils-1.9.4.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-io-2.11.0.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-anomaly-libsvm-4.2.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-clustering-core-4.2.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/commons-compress-1.21.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jackson-databind-2.15.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jline-terminal-jansi-3.21.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/commons-collections4-4.4.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jackson-annotations-2.15.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-core-4.2.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-common-sgd-4.2.1.jar + 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/commons-logging-1.2.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 + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/httpcore-nio-4.4.15.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/pytorch-engine-0.19.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-math-4.2.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/onnxruntime_gpu-1.13.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jline-terminal-3.21.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-ml-common-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/libsvm-3.25.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/jline-style-3.21.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/failureaccess-1.0.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-clustering-kmeans-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/commons-collections-3.2.2.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/opencsv-5.4.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/commons-lang3-3.10.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/protostuff-api-1.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/httpcore-4.4.15.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/randomcutforest-core-3.0-rc3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/plugin-security.policy + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/protostuff-collectionschema-1.8.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/plugin-descriptor.properties + 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/tribuo-regression-sgd-4.2.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-data-4.2.1.jar + 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/commons-codec-1.15.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/guava-31.0.1-jre.jar + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/woodstox-core-6.4.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jjwt-impl-0.10.8.jar + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/ + chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/securityadmin.sh + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/SECURITY_ADMIN_TESTS.md + chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/audit_config_migrater.sh + chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/hash.sh chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/minimal-json-0.9.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-security-api-3.4.5.jar - 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.8.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.8.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.5.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-xmlsec-impl-3.4.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/txw2-2.3.4.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/cxf-core-3.5.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/metrics-core-3.1.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-soap-impl-3.4.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jsr305-3.0.2.jar - 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/parent-join-client-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-transport-native-unix-common-4.1.91.Final.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/mapper-extras-client-2.8.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/error_prone_annotations-2.3.4.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/commons-lang-2.4.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/json-smart-2.4.10.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-soap-api-3.4.5.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/j2objc-annotations-1.3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-buffer-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/stax2-api-4.2.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/transport-netty4-client-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/zxcvbn-1.7.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/netty-resolver-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensearch-rest-client-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/commons-codec-1.14.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jakarta.activation-1.2.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/java-saml-core-2.5.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-core-3.4.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/commons-cli-1.3.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/lang-mustache-client-2.8.0.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/netty-common-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jsr305-3.0.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/bcpkix-jdk15on-1.70.jar 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.8.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.8.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.8.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 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/SECURITY_ADMIN_TESTS.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/config.yml - chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/hash.sh - chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/securityadmin.sh - chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/audit_config_migrater.sh - chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/wazuh-certs-tool.sh - chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/wazuh-passwords-tool.sh + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/commons-text-1.10.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/guava-30.0-jre.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-xmlsec-impl-3.4.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/xmlschema-core-2.2.5.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-handler-4.1.91.Final.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/jackson-databind-2.15.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-core-3.4.5.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/aggs-matrix-stats-client-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jackson-annotations-2.15.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/cxf-core-3.5.5.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-soap-impl-3.4.5.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/xmlsec-2.2.3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/ldaptive-1.2.3.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.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensearch-rest-client-2.8.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/compiler-0.9.10.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/commons-logging-1.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/zstd-jni-1.5.2-1.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.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/cxf-rt-security-3.5.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 + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/httpcore-nio-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/cxf-rt-rs-security-jose-3.5.5.jar + 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/lz4-java-1.8.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-profile-api-3.4.5.jar - 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.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 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/checker-qual-3.5.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/compiler-0.9.10.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/java-saml-2.5.0.jar + 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/opensaml-security-api-3.4.5.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/cryptacular-1.2.4.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/error_prone_annotations-2.3.4.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/netty-transport-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/asm-9.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensearch-security-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/cxf-rt-security-3.5.5.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-codec-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/rank-eval-client-2.8.0.jar 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.2.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/opensaml-saml-api-3.4.5.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/accessors-smart-2.4.7.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/commons-cli-1.3.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensearch-rest-high-level-client-2.8.0.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/cxf-rt-rs-json-basic-3.5.5.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-codec-http-4.1.91.Final.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/kafka-clients-3.4.0.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/checker-qual-3.5.0.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/log4j-slf4j-impl-2.17.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/metrics-core-3.1.2.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.87.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-codec-4.1.87.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-codec-http-4.1.87.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-common-4.1.87.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-handler-4.1.87.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-resolver-4.1.87.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-transport-4.1.87.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-transport-native-unix-common-4.1.87.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.14.2.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.8.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.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/opensearch-security-analytics-2.8.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-security/httpcore-4.4.15.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/plugin-security.policy + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/snappy-java-1.1.8.4.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jaxb-runtime-2.3.4.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/txw2-2.3.4.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/istack-commons-runtime-3.0.12.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/plugin-descriptor.properties + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/httpasyncclient-4.1.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/bcprov-jdk15on-1.67.jar + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/common-utils-2.8.0.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/annotations-13.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/NOTICE.txt + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/opensearch-index-management-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/opensearch-index-management-spi-2.8.0.0.jar + 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/kotlin-stdlib-1.8.21.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/kotlin-stdlib-common-1.8.21.jar + 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/LICENSE.txt + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/httpcore-4.4.15.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/kotlin-stdlib-jdk7-1.8.21.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/plugin-security.policy + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/plugin-descriptor.properties + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/httpclient-4.5.13.jar + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/common-utils-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/javassist-3.29.2-GA.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/reflections-0.9.12.jar 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.8.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/opensearch-neural-search-2.8.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/opensearch-ml-client-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/LICENSE.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/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.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/plugin-descriptor.properties + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/common-utils-2.8.0.0.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/plugin-security.policy + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/opensearch-notifications-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/plugin-descriptor.properties + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/kotlin-stdlib-common-1.6.10.jar + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search/ chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search/common-utils-2.8.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/opensearch-asynchronous-search-2.8.0.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search/plugin-security.policy - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/commons-lang3-3.12.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/commons-lang-2.6.jar - 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.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/opensearch-anomaly-detection-2.8.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.8.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 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/commons-math3-3.6.1.jar - 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.14.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/jackson-databind-2.14.1.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 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/protostuff-core-1.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/protostuff-runtime-1.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/randomcutforest-core-3.0-rc3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/randomcutforest-parkservices-3.0-rc3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/randomcutforest-serialization-3.0-rc3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/commons-logging-1.2.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial - 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.8.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.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/h3-2.8.0.0.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search/plugin-descriptor.properties + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/common-utils-2.8.0.0.jar 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 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/httpasyncclient-4.1.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/cron-utils-9.1.6.jar - 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/annotations-13.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/commons-digester-2.1.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.8.0.0.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/opensearch-rest-client-2.8.0.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/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/kotlin-stdlib-1.6.10.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/commons-beanutils-1.9.4.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/cron-utils-9.1.6.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/guava-30.0-jre.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/ipaddress-5.3.3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/commons-codec-1.13.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/commons-logging-1.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/httpcore-nio-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/javassist-3.27.0-GA.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/failureaccess-1.0.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/slf4j-api-1.7.30.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/kotlinx-coroutines-core-1.1.1.jar - 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.8.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.8.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.8.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 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/failureaccess-1.0.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/commons-beanutils-1.9.4.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/commons-collections-3.2.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/commons-digester-2.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/percolator-client-2.8.0.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/commons-validator-1.7.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/kotlin-stdlib-1.6.10.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/httpcore-4.4.15.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/plugin-security.policy + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/opensearch-alerting-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/plugin-descriptor.properties + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/httpasyncclient-4.1.5.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/httpclient-4.5.13.jar 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.8.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.8.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 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/commons-collections4-4.4.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/commons-io-2.11.0.jar - 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.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.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.14.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jackson-databind-2.14.2.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 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jline-reader-3.21.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jline-style-3.21.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jline-terminal-3.21.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jline-terminal-jansi-3.21.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/libsvm-3.25.jar - 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.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-ml-algorithms-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-ml-common-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-rest-client-2.8.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.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 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/protostuff-runtime-1.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/randomcutforest-core-3.0-rc3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/randomcutforest-parkservices-3.0-rc3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/randomcutforest-testutils-3.0-rc3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/reflections-0.9.12.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-anomaly-core-4.2.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-anomaly-libsvm-4.2.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-clustering-core-4.2.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-clustering-kmeans-4.2.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-common-libsvm-4.2.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-common-sgd-4.2.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-core-4.2.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-data-4.2.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-math-4.2.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-regression-core-4.2.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-regression-sgd-4.2.1.jar - 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_gpu-1.13.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 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/google-java-format-1.10.0.jar + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/common-utils-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/datasources-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-sql-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/okhttp-4.9.3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/parent-join-client-2.8.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/json-20230227.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/core-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/reflections-0.9.12.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/annotations-13.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/j2objc-annotations-1.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/opensearch-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/bcprov-ext-jdk15on-1.70.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-rest-client-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/NOTICE.txt + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/icu4j-58.2.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/ion-java-1.0.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/vavr-0.10.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/jsr305-3.0.2.jar + 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/checker-qual-3.12.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/sql-2.8.0.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-ssl-config-2.8.0.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/ST4-4.0.8.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/org.abego.treelayout.core-1.0.3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/jackson-databind-2.15.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/druid-1.0.15.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/legacy-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/jackson-annotations-2.15.1.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/kotlin-reflect-1.4.30.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/aws-encryption-sdk-java-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/geo-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/jmespath-java-1.12.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/antlr4-runtime-4.7.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/commons-logging-1.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/javassist-3.26.0-GA.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/commons-io-2.8.0.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/vavr-match-0.10.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-ml-client-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/reindex-client-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/protocol-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/prometheus-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/failureaccess-1.0.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/commons-lang3-3.12.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/antlr4-4.7.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/ppl-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/LICENSE.txt + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/httpcore-4.4.15.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/aws-java-sdk-core-1.12.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/aws-java-sdk-sts-1.12.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/plugin-security.policy + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/slf4j-api-1.7.36.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/common-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/resilience4j-retry-1.5.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/plugin-descriptor.properties + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/httpasyncclient-4.1.5.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/httpclient-4.5.13.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/gson-2.8.9.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/presto-matching-0.240.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/guava-31.0.1-jre.jar + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/NOTICE.txt + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/geo-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/opensearch-geospatial-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/commons-lang3-3.12.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/h3-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/LICENSE.txt + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/plugin-descriptor.properties + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/common-utils-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/json-20230227.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/json-flattener-0.15.1.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/json-base-2.2.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/opensearch-reports-scheduler-2.8.0.0.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/jackson-annotations-2.14.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/kotlin-test-1.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/jackson-databind-2.14.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/plugin-security.policy + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/plugin-descriptor.properties + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/gson-2.8.9.jar + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/common-utils-2.8.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/opensearch-cross-cluster-replication-2.8.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/ipaddress-5.3.3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/kotlinx-coroutines-core-jvm-1.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/kotlin-stdlib-jdk8-1.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/kotlin-stdlib-jdk7-1.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/plugin-descriptor.properties + 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/NOTICE.txt + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/opensearch-knn-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/guava-30.0-jre.jar + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/lib/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/lib/libopensearchknn_common.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/lib/libopensearchknn_nmslib.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/lib/libgomp.so.1 + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/lib/libopensearchknn_faiss.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/failureaccess-1.0.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/LICENSE.txt + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/plugin-security.policy + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/plugin-descriptor.properties + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/commons-lang-2.6.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/common-utils-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/commons-math3-3.6.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/opensearch-anomaly-detection-2.8.0.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/randomcutforest-parkservices-3.0-rc3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/protostuff-core-1.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/opensearch-rest-client-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/protostuff-runtime-1.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/randomcutforest-serialization-3.0-rc3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/jackson-annotations-2.14.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/commons-logging-1.2.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/httpcore-nio-4.4.15.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/commons-lang3-3.12.0.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/jackson-databind-2.14.1.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/httpcore-4.4.15.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/randomcutforest-core-3.0-rc3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/plugin-security.policy + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/protostuff-collectionschema-1.8.0.jar + 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/plugin-descriptor.properties + 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/httpclient-4.5.13.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/gson-2.8.9.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/commons-codec-1.15.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 chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/aws-java-sdk-ses-1.12.48.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/aws-java-sdk-sns-1.12.48.jar - 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.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/jackson-databind-2.14.2.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/jackson-databind-2.15.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/aws-java-sdk-sns-1.12.48.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/jackson-annotations-2.15.1.jar + 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/commons-logging-1.2.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/opensearch-notifications-core-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/activation-1.1.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/opensearch-notifications-core-spi-2.8.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/httpcore-4.4.15.jar 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.8.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.8.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.58.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/aws-java-sdk-core-1.12.48.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/plugin-descriptor.properties + 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/kotlin-stdlib-common-1.6.10.jar + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/common-utils-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/opensearch-rest-client-2.8.0.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/cron-utils-9.1.6.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/opensearch-security-analytics-2.8.0.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/httpcore-nio-4.4.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/antlr4-runtime-4.10.1.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/plugin-security.policy + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/plugin-descriptor.properties + 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/commons-codec-1.15.jar + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/common-utils-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/json-20230227.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/json-flattener-0.15.1.jar + 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 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/json-base-2.2.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/jackson-annotations-2.14.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/opensearch-observability-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/jackson-databind-2.14.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/plugin-security.policy + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/plugin-descriptor.properties + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/jackson-module-paranamer-2.15.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/opensearch-performance-analyzer-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-transport-native-unix-common-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/performance-analyzer-commons-1.0.0.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/netty-buffer-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-resolver-4.1.91.Final.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/netty-handler-proxy-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-common-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/objenesis-3.0.1.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/bcpkix-jdk15on-1.70.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/byte-buddy-1.9.7.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-handler-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-codec-socks-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/jackson-databind-2.15.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/jackson-annotations-2.15.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-codec-http2-4.1.91.Final.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/netty-transport-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-codec-4.1.91.Final.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/commons-lang3-3.12.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-codec-http-4.1.91.Final.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/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/checker-qual-3.29.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/mockito-core-2.23.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/byte-buddy-agent-1.9.7.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/plugin-security.policy + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/guava-31.1-jre.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/plugin-descriptor.properties + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/error_prone_annotations-2.9.0.jar + 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/opensearch-grok-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/joni-2.1.44.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/opensearch-dissect-2.8.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.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/joni-2.1.44.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.8.0.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/maxmind-db-2.1.0.jar - 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.8.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.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/jackson-annotations-2.14.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/jackson-databind-2.14.2.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.8.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.8.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.8.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/ingest-common/jcodings-1.0.58.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/plugin-descriptor.properties + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/repository-url/ chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/repository-url/repository-url-2.8.0.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-mustache - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-mustache/lang-mustache-client-2.8.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.8.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.8.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.87.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-codec-4.1.87.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-codec-http-4.1.87.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-common-4.1.87.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-handler-4.1.87.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-resolver-4.1.87.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-transport-4.1.87.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-transport-native-unix-common-4.1.87.Final.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/lang-expression-2.8.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.11.1.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.5.0.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.8.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.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/antlr4-runtime-4.11.1.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.8.0.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/repository-url/plugin-security.policy + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/repository-url/plugin-descriptor.properties + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/percolator/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/percolator/percolator-client-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/percolator/plugin-descriptor.properties + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/search-pipeline-common/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/search-pipeline-common/search-pipeline-common-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/search-pipeline-common/plugin-descriptor.properties + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/opensearch-rest-client-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/opensearch-ssl-config-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/opensearch-dashboards-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/commons-logging-1.2.jar 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.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/httpcore-4.4.15.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.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/httpasyncclient-4.1.5.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.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/opensearch-ssl-config-2.8.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.8.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 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/lang-painless-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/asm-tree-9.5.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/asm-analysis-9.5.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/antlr4-runtime-4.11.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/asm-9.5.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/opensearch-scripting-painless-spi-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/asm-util-9.5.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/plugin-security.policy + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/asm-commons-9.5.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/plugin-descriptor.properties + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/analysis-common/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/analysis-common/analysis-common-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/analysis-common/plugin-descriptor.properties + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/rank-eval/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/rank-eval/rank-eval-client-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/rank-eval/plugin-descriptor.properties + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/aggs-matrix-stats/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/aggs-matrix-stats/aggs-matrix-stats-client-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/aggs-matrix-stats/plugin-descriptor.properties + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/geo/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/geo/geo-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/geo/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.8.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 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-user-agent/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-user-agent/ingest-user-agent-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-user-agent/plugin-descriptor.properties + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/systemd/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/systemd/systemd-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/systemd/plugin-security.policy + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/systemd/plugin-descriptor.properties + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-transport-native-unix-common-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-buffer-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/transport-netty4-client-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-resolver-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-common-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-handler-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-transport-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-codec-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-codec-http-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/plugin-security.policy + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/plugin-descriptor.properties + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/parent-join/ chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/parent-join/parent-join-client-2.8.0.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/parent-join/plugin-descriptor.properties + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-mustache/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-mustache/lang-mustache-client-2.8.0.jar + 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 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-mustache/plugin-descriptor.properties + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/GeoLite2-ASN.mmdb + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/maxmind-db-2.1.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/jackson-databind-2.15.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/ingest-geoip-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/jackson-annotations-2.15.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/GeoLite2-Country.mmdb + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/geoip2-3.0.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/GeoLite2-City.mmdb + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/plugin-security.policy + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/plugin-descriptor.properties + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/opensearch-rest-client-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/opensearch-ssl-config-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/commons-logging-1.2.jar 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.8.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.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/transport-netty4/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/transport-netty4/plugin-security.policy + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/transport-netty4/plugin-descriptor.properties + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/parent-join/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/parent-join/plugin-descriptor.properties + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/httpcore-4.4.15.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/plugin-security.policy + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/plugin-descriptor.properties + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/httpasyncclient-4.1.5.jar 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.8.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 - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/parent-join - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/parent-join/plugin-descriptor.properties - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/transport-netty4 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/transport-netty4/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/transport-netty4/plugin-security.policy - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1 + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/asm-tree-9.5.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/lang-expression-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/lucene-expressions-9.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/antlr4-runtime-4.11.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/asm-9.5.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/plugin-security.policy + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/asm-commons-9.5.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/plugin-descriptor.properties + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/opensearch-upgrade-cli-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/jackson-core-2.15.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/jackson-databind-2.15.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/jackson-annotations-2.15.1.jar + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/plugin-cli/ + 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/plugin-cli/commons-compress-1.23.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/plugin-cli/bcpg-fips-1.0.7.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/plugin-cli/opensearch-plugin-cli-2.8.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.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/log4j-core-2.17.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-misc-9.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-launchers-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-cli-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-core-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-core-2.15.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-spatial-extras-9.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jna-5.5.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-memory-9.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/hppc-0.8.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/log4j-api-2.17.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jts-core-1.15.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-secure-sm-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-x-content-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-backward-codecs-9.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-core-9.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/java-version-checker-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-dataformat-yaml-2.15.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-plugin-classloader-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-spatial3d-9.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-common-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-dataformat-cbor-2.15.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-suggest-9.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/t-digest-3.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-geo-2.8.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-grouping-9.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jopt-simple-5.0.4.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-sandbox-9.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-queryparser-9.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-highlighter-9.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-join-9.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-dataformat-smile-2.15.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/snakeyaml-2.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/joda-time-2.12.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/protobuf-java-3.22.3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-analysis-common-9.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/log4j-jul-2.17.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-queries-9.6.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/spatial4j-0.7.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/HdrHistogram-2.1.12.jar + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jmap.1 + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jconsole.1 + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jstack.1 chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jrunscript.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jcmd.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/java.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jdeprscan.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/javadoc.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jar.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jdb.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jpackage.1 chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jstatd.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/serialver.1 + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jdb.1 + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jinfo.1 + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/javap.1 + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/javadoc.1 + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/javac.1 chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/keytool.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jconsole.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jlink.1 + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/java.1 + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jcmd.1 + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jstat.1 chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jhsdb.1 chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jshell.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/rmiregistry.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/javac.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jstack.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jfr.1 chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jps.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jarsigner.1 + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jfr.1 + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jdeprscan.1 + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jar.1 + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jlink.1 + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/serialver.1 chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jmod.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jstat.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jinfo.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jmap.1 + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/rmiregistry.1 + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jpackage.1 chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jdeps.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/javap.1 - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jdeps - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/rmiregistry - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jrunscript - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jdeprscan - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jmap - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jps - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jstatd - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/java - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jdb - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jimage - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/javadoc - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jconsole - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jcmd - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jstack - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jinfo - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jpackage - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/serialver - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/javap - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/keytool - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jarsigner - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jhsdb - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jlink - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jfr - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jstat - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/javac - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jmod - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jshell + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jarsigner.1 + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.xml.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.management.rmi.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.attach.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.localedata.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.internal.opt.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.naming.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.sql.rowset.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.internal.le.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.dynalink.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jfr.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.smartcardio.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.editpad.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.security.jgss.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.crypto.cryptoki.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.nio.mapmode.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jsobject.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.incubator.vector.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.accessibility.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.compiler.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.prefs.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jdwp.agent.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.instrument.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.javadoc.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.unsupported.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.internal.vm.compiler.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.xml.dom.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jstatd.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.internal.jvmstat.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.security.auth.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.security.jgss.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.sql.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.management.agent.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.naming.dns.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.zipfs.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.transaction.xa.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.management.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.internal.ed.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.incubator.foreign.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.crypto.ec.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jshell.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.xml.crypto.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jcmd.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.management.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jpackage.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.compiler.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.logging.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.se.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.unsupported.desktop.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.httpserver.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.charsets.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.datatransfer.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.naming.rmi.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.scripting.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jlink.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jartool.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.rmi.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.net.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.net.http.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.management.jfr.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.hotspot.agent.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.security.sasl.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.sctp.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jdeps.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.random.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.internal.vm.ci.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.desktop.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.base.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jdi.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jconsole.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.internal.vm.compiler.management.jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/NOTICE + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/classfile_constants.h + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/linux/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/linux/jni_md.h + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/linux/jawt_md.h + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/jdwpTransport.h + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/jvmticmlr.h + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/jni.h + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/jvmti.h + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/jawt.h + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/jvm.cfg + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libawt_xawt.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libawt_headless.so + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/security/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/security/blocked.certs + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/security/default.policy + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/security/cacerts + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/security/public_suffix_list.dat + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjava.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libextnet.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjimage.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libnio.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libprefs.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjaas.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjawt.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/jspawnhelper + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjdwp.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libawt.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/psfont.properties.ja + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libmanagement.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjsig.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/tzdb.dat + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/modules + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/server/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/server/libjsig.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/server/classes.jsa + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/server/classes_nocoops.jsa + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/server/libjvm.so + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/jfr/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/jfr/profile.jfc + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/jfr/default.jfc + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libattach.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libdt_socket.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjsound.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/psfontj2d.properties + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjavajpeg.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/ct.sym + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libnet.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/classlist + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libj2gss.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libmanagement_agent.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libsplashscreen.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libj2pcsc.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libverify.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/jrt-fs.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libsyslookup.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libmanagement_ext.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libj2pkcs11.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjsvml.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libsaproc.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libinstrument.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjli.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libsctp.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libfontmanager.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/liblcms.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/librmi.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/jexec + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libzip.so + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libmlib_image.so + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/javadoc + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jmod + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jpackage + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jrunscript + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jhsdb + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jstat + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jdb + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jdeprscan + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/java + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/rmiregistry + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/javac + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jconsole + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jlink + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jfr + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jinfo + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/serialver + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jps + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jcmd + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/javap + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/keytool + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jstatd + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jstack + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jdeps + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jshell + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jimage + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jmap + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jarsigner + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/release - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/LICENSE - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/ADDITIONAL_LICENSE_INFO - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/icu.md + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.instrument/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.net/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.crypto.cryptoki/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.crypto.cryptoki/pkcs11cryptotoken.md + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.crypto.cryptoki/pkcs11wrapper.md + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.security.auth/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.smartcardio/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.smartcardio/pcsclite.md + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.zipfs/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.localedata/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.localedata/thaidict.md + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.prefs/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.dynalink/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.dynalink/dynalink.md + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.jpackage/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.management/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.internal.jvmstat/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.xml.crypto/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.xml.crypto/santuario.md + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.net.http/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.unsupported/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.datatransfer/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.jdi/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.incubator.vector/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.charsets/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.management.jfr/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.accessibility/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.jartool/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.security.sasl/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.internal.ed/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.editpad/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.httpserver/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/ chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/c-libutl.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/public_suffix.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/cldr.md + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/icu.md chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/aes.md + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/cldr.md + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/public_suffix.md chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/ASSEMBLY_EXCEPTION - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/asm.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/unicode.md - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.security.sasl - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.scripting - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.dynalink/dynalink.md - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.management - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.javadoc/jqueryUI.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.javadoc/jquery.md - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.xml + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/ADDITIONAL_LICENSE_INFO + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/asm.md + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/unicode.md + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/LICENSE + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.jcmd/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.internal.opt/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.internal.opt/jopt-simple.md + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.scripting/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.xml/ chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.xml/xalan.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.xml/xerces.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.xml/jcup.md chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.xml/bcel.md + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.xml/jcup.md + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.xml/xerces.md chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.xml/dom.md - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.smartcardio - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.smartcardio/pcsclite.md - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.transaction.xa - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.prefs - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.compiler - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.logging - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.internal.opt/jopt-simple.md - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.xml.crypto - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.xml.crypto/santuario.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.localedata/thaidict.md - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.sql.rowset - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.net.http - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.rmi - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.sql - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.naming - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.datatransfer + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.jdeps/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.jstatd/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.management.agent/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.random/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.sctp/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.sql/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.nio.mapmode/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.hotspot.agent/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.attach/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.naming/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.management/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.sql.rowset/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.rmi/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.internal.vm.compiler/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.unsupported.desktop/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.logging/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.security.jgss/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.internal.vm.compiler.management/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.jfr/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.transaction.xa/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.crypto.ec/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.internal.vm.ci/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.naming.rmi/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.xml.dom/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.internal.le/ chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.internal.le/jline.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.crypto.cryptoki/pkcs11cryptotoken.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.crypto.cryptoki/pkcs11wrapper.md - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.instrument - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.management.rmi - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.desktop + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.jsobject/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.jdwp.agent/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.se/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.compiler/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.incubator.foreign/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.jshell/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.javadoc/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.javadoc/jquery.md + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.javadoc/jqueryUI.md + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.compiler/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.security.jgss/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.jconsole/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.naming.dns/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.management.rmi/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.desktop/ chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.desktop/xwd.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.desktop/mesa3d.md chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.desktop/harfbuzz.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.desktop/lcms.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.desktop/giflib.md + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.desktop/libpng.md chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.desktop/jpeg.md chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.desktop/colorimaging.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.desktop/libpng.md - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/server - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/server/libjsig.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/server/classes.jsa - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/server/classes_nocoops.jsa - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/server/libjvm.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libawt.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libawt_headless.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libsplashscreen.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libnio.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjdwp.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libj2pcsc.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjli.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libsctp.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjimage.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjsig.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjava.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/liblcms.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libawt_xawt.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/jexec - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libverify.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libmanagement_agent.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/psfont.properties.ja - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libprefs.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libzip.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjaas.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjsound.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libextnet.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libj2gss.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/tzdb.dat - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libdt_socket.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/psfontj2d.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/jvm.cfg - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/ct.sym - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libj2pkcs11.so - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/jfr - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/jfr/default.jfc - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/jfr/profile.jfc - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libmanagement_ext.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/classlist - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libnet.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjavajpeg.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libfontmanager.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/modules - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libinstrument.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libmanagement.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjawt.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libsaproc.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libmlib_image.so - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/security - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/security/cacerts - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/security/public_suffix_list.dat - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/security/default.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/librmi.so - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/jspawnhelper - 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/jvmti.h - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/classfile_constants.h - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/jdwpTransport.h - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/jawt.h - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/jni.h - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/jvmticmlr.h - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/linux - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/linux/jawt_md.h - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/linux/jni_md.h - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/net.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/sound.properties - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/sdp - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/sdp/sdp.conf.template - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/management - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/management/management.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/management/jmxremote.access - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/management/jmxremote.password.template - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/logging.properties - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.desktop/mesa3d.md + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.desktop/giflib.md + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.desktop/lcms.md + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.jlink/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/ chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/java.policy - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/policy - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/policy/limited - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/policy/limited/default_US_export.policy + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/java.security + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/policy/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/policy/limited/ chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/policy/limited/exempt_local.policy chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/policy/limited/default_local.policy - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/policy/unlimited - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/policy/unlimited/default_US_export.policy + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/policy/limited/default_US_export.policy + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/policy/unlimited/ chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/policy/unlimited/default_local.policy + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/policy/unlimited/default_US_export.policy chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/policy/README.txt - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/java.security - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.unsupported.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.transaction.xa.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.crypto.cryptoki.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.rmi.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.attach.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jshell.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.xml.dom.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.se.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.internal.ed.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jartool.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.compiler.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.base.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.smartcardio.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.security.auth.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.unsupported.desktop.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.security.sasl.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.incubator.foreign.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.management.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.management.agent.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.xml.crypto.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.internal.vm.ci.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.prefs.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.crypto.ec.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.internal.jvmstat.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.sql.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.xml.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.security.jgss.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.compiler.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.sctp.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.charsets.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.management.jfr.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jlink.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.localedata.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jsobject.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.net.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.hotspot.agent.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jstatd.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.dynalink.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jfr.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.naming.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.internal.le.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jcmd.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.management.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.net.http.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.logging.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.accessibility.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.internal.opt.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.management.rmi.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.security.jgss.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.desktop.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.nio.mapmode.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.internal.vm.compiler.management.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jdwp.agent.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jdi.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.javadoc.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.naming.rmi.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.naming.dns.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.editpad.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jdeps.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.internal.vm.compiler.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.sql.rowset.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.scripting.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.datatransfer.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.httpserver.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.zipfs.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jconsole.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.instrument.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/NOTICE - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.incubator.vector.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jpackage.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.random.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjsvml.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libsyslookup.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/security/blocked.certs + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/logging.properties + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/net.properties + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/sound.properties + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/sdp/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/sdp/sdp.conf.template + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/management/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/management/jmxremote.access + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/management/management.properties + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/management/jmxremote.password.template + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/etc/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/etc/wazuh-indexer/ + chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/ + chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/internal_users.yml + chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/audit.yml + chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/opensearch.yml.example + chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/roles.yml + chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/tenants.yml + chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/whitelist.yml + chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/action_groups.yml + chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/allowlist.yml + chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/roles_mapping.yml + chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/nodes_dn.yml + chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/config.yml + chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-notifications/ + chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-notifications/notifications.yml + chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/jvm.options + chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/jvm.options.d/ + chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-reports-scheduler/ + chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-reports-scheduler/reports-scheduler.yml + chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/log4j2.properties + chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-notifications-core/ + chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-notifications-core/notifications-core.yml + chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/opensearch.yml + chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-observability/ + chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-observability/observability.yml + chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/ + chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/agent-stats-metadata + 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/log4j2.xml + chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/rca.conf + 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/supervisord.conf + chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/opensearch_security.policy + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/etc/sysconfig/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/etc/sysconfig/wazuh-indexer + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/etc/init.d/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/etc/init.d/wazuh-indexer + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/ + 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/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/log4j2.xml + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/rca.conf + 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/supervisord.conf + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/opensearch_security.policy + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/ + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/log4j-core-2.17.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-transport-native-unix-common-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/commons-lang3-3.9.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/jackson-core-2.15.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/performance-analyzer-commons-1.0.0-SNAPSHOT.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/j2objc-annotations-1.3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-buffer-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-resolver-4.1.91.Final.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/perfmark-api-0.25.0.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/netty-handler-proxy-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-common-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/performance-analyzer-rca-2.8.0.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/jsr305-3.0.2.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/netty-handler-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-codec-socks-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/jackson-databind-2.15.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/jackson-annotations-2.15.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-stub-1.52.1.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/netty-codec-http2-4.1.91.Final.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/grpc-context-1.52.1.jar + 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/error_prone_annotations-2.14.0.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-api-1.52.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/javax.annotation-api-1.3.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/annotations-4.1.1.4.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-transport-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-codec-4.1.91.Final.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/failureaccess-1.0.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-protobuf-1.52.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-codec-http-4.1.91.Final.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-netty-1.52.1.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-protobuf-lite-1.52.1.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/sqlite-jdbc-3.41.2.2.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/checker-qual-3.29.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/protobuf-java-3.22.3.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/guava-31.1-jre.jar + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-core-1.52.1.jar + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/bin/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/bin/performance-analyzer-agent + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/bin/performance-analyzer-rca + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-cli + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/systemd-entrypoint + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-upgrade + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-shard + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-plugin + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-node + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-env + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-env-from-file + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-keystore + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-performance-analyzer/ + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-performance-analyzer/performance-analyzer-agent-cli + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-performance-analyzer/performance-analyzer-agent + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/LICENSE.txt + chmod 440 $(TARGET_DIR)$(INSTALLATION_DIR)/VERSION # ----------------------------------------------------------------------------- From f76771eccd18f18b389fc2a2973ea6a952f9e345 Mon Sep 17 00:00:00 2001 From: Deblintrake09 Date: Thu, 31 Aug 2023 08:26:20 -0300 Subject: [PATCH 711/994] remove invalid files --- stack/indexer/deb/debian/rules | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index 8033c3ca7d..00f0588492 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -147,17 +147,7 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(SYS_DIR)/tmpfiles.d/$(NAME).conf chown root:root $(TARGET_DIR)$(SYS_DIR)/tmpfiles.d/$(NAME).conf - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/usr/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/usr/lib/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/usr/lib/tmpfiles.d/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/usr/lib/tmpfiles.d/wazuh-indexer.conf - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/usr/lib/sysctl.d/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/usr/lib/sysctl.d/wazuh-indexer.conf - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/usr/lib/systemd/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/usr/lib/systemd/system/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/usr/lib/systemd/system/wazuh-indexer.service - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/usr/lib/systemd/system/wazuh-indexer-performance-analyzer.service + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/ chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/NOTICE.txt chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/ chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler/ From b897d320ad9601c2b551449f134a73b73e3f7d25 Mon Sep 17 00:00:00 2001 From: Deblintrake09 Date: Thu, 31 Aug 2023 09:15:27 -0300 Subject: [PATCH 712/994] remove invalid files --- stack/indexer/deb/debian/rules | 2 -- 1 file changed, 2 deletions(-) diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index 00f0588492..7582f5af8f 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -1146,8 +1146,6 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/management/jmxremote.access chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/management/management.properties chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/management/jmxremote.password.template - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/etc/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/etc/wazuh-indexer/ chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/ chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/internal_users.yml chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/audit.yml From 5cde419f1848376ad0c2928f79bf14907f72dd50 Mon Sep 17 00:00:00 2001 From: Deblintrake09 Date: Thu, 31 Aug 2023 09:32:43 -0300 Subject: [PATCH 713/994] remove invalid files --- stack/indexer/deb/debian/rules | 4 ---- 1 file changed, 4 deletions(-) diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index 7582f5af8f..fd873373a5 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -1180,10 +1180,6 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/plugin-stats-metadata chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/supervisord.conf chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/opensearch_security.policy - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/etc/sysconfig/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/etc/sysconfig/wazuh-indexer - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/etc/init.d/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/etc/init.d/wazuh-indexer chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/ chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/ chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/agent-stats-metadata From b8ffbcea43a36bf146a5bad907a622f3c422238b Mon Sep 17 00:00:00 2001 From: Tostti Date: Thu, 31 Aug 2023 09:49:56 -0300 Subject: [PATCH 714/994] Improve quality --- wazuhapp/opensearch-dashboards/Docker/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/wazuhapp/opensearch-dashboards/Docker/build.sh b/wazuhapp/opensearch-dashboards/Docker/build.sh index d0f2cf2bed..776a767672 100755 --- a/wazuhapp/opensearch-dashboards/Docker/build.sh +++ b/wazuhapp/opensearch-dashboards/Docker/build.sh @@ -54,7 +54,7 @@ prepare_env() { fi if ! curl $wazuh_app_nvmrc_url -o "/tmp/.nvmrc" ; then - echo "Error downloading package.json from GitHub." + echo "Error downloading .nvmrc from GitHub." exit 1 fi wazuh_version=$(python -c 'import json, os; f=open("/tmp/package.json"); pkg=json.load(f); f.close();\ @@ -71,8 +71,7 @@ prepare_env() { exit 1 fi - plugin_platform_node_version=$(python -c 'import json, os; f=open("/tmp/.nvmrc"); pkg=f.readline(); f.close();\ - print(pkg)') + plugin_platform_node_version=$(cat /tmp/.nvmrc) plugin_platform_yarn_version=$(python -c 'import json, os; f=open("/tmp/package.json"); pkg=json.load(f); f.close();\ print(str(pkg["engines"]["yarn"]).replace("^",""))') From 43d889bcfb87c127d3d76c1e3ca9fed0378e2934 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 31 Aug 2023 10:20:44 -0300 Subject: [PATCH 715/994] change GRUB options --- ova/assets/custom/grub/grub | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ova/assets/custom/grub/grub b/ova/assets/custom/grub/grub index 2eb9b7ade9..6cc85d8b52 100644 --- a/ova/assets/custom/grub/grub +++ b/ova/assets/custom/grub/grub @@ -1,9 +1,8 @@ - -GRUB_CMDLINE_LINUX="console=tty12" +GRUB_CMDLINE_LINUX_DEFAULT="console=tty0 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0 nvme_core.io_timeout=4294967295 rd.emergency=poweroff quiet splash rd.plymouth=0 plymouth.enable=0 loglevel=0 systemd.show_status=0 systemd.log_level=0 vt.cur_default=0 rd.shell=0 root=/dev/sda1" GRUB_DEFAULT=0 GRUB_TIMEOUT=0 GRUB_HIDDEN_TIMEOUT=2 GRUB_DISABLE_RECOVERY="true" GRUB_DISABLE_SUBMENU=y -GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 biosdevname=0 quiet splash rd.plymouth=0 plymouth.enable=0 loglevel=0 systemd.show_status=0 systemd.log_level=0 vt.cur_default=0" +GRUB_DISABLE_LINUX_UUID=true GRUB_BACKGROUND="/boot/grub2/wazuh.png" \ No newline at end of file From 9e7dfaaf288a13b715b0c4331efa9a36d659d01a Mon Sep 17 00:00:00 2001 From: Deblintrake09 Date: Thu, 31 Aug 2023 10:30:07 -0300 Subject: [PATCH 716/994] bump wazuh dashboard to 2.8.0 --- stack/dashboard/base/builder.sh | 2 +- stack/indexer/deb/debian/rules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh index c88304df48..c474d56eca 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -16,7 +16,7 @@ revision="$2" future="$3" repository="$4" reference="$5" -opensearch_version="2.6.0" +opensearch_version="2.8.0" base_dir=/opt/wazuh-dashboard-base # ----------------------------------------------------------------------------- diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index fd873373a5..f2b9631011 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -1163,7 +1163,7 @@ override_dh_fixperms: chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/jvm.options chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/jvm.options.d/ chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-reports-scheduler/ - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-reports-scheduler/reports-scheduler.yml + chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-reports-scheduler/reports-scheduler.yml chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/log4j2.properties chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-notifications-core/ chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-notifications-core/notifications-core.yml From e67183174bb260a11aaf1924d0b70d3771efb85a Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Thu, 31 Aug 2023 16:30:39 +0200 Subject: [PATCH 717/994] Remove single file references --- stack/indexer/base/builder.sh | 8 +- stack/indexer/deb/debian/rules | 1124 +------------------------- stack/indexer/rpm/wazuh-indexer.spec | 1068 +----------------------- 3 files changed, 21 insertions(+), 2179 deletions(-) diff --git a/stack/indexer/base/builder.sh b/stack/indexer/base/builder.sh index e656a12a0a..bf864c9bf6 100644 --- a/stack/indexer/base/builder.sh +++ b/stack/indexer/base/builder.sh @@ -58,7 +58,7 @@ find -type l -exec rm -rf {} \; find -name "*.bat" -exec rm -rf {} \; rm -rf README.md manifest.yml opensearch-tar-install.sh logs sed -i 's|OPENSEARCH_DISTRIBUTION_TYPE=tar|OPENSEARCH_DISTRIBUTION_TYPE=rpm|g' bin/opensearch-env -sed -i 's|"$OPENSEARCH_HOME"/config|/etc/wazuh-indexer|g' bin/opensearch-env +sed -i 's|"$OPENSEARCH_HOME"/config|/etc/wazuh-indexer|g' bin/opensearch-env cp -r /root/stack/indexer/base/files/systemd-entrypoint bin/ mkdir -p ./etc/wazuh-indexer/ cp -r ./config/* ./etc/wazuh-indexer/ @@ -85,6 +85,12 @@ sed -i 's|-SNAPSHOT||g' "${base_dir}"/modules/systemd/plugin-descriptor.properti cd "${base_dir}" rm -rf OpenSearch +find -type d -exec chmod 750 {} \; +find -type f -perm 644 -exec chmod 640 {} \; +find -type f -perm 664 -exec chmod 660 {} \; +find -type f -perm 755 -exec chmod 750 {} \; +find -type f -perm 744 -exec chmod 740 {} \; + # ----------------------------------------------------------------------------- # Base output diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index 7582f5af8f..1d895ef4df 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -133,1135 +133,27 @@ override_dh_fixperms: chown -R $(USER):$(GROUP) $(TARGET_DIR)$(LIB_DIR) chmod 750 $(TARGET_DIR)$(LOG_DIR) chown -R $(USER):$(GROUP) $(TARGET_DIR)$(LOG_DIR) - chmod 660 $(TARGET_DIR)/etc/default/$(NAME) chown root:$(GROUP) $(TARGET_DIR)/etc/default/$(NAME) chmod 750 $(TARGET_DIR)/etc/init.d/$(NAME) chown root:root $(TARGET_DIR)/etc/init.d/$(NAME) - chmod 640 $(TARGET_DIR)$(SYS_DIR)/sysctl.d/$(NAME).conf chown root:root $(TARGET_DIR)$(SYS_DIR)/sysctl.d/$(NAME).conf - chmod 640 $(TARGET_DIR)$(SYS_DIR)/systemd/system/$(NAME).service chown root:root $(TARGET_DIR)$(SYS_DIR)/systemd/system/$(NAME).service - chmod 640 $(TARGET_DIR)$(SYS_DIR)/systemd/system/$(NAME)-performance-analyzer.service chown root:root $(TARGET_DIR)$(SYS_DIR)/systemd/system/$(NAME)-performance-analyzer.service chmod 640 $(TARGET_DIR)$(SYS_DIR)/tmpfiles.d/$(NAME).conf chown root:root $(TARGET_DIR)$(SYS_DIR)/tmpfiles.d/$(NAME).conf - - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/NOTICE.txt - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler/opensearch-job-scheduler-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler/failureaccess-1.0.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-job-scheduler/opensearch-job-scheduler-spi-2.8.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/guava-31.0.1-jre.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/common-utils-2.8.0.0.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/tokenizers-0.19.0.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/opensearch-ml-algorithms-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jline-reader-3.21.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-ml-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/randomcutforest-parkservices-3.0-rc3.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/reflections-0.9.12.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-common-libsvm-4.2.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/protostuff-core-1.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/api-0.19.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/j2objc-annotations-1.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/gson-2.9.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/randomcutforest-testutils-3.0-rc3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-rest-client-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-anomaly-core-4.2.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/tribuo-regression-core-4.2.1.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/protostuff-runtime-1.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jsr305-3.0.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jansi-2.4.0.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/commons-beanutils-1.9.4.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-io-2.11.0.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-anomaly-libsvm-4.2.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-clustering-core-4.2.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/commons-compress-1.21.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jackson-databind-2.15.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jline-terminal-jansi-3.21.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/commons-collections4-4.4.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jackson-annotations-2.15.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-core-4.2.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-common-sgd-4.2.1.jar - 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/commons-logging-1.2.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 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/httpcore-nio-4.4.15.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/pytorch-engine-0.19.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-math-4.2.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/onnxruntime_gpu-1.13.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/jline-terminal-3.21.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/opensearch-ml-common-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/libsvm-3.25.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/jline-style-3.21.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/failureaccess-1.0.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-clustering-kmeans-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/commons-collections-3.2.2.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/opencsv-5.4.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/commons-lang3-3.10.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/protostuff-api-1.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/httpcore-4.4.15.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/randomcutforest-core-3.0-rc3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/protostuff-collectionschema-1.8.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/plugin-descriptor.properties - 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/tribuo-regression-sgd-4.2.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/tribuo-data-4.2.1.jar - 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/commons-codec-1.15.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-ml/guava-31.0.1-jre.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/woodstox-core-6.4.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jjwt-impl-0.10.8.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/ - chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/securityadmin.sh - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/SECURITY_ADMIN_TESTS.md - chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/audit_config_migrater.sh - chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/hash.sh - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/minimal-json-0.9.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/parent-join-client-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-transport-native-unix-common-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/mapper-extras-client-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/error_prone_annotations-2.3.4.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/commons-lang-2.4.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/json-smart-2.4.10.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-soap-api-3.4.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/j2objc-annotations-1.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-buffer-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/stax2-api-4.2.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/transport-netty4-client-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/zxcvbn-1.7.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/netty-resolver-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensearch-rest-client-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/commons-codec-1.14.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jakarta.activation-1.2.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/java-saml-core-2.5.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/lang-mustache-client-2.8.0.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/netty-common-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jsr305-3.0.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/bcpkix-jdk15on-1.70.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/commons-lang3-3.4.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/eventbus-3.2.0.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/guava-30.0-jre.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-xmlsec-impl-3.4.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/xmlschema-core-2.2.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-handler-4.1.91.Final.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/jackson-databind-2.15.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-core-3.4.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/aggs-matrix-stats-client-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jackson-annotations-2.15.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/cxf-core-3.5.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-soap-impl-3.4.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/xmlsec-2.2.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/ldaptive-1.2.3.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/compiler-0.9.10.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/commons-logging-1.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/zstd-jni-1.5.2-1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/zjsonpatch-0.4.4.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/cxf-rt-rs-security-jose-3.5.5.jar - 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/lz4-java-1.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensaml-profile-api-3.4.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/java-saml-2.5.0.jar - 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/opensaml-security-api-3.4.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/cryptacular-1.2.4.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/netty-transport-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/asm-9.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensearch-security-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/cxf-rt-security-3.5.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-codec-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/rank-eval-client-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/failureaccess-1.0.1.jar - 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/slf4j-api-1.7.30.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/commons-cli-1.3.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/opensearch-rest-high-level-client-2.8.0.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/cxf-rt-rs-json-basic-3.5.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/netty-codec-http-4.1.91.Final.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/kafka-clients-3.4.0.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/checker-qual-3.5.0.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/log4j-slf4j-impl-2.17.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/metrics-core-3.1.2.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/httpcore-4.4.15.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/snappy-java-1.1.8.4.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/jaxb-runtime-2.3.4.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/txw2-2.3.4.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/istack-commons-runtime-3.0.12.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/httpasyncclient-4.1.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/bcprov-jdk15on-1.67.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/common-utils-2.8.0.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/annotations-13.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/NOTICE.txt - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/opensearch-index-management-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/opensearch-index-management-spi-2.8.0.0.jar - 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/kotlin-stdlib-1.8.21.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/kotlin-stdlib-common-1.8.21.jar - 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/LICENSE.txt - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/httpcore-4.4.15.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/kotlin-stdlib-jdk7-1.8.21.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-index-management/httpclient-4.5.13.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/common-utils-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/javassist-3.29.2-GA.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/reflections-0.9.12.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/NOTICE.txt - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/opensearch-neural-search-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/opensearch-ml-client-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/LICENSE.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/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-neural-search/plugin-descriptor.properties - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/common-utils-2.8.0.0.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/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/opensearch-notifications-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications/kotlin-stdlib-common-1.6.10.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search/common-utils-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search/opensearch-asynchronous-search-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-asynchronous-search/plugin-descriptor.properties - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/common-utils-2.8.0.0.jar - 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/annotations-13.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/commons-digester-2.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/j2objc-annotations-1.3.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/opensearch-rest-client-2.8.0.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/jsr305-3.0.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/kotlin-stdlib-1.6.10.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/commons-beanutils-1.9.4.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/cron-utils-9.1.6.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/guava-30.0-jre.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/ipaddress-5.3.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/commons-codec-1.13.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/commons-logging-1.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/httpcore-nio-4.4.15.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/javassist-3.27.0-GA.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/failureaccess-1.0.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/slf4j-api-1.7.30.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/kotlinx-coroutines-core-1.1.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/alerting-core-2.8.0.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/commons-collections-3.2.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/percolator-client-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/commons-validator-1.7.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/httpcore-4.4.15.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/opensearch-alerting-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/httpasyncclient-4.1.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-alerting/httpclient-4.5.13.jar - 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/google-java-format-1.10.0.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/common-utils-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/datasources-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-sql-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/okhttp-4.9.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/parent-join-client-2.8.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/json-20230227.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/core-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/reflections-0.9.12.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/annotations-13.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/j2objc-annotations-1.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/opensearch-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/bcprov-ext-jdk15on-1.70.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-rest-client-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/NOTICE.txt - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/icu4j-58.2.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/ion-java-1.0.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/vavr-0.10.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/jsr305-3.0.2.jar - 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/checker-qual-3.12.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/sql-2.8.0.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-ssl-config-2.8.0.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/ST4-4.0.8.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/org.abego.treelayout.core-1.0.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/jackson-databind-2.15.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/druid-1.0.15.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/legacy-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/jackson-annotations-2.15.1.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/kotlin-reflect-1.4.30.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/aws-encryption-sdk-java-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/geo-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/jmespath-java-1.12.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/antlr4-runtime-4.7.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/commons-logging-1.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/javassist-3.26.0-GA.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/commons-io-2.8.0.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/vavr-match-0.10.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/opensearch-ml-client-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/reindex-client-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/protocol-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/prometheus-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/failureaccess-1.0.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/commons-lang3-3.12.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/antlr4-4.7.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/ppl-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/LICENSE.txt - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/httpcore-4.4.15.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/aws-java-sdk-core-1.12.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/aws-java-sdk-sts-1.12.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/slf4j-api-1.7.36.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/common-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/resilience4j-retry-1.5.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/httpasyncclient-4.1.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/httpclient-4.5.13.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/gson-2.8.9.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/presto-matching-0.240.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-sql/guava-31.0.1-jre.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/NOTICE.txt - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/geo-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/opensearch-geospatial-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/commons-lang3-3.12.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/h3-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/LICENSE.txt - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-geospatial/plugin-descriptor.properties - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/common-utils-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/json-20230227.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/json-flattener-0.15.1.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/json-base-2.2.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/opensearch-reports-scheduler-2.8.0.0.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/jackson-annotations-2.14.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/kotlin-test-1.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/jackson-databind-2.14.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-reports-scheduler/gson-2.8.9.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/common-utils-2.8.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/opensearch-cross-cluster-replication-2.8.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/ipaddress-5.3.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/kotlinx-coroutines-core-jvm-1.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/kotlin-stdlib-jdk8-1.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/kotlin-stdlib-jdk7-1.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-cross-cluster-replication/plugin-descriptor.properties - 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/NOTICE.txt - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/opensearch-knn-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/guava-30.0-jre.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/lib/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/lib/libopensearchknn_common.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/lib/libopensearchknn_nmslib.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/lib/libgomp.so.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/lib/libopensearchknn_faiss.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/failureaccess-1.0.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/LICENSE.txt - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-knn/plugin-descriptor.properties - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/commons-lang-2.6.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/common-utils-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/commons-math3-3.6.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/opensearch-anomaly-detection-2.8.0.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/randomcutforest-parkservices-3.0-rc3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/protostuff-core-1.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/opensearch-rest-client-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/protostuff-runtime-1.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/randomcutforest-serialization-3.0-rc3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/jackson-annotations-2.14.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/commons-logging-1.2.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/httpcore-nio-4.4.15.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/commons-lang3-3.12.0.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/jackson-databind-2.14.1.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/httpcore-4.4.15.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/randomcutforest-core-3.0-rc3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/protostuff-collectionschema-1.8.0.jar - 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/plugin-descriptor.properties - 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/httpclient-4.5.13.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/gson-2.8.9.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-anomaly-detection/commons-codec-1.15.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/aws-java-sdk-ses-1.12.48.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/jackson-databind-2.15.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/aws-java-sdk-sns-1.12.48.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/jackson-annotations-2.15.1.jar - 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/commons-logging-1.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/opensearch-notifications-core-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/activation-1.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/opensearch-notifications-core-spi-2.8.0.0.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/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/aws-java-sdk-core-1.12.48.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-notifications-core/plugin-descriptor.properties - 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/kotlin-stdlib-common-1.6.10.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/common-utils-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/opensearch-rest-client-2.8.0.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/cron-utils-9.1.6.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/opensearch-security-analytics-2.8.0.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/httpcore-nio-4.4.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/antlr4-runtime-4.10.1.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/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security-analytics/plugin-descriptor.properties - 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/commons-codec-1.15.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/common-utils-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/json-20230227.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/json-flattener-0.15.1.jar - 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 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/json-base-2.2.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/jackson-annotations-2.14.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/opensearch-observability-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/jackson-databind-2.14.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-observability/plugin-descriptor.properties - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/jackson-module-paranamer-2.15.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/opensearch-performance-analyzer-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-transport-native-unix-common-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/performance-analyzer-commons-1.0.0.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/netty-buffer-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-resolver-4.1.91.Final.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/netty-handler-proxy-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-common-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/objenesis-3.0.1.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/bcpkix-jdk15on-1.70.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/byte-buddy-1.9.7.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-handler-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-codec-socks-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/jackson-databind-2.15.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/jackson-annotations-2.15.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-codec-http2-4.1.91.Final.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/netty-transport-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-codec-4.1.91.Final.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/commons-lang3-3.12.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/netty-codec-http-4.1.91.Final.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/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/checker-qual-3.29.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/mockito-core-2.23.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/byte-buddy-agent-1.9.7.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/guava-31.1-jre.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-performance-analyzer/error_prone_annotations-2.9.0.jar - 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/opensearch-grok-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/joni-2.1.44.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/opensearch-dissect-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/ingest-common-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/jcodings-1.0.58.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-common/plugin-descriptor.properties - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/repository-url/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/repository-url/repository-url-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/repository-url/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/repository-url/plugin-descriptor.properties - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/percolator/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/percolator/percolator-client-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/percolator/plugin-descriptor.properties - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/search-pipeline-common/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/search-pipeline-common/search-pipeline-common-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/search-pipeline-common/plugin-descriptor.properties - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/opensearch-rest-client-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/opensearch-ssl-config-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/opensearch-dashboards-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/commons-logging-1.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/httpcore-nio-4.4.15.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/reindex-client-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/httpcore-4.4.15.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/httpasyncclient-4.1.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/httpclient-4.5.13.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/opensearch-dashboards/commons-codec-1.15.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/lang-painless-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/asm-tree-9.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/asm-analysis-9.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/antlr4-runtime-4.11.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/asm-9.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/opensearch-scripting-painless-spi-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/asm-util-9.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/asm-commons-9.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-painless/plugin-descriptor.properties - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/analysis-common/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/analysis-common/analysis-common-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/analysis-common/plugin-descriptor.properties - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/rank-eval/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/rank-eval/rank-eval-client-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/rank-eval/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/aggs-matrix-stats/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/aggs-matrix-stats/aggs-matrix-stats-client-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/aggs-matrix-stats/plugin-descriptor.properties - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/geo/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/geo/geo-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/geo/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.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/mapper-extras/plugin-descriptor.properties - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-user-agent/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-user-agent/ingest-user-agent-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-user-agent/plugin-descriptor.properties - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/systemd/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/systemd/systemd-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/systemd/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/systemd/plugin-descriptor.properties - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-transport-native-unix-common-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-buffer-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/transport-netty4-client-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-resolver-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-common-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-handler-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-transport-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-codec-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/netty-codec-http-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/transport-netty4/plugin-descriptor.properties - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/parent-join/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/parent-join/parent-join-client-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/parent-join/plugin-descriptor.properties - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-mustache/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-mustache/lang-mustache-client-2.8.0.jar - 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 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-mustache/plugin-descriptor.properties - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/GeoLite2-ASN.mmdb - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/maxmind-db-2.1.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/jackson-databind-2.15.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/ingest-geoip-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/jackson-annotations-2.15.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/GeoLite2-Country.mmdb - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/geoip2-3.0.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/GeoLite2-City.mmdb - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/ingest-geoip/plugin-descriptor.properties - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/opensearch-rest-client-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/opensearch-ssl-config-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/commons-logging-1.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/httpcore-nio-4.4.15.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/reindex-client-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/transport-netty4/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/transport-netty4/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/transport-netty4/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/parent-join/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/parent-join/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/httpcore-4.4.15.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/plugin-descriptor.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/httpasyncclient-4.1.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/httpclient-4.5.13.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/reindex/commons-codec-1.15.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/asm-tree-9.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/lang-expression-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/lucene-expressions-9.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/antlr4-runtime-4.11.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/asm-9.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/plugin-security.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/asm-commons-9.5.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/lang-expression/plugin-descriptor.properties - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/opensearch-upgrade-cli-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/jackson-core-2.15.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/jackson-databind-2.15.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/upgrade-cli/jackson-annotations-2.15.1.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/plugin-cli/ - 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/plugin-cli/commons-compress-1.23.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/plugin-cli/bcpg-fips-1.0.7.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/tools/plugin-cli/opensearch-plugin-cli-2.8.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.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/log4j-core-2.17.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-misc-9.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-launchers-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-cli-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-core-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-core-2.15.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-spatial-extras-9.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jna-5.5.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-memory-9.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/hppc-0.8.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/log4j-api-2.17.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jts-core-1.15.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-secure-sm-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-x-content-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-backward-codecs-9.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-core-9.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/java-version-checker-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-dataformat-yaml-2.15.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-plugin-classloader-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-spatial3d-9.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-common-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-dataformat-cbor-2.15.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-suggest-9.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/t-digest-3.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/opensearch-geo-2.8.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-grouping-9.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jopt-simple-5.0.4.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-sandbox-9.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-queryparser-9.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-highlighter-9.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-join-9.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/jackson-dataformat-smile-2.15.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/snakeyaml-2.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/joda-time-2.12.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/protobuf-java-3.22.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-analysis-common-9.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/log4j-jul-2.17.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/lucene-queries-9.6.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/spatial4j-0.7.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/lib/HdrHistogram-2.1.12.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jmap.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jconsole.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jstack.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jrunscript.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jstatd.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jdb.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jinfo.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/javap.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/javadoc.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/javac.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/keytool.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/java.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jcmd.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jstat.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jhsdb.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jshell.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jps.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jfr.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jdeprscan.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jar.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jlink.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/serialver.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jmod.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/rmiregistry.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jpackage.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jdeps.1 - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/man/man1/jarsigner.1 - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.xml.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.management.rmi.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.attach.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.localedata.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.internal.opt.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.naming.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.sql.rowset.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.internal.le.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.dynalink.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jfr.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.smartcardio.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.editpad.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.security.jgss.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.crypto.cryptoki.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.nio.mapmode.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jsobject.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.incubator.vector.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.accessibility.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.compiler.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.prefs.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jdwp.agent.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.instrument.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.javadoc.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.unsupported.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.internal.vm.compiler.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.xml.dom.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jstatd.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.internal.jvmstat.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.security.auth.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.security.jgss.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.sql.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.management.agent.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.naming.dns.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.zipfs.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.transaction.xa.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.management.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.internal.ed.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.incubator.foreign.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.crypto.ec.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jshell.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.xml.crypto.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jcmd.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.management.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jpackage.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.compiler.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.logging.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.se.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.unsupported.desktop.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.httpserver.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.charsets.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.datatransfer.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.naming.rmi.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.scripting.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jlink.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jartool.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.rmi.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.net.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.net.http.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.management.jfr.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.hotspot.agent.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.security.sasl.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.sctp.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jdeps.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.random.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.internal.vm.ci.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.desktop.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/java.base.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jdi.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.jconsole.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/jmods/jdk.internal.vm.compiler.management.jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/NOTICE - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/classfile_constants.h - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/linux/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/linux/jni_md.h - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/linux/jawt_md.h - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/jdwpTransport.h - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/jvmticmlr.h - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/jni.h - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/jvmti.h - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/include/jawt.h - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/jvm.cfg - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libawt_xawt.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libawt_headless.so - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/security/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/security/blocked.certs - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/security/default.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/security/cacerts - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/security/public_suffix_list.dat - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjava.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libextnet.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjimage.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libnio.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libprefs.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjaas.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjawt.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/jspawnhelper - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjdwp.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libawt.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/psfont.properties.ja - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libmanagement.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjsig.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/tzdb.dat - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/modules - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/server/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/server/libjsig.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/server/classes.jsa - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/server/classes_nocoops.jsa - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/server/libjvm.so - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/jfr/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/jfr/profile.jfc - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/jfr/default.jfc - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libattach.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libdt_socket.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjsound.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/psfontj2d.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjavajpeg.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/ct.sym - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libnet.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/classlist - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libj2gss.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libmanagement_agent.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libsplashscreen.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libj2pcsc.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libverify.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/jrt-fs.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libsyslookup.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libmanagement_ext.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libj2pkcs11.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjsvml.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libsaproc.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libinstrument.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libjli.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libsctp.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libfontmanager.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/liblcms.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/librmi.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/jexec - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libzip.so - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/lib/libmlib_image.so - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/javadoc - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jmod - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jpackage - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jrunscript - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jhsdb - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jstat - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jdb - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jdeprscan - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/java - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/rmiregistry - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/javac - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jconsole - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jlink - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jfr - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jinfo - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/serialver - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jps - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jcmd - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/javap - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/keytool - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jstatd - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jstack - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jdeps - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jshell - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jimage - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jmap - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jarsigner - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/bin/jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/release - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.instrument/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.net/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.crypto.cryptoki/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.crypto.cryptoki/pkcs11cryptotoken.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.crypto.cryptoki/pkcs11wrapper.md - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.security.auth/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.smartcardio/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.smartcardio/pcsclite.md - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.zipfs/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.localedata/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.localedata/thaidict.md - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.prefs/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.dynalink/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.dynalink/dynalink.md - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.jpackage/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.management/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.internal.jvmstat/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.xml.crypto/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.xml.crypto/santuario.md - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.net.http/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.unsupported/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.datatransfer/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.jdi/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.incubator.vector/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.charsets/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.management.jfr/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.accessibility/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.jartool/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.security.sasl/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.internal.ed/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.editpad/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.httpserver/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/c-libutl.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/icu.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/aes.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/cldr.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/public_suffix.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/ASSEMBLY_EXCEPTION - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/ADDITIONAL_LICENSE_INFO - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/asm.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/unicode.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.base/LICENSE - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.jcmd/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.internal.opt/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.internal.opt/jopt-simple.md - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.scripting/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.xml/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.xml/xalan.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.xml/bcel.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.xml/jcup.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.xml/xerces.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.xml/dom.md - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.jdeps/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.jstatd/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.management.agent/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.random/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.sctp/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.sql/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.nio.mapmode/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.hotspot.agent/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.attach/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.naming/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.management/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.sql.rowset/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.rmi/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.internal.vm.compiler/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.unsupported.desktop/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.logging/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.security.jgss/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.internal.vm.compiler.management/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.jfr/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.transaction.xa/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.crypto.ec/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.internal.vm.ci/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.naming.rmi/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.xml.dom/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.internal.le/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.internal.le/jline.md - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.jsobject/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.jdwp.agent/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.se/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.compiler/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.incubator.foreign/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.jshell/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.javadoc/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.javadoc/jquery.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.javadoc/jqueryUI.md - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.compiler/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.security.jgss/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.jconsole/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.naming.dns/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.management.rmi/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.desktop/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.desktop/xwd.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.desktop/harfbuzz.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.desktop/libpng.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.desktop/jpeg.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.desktop/colorimaging.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.desktop/mesa3d.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.desktop/giflib.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/java.desktop/lcms.md - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/legal/jdk.jlink/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/java.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/java.security - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/policy/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/policy/limited/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/policy/limited/exempt_local.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/policy/limited/default_local.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/policy/limited/default_US_export.policy - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/policy/unlimited/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/policy/unlimited/default_local.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/policy/unlimited/default_US_export.policy - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/security/policy/README.txt - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/logging.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/net.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/sound.properties - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/sdp/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/sdp/sdp.conf.template - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/management/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/management/jmxremote.access - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/management/management.properties - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/jdk/conf/management/jmxremote.password.template - chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/ - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/internal_users.yml - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/audit.yml - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/opensearch.yml.example - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/roles.yml - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/tenants.yml - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/whitelist.yml - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/action_groups.yml - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/allowlist.yml - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/roles_mapping.yml - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/nodes_dn.yml - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/config.yml - chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-notifications/ - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-notifications/notifications.yml + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR) chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/jvm.options - chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/jvm.options.d/ - chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-reports-scheduler/ - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-reports-scheduler/reports-scheduler.yml - chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/log4j2.properties - chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-notifications-core/ - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-notifications-core/notifications-core.yml chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/opensearch.yml - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-observability/ - chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-observability/observability.yml - chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/ - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/agent-stats-metadata - 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/log4j2.xml - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/rca.conf - 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/supervisord.conf - chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-performance-analyzer/opensearch_security.policy - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/etc/sysconfig/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/etc/sysconfig/wazuh-indexer - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/etc/init.d/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/etc/init.d/wazuh-indexer - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/ - 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/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/log4j2.xml - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/rca.conf - 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/supervisord.conf - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/config/opensearch_security.policy - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/ - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/log4j-core-2.17.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-transport-native-unix-common-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/commons-lang3-3.9.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/jackson-core-2.15.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/performance-analyzer-commons-1.0.0-SNAPSHOT.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/j2objc-annotations-1.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-buffer-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-resolver-4.1.91.Final.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/perfmark-api-0.25.0.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/netty-handler-proxy-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-common-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/performance-analyzer-rca-2.8.0.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/jsr305-3.0.2.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/netty-handler-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-codec-socks-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/jackson-databind-2.15.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/jackson-annotations-2.15.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-stub-1.52.1.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/netty-codec-http2-4.1.91.Final.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/grpc-context-1.52.1.jar - 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/error_prone_annotations-2.14.0.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-api-1.52.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/javax.annotation-api-1.3.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/annotations-4.1.1.4.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-transport-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-codec-4.1.91.Final.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/failureaccess-1.0.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-protobuf-1.52.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/netty-codec-http-4.1.91.Final.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-netty-1.52.1.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-protobuf-lite-1.52.1.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/sqlite-jdbc-3.41.2.2.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/checker-qual-3.29.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/protobuf-java-3.22.3.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/guava-31.1-jre.jar - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/lib/grpc-core-1.52.1.jar - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/bin/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/bin/performance-analyzer-agent - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/performance-analyzer-rca/bin/performance-analyzer-rca - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-cli - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/systemd-entrypoint - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-upgrade - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-shard - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-plugin - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-node - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-env - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-env-from-file - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-keystore - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-performance-analyzer/ - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-performance-analyzer/performance-analyzer-agent-cli - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-performance-analyzer/performance-analyzer-agent - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/LICENSE.txt + chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/jvm.options.d chmod 440 $(TARGET_DIR)$(INSTALLATION_DIR)/VERSION + find "$(TARGET_DIR)$(INSTALLATION_DIR)" -type d -exec chmod 750 {} \; + find "$(TARGET_DIR)$(INSTALLATION_DIR)" -type f -perm 644 -exec chmod 640 {} \; + find "$(TARGET_DIR)$(INSTALLATION_DIR)" -type f -perm 664 -exec chmod 660 {} \; + find "$(TARGET_DIR)$(INSTALLATION_DIR)" -type f -perm 755 -exec chmod 750 {} \; + find "$(TARGET_DIR)$(INSTALLATION_DIR)" -type f -perm 744 -exec chmod 740 {} \; + # ----------------------------------------------------------------------------- override_dh_strip: diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index b8406cc944..800a84e131 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -326,1072 +326,16 @@ rm -fr %{buildroot} %attr(0640, root, root) %{SYS_DIR}/systemd/system/%{name}-performance-analyzer.service %attr(0640, root, root) %{SYS_DIR}/tmpfiles.d/%{name}.conf -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR} -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/bin -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/bin/performance-analyzer-rca -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/bin/performance-analyzer-agent -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/sqlite-jdbc-3.32.3.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/log4j-api-2.17.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/j2objc-annotations-1.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/commons-lang3-3.9.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jsr305-3.0.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/log4j-core-2.17.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/annotations-4.1.1.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/javax.annotation-api-1.3.2.jar -%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/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/grpc-api-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-context-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-core-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-netty-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-protobuf-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-protobuf-lite-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-stub-1.52.1.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.14.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jackson-core-2.14.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jackson-databind-2.14.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-buffer-4.1.86.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-4.1.86.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-http-4.1.86.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-http2-4.1.86.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-socks-4.1.86.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-common-4.1.86.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-handler-4.1.86.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-handler-proxy-4.1.86.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-resolver-4.1.86.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-transport-4.1.86.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-transport-native-unix-common-4.1.86.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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/protobuf-java-3.21.12.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/opensearch_security.policy -%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_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 -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-node -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-keystore -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-plugin -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-cli -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-env -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-env-from-file -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-upgrade -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/systemd-entrypoint -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/indexer-security-init.sh -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-performance-analyzer -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-performance-analyzer/performance-analyzer-agent -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-performance-analyzer/performance-analyzer-agent-cli -%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.33.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.7.1.jar -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/keystore-cli -%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/java-version-checker-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-core-2.14.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-cbor-2.14.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-smile-2.14.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-yaml-2.14.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/joda-time-2.12.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jopt-simple-5.0.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-cli-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-core-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-geo-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-launchers-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-plugin-classloader-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-secure-sm-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-x-content-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-common-2.6.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.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-backward-codecs-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-core-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-grouping-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-highlighter-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-join-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-memory-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-misc-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-queries-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-queryparser-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-sandbox-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-spatial-extras-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-spatial3d-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-suggest-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/keystore-cli/keystore-cli-2.6.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.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-annotations-2.14.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-core-2.14.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-databind-2.14.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/opensearch-upgrade-cli-2.6.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 -%attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-reports-scheduler/reports-scheduler.yml %config(noreplace) %attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/jvm.options %config(noreplace) %attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch.yml -%dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-notifications-core -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-notifications-core/notifications-core.yml -%dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-notifications -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-notifications/notifications.yml -%dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/agent-stats-metadata -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/log4j2.xml -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/opensearch_security.policy -%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_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 -%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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/NOTICE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/LICENSE.txt -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability -%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.6.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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/jackson-annotations-2.14.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/jackson-databind-2.14.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/json-20220924.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/json-base-2.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/json-flattener-0.15.1.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.15.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/jackson-annotations-2.14.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/jackson-databind-2.14.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/json-base-2.2.1.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.6.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.6.0.0.jar -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/geo-2.6.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/slf4j-api-1.7.36.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/druid-1.0.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/commons-lang3-3.10.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/gson-2.8.9.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/j2objc-annotations-1.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/jsr305-3.0.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/antlr4-runtime-4.7.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/json-20180813.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/NOTICE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/resilience4j-retry-1.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/LICENSE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/vavr-match-0.10.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/vavr-0.10.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/presto-matching-0.240.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/httpclient-4.5.13.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/commons-codec-1.13.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/commons-math3-3.6.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/httpcore-4.4.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/failureaccess-1.0.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/ST4-4.0.8.jar -%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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/core-2.6.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.14.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/jackson-databind-2.14.2.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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-2.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-ml-client-2.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-rest-client-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-sql-2.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-ssl-config-2.6.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.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/ppl-2.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/protocol-2.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/reindex-client-2.6.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.6.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.6.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.6.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.6.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/failureaccess-1.0.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/LICENSE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/NOTICE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/guava-30.0-jre.jar -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/libgomp.so.1 -%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.6.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.6.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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/opensearch-index-management-spi-2.6.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jsr305-3.0.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/annotations-4.1.1.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/javax.annotation-api-1.3.2.jar -%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.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.29.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.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-context-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-core-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-netty-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-protobuf-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-protobuf-lite-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-stub-1.52.1.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-31.1-jre.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jackson-annotations-2.14.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jackson-databind-2.14.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jackson-module-paranamer-2.14.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-buffer-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-codec-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-codec-http-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-codec-http2-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-codec-socks-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-common-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-handler-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-handler-proxy-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-resolver-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-transport-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-transport-native-unix-common-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/opensearch-performance-analyzer-2.6.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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/protobuf-java-3.21.12.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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/opensearch-job-scheduler-spi-2.6.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/java-saml-2.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/minimal-json-0.9.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-security-api-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jakarta.activation-1.2.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-logging-1.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/json-path-2.4.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/httpcore-nio-4.4.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/httpasyncclient-4.1.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/bcprov-jdk15on-1.67.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/json-flattener-0.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/cxf-rt-rs-json-basic-3.5.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-xmlsec-impl-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/txw2-2.3.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/cxf-core-3.5.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/metrics-core-3.1.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-soap-impl-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jsr305-3.0.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-messaging-api-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-storage-api-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-lang-2.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jakarta.xml.bind-api-2.3.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-saml-impl-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/java-saml-core-2.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-core-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-cli-1.3.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-lang3-3.4.jar -%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.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/json-smart-2.4.7.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/xmlsec-2.2.3.jar -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/httpcore-4.4.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/SECURITY_ADMIN_TESTS.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/config.yml -%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/hash.sh -%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/securityadmin.sh -%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/audit_config_migrater.sh -%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/wazuh-certs-tool.sh -%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/wazuh-passwords-tool.sh -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/xmlschema-core-2.2.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/httpclient-cache-4.5.13.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-xmlsec-api-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/httpclient-4.5.13.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/zjsonpatch-0.4.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/accessors-smart-2.4.7.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/cxf-rt-security-3.5.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/java-support-7.5.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/stax2-api-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/cxf-rt-rs-security-jose-3.5.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-profile-api-3.4.5.jar -%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.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.6.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/error_prone_annotations-2.3.4.jar -%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.2.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.6.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.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-buffer-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-codec-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-codec-http-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-common-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-handler-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-resolver-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-transport-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-transport-native-unix-common-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-rest-client-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-rest-high-level-client-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-security-2.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/parent-join-client-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/rank-eval-client-2.6.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.6.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.14.2.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.6.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.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/opensearch-security-analytics-2.6.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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/opensearch-neural-search-2.6.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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/opensearch-asynchronous-search-2.6.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/httpcore-nio-4.4.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/httpasyncclient-4.1.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/gson-2.8.9.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/org.jacoco.ant-0.8.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/commons-pool2-2.10.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/sketches-core-0.13.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/org.jacoco.agent-0.8.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/memory-0.12.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/httpclient-4.5.13.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/commons-codec-1.15.jar -%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.6.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.14.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/jackson-databind-2.14.1.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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/opensearch-rest-client-2.6.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/protostuff-runtime-1.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/randomcutforest-core-3.0-rc3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/randomcutforest-parkservices-3.0-rc3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/randomcutforest-serialization-3.0-rc3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/commons-logging-1.2.jar -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial -%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.6.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.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/h3-2.6.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/httpasyncclient-4.1.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/cron-utils-9.1.6.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/slf4j-api-1.7.30.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/ipaddress-5.3.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/j2objc-annotations-1.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/jsr305-3.0.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/javax.el-3.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/javassist-3.27.0-GA.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/kotlinx-coroutines-core-1.1.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/annotations-13.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/guava-30.0-jre.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/google-java-format-1.10.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/checker-qual-3.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/httpclient-4.5.13.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/kotlinx-coroutines-core-common-1.1.1.jar -%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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/common-utils-2.6.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/commons-validator-1.7.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/kotlin-stdlib-1.6.10.jar -%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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/opensearch-rest-client-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/percolator-client-2.6.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.6.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/commons-collections4-4.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/commons-io-2.11.0.jar -%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.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.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.14.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jackson-databind-2.14.2.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jline-reader-3.21.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jline-style-3.21.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jline-terminal-3.21.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jline-terminal-jansi-3.21.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/libsvm-3.25.jar -%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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-ml-algorithms-2.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-ml-common-2.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-rest-client-2.6.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.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/protostuff-runtime-1.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/randomcutforest-core-3.0-rc3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/randomcutforest-parkservices-3.0-rc3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/randomcutforest-testutils-3.0-rc3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/reflections-0.9.12.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-anomaly-core-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-anomaly-libsvm-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-clustering-core-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-clustering-kmeans-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-common-libsvm-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-common-sgd-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-core-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-data-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-math-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-regression-core-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-regression-sgd-4.2.1.jar -%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_gpu-1.13.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/aws-java-sdk-ses-1.12.48.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/aws-java-sdk-sns-1.12.48.jar -%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.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/jackson-databind-2.14.2.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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/opensearch-notifications-core-spi-2.6.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.6.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.6.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.58.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.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/joni-2.1.44.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/opensearch-dissect-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/opensearch-grok-2.6.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.6.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/plugin-descriptor.properties -%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/ingest-geoip-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/geoip2-3.0.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/jackson-annotations-2.14.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/jackson-databind-2.14.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/maxmind-db-2.1.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.6.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.6.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.6.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.6.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.6.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.6.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.6.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.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-codec-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-codec-http-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-common-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-handler-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-resolver-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-transport-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-transport-native-unix-common-4.1.87.Final.jar -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/lang-expression-2.6.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.11.1.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.5.0.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.6.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.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/antlr4-runtime-4.11.1.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.6.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.6.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.6.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.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/opensearch-ssl-config-2.6.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.6.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.6.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.6.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.6.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.6.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.6.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 -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/parent-join -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/parent-join/plugin-descriptor.properties -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/transport-netty4 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/transport-netty4/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/transport-netty4/plugin-security.policy -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jrunscript.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jcmd.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/java.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jdeprscan.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/javadoc.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jar.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jdb.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jpackage.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jstatd.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/serialver.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/keytool.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jconsole.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jlink.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jhsdb.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jshell.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/rmiregistry.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/javac.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jstack.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jfr.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jps.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jarsigner.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jmod.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jstat.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jinfo.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jmap.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jdeps.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/javap.1 -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jdeps -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/rmiregistry -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jrunscript -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jdeprscan -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jar -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jmap -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jps -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jstatd -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/java -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jdb -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jimage -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/javadoc -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jconsole -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jcmd -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jstack -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jinfo -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jpackage -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/serialver -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/javap -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/keytool -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jarsigner -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jhsdb -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jlink -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jfr -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jstat -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/javac -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jmod -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jshell -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/release -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/LICENSE -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/ADDITIONAL_LICENSE_INFO -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/icu.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/c-libutl.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/public_suffix.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/cldr.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/aes.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/ASSEMBLY_EXCEPTION -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/asm.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/unicode.md -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.security.sasl -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.scripting -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.dynalink -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.dynalink/dynalink.md -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.management -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.javadoc -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.javadoc/jqueryUI.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.javadoc/jquery.md -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/xalan.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/xerces.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/jcup.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/bcel.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/dom.md -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.smartcardio -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.smartcardio/pcsclite.md -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.transaction.xa -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.prefs -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.compiler -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.logging -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.opt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.opt/jopt-simple.md -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml.crypto -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml.crypto/santuario.md -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.localedata -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.localedata/thaidict.md -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.sql.rowset -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.net.http -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.rmi -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.sql -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.naming -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.datatransfer -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.le -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.le/jline.md -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.crypto.cryptoki -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.crypto.cryptoki/pkcs11cryptotoken.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.crypto.cryptoki/pkcs11wrapper.md -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.instrument -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.management.rmi -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/xwd.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/mesa3d.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/harfbuzz.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/lcms.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/giflib.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/jpeg.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/colorimaging.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/libpng.md -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server/libjsig.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server/classes.jsa -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server/classes_nocoops.jsa -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server/libjvm.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libawt.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libawt_headless.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libsplashscreen.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libnio.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjdwp.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libj2pcsc.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjli.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libsctp.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjimage.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjsig.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjava.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/liblcms.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libawt_xawt.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jexec -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libverify.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libmanagement_agent.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/psfont.properties.ja -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libprefs.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libzip.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjaas.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjsound.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libextnet.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libj2gss.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/tzdb.dat -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libdt_socket.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/psfontj2d.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jvm.cfg -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/ct.sym -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libj2pkcs11.so -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jfr -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jfr/default.jfc -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jfr/profile.jfc -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libmanagement_ext.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/classlist -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libnet.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjavajpeg.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libfontmanager.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/modules -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libinstrument.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libmanagement.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjawt.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libsaproc.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libmlib_image.so -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/cacerts -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/public_suffix_list.dat -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/default.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/librmi.so -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jspawnhelper -%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/jvmti.h -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/classfile_constants.h -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/jdwpTransport.h -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/jawt.h -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/jni.h -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/jvmticmlr.h -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/linux -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/linux/jawt_md.h -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/linux/jni_md.h -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/net.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/sound.properties -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/sdp -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/sdp/sdp.conf.template -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/management -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/management/management.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/management/jmxremote.access -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/management/jmxremote.password.template -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/logging.properties -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/java.policy -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/limited -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/limited/default_US_export.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/limited/exempt_local.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/limited/default_local.policy -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/unlimited -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/unlimited/default_US_export.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/unlimited/default_local.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/README.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/java.security -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.unsupported.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.transaction.xa.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.crypto.cryptoki.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.rmi.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.attach.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jshell.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.xml.dom.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.se.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.ed.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jartool.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.compiler.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.base.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.smartcardio.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.security.auth.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.unsupported.desktop.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.security.sasl.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.incubator.foreign.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.management.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.management.agent.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.xml.crypto.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.vm.ci.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.prefs.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.crypto.ec.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.jvmstat.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.sql.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.xml.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.security.jgss.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.compiler.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.sctp.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.charsets.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.management.jfr.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jlink.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.localedata.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jsobject.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.net.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.hotspot.agent.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jstatd.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.dynalink.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jfr.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.naming.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.le.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jcmd.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.management.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.net.http.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.logging.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.accessibility.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.opt.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.management.rmi.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.security.jgss.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.desktop.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.nio.mapmode.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.vm.compiler.management.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jdwp.agent.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jdi.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.javadoc.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.naming.rmi.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.naming.dns.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.editpad.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jdeps.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.vm.compiler.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.sql.rowset.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.scripting.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.datatransfer.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.httpserver.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.zipfs.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jconsole.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.instrument.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/NOTICE -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.incubator.vector.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jpackage.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.random.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjsvml.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libsyslookup.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/blocked.certs + +find "$(INSTALL_DIR)" -type d -exec chmod 750 {} \; +find "$(INSTALL_DIR)" -type f -perm 644 -exec chmod 640 {} \; +find "$(INSTALL_DIR)" -type f -perm 664 -exec chmod 660 {} \; +find "$(INSTALL_DIR)" -type f -perm 755 -exec chmod 750 {} \; +find "$(INSTALL_DIR)" -type f -perm 744 -exec chmod 740 {} \; %changelog * Fri Sep 08 2023 support - %{version} From d38fffe6ef0a18b142506aaaa69a5bd8484241f1 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Thu, 31 Aug 2023 17:28:46 +0200 Subject: [PATCH 718/994] Bump to 2.8.0 --- 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 c88304df48..c474d56eca 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -16,7 +16,7 @@ revision="$2" future="$3" repository="$4" reference="$5" -opensearch_version="2.6.0" +opensearch_version="2.8.0" base_dir=/opt/wazuh-dashboard-base # ----------------------------------------------------------------------------- From 06877224c296155985f9bdaba3555fac4758eb84 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Thu, 31 Aug 2023 17:29:13 +0200 Subject: [PATCH 719/994] Set Brotli tag v1.0.9 --- stack/dashboard/base/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/dashboard/base/docker/Dockerfile b/stack/dashboard/base/docker/Dockerfile index 184d894e16..1f48bfa54d 100644 --- a/stack/dashboard/base/docker/Dockerfile +++ b/stack/dashboard/base/docker/Dockerfile @@ -21,7 +21,7 @@ RUN yum install -y \ jq \ unzip -RUN git clone https://github.com/google/brotli.git +RUN git clone https://github.com/google/brotli.git -b v1.0.9 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 From b7f0e2321bfa855399a24e6eab1fc5a2bc8a3e15 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Thu, 31 Aug 2023 18:03:07 +0200 Subject: [PATCH 720/994] Changed from Rocky Linux 8.5 to CentOS 7 due to repo.ius.io repository deprecation --- stack/dashboard/rpm/docker/x86_64/Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/stack/dashboard/rpm/docker/x86_64/Dockerfile b/stack/dashboard/rpm/docker/x86_64/Dockerfile index 5d87b62269..e7635a2d64 100644 --- a/stack/dashboard/rpm/docker/x86_64/Dockerfile +++ b/stack/dashboard/rpm/docker/x86_64/Dockerfile @@ -1,13 +1,16 @@ -FROM rockylinux:8.5 +FROM amd64/centos:7 + +# Enable EPEL +RUN yum install -y http://packages.wazuh.com/utils/pkg/epel-release-latest-7.noarch.rpm # 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 \ + yum-utils redhat-rpm-config rpm-devel \ zlib zlib-devel rpm-build autoconf automake \ glibc-devel libtool perl -RUN yum install -y https://repo.ius.io/ius-release-el$(rpm -E '%{rhel}').rpm +RUN yum install -y https://repo.ius.io/ius-release-el$(rpm -E '%{rhel}').rpm RUN yum update -y && yum install -y python3 From d98cc59e2159fc19a9af0b80c0ad717099b018a8 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Thu, 31 Aug 2023 18:30:03 +0200 Subject: [PATCH 721/994] Added new use_node file with 750 permissions --- stack/dashboard/rpm/wazuh-dashboard.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 767d301032..a621622dc1 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -391,6 +391,7 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/LICENSE.txt" %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/NOTICE.txt" %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/README.txt" +%attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/bin/use_node" %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/bin/opensearch-dashboards" %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/bin/opensearch-dashboards-plugin" %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/bin/opensearch-dashboards-keystore" From c90b6cc807d19c5019575685ba1a529dc9eed9e2 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Thu, 31 Aug 2023 18:43:43 +0200 Subject: [PATCH 722/994] Added Wazuh dashboard 2.8.0 --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0c74d32329..6145e9cca4 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,8 @@ The following table shows the references for the versions of each component. |-----------------|-----------------------| | 4.3.x | 1.2.0 | | 4.4.0 | 2.4.1 | -| 4.4.1 - 4.5.1 | 2.6.0 | +| 4.4.1 - 4.5.2 | 2.6.0 | +| 4.6.0 | 2.8.0 | ### Wazuh indexer From a1dd7baed15d107fe261baf360126c3c3dd55658 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Thu, 31 Aug 2023 18:44:39 +0200 Subject: [PATCH 723/994] Added Wazuh indexer 2.8.0 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0c74d32329..18ec29dd39 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,7 @@ The following table shows the references for the versions of each component. | 4.3.x | 1.2.4 | | 4.4.0 | 2.4.1 | | 4.4.1 - 4.5.2 | 2.6.0 | +| 4.6.0 | 2.8.0 | ## Contribute From c951f3c54420d3f47d0b5722d8f2a482133f2b4b Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Thu, 31 Aug 2023 19:53:44 +0200 Subject: [PATCH 724/994] Restore SPECS files references --- stack/indexer/rpm/wazuh-indexer.spec | 1068 +++++++++++++++++++++++++- 1 file changed, 1062 insertions(+), 6 deletions(-) diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 800a84e131..b8406cc944 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -326,16 +326,1072 @@ rm -fr %{buildroot} %attr(0640, root, root) %{SYS_DIR}/systemd/system/%{name}-performance-analyzer.service %attr(0640, root, root) %{SYS_DIR}/tmpfiles.d/%{name}.conf +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR} +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/bin +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/bin/performance-analyzer-rca +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/bin/performance-analyzer-agent +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/sqlite-jdbc-3.32.3.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/log4j-api-2.17.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/j2objc-annotations-1.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/commons-lang3-3.9.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jsr305-3.0.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/log4j-core-2.17.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/annotations-4.1.1.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/javax.annotation-api-1.3.2.jar +%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/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/grpc-api-1.52.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-context-1.52.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-core-1.52.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-netty-1.52.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-protobuf-1.52.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-protobuf-lite-1.52.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-stub-1.52.1.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.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jackson-core-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jackson-databind-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-buffer-4.1.86.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-4.1.86.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-http-4.1.86.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-http2-4.1.86.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-socks-4.1.86.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-common-4.1.86.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-handler-4.1.86.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-handler-proxy-4.1.86.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-resolver-4.1.86.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-transport-4.1.86.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-transport-native-unix-common-4.1.86.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.6.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/protobuf-java-3.21.12.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 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/opensearch_security.policy +%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_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 +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-node +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-keystore +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-plugin +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-cli +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-env +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-env-from-file +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-upgrade +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/systemd-entrypoint +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/indexer-security-init.sh +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-performance-analyzer +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-performance-analyzer/performance-analyzer-agent +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-performance-analyzer/performance-analyzer-agent-cli +%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.33.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.7.1.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/keystore-cli +%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/java-version-checker-2.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-core-2.14.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-cbor-2.14.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-smile-2.14.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-yaml-2.14.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/joda-time-2.12.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jopt-simple-5.0.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-2.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-cli-2.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-core-2.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-geo-2.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-launchers-2.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-plugin-classloader-2.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-secure-sm-2.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-x-content-2.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-common-2.6.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.5.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-backward-codecs-9.5.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-core-9.5.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-grouping-9.5.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-highlighter-9.5.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-join-9.5.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-memory-9.5.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-misc-9.5.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-queries-9.5.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-queryparser-9.5.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-sandbox-9.5.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-spatial-extras-9.5.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-spatial3d-9.5.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-suggest-9.5.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/keystore-cli/keystore-cli-2.6.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.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-annotations-2.14.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-core-2.14.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-databind-2.14.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/opensearch-upgrade-cli-2.6.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 +%attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-reports-scheduler/reports-scheduler.yml %config(noreplace) %attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/jvm.options %config(noreplace) %attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch.yml +%dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-notifications-core +%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-notifications-core/notifications-core.yml +%dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-notifications +%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-notifications/notifications.yml +%dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer +%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/agent-stats-metadata +%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/log4j2.xml +%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/opensearch_security.policy +%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_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 +%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 - -find "$(INSTALL_DIR)" -type d -exec chmod 750 {} \; -find "$(INSTALL_DIR)" -type f -perm 644 -exec chmod 640 {} \; -find "$(INSTALL_DIR)" -type f -perm 664 -exec chmod 660 {} \; -find "$(INSTALL_DIR)" -type f -perm 755 -exec chmod 750 {} \; -find "$(INSTALL_DIR)" -type f -perm 744 -exec chmod 740 {} \; +%config(noreplace) %attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/log4j2.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/NOTICE.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/LICENSE.txt +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability +%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.6.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.6.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/jackson-annotations-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/jackson-databind-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/json-20220924.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/json-base-2.2.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/json-flattener-0.15.1.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.15.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/jackson-annotations-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/jackson-databind-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/json-base-2.2.1.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.6.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.6.0.0.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/geo-2.6.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 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/slf4j-api-1.7.36.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/druid-1.0.15.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/commons-lang3-3.10.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/gson-2.8.9.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/j2objc-annotations-1.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/jsr305-3.0.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/antlr4-runtime-4.7.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/json-20180813.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/NOTICE.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/resilience4j-retry-1.5.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/LICENSE.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/vavr-match-0.10.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/vavr-0.10.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/presto-matching-0.240.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/httpclient-4.5.13.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/commons-codec-1.13.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/commons-math3-3.6.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/httpcore-4.4.15.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/failureaccess-1.0.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/ST4-4.0.8.jar +%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.6.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/core-2.6.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.14.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/jackson-databind-2.14.2.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.6.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-2.6.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-ml-client-2.6.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-rest-client-2.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-sql-2.6.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-ssl-config-2.6.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.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/ppl-2.6.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/protocol-2.6.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/reindex-client-2.6.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.6.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.6.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.6.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.6.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 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/failureaccess-1.0.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/LICENSE.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/NOTICE.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/guava-30.0-jre.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/libgomp.so.1 +%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.6.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.6.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.6.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/opensearch-index-management-spi-2.6.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 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jsr305-3.0.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/annotations-4.1.1.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/javax.annotation-api-1.3.2.jar +%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.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.29.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.52.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-context-1.52.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-core-1.52.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-netty-1.52.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-protobuf-1.52.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-protobuf-lite-1.52.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-stub-1.52.1.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-31.1-jre.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jackson-annotations-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jackson-databind-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jackson-module-paranamer-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-buffer-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-codec-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-codec-http-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-codec-http2-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-codec-socks-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-common-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-handler-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-handler-proxy-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-resolver-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-transport-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-transport-native-unix-common-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/opensearch-performance-analyzer-2.6.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.6.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/protobuf-java-3.21.12.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.6.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/opensearch-job-scheduler-spi-2.6.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 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/java-saml-2.5.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/minimal-json-0.9.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-security-api-3.4.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jakarta.activation-1.2.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-logging-1.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/json-path-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/httpcore-nio-4.4.15.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/httpasyncclient-4.1.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/bcprov-jdk15on-1.67.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/json-flattener-0.5.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/cxf-rt-rs-json-basic-3.5.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-xmlsec-impl-3.4.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/txw2-2.3.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/cxf-core-3.5.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/metrics-core-3.1.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-soap-impl-3.4.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jsr305-3.0.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-messaging-api-3.4.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-storage-api-3.4.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-lang-2.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jakarta.xml.bind-api-2.3.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-saml-impl-3.4.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/java-saml-core-2.5.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-core-3.4.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-cli-1.3.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-lang3-3.4.jar +%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.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 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/json-smart-2.4.7.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/xmlsec-2.2.3.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/httpcore-4.4.15.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/SECURITY_ADMIN_TESTS.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/config.yml +%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/hash.sh +%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/securityadmin.sh +%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/audit_config_migrater.sh +%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/wazuh-certs-tool.sh +%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/wazuh-passwords-tool.sh +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/xmlschema-core-2.2.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/httpclient-cache-4.5.13.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-xmlsec-api-3.4.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/httpclient-4.5.13.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/zjsonpatch-0.4.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/accessors-smart-2.4.7.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/cxf-rt-security-3.5.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/java-support-7.5.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/stax2-api-4.2.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/cxf-rt-rs-security-jose-3.5.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-profile-api-3.4.5.jar +%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.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.6.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 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/error_prone_annotations-2.3.4.jar +%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.2.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.6.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.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-buffer-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-codec-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-codec-http-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-common-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-handler-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-resolver-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-transport-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-transport-native-unix-common-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-rest-client-2.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-rest-high-level-client-2.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-security-2.6.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/parent-join-client-2.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/rank-eval-client-2.6.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.6.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.14.2.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.6.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.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/opensearch-security-analytics-2.6.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.6.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/opensearch-neural-search-2.6.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.6.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/opensearch-asynchronous-search-2.6.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 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/httpcore-nio-4.4.15.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/httpasyncclient-4.1.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/gson-2.8.9.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/org.jacoco.ant-0.8.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/commons-pool2-2.10.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/sketches-core-0.13.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/org.jacoco.agent-0.8.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/memory-0.12.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/httpclient-4.5.13.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/commons-codec-1.15.jar +%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.6.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.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/jackson-databind-2.14.1.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.6.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/opensearch-rest-client-2.6.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 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/protostuff-runtime-1.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/randomcutforest-core-3.0-rc3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/randomcutforest-parkservices-3.0-rc3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/randomcutforest-serialization-3.0-rc3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/commons-logging-1.2.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial +%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.6.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.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/h3-2.6.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 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/httpasyncclient-4.1.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/cron-utils-9.1.6.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/slf4j-api-1.7.30.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/ipaddress-5.3.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/j2objc-annotations-1.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/jsr305-3.0.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/javax.el-3.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/javassist-3.27.0-GA.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/kotlinx-coroutines-core-1.1.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/annotations-13.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/guava-30.0-jre.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/google-java-format-1.10.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/checker-qual-3.5.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/httpclient-4.5.13.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/kotlinx-coroutines-core-common-1.1.1.jar +%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.6.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/common-utils-2.6.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 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/commons-validator-1.7.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/kotlin-stdlib-1.6.10.jar +%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.6.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/opensearch-rest-client-2.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/percolator-client-2.6.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.6.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 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/commons-collections4-4.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/commons-io-2.11.0.jar +%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.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.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.14.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jackson-databind-2.14.2.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 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jline-reader-3.21.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jline-style-3.21.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jline-terminal-3.21.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jline-terminal-jansi-3.21.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/libsvm-3.25.jar +%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.6.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-ml-algorithms-2.6.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-ml-common-2.6.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-rest-client-2.6.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.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 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/protostuff-runtime-1.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/randomcutforest-core-3.0-rc3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/randomcutforest-parkservices-3.0-rc3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/randomcutforest-testutils-3.0-rc3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/reflections-0.9.12.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-anomaly-core-4.2.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-anomaly-libsvm-4.2.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-clustering-core-4.2.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-clustering-kmeans-4.2.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-common-libsvm-4.2.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-common-sgd-4.2.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-core-4.2.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-data-4.2.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-math-4.2.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-regression-core-4.2.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-regression-sgd-4.2.1.jar +%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_gpu-1.13.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 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/aws-java-sdk-ses-1.12.48.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/aws-java-sdk-sns-1.12.48.jar +%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.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/jackson-databind-2.14.2.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.6.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/opensearch-notifications-core-spi-2.6.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.6.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.6.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.58.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.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/joni-2.1.44.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/opensearch-dissect-2.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/opensearch-grok-2.6.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.6.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 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/plugin-descriptor.properties +%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/ingest-geoip-2.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/geoip2-3.0.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/jackson-annotations-2.14.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/jackson-databind-2.14.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/maxmind-db-2.1.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.6.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.6.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.6.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.6.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.6.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.6.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.6.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.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-codec-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-codec-http-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-common-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-handler-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-resolver-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-transport-4.1.87.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-transport-native-unix-common-4.1.87.Final.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/lang-expression-2.6.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.11.1.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.5.0.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.6.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.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/antlr4-runtime-4.11.1.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.6.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.6.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.6.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.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/opensearch-ssl-config-2.6.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.6.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.6.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.6.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.6.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.6.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.6.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 +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/parent-join +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/parent-join/plugin-descriptor.properties +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/transport-netty4 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/transport-netty4/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/transport-netty4/plugin-security.policy +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jrunscript.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jcmd.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/java.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jdeprscan.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/javadoc.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jar.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jdb.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jpackage.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jstatd.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/serialver.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/keytool.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jconsole.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jlink.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jhsdb.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jshell.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/rmiregistry.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/javac.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jstack.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jfr.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jps.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jarsigner.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jmod.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jstat.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jinfo.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jmap.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jdeps.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/javap.1 +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jdeps +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/rmiregistry +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jrunscript +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jdeprscan +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jar +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jmap +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jps +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jstatd +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/java +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jdb +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jimage +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/javadoc +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jconsole +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jcmd +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jstack +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jinfo +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jpackage +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/serialver +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/javap +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/keytool +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jarsigner +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jhsdb +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jlink +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jfr +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jstat +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/javac +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jmod +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jshell +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/release +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/LICENSE +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/ADDITIONAL_LICENSE_INFO +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/icu.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/c-libutl.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/public_suffix.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/cldr.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/aes.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/ASSEMBLY_EXCEPTION +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/asm.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/unicode.md +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.security.sasl +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.scripting +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.dynalink +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.dynalink/dynalink.md +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.management +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.javadoc +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.javadoc/jqueryUI.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.javadoc/jquery.md +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/xalan.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/xerces.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/jcup.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/bcel.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/dom.md +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.smartcardio +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.smartcardio/pcsclite.md +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.transaction.xa +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.prefs +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.compiler +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.logging +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.opt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.opt/jopt-simple.md +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml.crypto +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml.crypto/santuario.md +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.localedata +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.localedata/thaidict.md +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.sql.rowset +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.net.http +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.rmi +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.sql +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.naming +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.datatransfer +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.le +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.le/jline.md +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.crypto.cryptoki +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.crypto.cryptoki/pkcs11cryptotoken.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.crypto.cryptoki/pkcs11wrapper.md +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.instrument +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.management.rmi +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/xwd.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/mesa3d.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/harfbuzz.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/lcms.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/giflib.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/jpeg.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/colorimaging.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/libpng.md +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server/libjsig.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server/classes.jsa +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server/classes_nocoops.jsa +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server/libjvm.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libawt.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libawt_headless.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libsplashscreen.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libnio.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjdwp.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libj2pcsc.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjli.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libsctp.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjimage.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjsig.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjava.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/liblcms.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libawt_xawt.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jexec +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libverify.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libmanagement_agent.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/psfont.properties.ja +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libprefs.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libzip.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjaas.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjsound.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libextnet.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libj2gss.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/tzdb.dat +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libdt_socket.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/psfontj2d.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jvm.cfg +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/ct.sym +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libj2pkcs11.so +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jfr +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jfr/default.jfc +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jfr/profile.jfc +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libmanagement_ext.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/classlist +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libnet.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjavajpeg.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libfontmanager.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/modules +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libinstrument.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libmanagement.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjawt.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libsaproc.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libmlib_image.so +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/cacerts +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/public_suffix_list.dat +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/default.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/librmi.so +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jspawnhelper +%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/jvmti.h +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/classfile_constants.h +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/jdwpTransport.h +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/jawt.h +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/jni.h +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/jvmticmlr.h +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/linux +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/linux/jawt_md.h +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/linux/jni_md.h +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/net.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/sound.properties +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/sdp +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/sdp/sdp.conf.template +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/management +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/management/management.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/management/jmxremote.access +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/management/jmxremote.password.template +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/logging.properties +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/java.policy +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/limited +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/limited/default_US_export.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/limited/exempt_local.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/limited/default_local.policy +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/unlimited +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/unlimited/default_US_export.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/unlimited/default_local.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/README.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/java.security +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.unsupported.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.transaction.xa.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.crypto.cryptoki.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.rmi.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.attach.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jshell.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.xml.dom.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.se.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.ed.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jartool.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.compiler.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.base.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.smartcardio.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.security.auth.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.unsupported.desktop.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.security.sasl.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.incubator.foreign.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.management.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.management.agent.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.xml.crypto.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.vm.ci.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.prefs.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.crypto.ec.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.jvmstat.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.sql.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.xml.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.security.jgss.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.compiler.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.sctp.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.charsets.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.management.jfr.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jlink.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.localedata.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jsobject.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.net.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.hotspot.agent.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jstatd.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.dynalink.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jfr.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.naming.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.le.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jcmd.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.management.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.net.http.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.logging.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.accessibility.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.opt.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.management.rmi.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.security.jgss.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.desktop.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.nio.mapmode.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.vm.compiler.management.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jdwp.agent.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jdi.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.javadoc.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.naming.rmi.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.naming.dns.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.editpad.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jdeps.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.vm.compiler.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.sql.rowset.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.scripting.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.datatransfer.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.httpserver.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.zipfs.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jconsole.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.instrument.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/NOTICE +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.incubator.vector.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jpackage.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.random.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjsvml.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libsyslookup.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/blocked.certs %changelog * Fri Sep 08 2023 support - %{version} From 88243c66f9e0f7fab65af37b8a4bce86e8b9a95a Mon Sep 17 00:00:00 2001 From: Deblintrake09 Date: Thu, 31 Aug 2023 15:50:29 -0300 Subject: [PATCH 725/994] bump rpm spec files permissions --- stack/indexer/rpm/wazuh-indexer.spec | 2028 +++++++++++++------------- 1 file changed, 1037 insertions(+), 991 deletions(-) diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index b8406cc944..583d3cbdc6 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -326,1072 +326,1118 @@ rm -fr %{buildroot} %attr(0640, root, root) %{SYS_DIR}/systemd/system/%{name}-performance-analyzer.service %attr(0640, root, root) %{SYS_DIR}/tmpfiles.d/%{name}.conf -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR} -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/bin -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/bin/performance-analyzer-rca -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/bin/performance-analyzer-agent -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/sqlite-jdbc-3.32.3.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/log4j-api-2.17.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/j2objc-annotations-1.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/commons-lang3-3.9.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jsr305-3.0.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/log4j-core-2.17.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/annotations-4.1.1.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/javax.annotation-api-1.3.2.jar -%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/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/grpc-api-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-context-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-core-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-netty-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-protobuf-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-protobuf-lite-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-stub-1.52.1.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.14.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jackson-core-2.14.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jackson-databind-2.14.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-buffer-4.1.86.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-4.1.86.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-http-4.1.86.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-http2-4.1.86.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-socks-4.1.86.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-common-4.1.86.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-handler-4.1.86.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-handler-proxy-4.1.86.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-resolver-4.1.86.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-transport-4.1.86.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-transport-native-unix-common-4.1.86.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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/protobuf-java-3.21.12.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/opensearch_security.policy -%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_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 -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-node -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-keystore -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-plugin -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-cli -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-env -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-env-from-file -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-upgrade -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/systemd-entrypoint -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/indexer-security-init.sh -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-performance-analyzer -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-performance-analyzer/performance-analyzer-agent -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-performance-analyzer/performance-analyzer-agent-cli -%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.33.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.7.1.jar -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/keystore-cli -%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/java-version-checker-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-core-2.14.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-cbor-2.14.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-smile-2.14.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-yaml-2.14.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/joda-time-2.12.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jopt-simple-5.0.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-cli-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-core-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-geo-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-launchers-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-plugin-classloader-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-secure-sm-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-x-content-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-common-2.6.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.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-backward-codecs-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-core-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-grouping-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-highlighter-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-join-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-memory-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-misc-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-queries-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-queryparser-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-sandbox-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-spatial-extras-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-spatial3d-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-suggest-9.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/keystore-cli/keystore-cli-2.6.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.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-annotations-2.14.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-core-2.14.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-databind-2.14.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/opensearch-upgrade-cli-2.6.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 -%attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-reports-scheduler/reports-scheduler.yml -%config(noreplace) %attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/jvm.options -%config(noreplace) %attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch.yml -%dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-notifications-core -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-notifications-core/notifications-core.yml -%dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-notifications -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-notifications/notifications.yml -%dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/agent-stats-metadata -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/log4j2.xml -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/opensearch_security.policy -%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_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 -%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 + +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/NOTICE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/LICENSE.txt -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability -%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.6.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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/jackson-annotations-2.14.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/jackson-databind-2.14.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/json-20220924.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/json-base-2.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/json-flattener-0.15.1.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.15.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/jackson-annotations-2.14.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/jackson-databind-2.14.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/json-base-2.2.1.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.6.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.6.0.0.jar -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/geo-2.6.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/slf4j-api-1.7.36.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/druid-1.0.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/commons-lang3-3.10.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/gson-2.8.9.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/j2objc-annotations-1.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/jsr305-3.0.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/antlr4-runtime-4.7.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/json-20180813.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/NOTICE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/resilience4j-retry-1.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/LICENSE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/vavr-match-0.10.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/vavr-0.10.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/presto-matching-0.240.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/httpclient-4.5.13.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/commons-codec-1.13.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/commons-math3-3.6.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/httpcore-4.4.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/failureaccess-1.0.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/ST4-4.0.8.jar -%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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/core-2.6.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.14.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/jackson-databind-2.14.2.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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-2.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-ml-client-2.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-rest-client-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-sql-2.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-ssl-config-2.6.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.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/ppl-2.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/protocol-2.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/reindex-client-2.6.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.6.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.6.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.6.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.6.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/failureaccess-1.0.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/LICENSE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/NOTICE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/guava-30.0-jre.jar -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/libgomp.so.1 -%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.6.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.6.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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/opensearch-index-management-spi-2.6.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jsr305-3.0.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/annotations-4.1.1.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/javax.annotation-api-1.3.2.jar -%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.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.29.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.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-context-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-core-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-netty-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-protobuf-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-protobuf-lite-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/grpc-stub-1.52.1.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-31.1-jre.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jackson-annotations-2.14.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jackson-databind-2.14.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jackson-module-paranamer-2.14.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-buffer-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-codec-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-codec-http-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-codec-http2-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-codec-socks-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-common-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-handler-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-handler-proxy-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-resolver-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-transport-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-transport-native-unix-common-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/opensearch-performance-analyzer-2.6.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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/protobuf-java-3.21.12.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 +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/opensearch-job-scheduler-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/failureaccess-1.0.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/opensearch-job-scheduler-spi-2.8.0.0.jar %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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/opensearch-job-scheduler-spi-2.6.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/java-saml-2.5.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/guava-31.0.1-jre.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/common-utils-2.8.0.0.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/tokenizers-0.19.0.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/opensearch-ml-algorithms-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jline-reader-3.21.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-ml-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/randomcutforest-parkservices-3.0-rc3.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/reflections-0.9.12.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-common-libsvm-4.2.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/protostuff-core-1.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/api-0.19.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/j2objc-annotations-1.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/gson-2.9.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/randomcutforest-testutils-3.0-rc3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-rest-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-anomaly-core-4.2.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/tribuo-regression-core-4.2.1.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/protostuff-runtime-1.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jsr305-3.0.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jansi-2.4.0.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/commons-beanutils-1.9.4.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-io-2.11.0.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-anomaly-libsvm-4.2.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-clustering-core-4.2.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/commons-compress-1.21.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jackson-databind-2.15.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jline-terminal-jansi-3.21.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/commons-collections4-4.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jackson-annotations-2.15.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-core-4.2.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-common-sgd-4.2.1.jar +%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/commons-logging-1.2.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 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/httpcore-nio-4.4.15.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/pytorch-engine-0.19.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-math-4.2.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/onnxruntime_gpu-1.13.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jline-terminal-3.21.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-ml-common-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/libsvm-3.25.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/jline-style-3.21.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/failureaccess-1.0.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-clustering-kmeans-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/commons-collections-3.2.2.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/opencsv-5.4.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/commons-lang3-3.10.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/protostuff-api-1.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/httpcore-4.4.15.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/randomcutforest-core-3.0-rc3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/protostuff-collectionschema-1.8.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/plugin-descriptor.properties +%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/tribuo-regression-sgd-4.2.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-data-4.2.1.jar +%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/commons-codec-1.15.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/guava-31.0.1-jre.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/woodstox-core-6.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jjwt-impl-0.10.8.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/ +%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/securityadmin.sh +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/SECURITY_ADMIN_TESTS.md +%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/audit_config_migrater.sh +%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/hash.sh %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/minimal-json-0.9.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-security-api-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jakarta.activation-1.2.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-logging-1.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/json-path-2.4.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/httpcore-nio-4.4.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/httpasyncclient-4.1.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/bcprov-jdk15on-1.67.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/json-flattener-0.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/cxf-rt-rs-json-basic-3.5.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-xmlsec-impl-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/txw2-2.3.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/cxf-core-3.5.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/metrics-core-3.1.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-soap-impl-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jsr305-3.0.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-messaging-api-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-storage-api-3.4.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/parent-join-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-transport-native-unix-common-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/mapper-extras-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/error_prone_annotations-2.3.4.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-lang-2.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jakarta.xml.bind-api-2.3.3.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-saml-impl-3.4.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/json-smart-2.4.10.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/j2objc-annotations-1.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-buffer-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/stax2-api-4.2.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/transport-netty4-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/zxcvbn-1.7.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jakarta.xml.bind-api-2.3.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-resolver-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-rest-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-codec-1.14.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jakarta.activation-1.2.2.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/java-saml-core-2.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-core-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-cli-1.3.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/lang-mustache-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/json-path-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-common-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jsr305-3.0.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/bcpkix-jdk15on-1.70.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-lang3-3.4.jar -%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.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/json-smart-2.4.7.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/xmlsec-2.2.3.jar -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/httpcore-4.4.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/SECURITY_ADMIN_TESTS.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/config.yml -%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/hash.sh -%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/securityadmin.sh -%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/audit_config_migrater.sh -%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/wazuh-certs-tool.sh -%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/wazuh-passwords-tool.sh +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-text-1.10.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/guava-30.0-jre.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-xmlsec-impl-3.4.5.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/xmlschema-core-2.2.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-handler-4.1.91.Final.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/jackson-databind-2.15.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-core-3.4.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/aggs-matrix-stats-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jackson-annotations-2.15.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/cxf-core-3.5.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-soap-impl-3.4.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/xmlsec-2.2.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/ldaptive-1.2.3.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/httpclient-cache-4.5.13.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-xmlsec-api-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/httpclient-4.5.13.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/compiler-0.9.10.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-logging-1.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/zstd-jni-1.5.2-1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/zjsonpatch-0.4.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/accessors-smart-2.4.7.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/cxf-rt-security-3.5.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/java-support-7.5.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/stax2-api-4.2.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/httpcore-nio-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/cxf-rt-rs-security-jose-3.5.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-messaging-api-3.4.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-storage-api-3.4.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/lz4-java-1.8.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-profile-api-3.4.5.jar -%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.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.6.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/java-saml-2.5.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-xmlsec-api-3.4.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-security-api-3.4.5.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/cryptacular-1.2.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/error_prone_annotations-2.3.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/java-support-7.5.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-transport-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/asm-9.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-security-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/cxf-rt-security-3.5.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-codec-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/rank-eval-client-2.8.0.jar %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.2.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/opensaml-saml-api-3.4.5.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/accessors-smart-2.4.7.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-cli-1.3.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-rest-high-level-client-2.8.0.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/cxf-rt-rs-json-basic-3.5.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-codec-http-4.1.91.Final.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.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/kafka-clients-3.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/json-flattener-0.5.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/commons-collections-3.2.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/log4j-slf4j-impl-2.17.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/metrics-core-3.1.2.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.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-buffer-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-codec-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-codec-http-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-common-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-handler-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-resolver-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-transport-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-transport-native-unix-common-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-rest-client-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-rest-high-level-client-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-security-2.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/parent-join-client-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/rank-eval-client-2.6.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.6.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.14.2.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.6.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.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/opensearch-security-analytics-2.6.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-security/httpcore-4.4.15.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/snappy-java-1.1.8.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jaxb-runtime-2.3.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/txw2-2.3.4.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/istack-commons-runtime-3.0.12.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/httpasyncclient-4.1.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/httpclient-4.5.13.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/bcprov-jdk15on-1.67.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/common-utils-2.8.0.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/annotations-13.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/NOTICE.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/opensearch-index-management-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/opensearch-index-management-spi-2.8.0.0.jar +%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/kotlin-stdlib-1.8.21.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/kotlin-stdlib-common-1.8.21.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/LICENSE.txt +%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-jdk7-1.8.21.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/httpclient-4.5.13.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/common-utils-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/javassist-3.29.2-GA.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/reflections-0.9.12.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/NOTICE.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/opensearch-neural-search-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/opensearch-ml-client-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/LICENSE.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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/opensearch-neural-search-2.6.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-neural-search/plugin-descriptor.properties +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/common-utils-2.8.0.0.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/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/opensearch-notifications-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/kotlin-stdlib-common-1.6.10.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/common-utils-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/opensearch-asynchronous-search-2.8.0.0.jar %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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/opensearch-asynchronous-search-2.6.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/httpcore-nio-4.4.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/httpasyncclient-4.1.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/gson-2.8.9.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/org.jacoco.ant-0.8.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/commons-pool2-2.10.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/sketches-core-0.13.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/org.jacoco.agent-0.8.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/memory-0.12.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/httpclient-4.5.13.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/commons-codec-1.15.jar -%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.6.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.14.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/jackson-databind-2.14.1.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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/opensearch-rest-client-2.6.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/protostuff-runtime-1.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/randomcutforest-core-3.0-rc3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/randomcutforest-parkservices-3.0-rc3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/randomcutforest-serialization-3.0-rc3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/commons-logging-1.2.jar -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial -%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.6.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.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/h3-2.6.0.0.jar -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/plugin-descriptor.properties +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/common-utils-2.8.0.0.jar %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/annotations-13.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/commons-digester-2.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/j2objc-annotations-1.3.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-rest-client-2.8.0.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/jsr305-3.0.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/kotlin-stdlib-1.6.10.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/kotlinx-coroutines-core-common-1.1.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/cron-utils-9.1.6.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/guava-30.0-jre.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/ipaddress-5.3.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/commons-codec-1.13.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/commons-logging-1.2.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/httpcore-nio-4.4.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/httpasyncclient-4.1.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/cron-utils-9.1.6.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/javassist-3.27.0-GA.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/failureaccess-1.0.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/slf4j-api-1.7.30.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/ipaddress-5.3.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/j2objc-annotations-1.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/jsr305-3.0.2.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/javax.el-3.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/javassist-3.27.0-GA.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/kotlinx-coroutines-core-1.1.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/annotations-13.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/guava-30.0-jre.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/google-java-format-1.10.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/alerting-core-2.8.0.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/checker-qual-3.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/httpclient-4.5.13.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/kotlinx-coroutines-core-common-1.1.1.jar -%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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/common-utils-2.6.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 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/percolator-client-2.8.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/commons-validator-1.7.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/kotlin-stdlib-1.6.10.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/httpcore-4.4.15.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/opensearch-alerting-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/httpasyncclient-4.1.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/httpclient-4.5.13.jar %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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/opensearch-rest-client-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/percolator-client-2.6.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.6.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/commons-collections4-4.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/commons-io-2.11.0.jar -%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.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.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.14.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jackson-databind-2.14.2.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jline-reader-3.21.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jline-style-3.21.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jline-terminal-3.21.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jline-terminal-jansi-3.21.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/libsvm-3.25.jar -%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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-ml-algorithms-2.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-ml-common-2.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-rest-client-2.6.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.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/protostuff-runtime-1.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/randomcutforest-core-3.0-rc3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/randomcutforest-parkservices-3.0-rc3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/randomcutforest-testutils-3.0-rc3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/reflections-0.9.12.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-anomaly-core-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-anomaly-libsvm-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-clustering-core-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-clustering-kmeans-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-common-libsvm-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-common-sgd-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-core-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-data-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-math-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-regression-core-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-regression-sgd-4.2.1.jar -%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_gpu-1.13.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 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/google-java-format-1.10.0.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/common-utils-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/datasources-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-sql-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/okhttp-4.9.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/parent-join-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/commons-math3-3.6.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/json-20230227.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/core-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/reflections-0.9.12.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/annotations-13.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/j2objc-annotations-1.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/opensearch-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/bcprov-ext-jdk15on-1.70.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-rest-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/NOTICE.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/icu4j-58.2.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/ion-java-1.0.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/vavr-0.10.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/jsr305-3.0.2.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/checker-qual-3.12.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/sql-2.8.0.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/opensearch-ssl-config-2.8.0.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/ST4-4.0.8.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/org.abego.treelayout.core-1.0.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/jackson-databind-2.15.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/druid-1.0.15.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/legacy-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/jackson-annotations-2.15.1.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/kotlin-reflect-1.4.30.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/aws-encryption-sdk-java-2.4.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/commons-codec-1.13.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/geo-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/jmespath-java-1.12.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/antlr4-runtime-4.7.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/commons-logging-1.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/javassist-3.26.0-GA.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/commons-io-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/antlr-runtime-3.5.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/vavr-match-0.10.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-ml-client-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/reindex-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/protocol-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/prometheus-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/failureaccess-1.0.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/commons-lang3-3.12.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/antlr4-4.7.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/ppl-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/LICENSE.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/httpcore-4.4.15.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/aws-java-sdk-core-1.12.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/aws-java-sdk-sts-1.12.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/slf4j-api-1.7.36.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/common-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/resilience4j-retry-1.5.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/httpasyncclient-4.1.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/httpclient-4.5.13.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/gson-2.8.9.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/presto-matching-0.240.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/guava-31.0.1-jre.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/NOTICE.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/geo-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/opensearch-geospatial-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/commons-lang3-3.12.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/h3-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/LICENSE.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/plugin-descriptor.properties +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/common-utils-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/json-20230227.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/json-flattener-0.15.1.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/json-base-2.2.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/opensearch-reports-scheduler-2.8.0.0.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/jackson-annotations-2.14.1.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/jackson-databind-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/gson-2.8.9.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/common-utils-2.8.0.0.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/opensearch-cross-cluster-replication-2.8.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/ipaddress-5.3.3.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/kotlin-stdlib-jdk8-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/plugin-descriptor.properties +%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/NOTICE.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/opensearch-knn-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/guava-30.0-jre.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/libopensearchknn_common.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/libopensearchknn_nmslib.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/libgomp.so.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/libopensearchknn_faiss.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/failureaccess-1.0.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/LICENSE.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/plugin-descriptor.properties +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/commons-lang-2.6.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/common-utils-2.8.0.0.jar +%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/opensearch-anomaly-detection-2.8.0.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/randomcutforest-parkservices-3.0-rc3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/protostuff-core-1.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/opensearch-rest-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/protostuff-runtime-1.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/randomcutforest-serialization-3.0-rc3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/jackson-annotations-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/commons-logging-1.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/org.jacoco.agent-0.8.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/httpcore-nio-4.4.15.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/sketches-core-0.13.4.jar +%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-pool2-2.10.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/jackson-databind-2.14.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/httpcore-4.4.15.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/randomcutforest-core-3.0-rc3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/plugin-security.policy +%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/memory-0.12.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/httpasyncclient-4.1.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/httpclient-4.5.13.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/org.jacoco.ant-0.8.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/gson-2.8.9.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/commons-codec-1.15.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/aws-java-sdk-ses-1.12.48.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/aws-java-sdk-sns-1.12.48.jar -%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.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/jackson-databind-2.14.2.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.6.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/opensearch-notifications-core-spi-2.6.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/jackson-databind-2.15.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/aws-java-sdk-sns-1.12.48.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/jackson-annotations-2.15.1.jar +%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/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/opensearch-notifications-core-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/activation-1.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/opensearch-notifications-core-spi-2.8.0.0.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/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.6.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.6.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}/plugins/opensearch-notifications-core/aws-java-sdk-core-1.12.48.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/plugin-descriptor.properties +%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/kotlin-stdlib-common-1.6.10.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/common-utils-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/opensearch-rest-client-2.8.0.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/cron-utils-9.1.6.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/opensearch-security-analytics-2.8.0.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/httpcore-nio-4.4.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/antlr4-runtime-4.10.1.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/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/plugin-descriptor.properties +%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/commons-codec-1.15.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/common-utils-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/json-20230227.jar +%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/json-flattener-0.15.1.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/json-base-2.2.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/jackson-annotations-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/opensearch-observability-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/jackson-databind-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/plugin-descriptor.properties +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jackson-module-paranamer-2.15.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/opensearch-performance-analyzer-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-transport-native-unix-common-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/performance-analyzer-commons-1.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/j2objc-annotations-1.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-buffer-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-resolver-4.1.91.Final.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/netty-handler-proxy-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-common-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/objenesis-3.0.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jsr305-3.0.2.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/byte-buddy-1.9.7.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-handler-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-codec-socks-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jackson-databind-2.15.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jackson-annotations-2.15.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-codec-http2-4.1.91.Final.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/netty-transport-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-codec-4.1.91.Final.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/commons-lang3-3.12.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-codec-http-4.1.91.Final.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/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/checker-qual-3.29.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/mockito-core-2.23.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/byte-buddy-agent-1.9.7.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/guava-31.1-jre.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/error_prone_annotations-2.9.0.jar +%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/opensearch-grok-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/joni-2.1.44.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/opensearch-dissect-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/ingest-common-2.8.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/jcodings-1.0.58.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.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/joni-2.1.44.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/opensearch-dissect-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/opensearch-grok-2.6.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.6.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/plugin-descriptor.properties -%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/ingest-geoip-2.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/geoip2-3.0.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/jackson-annotations-2.14.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/jackson-databind-2.14.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/maxmind-db-2.1.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.6.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.6.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.6.0.jar -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/plugin-descriptor.properties +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/repository-url-2.8.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/repository-url-2.6.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.6.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.6.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.6.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.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-codec-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-codec-http-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-common-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-handler-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-resolver-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-transport-4.1.87.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-transport-native-unix-common-4.1.87.Final.jar -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/lang-expression-2.6.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.11.1.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.5.0.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.6.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.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/antlr4-runtime-4.11.1.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.6.0.jar -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/plugin-descriptor.properties +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/percolator/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/percolator/percolator-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/percolator/plugin-descriptor.properties +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/search-pipeline-common/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/search-pipeline-common/search-pipeline-common-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/search-pipeline-common/plugin-descriptor.properties +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/opensearch-rest-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/opensearch-ssl-config-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/opensearch-dashboards-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/commons-logging-1.2.jar %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.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/reindex-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/httpcore-4.4.15.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.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/httpasyncclient-4.1.5.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.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/opensearch-ssl-config-2.6.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.6.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.6.0.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/lang-painless-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/asm-tree-9.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/asm-analysis-9.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/antlr4-runtime-4.11.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/asm-9.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/opensearch-scripting-painless-spi-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/asm-util-9.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/asm-commons-9.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/plugin-descriptor.properties +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/analysis-common/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/analysis-common/analysis-common-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/analysis-common/plugin-descriptor.properties +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/rank-eval/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/rank-eval/rank-eval-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/rank-eval/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/aggs-matrix-stats/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/aggs-matrix-stats/aggs-matrix-stats-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/aggs-matrix-stats/plugin-descriptor.properties +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/geo/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/geo/geo-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/geo/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.8.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/mapper-extras/plugin-descriptor.properties -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/parent-join +%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.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-user-agent/plugin-descriptor.properties +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd/systemd-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd/plugin-descriptor.properties +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-transport-native-unix-common-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-buffer-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/transport-netty4-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-resolver-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-common-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-handler-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-transport-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-codec-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-codec-http-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/plugin-descriptor.properties +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/parent-join/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/parent-join/parent-join-client-2.8.0.jar %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.6.0.jar -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/lang-mustache-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/compiler-0.9.10.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/plugin-descriptor.properties +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/GeoLite2-ASN.mmdb +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/maxmind-db-2.1.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/jackson-databind-2.15.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/ingest-geoip-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/jackson-annotations-2.15.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/GeoLite2-Country.mmdb +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/geoip2-3.0.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/GeoLite2-City.mmdb +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/plugin-descriptor.properties +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/opensearch-rest-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/opensearch-ssl-config-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/commons-logging-1.2.jar %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.6.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.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/reindex-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/transport-netty4/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/transport-netty4/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/transport-netty4/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/parent-join/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/parent-join/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/httpcore-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/httpasyncclient-4.1.5.jar %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.6.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 -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/parent-join -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/parent-join/plugin-descriptor.properties -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/transport-netty4 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/transport-netty4/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/transport-netty4/plugin-security.policy -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1 +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/asm-tree-9.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/lang-expression-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/lucene-expressions-9.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/antlr4-runtime-4.11.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/asm-9.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/asm-commons-9.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/plugin-descriptor.properties +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/opensearch-upgrade-cli-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-core-2.15.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-databind-2.15.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-annotations-2.15.1.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/plugin-cli/ +%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/commons-compress-1.23.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/plugin-cli/bcpg-fips-1.0.7.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/plugin-cli/opensearch-plugin-cli-2.8.0.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/keystore-cli/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/keystore-cli/keystore-cli-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/log4j-core-2.17.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-misc-9.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-launchers-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-cli-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-core-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-core-2.15.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-spatial-extras-9.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jna-5.5.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-memory-9.6.0.jar +%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/jts-core-1.15.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-secure-sm-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-x-content-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-backward-codecs-9.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-core-9.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/java-version-checker-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-yaml-2.15.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-plugin-classloader-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-spatial3d-9.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-common-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-cbor-2.15.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-suggest-9.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/t-digest-3.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-geo-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-grouping-9.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jopt-simple-5.0.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-sandbox-9.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-queryparser-9.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-highlighter-9.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-join-9.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-smile-2.15.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/snakeyaml-2.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/joda-time-2.12.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/protobuf-java-3.22.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-analysis-common-9.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/log4j-jul-2.17.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-queries-9.6.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/spatial4j-0.7.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/HdrHistogram-2.1.12.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jmap.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jconsole.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jstack.1 %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jrunscript.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jcmd.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/java.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jdeprscan.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/javadoc.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jar.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jdb.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jpackage.1 %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jstatd.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/serialver.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jdb.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jinfo.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/javap.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/javadoc.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/javac.1 %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/keytool.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jconsole.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jlink.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/java.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jcmd.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jstat.1 %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jhsdb.1 %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jshell.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/rmiregistry.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/javac.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jstack.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jfr.1 %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jps.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jarsigner.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jfr.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jdeprscan.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jar.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jlink.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/serialver.1 %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jmod.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jstat.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jinfo.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jmap.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/rmiregistry.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jpackage.1 %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jdeps.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/javap.1 -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jdeps -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/rmiregistry -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jrunscript -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jdeprscan -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jar -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jmap -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jps -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jstatd -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/java -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jdb -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jimage -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/javadoc -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jconsole -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jcmd -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jstack -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jinfo -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jpackage -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/serialver -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/javap -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/keytool -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jarsigner -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jhsdb -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jlink -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jfr -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jstat -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/javac -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jmod -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jshell +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jarsigner.1 +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.xml.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.management.rmi.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.attach.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.localedata.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.opt.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.naming.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.sql.rowset.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.le.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.dynalink.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jfr.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.smartcardio.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.editpad.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.security.jgss.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.crypto.cryptoki.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.nio.mapmode.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jsobject.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.incubator.vector.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.accessibility.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.compiler.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.prefs.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jdwp.agent.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.instrument.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.javadoc.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.unsupported.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.vm.compiler.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.xml.dom.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jstatd.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.jvmstat.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.security.auth.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.security.jgss.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.sql.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.management.agent.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.naming.dns.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.zipfs.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.transaction.xa.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.management.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.ed.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.incubator.foreign.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.crypto.ec.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jshell.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.xml.crypto.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jcmd.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.management.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jpackage.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.compiler.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.logging.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.se.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.unsupported.desktop.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.httpserver.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.charsets.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.datatransfer.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.naming.rmi.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.scripting.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jlink.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jartool.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.rmi.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.net.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.net.http.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.management.jfr.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.hotspot.agent.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.security.sasl.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.sctp.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jdeps.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.random.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.vm.ci.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.desktop.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.base.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jdi.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jconsole.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.vm.compiler.management.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/NOTICE +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/classfile_constants.h +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/linux/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/linux/jni_md.h +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/linux/jawt_md.h +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/jdwpTransport.h +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/jvmticmlr.h +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/jni.h +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/jvmti.h +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/jawt.h +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jvm.cfg +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libawt_xawt.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libawt_headless.so +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/blocked.certs +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/default.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/cacerts +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/public_suffix_list.dat +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjava.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libextnet.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjimage.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libnio.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libprefs.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjaas.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjawt.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jspawnhelper +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjdwp.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libawt.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/psfont.properties.ja +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libmanagement.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjsig.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/tzdb.dat +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/modules +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server/libjsig.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server/classes.jsa +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server/classes_nocoops.jsa +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server/libjvm.so +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jfr/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jfr/profile.jfc +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jfr/default.jfc +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libattach.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libdt_socket.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjsound.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/psfontj2d.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjavajpeg.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/ct.sym +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libnet.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/classlist +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libj2gss.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libmanagement_agent.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libsplashscreen.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libj2pcsc.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libverify.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jrt-fs.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libsyslookup.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libmanagement_ext.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libj2pkcs11.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjsvml.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libsaproc.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libinstrument.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjli.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libsctp.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libfontmanager.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/liblcms.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/librmi.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jexec +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libzip.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libmlib_image.so +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/javadoc +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jpackage +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jrunscript +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jhsdb +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jstat +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jdb +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jdeprscan +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/java +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/rmiregistry +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/javac +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jconsole +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jlink +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jfr +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jinfo +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/serialver +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jps +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jcmd +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/javap +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/keytool +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jstatd +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jstack +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jdeps +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jshell +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jimage +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jmap +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jarsigner +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/release -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/LICENSE -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/ADDITIONAL_LICENSE_INFO -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/icu.md +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.instrument/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.net/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.crypto.cryptoki/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.crypto.cryptoki/pkcs11cryptotoken.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.crypto.cryptoki/pkcs11wrapper.md +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.security.auth/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.smartcardio/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.smartcardio/pcsclite.md +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.zipfs/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.localedata/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.localedata/thaidict.md +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.prefs/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.dynalink/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.dynalink/dynalink.md +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.jpackage/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.management/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.jvmstat/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml.crypto/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml.crypto/santuario.md +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.net.http/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.unsupported/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.datatransfer/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.jdi/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.incubator.vector/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.charsets/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.management.jfr/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.accessibility/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.jartool/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.security.sasl/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.ed/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.editpad/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.httpserver/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/c-libutl.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/public_suffix.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/cldr.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/icu.md %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/aes.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/cldr.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/public_suffix.md %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/ASSEMBLY_EXCEPTION +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/ADDITIONAL_LICENSE_INFO %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/asm.md %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/unicode.md -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.security.sasl -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.scripting -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.dynalink -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.dynalink/dynalink.md -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.management -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.javadoc -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.javadoc/jqueryUI.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.javadoc/jquery.md -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/LICENSE +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.jcmd/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.opt/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.opt/jopt-simple.md +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.scripting/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/xalan.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/xerces.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/jcup.md %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/bcel.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/jcup.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/xerces.md %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/dom.md -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.smartcardio -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.smartcardio/pcsclite.md -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.transaction.xa -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.prefs -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.compiler -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.logging -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.opt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.opt/jopt-simple.md -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml.crypto -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml.crypto/santuario.md -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.localedata -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.localedata/thaidict.md -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.sql.rowset -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.net.http -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.rmi -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.sql -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.naming -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.datatransfer -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.le +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.jdeps/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.jstatd/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.management.agent/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.random/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.sctp/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.sql/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.nio.mapmode/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.hotspot.agent/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.attach/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.naming/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.management/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.sql.rowset/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.rmi/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.vm.compiler/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.unsupported.desktop/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.logging/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.security.jgss/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.vm.compiler.management/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.jfr/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.transaction.xa/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.crypto.ec/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.vm.ci/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.naming.rmi/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.xml.dom/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.le/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.le/jline.md -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.crypto.cryptoki -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.crypto.cryptoki/pkcs11cryptotoken.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.crypto.cryptoki/pkcs11wrapper.md -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.instrument -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.management.rmi -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.jsobject/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.jdwp.agent/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.se/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.compiler/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.incubator.foreign/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.jshell/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.javadoc/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.javadoc/jquery.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.javadoc/jqueryUI.md +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.compiler/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.security.jgss/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.jconsole/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.naming.dns/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.management.rmi/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/xwd.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/mesa3d.md %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/harfbuzz.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/lcms.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/giflib.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/libpng.md %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/jpeg.md %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/colorimaging.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/libpng.md -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server/libjsig.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server/classes.jsa -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server/classes_nocoops.jsa -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server/libjvm.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libawt.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libawt_headless.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libsplashscreen.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libnio.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjdwp.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libj2pcsc.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjli.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libsctp.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjimage.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjsig.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjava.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/liblcms.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libawt_xawt.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jexec -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libverify.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libmanagement_agent.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/psfont.properties.ja -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libprefs.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libzip.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjaas.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjsound.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libextnet.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libj2gss.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/tzdb.dat -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libdt_socket.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/psfontj2d.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jvm.cfg -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/ct.sym -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libj2pkcs11.so -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jfr -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jfr/default.jfc -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jfr/profile.jfc -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libmanagement_ext.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/classlist -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libnet.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjavajpeg.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libfontmanager.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/modules -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libinstrument.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libmanagement.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjawt.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libsaproc.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libmlib_image.so -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/cacerts -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/public_suffix_list.dat -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/default.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/librmi.so -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jspawnhelper -%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/jvmti.h -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/classfile_constants.h -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/jdwpTransport.h -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/jawt.h -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/jni.h -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/jvmticmlr.h -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/linux -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/linux/jawt_md.h -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/linux/jni_md.h -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/net.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/sound.properties -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/sdp -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/sdp/sdp.conf.template -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/management -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/management/management.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/management/jmxremote.access -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/management/jmxremote.password.template -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/logging.properties -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/mesa3d.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/giflib.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/lcms.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.jlink/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/java.policy -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/limited -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/limited/default_US_export.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/java.security +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/limited/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/limited/exempt_local.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/limited/default_local.policy -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/unlimited -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/unlimited/default_US_export.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/limited/default_US_export.policy +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/unlimited/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/unlimited/default_local.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/unlimited/default_US_export.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/README.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/java.security -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.unsupported.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.transaction.xa.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.crypto.cryptoki.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.rmi.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.attach.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jshell.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.xml.dom.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.se.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.ed.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jartool.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.compiler.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.base.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.smartcardio.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.security.auth.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.unsupported.desktop.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.security.sasl.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.incubator.foreign.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.management.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.management.agent.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.xml.crypto.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.vm.ci.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.prefs.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.crypto.ec.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.jvmstat.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.sql.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.xml.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.security.jgss.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.compiler.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.sctp.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.charsets.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.management.jfr.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jlink.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.localedata.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jsobject.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.net.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.hotspot.agent.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jstatd.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.dynalink.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jfr.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.naming.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.le.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jcmd.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.management.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.net.http.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.logging.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.accessibility.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.opt.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.management.rmi.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.security.jgss.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.desktop.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.nio.mapmode.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.vm.compiler.management.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jdwp.agent.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jdi.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.javadoc.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.naming.rmi.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.naming.dns.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.editpad.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jdeps.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.vm.compiler.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.sql.rowset.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.scripting.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.datatransfer.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.httpserver.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.zipfs.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jconsole.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.instrument.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/NOTICE -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.incubator.vector.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jpackage.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.random.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjsvml.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libsyslookup.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/blocked.certs +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/logging.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/net.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/sound.properties +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/sdp/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/sdp/sdp.conf.template +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/management/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/management/jmxremote.access +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/management/management.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/management/jmxremote.password.template +%dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/ +%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/internal_users.yml +%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/audit.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/tenants.yml +%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/whitelist.yml +%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/action_groups.yml +%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/allowlist.yml +%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/roles_mapping.yml +%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/nodes_dn.yml +%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/config.yml +%dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-notifications/ +%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR})/opensearch-notifications/notifications.yml +%config(noreplace) %attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/jvm.options +%dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/jvm.options.d/ +%dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-reports-scheduler/ +%attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-reports-scheduler/reports-scheduler.yml +%config(noreplace) %attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/log4j2.properties +%dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-notifications-core/ +%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR})/opensearch-notifications-core/notifications-core.yml +%config(noreplace) %attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch.yml +%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-performance-analyzer/ +%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR})/opensearch-performance-analyzer/agent-stats-metadata +%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/log4j2.xml +%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR})/opensearch-performance-analyzer/rca.conf +%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/supervisord.conf +%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR})/opensearch-performance-analyzer/opensearch_security.policy +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/ +%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/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/log4j2.xml +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/rca.conf +%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/supervisord.conf +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/opensearch_security.policy +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/log4j-core-2.17.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-transport-native-unix-common-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/commons-lang3-3.9.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jackson-core-2.15.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/performance-analyzer-commons-1.0.0-SNAPSHOT.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/j2objc-annotations-1.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-buffer-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-resolver-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/log4j-api-2.17.1.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/jooq-3.10.8.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-handler-proxy-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-common-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/performance-analyzer-rca-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jsr305-3.0.2.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/netty-handler-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-socks-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jackson-databind-2.15.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jackson-annotations-2.15.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-stub-1.52.1.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/netty-codec-http2-4.1.91.Final.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/grpc-context-1.52.1.jar +%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/error_prone_annotations-2.14.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-api-1.52.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/javax.annotation-api-1.3.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/annotations-4.1.1.4.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-transport-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-4.1.91.Final.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/failureaccess-1.0.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-protobuf-1.52.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-http-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-netty-1.52.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-protobuf-lite-1.52.1.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/sqlite-jdbc-3.41.2.2.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/checker-qual-3.29.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/protobuf-java-3.22.3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/guava-31.1-jre.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-core-1.52.1.jar +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/bin/ +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/bin/performance-analyzer-agent +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/bin/performance-analyzer-rca +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-cli +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/systemd-entrypoint +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-upgrade +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-shard +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-plugin +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-node +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-env +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-env-from-file +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-keystore +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-performance-analyzer/ +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-performance-analyzer/performance-analyzer-agent-cli +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-performance-analyzer/performance-analyzer-agent +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/LICENSE.txt +%attr(440, %{USER}, %{GROUP}) %{INSTALL_DIR}/VERSION + %changelog * Fri Sep 08 2023 support - %{version} From c80e010ded9f6eca155690ed778119297876c5d5 Mon Sep 17 00:00:00 2001 From: Deblintrake09 Date: Thu, 31 Aug 2023 16:48:19 -0300 Subject: [PATCH 726/994] fix permission syntax errors --- stack/indexer/rpm/wazuh-indexer.spec | 42 ++++++++++++++-------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 583d3cbdc6..3d5d59de5c 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1339,27 +1339,27 @@ rm -fr %{buildroot} %config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/nodes_dn.yml %config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/config.yml %dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-notifications/ -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR})/opensearch-notifications/notifications.yml +%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-notifications/notifications.yml %config(noreplace) %attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/jvm.options %dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/jvm.options.d/ %dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-reports-scheduler/ %attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-reports-scheduler/reports-scheduler.yml %config(noreplace) %attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/log4j2.properties %dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-notifications-core/ -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR})/opensearch-notifications-core/notifications-core.yml +%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-notifications-core/notifications-core.yml %config(noreplace) %attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch.yml %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-performance-analyzer/ -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR})/opensearch-performance-analyzer/agent-stats-metadata -%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/log4j2.xml -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR})/opensearch-performance-analyzer/rca.conf -%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/supervisord.conf -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR})/opensearch-performance-analyzer/opensearch_security.policy +%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/agent-stats-metadata +%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/log4j2.xml +%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/rca.conf +%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/supervisord.conf +%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/opensearch_security.policy %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/agent-stats-metadata @@ -1422,16 +1422,16 @@ rm -fr %{buildroot} %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/bin/performance-analyzer-agent %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/bin/performance-analyzer-rca %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/ -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-cli -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/systemd-entrypoint -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-upgrade -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-shard -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-plugin -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-node -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-env -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-env-from-file -%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-keystore +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-cli +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/systemd-entrypoint +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-upgrade +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-shard +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-plugin +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-node +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-env +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-env-from-file +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-keystore %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-performance-analyzer/ %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-performance-analyzer/performance-analyzer-agent-cli %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-performance-analyzer/performance-analyzer-agent From 09718b43c2a5bfbde85b3b92d3dbf18dd9442de9 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Thu, 31 Aug 2023 22:40:30 +0200 Subject: [PATCH 727/994] Added missing files --- stack/indexer/rpm/wazuh-indexer.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 3d5d59de5c..e511b9b9ac 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1437,6 +1437,10 @@ rm -fr %{buildroot} %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-performance-analyzer/performance-analyzer-agent %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/LICENSE.txt %attr(440, %{USER}, %{GROUP}) %{INSTALL_DIR}/VERSION +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/indexer-security-init.sh +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/config.yml +%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/wazuh-certs-tool.sh +%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/wazuh-passwords-tool.sh %changelog From 1df48b8b5ae8130551d93a6619d86fb12fe68051 Mon Sep 17 00:00:00 2001 From: Deblintrake09 Date: Thu, 31 Aug 2023 18:01:48 -0300 Subject: [PATCH 728/994] fix permission errors in rpm specs --- stack/dashboard/base/builder.sh | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 56 ++++++++++++++-------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh index c474d56eca..c88304df48 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -16,7 +16,7 @@ revision="$2" future="$3" repository="$4" reference="$5" -opensearch_version="2.8.0" +opensearch_version="2.6.0" base_dir=/opt/wazuh-dashboard-base # ----------------------------------------------------------------------------- diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index e511b9b9ac..8189f41a92 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1171,34 +1171,34 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libzip.so %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libmlib_image.so %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/javadoc -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jpackage -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jrunscript -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jhsdb -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jstat -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jdb -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jdeprscan -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/java -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/rmiregistry -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/javac -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jconsole -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jlink -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jfr -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jinfo -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/serialver -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jps -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jcmd -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/javap -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/keytool -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jstatd -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jstack -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jdeps -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jshell -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jimage -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jmap -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jarsigner -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jar +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/javadoc +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jmod +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jpackage +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jrunscript +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jhsdb +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jstat +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jdb +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jdeprscan +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/java +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/rmiregistry +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/javac +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jconsole +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jlink +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jfr +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jinfo +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/serialver +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jps +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jcmd +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/javap +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/keytool +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jstatd +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jstack +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jdeps +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jshell +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jimage +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jmap +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jarsigner +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/release %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.instrument/ From ebb19af7accf38b801c61c2108dfa6c0ff214d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Fri, 1 Sep 2023 12:25:39 +0200 Subject: [PATCH 729/994] Fixed debug redirection in complex commands --- unattended_installer/install_functions/filebeat.sh | 6 +++--- unattended_installer/install_functions/indexer.sh | 2 +- unattended_installer/install_functions/installCommon.sh | 4 ++-- unattended_installer/passwords_tool/passwordsFunctions.sh | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/unattended_installer/install_functions/filebeat.sh b/unattended_installer/install_functions/filebeat.sh index 4604d601ff..df06396fa3 100644 --- a/unattended_installer/install_functions/filebeat.sh +++ b/unattended_installer/install_functions/filebeat.sh @@ -16,7 +16,7 @@ function filebeat_configure(){ fi eval "chmod go+r /etc/filebeat/wazuh-template.json ${debug}" - eval "common_curl -sS ${filebeat_wazuh_module} --max-time 300 --retry 5 --retry-delay 5 --fail | tar -xvz -C /usr/share/filebeat/module ${debug}" + eval "(common_curl -sS ${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 @@ -42,8 +42,8 @@ function filebeat_configure(){ filebeat_copyCertificates eval "filebeat keystore create ${debug}" - eval "echo admin | filebeat keystore add username --force --stdin ${debug}" - eval "echo admin | filebeat keystore add password --force --stdin ${debug}" + eval "(echo admin | filebeat keystore add username --force --stdin)" "${debug}" + eval "(echo admin | filebeat keystore add password --force --stdin)" "${debug}" common_logger "Filebeat post-install configuration finished." } diff --git a/unattended_installer/install_functions/indexer.sh b/unattended_installer/install_functions/indexer.sh index 542aff48b2..16c344f857 100644 --- a/unattended_installer/install_functions/indexer.sh +++ b/unattended_installer/install_functions/indexer.sh @@ -176,7 +176,7 @@ function indexer_startCluster() { else common_logger "Wazuh indexer cluster security configuration initialized." fi - 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}" + $"(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 a34384dde6..b13a3088fa 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -47,7 +47,7 @@ function installCommon_addWazuhRepo() { 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 "(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 "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}" @@ -56,7 +56,7 @@ function installCommon_addWazuhRepo() { 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 "(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}" eval "chmod 644 /etc/apt/sources.list.d/wazuh.list ${debug}" fi diff --git a/unattended_installer/passwords_tool/passwordsFunctions.sh b/unattended_installer/passwords_tool/passwordsFunctions.sh index 70b6e3df0b..6d3ab3b9d2 100644 --- a/unattended_installer/passwords_tool/passwordsFunctions.sh +++ b/unattended_installer/passwords_tool/passwordsFunctions.sh @@ -48,7 +48,7 @@ function passwords_changePassword() { if [ "${nuser}" == "admin" ] || [ -n "${changeall}" ]; then if [ -n "${filebeat_installed}" ]; then if filebeat keystore list | grep -q password ; then - eval "echo ${adminpass} | filebeat keystore add password --force --stdin ${debug}" + eval "(echo ${adminpass} | filebeat keystore add password --force --stdin)" "${debug}" else wazuhold=$(grep "password:" /etc/filebeat/filebeat.yml ) ra=" password: " From 57f6d3fe273e1b0d4d2078c11be08b793abeba5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Fri, 1 Sep 2023 13:37:40 +0200 Subject: [PATCH 730/994] Fixed indexer command --- unattended_installer/install_functions/indexer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/indexer.sh b/unattended_installer/install_functions/indexer.sh index 16c344f857..ad359fb2cd 100644 --- a/unattended_installer/install_functions/indexer.sh +++ b/unattended_installer/install_functions/indexer.sh @@ -176,7 +176,7 @@ function indexer_startCluster() { else common_logger "Wazuh indexer cluster security configuration initialized." fi - $"(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}" + eval "common_curl --silent ${filebeat_wazuh_template} --max-time 300 --retry 5 --retry-delay 5 ${debug}" | 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 From 203f4765298a7054be3cd40c8c86dc84338ad074 Mon Sep 17 00:00:00 2001 From: Deblintrake09 Date: Fri, 1 Sep 2023 10:34:06 -0300 Subject: [PATCH 731/994] fix java spawnhelper persmissions --- 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 8189f41a92..8025e80510 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1126,7 +1126,7 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libprefs.so %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjaas.so %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjawt.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jspawnhelper +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jspawnhelper %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjdwp.so %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libawt.so %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/psfont.properties.ja From bb53138233feee3dc651eff3631f49ba40d47069 Mon Sep 17 00:00:00 2001 From: Deblintrake09 Date: Fri, 1 Sep 2023 10:47:23 -0300 Subject: [PATCH 732/994] fix folder persmissions --- stack/indexer/rpm/wazuh-indexer.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 8025e80510..7ae93aeb72 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -870,7 +870,7 @@ rm -fr %{buildroot} %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/rank-eval/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/rank-eval/rank-eval-client-2.8.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/rank-eval/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/aggs-matrix-stats/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/aggs-matrix-stats/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/aggs-matrix-stats/aggs-matrix-stats-client-2.8.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/aggs-matrix-stats/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/geo/ @@ -923,10 +923,10 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/commons-logging-1.2.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/httpcore-nio-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/reindex-client-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/transport-netty4/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/transport-netty4/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/transport-netty4/plugin-security.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/transport-netty4/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/parent-join/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/parent-join/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/parent-join/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/httpcore-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/plugin-security.policy @@ -1303,7 +1303,7 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/mesa3d.md %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/giflib.md %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/lcms.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.jlink/ +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.jlink/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/java.policy From 2ce6fbc36816b78945c4c12c0053a154a5758d0c Mon Sep 17 00:00:00 2001 From: Deblintrake09 Date: Fri, 1 Sep 2023 10:49:38 -0300 Subject: [PATCH 733/994] fix service files persmissions --- stack/indexer/deb/debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index 1d895ef4df..05654f968e 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -139,7 +139,9 @@ override_dh_fixperms: chown root:root $(TARGET_DIR)/etc/init.d/$(NAME) chown root:root $(TARGET_DIR)$(SYS_DIR)/sysctl.d/$(NAME).conf chown root:root $(TARGET_DIR)$(SYS_DIR)/systemd/system/$(NAME).service + chmod 640 $(TARGET_DIR)$(SYS_DIR)/systemd/system/$(NAME).service chown root:root $(TARGET_DIR)$(SYS_DIR)/systemd/system/$(NAME)-performance-analyzer.service + chmod 640 $(TARGET_DIR)$(SYS_DIR)/systemd/system/$(NAME)-performance-analyzer.service chmod 640 $(TARGET_DIR)$(SYS_DIR)/tmpfiles.d/$(NAME).conf chown root:root $(TARGET_DIR)$(SYS_DIR)/tmpfiles.d/$(NAME).conf chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR) From 919d42f260ebd0c7caf53de64130876dea654d80 Mon Sep 17 00:00:00 2001 From: Deblintrake09 Date: Fri, 1 Sep 2023 10:52:46 -0300 Subject: [PATCH 734/994] fix deb wazuh-indexer file persmissions --- stack/indexer/deb/debian/rules | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index 05654f968e..3834ea3e95 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -133,17 +133,21 @@ override_dh_fixperms: chown -R $(USER):$(GROUP) $(TARGET_DIR)$(LIB_DIR) chmod 750 $(TARGET_DIR)$(LOG_DIR) chown -R $(USER):$(GROUP) $(TARGET_DIR)$(LOG_DIR) + + chmod 660 $(TARGET_DIR)/etc/default/$(NAME) chown root:$(GROUP) $(TARGET_DIR)/etc/default/$(NAME) chmod 750 $(TARGET_DIR)/etc/init.d/$(NAME) chown root:root $(TARGET_DIR)/etc/init.d/$(NAME) - chown root:root $(TARGET_DIR)$(SYS_DIR)/sysctl.d/$(NAME).conf - chown root:root $(TARGET_DIR)$(SYS_DIR)/systemd/system/$(NAME).service + chmod 640 $(TARGET_DIR)$(SYS_DIR)/sysctl.d/$(NAME).conf + chown root:root $(TARGET_DIR)$(SYS_DIR)/sysctl.d/$(NAME).conf chmod 640 $(TARGET_DIR)$(SYS_DIR)/systemd/system/$(NAME).service - chown root:root $(TARGET_DIR)$(SYS_DIR)/systemd/system/$(NAME)-performance-analyzer.service + chown root:root $(TARGET_DIR)$(SYS_DIR)/systemd/system/$(NAME).service chmod 640 $(TARGET_DIR)$(SYS_DIR)/systemd/system/$(NAME)-performance-analyzer.service + chown root:root $(TARGET_DIR)$(SYS_DIR)/systemd/system/$(NAME)-performance-analyzer.service chmod 640 $(TARGET_DIR)$(SYS_DIR)/tmpfiles.d/$(NAME).conf chown root:root $(TARGET_DIR)$(SYS_DIR)/tmpfiles.d/$(NAME).conf + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR) chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/jvm.options chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/opensearch.yml From fad98a9711b50777951dfb4af349b00d34a6fd3a Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Fri, 1 Sep 2023 16:26:01 +0200 Subject: [PATCH 735/994] Added debian missing files --- stack/indexer/deb/debian/rules | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index 3834ea3e95..d664c6102e 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -139,8 +139,8 @@ override_dh_fixperms: chown root:$(GROUP) $(TARGET_DIR)/etc/default/$(NAME) chmod 750 $(TARGET_DIR)/etc/init.d/$(NAME) chown root:root $(TARGET_DIR)/etc/init.d/$(NAME) - chmod 640 $(TARGET_DIR)$(SYS_DIR)/sysctl.d/$(NAME).conf - chown root:root $(TARGET_DIR)$(SYS_DIR)/sysctl.d/$(NAME).conf + chmod 640 $(TARGET_DIR)$(SYS_DIR)/sysctl.d/$(NAME).conf + chown root:root $(TARGET_DIR)$(SYS_DIR)/sysctl.d/$(NAME).conf chmod 640 $(TARGET_DIR)$(SYS_DIR)/systemd/system/$(NAME).service chown root:root $(TARGET_DIR)$(SYS_DIR)/systemd/system/$(NAME).service chmod 640 $(TARGET_DIR)$(SYS_DIR)/systemd/system/$(NAME)-performance-analyzer.service @@ -154,6 +154,9 @@ override_dh_fixperms: chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/jvm.options.d chmod 440 $(TARGET_DIR)$(INSTALLATION_DIR)/VERSION + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/indexer-security-init.sh + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/systemd-entrypoint + find "$(TARGET_DIR)$(INSTALLATION_DIR)" -type d -exec chmod 750 {} \; find "$(TARGET_DIR)$(INSTALLATION_DIR)" -type f -perm 644 -exec chmod 640 {} \; find "$(TARGET_DIR)$(INSTALLATION_DIR)" -type f -perm 664 -exec chmod 660 {} \; From a15f97c5d9f925f0ffa0ca2ba1fcf3748880aeba Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Fri, 1 Sep 2023 16:49:46 +0200 Subject: [PATCH 736/994] Added specials files to SPECS %files list --- stack/indexer/deb/debian/rules | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index d664c6102e..dd0ef02738 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -149,13 +149,18 @@ override_dh_fixperms: chown root:root $(TARGET_DIR)$(SYS_DIR)/tmpfiles.d/$(NAME).conf chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR) + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/extensions chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/jvm.options chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/opensearch.yml chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/jvm.options.d chmod 440 $(TARGET_DIR)$(INSTALLATION_DIR)/VERSION - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/indexer-security-init.sh chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/systemd-entrypoint + chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/audit_config_migrater.sh + chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/hash.sh + chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/securityadmin.sh + chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/wazuh-certs-tool.sh + chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/wazuh-passwords-tool.sh find "$(TARGET_DIR)$(INSTALLATION_DIR)" -type d -exec chmod 750 {} \; find "$(TARGET_DIR)$(INSTALLATION_DIR)" -type f -perm 644 -exec chmod 640 {} \; From ca63bb6ca907011ffcfe11d3e2330d40e49025f8 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Fri, 1 Sep 2023 17:06:50 +0200 Subject: [PATCH 737/994] Removed extensions directory --- stack/indexer/deb/debian/rules | 1 - 1 file changed, 1 deletion(-) diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index dd0ef02738..523c894803 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -149,7 +149,6 @@ override_dh_fixperms: chown root:root $(TARGET_DIR)$(SYS_DIR)/tmpfiles.d/$(NAME).conf chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR) - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/extensions chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/jvm.options chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/opensearch.yml chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/jvm.options.d From c2827400c2a4cf76e42a1c49541125761e869549 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Fri, 1 Sep 2023 17:09:43 +0200 Subject: [PATCH 738/994] Added aggs-matrix-stats directory --- stack/indexer/deb/debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index 523c894803..7e88294fa3 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -150,6 +150,7 @@ override_dh_fixperms: chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR) chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/jvm.options + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/aggs-matrix-stats chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/opensearch.yml chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/jvm.options.d chmod 440 $(TARGET_DIR)$(INSTALLATION_DIR)/VERSION From 63f7419de42ec8fd7d9e30b807ae1db72b3c05a3 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Fri, 1 Sep 2023 16:43:05 -0300 Subject: [PATCH 739/994] Fixed filebeat module URL --- unattended_installer/builder.sh | 15 ++++++++++----- .../install_functions/installVariables.sh | 3 ++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index 4e4a7d87b7..286ba2f001 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -16,7 +16,7 @@ readonly resources_certs="${base_path_builder}/cert_tool" readonly resources_passwords="${base_path_builder}/passwords_tool" readonly resources_common="${base_path_builder}/common_functions" readonly resources_download="${base_path_builder}/downloader" -readonly source_branch="4.6.0" +source_branch="v4.6.0" function getHelp() { @@ -48,9 +48,6 @@ function getHelp() { function buildInstaller() { - checkDistDetectURL - checkFilebeatURL - output_script_path="${base_path_builder}/wazuh-install.sh" ## Create installer script @@ -77,6 +74,8 @@ function buildInstaller() { echo 'readonly filebeat_wazuh_module="${repobaseurl}/filebeat/wazuh-filebeat-0.2.tar.gz"' >> "${output_script_path}" echo 'readonly bucket="packages-dev.wazuh.com"' >> "${output_script_path}" echo 'readonly repository="'"${devrepo}"'"' >> "${output_script_path}" + sed -i 's|v${wazuh_version}|${wazuh_version}|g' "${resources_installer}/installVariables.sh" + source_branch="4.6.0" else echo 'readonly repogpg="https://packages.wazuh.com/key/GPG-KEY-WAZUH"' >> "${output_script_path}" echo 'readonly repobaseurl="https://packages.wazuh.com/4.x"' >> "${output_script_path}" @@ -133,6 +132,9 @@ function buildInstaller() { echo >> "${output_script_path}" echo "main \"\$@\"" >> "${output_script_path}" + checkDistDetectURL + checkFilebeatURL + } function buildPasswordsTool() { @@ -263,7 +265,10 @@ function builder_main() { buildInstaller chmod 500 ${output_script_path} if [ -n "${change_filebeat_url}" ]; then - sed -i -E "s|(https.+)master(.+wazuh-template.json)|\1\\$\\{wazuh_major\\}\2|" "${resources_installer}/installVariables.sh" + sed -i -E "s|(https.+)master(.+wazuh-template.json)|\1\\$\\{source_branch\\}\2|" "${resources_installer}/installVariables.sh" + fi + if [ -n "${development}" ]; then + sed -i 's|${wazuh_version}|v${wazuh_version}|g' "${resources_installer}/installVariables.sh" fi fi diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index a0f2c7afe0..18368b9c5c 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -11,6 +11,7 @@ readonly wazuh_major="4.6" readonly wazuh_version="4.6.0" readonly filebeat_version="7.10.2" readonly wazuh_install_vesion="0.1" +readonly source_branch="v${wazuh_version}" ## Links and paths to resources readonly resources="https://${bucket}/${wazuh_major}" @@ -21,7 +22,7 @@ config_file="${base_path}/config.yml" readonly tar_file_name="wazuh-install-files.tar" tar_file="${base_path}/${tar_file_name}" -readonly filebeat_wazuh_template="https://raw.githubusercontent.com/wazuh/wazuh/${wazuh_major}/extensions/elasticsearch/7.x/wazuh-template.json" +readonly filebeat_wazuh_template="https://raw.githubusercontent.com/wazuh/wazuh/${source_branch}/extensions/elasticsearch/7.x/wazuh-template.json" readonly dashboard_cert_path="/etc/wazuh-dashboard/certs" readonly filebeat_cert_path="/etc/filebeat/certs" From bf126ff73d8466ae8db201cd547d195ef875b08a Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Fri, 1 Sep 2023 22:51:13 +0200 Subject: [PATCH 740/994] Changed stack config file path --- stack/dashboard/base/files/etc/services/wazuh-dashboard.service | 2 +- stack/dashboard/deb/debian/rules | 1 + stack/dashboard/rpm/wazuh-dashboard.spec | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/stack/dashboard/base/files/etc/services/wazuh-dashboard.service b/stack/dashboard/base/files/etc/services/wazuh-dashboard.service index 3fd27c5a1a..ef1d2afd42 100644 --- a/stack/dashboard/base/files/etc/services/wazuh-dashboard.service +++ b/stack/dashboard/base/files/etc/services/wazuh-dashboard.service @@ -7,7 +7,7 @@ User=wazuh-dashboard Group=wazuh-dashboard EnvironmentFile=-/etc/default/wazuh-dashboard EnvironmentFile=-/etc/sysconfig/wazuh-dashboard -ExecStart=/usr/share/wazuh-dashboard/bin/opensearch-dashboards "-c /etc/wazuh-dashboard/opensearch_dashboards.yml" +ExecStart=/usr/share/wazuh-dashboard/bin/opensearch-dashboards WorkingDirectory=/usr/share/wazuh-dashboard [Install] diff --git a/stack/dashboard/deb/debian/rules b/stack/dashboard/deb/debian/rules index 22f2c14cad..b011b00963 100644 --- a/stack/dashboard/deb/debian/rules +++ b/stack/dashboard/deb/debian/rules @@ -58,6 +58,7 @@ override_dh_install: useradd -g $(GROUP) $(USER) tar -xf $(DASHBOARD_FILE) + sed -i "s/cross_platform_1.REPO_ROOT\, 'config\//'\/etc\/wazuh-dashboard\/', '/g" "wazuh-dashboard-base/node_modules/@osd/utils/target/path/index.js" mkdir -p $(TARGET_DIR)$(CONFIG_DIR) mkdir -p $(TARGET_DIR)$(INSTALLATION_DIR) diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index a621622dc1..37bc5366c9 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -54,6 +54,7 @@ useradd -g %{GROUP} %{USER} %build tar -xf %{DASHBOARD_FILE} +sed -i "s/cross_platform_1.REPO_ROOT\, 'config\//'\/etc\/wazuh-dashboard\/', '/g" "wazuh-dashboard-base/node_modules/@osd/utils/target/path/index.js" # ----------------------------------------------------------------------------- From bcdfbe2630fcce69dfdbae42925103f79b8c7930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Mon, 4 Sep 2023 13:26:33 +0200 Subject: [PATCH 741/994] Fixed dashboard port definition --- unattended_installer/install_functions/installVariables.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index 18368b9c5c..3c3a725685 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -53,4 +53,4 @@ http_port=443 readonly wazuh_aio_ports=( 9200 9300 1514 1515 1516 55000 "${http_port}") readonly wazuh_indexer_ports=( 9200 9300 ) readonly wazuh_manager_ports=( 1514 1515 1516 55000 ) -readonly wazuh_dashboard_ports=( "${http_port}" ) +readonly wazuh_dashboard_port="${http_port}" From 5e18c6a63c344e36ec76e6e9bed4cbcb5da07cca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Mon, 4 Sep 2023 16:45:52 +0200 Subject: [PATCH 742/994] Silenced node version output --- unattended_installer/passwords_tool/passwordsFunctions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/passwords_tool/passwordsFunctions.sh b/unattended_installer/passwords_tool/passwordsFunctions.sh index c3c1ae7040..52c672497e 100644 --- a/unattended_installer/passwords_tool/passwordsFunctions.sh +++ b/unattended_installer/passwords_tool/passwordsFunctions.sh @@ -63,7 +63,7 @@ function passwords_changePassword() { if [ "$nuser" == "kibanaserver" ] || [ -n "$changeall" ]; then if [ -n "${dashboard_installed}" ] && [ -n "${dashpass}" ]; then if /usr/share/wazuh-dashboard/bin/opensearch-dashboards-keystore --allow-root list | grep -q opensearch.password; then - eval "echo ${dashpass} | /usr/share/wazuh-dashboard/bin/opensearch-dashboards-keystore --allow-root add -f --stdin opensearch.password ${debug_pass}" + eval "echo ${dashpass} | /usr/share/wazuh-dashboard/bin/opensearch-dashboards-keystore --allow-root add -f --stdin opensearch.password ${debug_pass} > /dev/null 2>&1" else wazuhdashold=$(grep "password:" /etc/wazuh-dashboard/opensearch_dashboards.yml ) rk="opensearch.password: " From c3194ab25584bcc63ec06d37967e5b2d9a347b1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Mon, 4 Sep 2023 17:30:24 +0200 Subject: [PATCH 743/994] Silenced grep output --- 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 cd74f021aa..6fb8881595 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -277,7 +277,7 @@ function checks_names() { exit 1 fi - if [ -n "${dashname}" ] && ! echo "${dashboard_node_names[@]}" | grep -w "${dashname}"; then + if [ -n "${dashname}" ] && ! echo "${dashboard_node_names[@]}" | grep -w -q "${dashname}"; then common_logger -e "The Wazuh dashboard node name ${dashname} does not appear on the configuration file." exit 1 fi From 6e44887671471d563bf0d75b8c88a07bba6ea5fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 5 Sep 2023 11:59:37 +0200 Subject: [PATCH 744/994] Added check to fix mkdir error in backup --- unattended_installer/passwords_tool/passwordsFunctions.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/unattended_installer/passwords_tool/passwordsFunctions.sh b/unattended_installer/passwords_tool/passwordsFunctions.sh index 52c672497e..153f05cb30 100644 --- a/unattended_installer/passwords_tool/passwordsFunctions.sh +++ b/unattended_installer/passwords_tool/passwordsFunctions.sh @@ -179,7 +179,9 @@ function passwords_createBackUp() { fi common_logger -d "Creating password backup." - eval "mkdir /etc/wazuh-indexer/backup ${debug}" + if [ ! -d "/etc/wazuh-indexer/backup" ]; then + eval "mkdir /etc/wazuh-indexer/backup ${debug}" + fi eval "JAVA_HOME=/usr/share/wazuh-indexer/jdk/ OPENSEARCH_CONF_DIR=/etc/wazuh-indexer /usr/share/wazuh-indexer/plugins/opensearch-security/tools/securityadmin.sh -backup /etc/wazuh-indexer/backup -icl -p 9200 -nhnv -cacert ${capem} -cert ${adminpem} -key ${adminkey} -h ${IP} ${debug}" if [ "${PIPESTATUS[0]}" != 0 ]; then common_logger -e "The backup could not be created" From 27385a3d915cbfcb6b1f4ac0534b0f9be80ef746 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Fri, 1 Sep 2023 17:36:19 +0200 Subject: [PATCH 745/994] Added modules path --- stack/indexer/deb/debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index 7e88294fa3..62beff43a8 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -150,7 +150,7 @@ override_dh_fixperms: chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR) chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/jvm.options - chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/aggs-matrix-stats + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/aggs-matrix-stats chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/opensearch.yml chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/jvm.options.d chmod 440 $(TARGET_DIR)$(INSTALLATION_DIR)/VERSION From a3b629232a4642bcc8a7a9f910f00a0db8688ab9 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 5 Sep 2023 09:52:28 -0300 Subject: [PATCH 746/994] Added fix in regex validation for DNS allowing localhost --- unattended_installer/cert_tool/certFunctions.sh | 2 +- unattended_installer/config/certificate/config_aio.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/unattended_installer/cert_tool/certFunctions.sh b/unattended_installer/cert_tool/certFunctions.sh index 2bf889999c..4722deb3f4 100644 --- a/unattended_installer/cert_tool/certFunctions.sh +++ b/unattended_installer/cert_tool/certFunctions.sh @@ -99,7 +99,7 @@ function cert_generateCertificateconfiguration() { sed -i '/IP.1/d' "${cert_tmp_path}/${1}.conf" for (( i=2; i<=${#@}; i++ )); do isIP=$(echo "${!i}" | grep -P "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$") - isDNS=$(echo "${!i}" | grep -P "^[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9](?:\.[a-zA-Z-]{2,})+$" ) + isDNS=$(echo "${!i}" | grep -P "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$" ) j=$((i-1)) if [ "${isIP}" ]; then printf '%s\n' " IP.${j} = ${!i}" >> "${cert_tmp_path}/${1}.conf" diff --git a/unattended_installer/config/certificate/config_aio.yml b/unattended_installer/config/certificate/config_aio.yml index 8f735643a6..24e26c7c8d 100644 --- a/unattended_installer/config/certificate/config_aio.yml +++ b/unattended_installer/config/certificate/config_aio.yml @@ -1,10 +1,10 @@ nodes: indexer: - name: wazuh-indexer - ip: 127.0.0.1 + ip: localhost server: - name: wazuh-server - ip: 127.0.0.1 + ip: localhost dashboard: - name: wazuh-dashboard - ip: 127.0.0.1 + ip: localhost From 89a2165afc622b07aa973568becc821858b3a635 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 5 Sep 2023 14:49:03 -0300 Subject: [PATCH 747/994] Replaced sed to new string match --- unattended_installer/cert_tool/certFunctions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/cert_tool/certFunctions.sh b/unattended_installer/cert_tool/certFunctions.sh index 4722deb3f4..724f7ac387 100644 --- a/unattended_installer/cert_tool/certFunctions.sh +++ b/unattended_installer/cert_tool/certFunctions.sh @@ -314,7 +314,7 @@ function cert_readConfig() { 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 -E "${nodes_server}" | sed '/\./!d' | cut -d = -f 2 | sed -r 's/\s+//g') )" + eval "server_node_ip_$i=( $( cert_parseYaml "${config_file}" | grep -E "${nodes_server}" | cut -d = -f 2 | sed -r 's/\s+//g' | sed -E '/__/d') )" done unique_names=($(echo "${indexer_node_names[@]}" | tr ' ' '\n' | sort -u | tr '\n' ' ')) From 7e1731ebace7a35dbafbe261fde11ddc6704c91b Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 5 Sep 2023 15:25:22 -0300 Subject: [PATCH 748/994] Testing changes in configuration files for stack --- unattended_installer/config/dashboard/dashboard_unattended.yml | 2 +- unattended_installer/config/filebeat/filebeat_all_in_one.yml | 2 +- unattended_installer/config/filebeat/filebeat_unattended.yml | 2 +- unattended_installer/config/indexer/indexer_all_in_one.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/unattended_installer/config/dashboard/dashboard_unattended.yml b/unattended_installer/config/dashboard/dashboard_unattended.yml index 8700bcb7da..d57a8a9aa4 100644 --- a/unattended_installer/config/dashboard/dashboard_unattended.yml +++ b/unattended_installer/config/dashboard/dashboard_unattended.yml @@ -1,5 +1,5 @@ server.host: 0.0.0.0 -opensearch.hosts: https://127.0.0.1:9200 +opensearch.hosts: https://localhost:9200 server.port: 443 opensearch.ssl.verificationMode: certificate # opensearch.username: kibanaserver diff --git a/unattended_installer/config/filebeat/filebeat_all_in_one.yml b/unattended_installer/config/filebeat/filebeat_all_in_one.yml index 34ad97071e..5c94ca4744 100644 --- a/unattended_installer/config/filebeat/filebeat_all_in_one.yml +++ b/unattended_installer/config/filebeat/filebeat_all_in_one.yml @@ -1,6 +1,6 @@ # Wazuh - Filebeat configuration file output.elasticsearch: - hosts: ["127.0.0.1:9200"] + hosts: ["localhost:9200"] protocol: https username: ${username} password: ${password} diff --git a/unattended_installer/config/filebeat/filebeat_unattended.yml b/unattended_installer/config/filebeat/filebeat_unattended.yml index 81a8ddf552..723b2f3281 100644 --- a/unattended_installer/config/filebeat/filebeat_unattended.yml +++ b/unattended_installer/config/filebeat/filebeat_unattended.yml @@ -1,6 +1,6 @@ # Wazuh - Filebeat configuration file output.elasticsearch.hosts: - - 127.0.0.1:9200 + - localhost:9200 # - :9200 # - :9200 diff --git a/unattended_installer/config/indexer/indexer_all_in_one.yml b/unattended_installer/config/indexer/indexer_all_in_one.yml index 0ae85fe266..cb3abe1d83 100644 --- a/unattended_installer/config/indexer/indexer_all_in_one.yml +++ b/unattended_installer/config/indexer/indexer_all_in_one.yml @@ -1,4 +1,4 @@ -network.host: "127.0.0.1" +network.host: "localhost" node.name: "node-1" cluster.initial_master_nodes: - "node-1" From dadb661c98086157506e7e38058aa328987ef6ef Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Wed, 6 Sep 2023 01:17:36 +0200 Subject: [PATCH 749/994] Restored configuration file in service file --- stack/dashboard/base/files/etc/services/wazuh-dashboard.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/dashboard/base/files/etc/services/wazuh-dashboard.service b/stack/dashboard/base/files/etc/services/wazuh-dashboard.service index ef1d2afd42..86e61a9aa2 100644 --- a/stack/dashboard/base/files/etc/services/wazuh-dashboard.service +++ b/stack/dashboard/base/files/etc/services/wazuh-dashboard.service @@ -7,7 +7,7 @@ User=wazuh-dashboard Group=wazuh-dashboard EnvironmentFile=-/etc/default/wazuh-dashboard EnvironmentFile=-/etc/sysconfig/wazuh-dashboard -ExecStart=/usr/share/wazuh-dashboard/bin/opensearch-dashboards +ExecStart=/usr/share/wazuh-dashboard/bin/opensearch-dashboards -c /etc/wazuh-dashboard/opensearch_dashboards.yml WorkingDirectory=/usr/share/wazuh-dashboard [Install] From b83e2a31c7e7fe43d0387c06e5ae0f3f9c2e131b Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Wed, 6 Sep 2023 01:19:31 +0200 Subject: [PATCH 750/994] Changed opensearch-dashboards.keystore location and added custom config directory to OpenSearch binaries --- stack/dashboard/base/builder.sh | 3 --- stack/dashboard/deb/debian/postinst | 2 +- stack/dashboard/deb/debian/rules | 5 +++-- stack/dashboard/rpm/wazuh-dashboard.spec | 8 ++++++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh index c474d56eca..edad446ec9 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -90,11 +90,8 @@ cp ./etc/styles.js ./src/core/server/rendering/views/styles.js 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 sed -i "s'\$DIR/config'/etc/wazuh-dashboard'g" ./bin/opensearch-dashboards-plugin -sed -i "s'NODE_OPTIONS=\"--no-warnings --max-http-header-size=65536 \$OSD_NODE_OPTS \$NODE_OPTIONS\" NODE_ENV=production exec \"\${NODE}\" \"\${DIR}/src/cli/dist\" \${@}'NODE_OPTIONS=\"--no-warnings --max-http-header-size=65536 \$OSD_NODE_OPTS \$NODE_OPTIONS\"'g" ./bin/opensearch-dashboards -echo "NODE_ENV=production exec \"\${NODE}\" \${NODE_OPTIONS} \"\${DIR}/src/cli/dist\" \${@}" >> ./bin/opensearch-dashboards # Replace the redirection to `home` in the header logo sed -i "s'/app/home'/app/wazuh'g" ./src/core/target/public/core.entry.js # Replace others redirections to `home` diff --git a/stack/dashboard/deb/debian/postinst b/stack/dashboard/deb/debian/postinst index 4084750dc6..6840e798a1 100644 --- a/stack/dashboard/deb/debian/postinst +++ b/stack/dashboard/deb/debian/postinst @@ -36,7 +36,7 @@ case "$1" in service wazuh-dashboard restart > /dev/null 2>&1 fi fi - if [ ! -f "${INSTALLATION_DIR}"/config/opensearch_dashboards.keystore ]; then + if [ ! -f "${CONFIG_DIR}"/opensearch_dashboards.keystore ]; then runuser "${NAME}" --shell="/bin/bash" --command="${INSTALLATION_DIR}/bin/opensearch-dashboards-keystore create" > /dev/null 2>&1 runuser "${NAME}" --shell="/bin/bash" --command="echo kibanaserver | ${INSTALLATION_DIR}/bin/opensearch-dashboards-keystore add opensearch.username --stdin" > /dev/null 2>&1 runuser "${NAME}" --shell="/bin/bash" --command="echo kibanaserver | ${INSTALLATION_DIR}/bin/opensearch-dashboards-keystore add opensearch.password --stdin" > /dev/null 2>&1 diff --git a/stack/dashboard/deb/debian/rules b/stack/dashboard/deb/debian/rules index b011b00963..6b4bcbb1ec 100644 --- a/stack/dashboard/deb/debian/rules +++ b/stack/dashboard/deb/debian/rules @@ -58,7 +58,8 @@ override_dh_install: useradd -g $(GROUP) $(USER) tar -xf $(DASHBOARD_FILE) - sed -i "s/cross_platform_1.REPO_ROOT\, 'config\//'\/etc\/wazuh-dashboard\/', '/g" "wazuh-dashboard-base/node_modules/@osd/utils/target/path/index.js" + sed -i 's/OSD_NODE_OPTS_PREFIX/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_NODE_OPTS_PREFIX/g' "wazuh-dashboard-base/bin/opensearch-dashboards" + sed -i 's/OSD_USE_NODE_JS_FILE_PATH/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_USE_NODE_JS_FILE_PATH/g' "wazuh-dashboard-base/bin/opensearch-dashboards-keystore" mkdir -p $(TARGET_DIR)$(CONFIG_DIR) mkdir -p $(TARGET_DIR)$(INSTALLATION_DIR) @@ -105,7 +106,7 @@ override_dh_fixperms: chmod 750 $(TARGET_DIR)/etc/default/wazuh-dashboard chmod 640 "$(TARGET_DIR)$(CONFIG_DIR)"/opensearch_dashboards.yml chmod 640 "$(TARGET_DIR)$(CONFIG_DIR)"/node.options - chmod 640 $(TARGET_DIR)/etc/systemd/system/wazuh-dashboard.service + chmod 640 "$(TARGET_DIR)"/etc/systemd/system/wazuh-dashboard.service find "$(TARGET_DIR)$(INSTALLATION_DIR)" -type d -exec chmod 750 {} \; find "$(TARGET_DIR)$(INSTALLATION_DIR)" -type f -perm 644 -exec chmod 640 {} \; find "$(TARGET_DIR)$(INSTALLATION_DIR)" -type f -perm 755 -exec chmod 750 {} \; diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 37bc5366c9..87ba32767d 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -54,7 +54,10 @@ useradd -g %{GROUP} %{USER} %build tar -xf %{DASHBOARD_FILE} -sed -i "s/cross_platform_1.REPO_ROOT\, 'config\//'\/etc\/wazuh-dashboard\/', '/g" "wazuh-dashboard-base/node_modules/@osd/utils/target/path/index.js" + +# Set custom config dir +sed -i 's/OSD_NODE_OPTS_PREFIX/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_NODE_OPTS_PREFIX/g' "wazuh-dashboard-base/bin/opensearch-dashboards" +sed -i 's/OSD_USE_NODE_JS_FILE_PATH/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_USE_NODE_JS_FILE_PATH/g' "wazuh-dashboard-base/bin/opensearch-dashboards-keystore" # ----------------------------------------------------------------------------- @@ -133,7 +136,7 @@ fi %post setcap 'cap_net_bind_service=+ep' %{INSTALL_DIR}/node/bin/node -if [ ! -f %{INSTALLATION_DIR}/config/opensearch_dashboards.keystore ]; then +if [ ! -f %{CONFIG_DIR}/opensearch_dashboards.keystore ]; then runuser %{USER} --shell="/bin/bash" --command="%{INSTALL_DIR}/bin/opensearch-dashboards-keystore create" > /dev/null 2>&1 runuser %{USER} --shell="/bin/bash" --command="echo kibanaserver | %{INSTALL_DIR}/bin/opensearch-dashboards-keystore add opensearch.username --stdin" > /dev/null 2>&1 runuser %{USER} --shell="/bin/bash" --command="echo kibanaserver | %{INSTALL_DIR}/bin/opensearch-dashboards-keystore add opensearch.password --stdin" > /dev/null 2>&1 @@ -398,6 +401,7 @@ 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}) "%{CONFIG_DIR}/opensearch-dashboards.keystore" %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog From 7df89e02c24ec30a2373f2604d3e4bc7f4050dd9 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Wed, 6 Sep 2023 08:47:51 -0300 Subject: [PATCH 751/994] Fixed regex --- unattended_installer/cert_tool/certFunctions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/cert_tool/certFunctions.sh b/unattended_installer/cert_tool/certFunctions.sh index 724f7ac387..df5429afa7 100644 --- a/unattended_installer/cert_tool/certFunctions.sh +++ b/unattended_installer/cert_tool/certFunctions.sh @@ -314,7 +314,7 @@ function cert_readConfig() { 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 -E "${nodes_server}" | cut -d = -f 2 | sed -r 's/\s+//g' | sed -E '/__/d') )" + eval "server_node_ip_$i=( $( cert_parseYaml "${config_file}" | grep -E "${nodes_server}" | cut -d = -f 2 | sed -r 's/\s+//g' | sed -E '/nodes_/d') )" done unique_names=($(echo "${indexer_node_names[@]}" | tr ' ' '\n' | sort -u | tr '\n' ' ')) From 8fbfb00f6d9913a136285cd565b1c2a1a298f9c0 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Wed, 6 Sep 2023 16:17:52 +0200 Subject: [PATCH 752/994] Changed Node options call in OpenSearch use_node --- stack/dashboard/base/builder.sh | 3 +++ stack/dashboard/deb/debian/postinst | 6 +++++- stack/dashboard/rpm/wazuh-dashboard.spec | 6 +++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh index edad446ec9..f6fb8a4b33 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -92,6 +92,9 @@ sed -i "90s|defaultValue: true|defaultValue: false|g" ./src/core/server/opensear # Replace config path sed -i "s'\$DIR/config'/etc/wazuh-dashboard'g" ./bin/opensearch-dashboards-keystore sed -i "s'\$DIR/config'/etc/wazuh-dashboard'g" ./bin/opensearch-dashboards-plugin +# Add fix to Node variablas as Node is not using the NODE_OPTIONS environment variable +sed -i 's/NODE_OPTIONS="$OSD_NODE_OPTS_PREFIX $OSD_NODE_OPTS $NODE_OPTIONS"/NODE_OPTIONS="$OSD_NODE_OPTS_PREFIX $OSD_NODE_OPTS $NODE_OPTIONS"\n/g' ./bin/use_node +sed -i 's/exec "${NODE}"/NODE_ENV=production exec "${NODE}" ${NODE_OPTIONS} /g' ./bin/use_node # Replace the redirection to `home` in the header logo sed -i "s'/app/home'/app/wazuh'g" ./src/core/target/public/core.entry.js # Replace others redirections to `home` diff --git a/stack/dashboard/deb/debian/postinst b/stack/dashboard/deb/debian/postinst index 6840e798a1..8b23da9da1 100644 --- a/stack/dashboard/deb/debian/postinst +++ b/stack/dashboard/deb/debian/postinst @@ -36,10 +36,14 @@ case "$1" in service wazuh-dashboard restart > /dev/null 2>&1 fi fi - if [ ! -f "${CONFIG_DIR}"/opensearch_dashboards.keystore ]; then + # Move keystore file if upgrade (file exists in install dir in <= 4.6.0) + if [ -f "${INSTALLATION_DIR}"/opensearch_dashboards.keystore ]; then + mv "${INSTALLATION_DIR}"/opensearch_dashboards.keystore "${CONFIG_DIR}"/opensearch_dashboards.keystore + elif [ ! -f "${CONFIG_DIR}"/opensearch_dashboards.keystore ]; then runuser "${NAME}" --shell="/bin/bash" --command="${INSTALLATION_DIR}/bin/opensearch-dashboards-keystore create" > /dev/null 2>&1 runuser "${NAME}" --shell="/bin/bash" --command="echo kibanaserver | ${INSTALLATION_DIR}/bin/opensearch-dashboards-keystore add opensearch.username --stdin" > /dev/null 2>&1 runuser "${NAME}" --shell="/bin/bash" --command="echo kibanaserver | ${INSTALLATION_DIR}/bin/opensearch-dashboards-keystore add opensearch.password --stdin" > /dev/null 2>&1 + chmod 640 "${CONFIG_DIR}"/opensearch_dashboards.keystore fi ;; diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 87ba32767d..eeb725a28e 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -136,10 +136,14 @@ fi %post setcap 'cap_net_bind_service=+ep' %{INSTALL_DIR}/node/bin/node -if [ ! -f %{CONFIG_DIR}/opensearch_dashboards.keystore ]; then +# Move keystore file if upgrade (file exists in install dir in <= 4.6.0) +if [ -f "${INSTALLATION_DIR}"/opensearch_dashboards.keystore ]; then + mv "${INSTALLATION_DIR}"/opensearch_dashboards.keystore "${CONFIG_DIR}"/opensearch_dashboards.keystore +elif [ ! -f %{CONFIG_DIR}/opensearch_dashboards.keystore ]; then runuser %{USER} --shell="/bin/bash" --command="%{INSTALL_DIR}/bin/opensearch-dashboards-keystore create" > /dev/null 2>&1 runuser %{USER} --shell="/bin/bash" --command="echo kibanaserver | %{INSTALL_DIR}/bin/opensearch-dashboards-keystore add opensearch.username --stdin" > /dev/null 2>&1 runuser %{USER} --shell="/bin/bash" --command="echo kibanaserver | %{INSTALL_DIR}/bin/opensearch-dashboards-keystore add opensearch.password --stdin" > /dev/null 2>&1 + chmod 640 "%{CONFIG_DIR}"/opensearch_dashboards.keystore fi # ----------------------------------------------------------------------------- From d4dc0fed3d1e378ce7805bd1cab217f79885a7c2 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Wed, 6 Sep 2023 16:47:26 +0200 Subject: [PATCH 753/994] Removed keystore attr as the file is generated when the package is installed --- stack/dashboard/rpm/wazuh-dashboard.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index eeb725a28e..63f0f14809 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -405,7 +405,6 @@ 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}) "%{CONFIG_DIR}/opensearch-dashboards.keystore" %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog From b842d320b4bbd833f839d9c1ad72220b0a7da0df Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Wed, 6 Sep 2023 20:05:22 +0200 Subject: [PATCH 754/994] Fixed OpenSearch keystore upgrade location --- stack/dashboard/deb/debian/postinst | 4 ++-- stack/dashboard/rpm/wazuh-dashboard.spec | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/stack/dashboard/deb/debian/postinst b/stack/dashboard/deb/debian/postinst index 8b23da9da1..71d13281d7 100644 --- a/stack/dashboard/deb/debian/postinst +++ b/stack/dashboard/deb/debian/postinst @@ -37,8 +37,8 @@ case "$1" in fi fi # Move keystore file if upgrade (file exists in install dir in <= 4.6.0) - if [ -f "${INSTALLATION_DIR}"/opensearch_dashboards.keystore ]; then - mv "${INSTALLATION_DIR}"/opensearch_dashboards.keystore "${CONFIG_DIR}"/opensearch_dashboards.keystore + if [ -f "${INSTALLATION_DIR}"/config/opensearch_dashboards.keystore ]; then + mv "${INSTALLATION_DIR}"/config/opensearch_dashboards.keystore "${CONFIG_DIR}"/opensearch_dashboards.keystore elif [ ! -f "${CONFIG_DIR}"/opensearch_dashboards.keystore ]; then runuser "${NAME}" --shell="/bin/bash" --command="${INSTALLATION_DIR}/bin/opensearch-dashboards-keystore create" > /dev/null 2>&1 runuser "${NAME}" --shell="/bin/bash" --command="echo kibanaserver | ${INSTALLATION_DIR}/bin/opensearch-dashboards-keystore add opensearch.username --stdin" > /dev/null 2>&1 diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 63f0f14809..f0d3cea5ae 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -136,16 +136,6 @@ fi %post setcap 'cap_net_bind_service=+ep' %{INSTALL_DIR}/node/bin/node -# Move keystore file if upgrade (file exists in install dir in <= 4.6.0) -if [ -f "${INSTALLATION_DIR}"/opensearch_dashboards.keystore ]; then - mv "${INSTALLATION_DIR}"/opensearch_dashboards.keystore "${CONFIG_DIR}"/opensearch_dashboards.keystore -elif [ ! -f %{CONFIG_DIR}/opensearch_dashboards.keystore ]; then - runuser %{USER} --shell="/bin/bash" --command="%{INSTALL_DIR}/bin/opensearch-dashboards-keystore create" > /dev/null 2>&1 - runuser %{USER} --shell="/bin/bash" --command="echo kibanaserver | %{INSTALL_DIR}/bin/opensearch-dashboards-keystore add opensearch.username --stdin" > /dev/null 2>&1 - runuser %{USER} --shell="/bin/bash" --command="echo kibanaserver | %{INSTALL_DIR}/bin/opensearch-dashboards-keystore add opensearch.password --stdin" > /dev/null 2>&1 - chmod 640 "%{CONFIG_DIR}"/opensearch_dashboards.keystore -fi - # ----------------------------------------------------------------------------- %preun @@ -191,6 +181,16 @@ if [ ! -d %{PID_DIR} ]; then chown %{USER}:%{GROUP} %{PID_DIR} fi +# Move keystore file if upgrade (file exists in install dir in <= 4.6.0) +if [ -f "%{INSTALL_DIR}"/config/opensearch_dashboards.keystore ]; then + mv "%{INSTALL_DIR}"/config/opensearch_dashboards.keystore "%{CONFIG_DIR}"/opensearch_dashboards.keystore +elif [ ! -f %{CONFIG_DIR}/opensearch_dashboards.keystore ]; then + runuser %{USER} --shell="/bin/bash" --command="%{INSTALL_DIR}/bin/opensearch-dashboards-keystore create" > /dev/null 2>&1 + runuser %{USER} --shell="/bin/bash" --command="echo kibanaserver | %{INSTALL_DIR}/bin/opensearch-dashboards-keystore add opensearch.username --stdin" > /dev/null 2>&1 + runuser %{USER} --shell="/bin/bash" --command="echo kibanaserver | %{INSTALL_DIR}/bin/opensearch-dashboards-keystore add opensearch.password --stdin" > /dev/null 2>&1 + chmod 640 "%{CONFIG_DIR}"/opensearch_dashboards.keystore +fi + if [ -f %{INSTALL_DIR}/wazuh-dashboard.restart ]; then rm -f %{INSTALL_DIR}/wazuh-dashboard.restart if command -v systemctl > /dev/null 2>&1 && systemctl > /dev/null 2>&1; then From 059f7bbb8b2cfcfda1d7bd967a222e99c9269649 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Wed, 6 Sep 2023 20:07:05 +0200 Subject: [PATCH 755/994] Fixed typo in comment --- 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 f6fb8a4b33..b109ed1e66 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -92,7 +92,7 @@ sed -i "90s|defaultValue: true|defaultValue: false|g" ./src/core/server/opensear # Replace config path sed -i "s'\$DIR/config'/etc/wazuh-dashboard'g" ./bin/opensearch-dashboards-keystore sed -i "s'\$DIR/config'/etc/wazuh-dashboard'g" ./bin/opensearch-dashboards-plugin -# Add fix to Node variablas as Node is not using the NODE_OPTIONS environment variable +# Add fix to Node variables as Node is not using the NODE_OPTIONS environment variables sed -i 's/NODE_OPTIONS="$OSD_NODE_OPTS_PREFIX $OSD_NODE_OPTS $NODE_OPTIONS"/NODE_OPTIONS="$OSD_NODE_OPTS_PREFIX $OSD_NODE_OPTS $NODE_OPTIONS"\n/g' ./bin/use_node sed -i 's/exec "${NODE}"/NODE_ENV=production exec "${NODE}" ${NODE_OPTIONS} /g' ./bin/use_node # Replace the redirection to `home` in the header logo From 2c3a8721bfa82ab1ec1a9e4c3c77aff1d205704f Mon Sep 17 00:00:00 2001 From: c-bordon Date: Fri, 8 Sep 2023 17:51:19 -0300 Subject: [PATCH 756/994] Fixed wazuh-dashboad and wazuh-indexer service validation --- tests/unattended/install/test_unattended.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unattended/install/test_unattended.py b/tests/unattended/install/test_unattended.py index b803760b96..80e9c4e3e5 100644 --- a/tests/unattended/install/test_unattended.py +++ b/tests/unattended/install/test_unattended.py @@ -183,11 +183,11 @@ def test_check_filebeat_process(): @pytest.mark.indexer def test_check_indexer_process(): - assert check_call("ps -xa | grep \"/usr/share/wazuh-indexer/jdk/bin/java\" | grep -v grep | cut -d \" \" -f15", shell=True) != "" + assert check_call("ps -xa | grep wazuh-indexer | grep -v grep | cut -d \" \" -f15", shell=True) != "" @pytest.mark.dashboard def test_check_dashboard_process(): - assert check_call("ps -xa | grep \"/usr/share/wazuh-dashboard/bin/../node/bin/node\" | grep -v grep", shell=True) != "" + assert check_call("ps -xa | grep wazuh-dashboard | grep -v grep", shell=True) != "" @pytest.mark.indexer def test_check_indexer_cluster_status_not_red(): From c668a288abf9ae51764189e53dcc9f00be5be317 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 11 Sep 2023 13:53:58 -0300 Subject: [PATCH 757/994] Reverted --all options for cert-tools --- unattended_installer/cert_tool/certMain.sh | 35 ++++++++++------------ 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/unattended_installer/cert_tool/certMain.sh b/unattended_installer/cert_tool/certMain.sh index f10d5a5ac0..62186cb039 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 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 " 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 "" echo -e " -ca, --root-ca-certificates" echo -e " Creates the root-ca certificates." @@ -186,26 +186,21 @@ function main() { fi if [[ -n "${all}" ]]; then - 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 + 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}" fi if [[ -n "${ca}" ]]; then From 1b797923af64d5be94fff0208e028482b55e6ea3 Mon Sep 17 00:00:00 2001 From: Nicolas Gomez Palacios Date: Wed, 13 Sep 2023 20:32:44 -0300 Subject: [PATCH 758/994] This change avoids deleting the entire syscheckd folder when creating WPKs, it keeps the wazuh-syscheckd, libfimdb.dylib and libfimdb.so files. --- wpk/run.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wpk/run.sh b/wpk/run.sh index 6db1a0e3e3..5b3ec89150 100755 --- a/wpk/run.sh +++ b/wpk/run.sh @@ -222,7 +222,11 @@ clean() { rm -rf src/{addagent,analysisd,client-agent,config,error_messages,external/*} rm -rf src/{headers,logcollector,monitord,os_auth,os_crypto,os_csyslogd} rm -rf src/{os_dbd,os_execd,os_integrator,os_maild,os_net,os_regex,os_xml,os_zlib} - rm -rf src/{remoted,reportd,shared,syscheckd,unit_tests,wazuh_db} + rm -rf src/{remoted,reportd,shared,unit_tests,wazuh_db} + + # Clean syscheckd folder + find src/syscheckd -type f -not -name "wazuh-syscheckd" -not -name "libfimdb.dylib" -not -name "libfimdb.so" -delete + if [[ "${BUILD_TARGET}" != "winagent" ]]; then rm -rf src/win32 From 8313d6e9d39ecbfee63b9d11ff8a6fc1d95949b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 14 Sep 2023 12:30:12 +0200 Subject: [PATCH 759/994] Fixed dashboard port check --- unattended_installer/install_functions/dashboard.sh | 2 ++ unattended_installer/install_functions/installVariables.sh | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/unattended_installer/install_functions/dashboard.sh b/unattended_installer/install_functions/dashboard.sh index d2011b9557..ddd1e1962f 100644 --- a/unattended_installer/install_functions/dashboard.sh +++ b/unattended_installer/install_functions/dashboard.sh @@ -10,6 +10,8 @@ function dashboard_changePort() { chosen_port="$1" http_port="${chosen_port}" + wazuh_dashboard_ports=( "${http_port}" ) + wazuh_aio_ports=(9200 9300 1514 1515 1516 55000 "${http_port}") sed -i 's/server\.port: [0-9]\+$/server.port: '"${chosen_port}"'/' "$0" common_logger "Wazuh web interface port will be ${chosen_port}." diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index 357c775e17..1b00690921 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -49,7 +49,7 @@ adminUser="wazuh" adminPassword="wazuh" http_port=443 -readonly wazuh_aio_ports=( 9200 9300 1514 1515 1516 55000 "${http_port}") +wazuh_aio_ports=( 9200 9300 1514 1515 1516 55000 "${http_port}") readonly wazuh_indexer_ports=( 9200 9300 ) readonly wazuh_manager_ports=( 1514 1515 1516 55000 ) -readonly wazuh_dashboard_ports=( "${http_port}" ) +wazuh_dashboard_ports=( "${http_port}" ) From ec7fd74759f1601f14ddeaa3f07baa40acf4e0ed Mon Sep 17 00:00:00 2001 From: c-bordon Date: Thu, 14 Sep 2023 16:47:47 -0300 Subject: [PATCH 760/994] adding Centos 7 to chromium installation exception --- unattended_installer/install_functions/installCommon.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 083dc38218..243057be3e 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -280,6 +280,8 @@ function installCommon_checkChromium() { if (! yum list installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\\.) && (! yum list installed 2>/dev/null | grep -q -E ^"chromium"\\.); then if [ "${DIST_NAME}" == "amzn" ]; then installCommon_installChrome + elif [[ "${DIST_NAME}" == "centos" ]] && [[ "${DIST_VER}" == "7" ]]; then + installCommon_installChrome else dashboard_dependencies=(chromium) fi From 6e316c209b6108d65586bda1683e51a452c302d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Fri, 15 Sep 2023 16:32:16 +0200 Subject: [PATCH 761/994] Update internal_users.yml file when changing passwords --- unattended_installer/passwords_tool/passwordsFunctions.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/unattended_installer/passwords_tool/passwordsFunctions.sh b/unattended_installer/passwords_tool/passwordsFunctions.sh index bfd0c4b2a3..de3fc588d5 100644 --- a/unattended_installer/passwords_tool/passwordsFunctions.sh +++ b/unattended_installer/passwords_tool/passwordsFunctions.sh @@ -18,6 +18,8 @@ function passwords_changePassword() { do if [ -n "${indexer_installed}" ] && [ -f "/etc/wazuh-indexer/backup/internal_users.yml" ]; then awk -v new=${hashes[i]} 'prev=="'${users[i]}':"{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 + cp -f /etc/wazuh-indexer/backup/internal_users.yml /etc/wazuh-indexer/opensearch-security/internal_users.yml + chown -R wazuh-indexer:wazuh-indexer /etc/wazuh-indexer/opensearch-security/internal_users.yml fi if [ "${users[i]}" == "admin" ]; then @@ -35,6 +37,8 @@ function passwords_changePassword() { 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 + cp -f /etc/wazuh-indexer/backup/internal_users.yml /etc/wazuh-indexer/opensearch-security/internal_users.yml + chown -R wazuh-indexer:wazuh-indexer /etc/wazuh-indexer/opensearch-security/internal_users.yml fi if [ "${nuser}" == "admin" ]; then From c119aaa44f218a4546c93d57aadf733865e3d6b6 Mon Sep 17 00:00:00 2001 From: Gabriel Valenzuela Date: Fri, 15 Sep 2023 12:46:22 -0300 Subject: [PATCH 762/994] Sign windows fimdb dll. --- windows/generate_wazuh_msi.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/windows/generate_wazuh_msi.ps1 b/windows/generate_wazuh_msi.ps1 index 08cffc4a48..8ddcf569e4 100644 --- a/windows/generate_wazuh_msi.ps1 +++ b/windows/generate_wazuh_msi.ps1 @@ -83,6 +83,7 @@ function BuildWazuhMsi(){ & $SIGNTOOL_EXE sign /a /tr http://timestamp.digicert.com /fd SHA256 /td SHA256 "..\shared_modules\dbsync\build\bin\dbsync.dll" & $SIGNTOOL_EXE sign /a /tr http://timestamp.digicert.com /fd SHA256 /td SHA256 "..\shared_modules\rsync\build\bin\rsync.dll" & $SIGNTOOL_EXE sign /a /tr http://timestamp.digicert.com /fd SHA256 /td SHA256 "..\wazuh_modules\syscollector\build\bin\syscollector.dll" + & $SIGNTOOL_EXE sign /a /tr http://timestamp.digicert.com /fd SHA256 /td SHA256 "..\syscheckd\build\bin\libfimdb.dll" } Write-Host "Building MSI installer..." From 80090d82e0b6a427c423b8ed9701dcca6f3ee162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Mon, 18 Sep 2023 16:20:18 +0200 Subject: [PATCH 763/994] Improved the update of the internal_users.yml file --- unattended_installer/passwords_tool/passwordsFunctions.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/unattended_installer/passwords_tool/passwordsFunctions.sh b/unattended_installer/passwords_tool/passwordsFunctions.sh index de3fc588d5..78d1e346e4 100644 --- a/unattended_installer/passwords_tool/passwordsFunctions.sh +++ b/unattended_installer/passwords_tool/passwordsFunctions.sh @@ -18,8 +18,6 @@ function passwords_changePassword() { do if [ -n "${indexer_installed}" ] && [ -f "/etc/wazuh-indexer/backup/internal_users.yml" ]; then awk -v new=${hashes[i]} 'prev=="'${users[i]}':"{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 - cp -f /etc/wazuh-indexer/backup/internal_users.yml /etc/wazuh-indexer/opensearch-security/internal_users.yml - chown -R wazuh-indexer:wazuh-indexer /etc/wazuh-indexer/opensearch-security/internal_users.yml fi if [ "${users[i]}" == "admin" ]; then @@ -37,8 +35,6 @@ function passwords_changePassword() { 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 - cp -f /etc/wazuh-indexer/backup/internal_users.yml /etc/wazuh-indexer/opensearch-security/internal_users.yml - chown -R wazuh-indexer:wazuh-indexer /etc/wazuh-indexer/opensearch-security/internal_users.yml fi if [ "${nuser}" == "admin" ]; then @@ -607,6 +603,7 @@ function passwords_runSecurityAdmin() { common_logger -e "Could not load the changes." exit 1; fi + eval "cp /etc/wazuh-indexer/backup/internal_users.yml /etc/wazuh-indexer/opensearch-security/internal_users.yml" eval "rm -rf /etc/wazuh-indexer/backup/ ${debug}" if [[ -n "${nuser}" ]] && [[ -n ${autopass} ]]; then From 62a6c9777179e4d0e78bccc787f308fb5b75b633 Mon Sep 17 00:00:00 2001 From: Deblintrake09 Date: Mon, 18 Sep 2023 11:26:40 -0300 Subject: [PATCH 764/994] fix: handle indexer base file missing --- stack/indexer/deb/build_package.sh | 11 ++++++++++- stack/indexer/rpm/build_package.sh | 9 +++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/stack/indexer/deb/build_package.sh b/stack/indexer/deb/build_package.sh index b5032d0760..590d7ef6e7 100755 --- a/stack/indexer/deb/build_package.sh +++ b/stack/indexer/deb/build_package.sh @@ -40,7 +40,7 @@ build_deb() { # Copy the necessary files cp ${current_path}/builder.sh ${dockerfile_path} - + if [ "${build_base}" == "yes" ];then # Base generation if [ "${future}" == "yes" ];then @@ -50,6 +50,15 @@ build_deb() { base_cmd+="--reference ${reference}" fi ../base/generate_base.sh -s ${outdir} -r ${revision} ${base_cmd} + else + version=$(cat ${current_path}/../../../VERSION) + basefile="${outdir}/wazuh-indexer-base-${version}-${revision}-linux-x64.tar.xz" + if test -f "${basefile}"; then + echo "Building using base file: ${basefile}" + else + echo "Did not find expected Wazuh Indexer base file: ${basefile} in output path. Exiting..." + exit 0 + fi fi # Build the Docker image diff --git a/stack/indexer/rpm/build_package.sh b/stack/indexer/rpm/build_package.sh index cc8bf9bb7b..2567de82f3 100755 --- a/stack/indexer/rpm/build_package.sh +++ b/stack/indexer/rpm/build_package.sh @@ -50,6 +50,15 @@ build_rpm() { base_cmd+="--reference ${reference}" fi ../base/generate_base.sh -s ${outdir} -r ${revision} ${base_cmd} + else + version=$(cat ${current_path}/../../../VERSION) + basefile="${outdir}/wazuh-indexer-base-${version}-${revision}-linux-x64.tar.xz" + if test -f "${basefile}"; then + echo "Building using base file: ${basefile}" + else + echo "Did not find expected Wazuh Indexer base file: ${basefile} in output path. Exiting..." + exit 0 + fi fi # Build the Docker image From 955e5cabff20468a3e582590451d1b90b28f885c Mon Sep 17 00:00:00 2001 From: Deblintrake09 Date: Mon, 18 Sep 2023 11:26:48 -0300 Subject: [PATCH 765/994] fix: handle dashboard base file missing --- stack/dashboard/deb/build_package.sh | 9 +++++++++ stack/dashboard/rpm/build_package.sh | 10 ++++++++++ 2 files changed, 19 insertions(+) diff --git a/stack/dashboard/deb/build_package.sh b/stack/dashboard/deb/build_package.sh index e75e9aa1d1..ccf1b456dd 100755 --- a/stack/dashboard/deb/build_package.sh +++ b/stack/dashboard/deb/build_package.sh @@ -58,6 +58,15 @@ build_deb() { base_cmd+="--app-url ${url}" fi ../base/generate_base.sh -s ${outdir} -r ${revision} ${base_cmd} + else + version=$(cat ${current_path}/../../../VERSION) + basefile="${outdir}/wazuh-dashboard-base-${version}-${revision}-linux-x64.tar.xz" + if test -f "${basefile}"; then + echo "Building using base file: ${basefile}" + else + echo "Did not find expected Wazuh Dashboard base file: ${basefile} in output path. Exiting..." + exit 0 + fi fi # Build the Docker image diff --git a/stack/dashboard/rpm/build_package.sh b/stack/dashboard/rpm/build_package.sh index 06d48f526b..1a3cd3c735 100755 --- a/stack/dashboard/rpm/build_package.sh +++ b/stack/dashboard/rpm/build_package.sh @@ -58,6 +58,16 @@ build_rpm() { base_cmd+="--app-url ${url}" fi ../base/generate_base.sh -s ${outdir} -r ${revision} ${base_cmd} + else + version=$(cat ${current_path}/../../../VERSION) + basefile="${outdir}/wazuh-dashboard-base-${version}-${revision}-linux-x64.tar.xz" + if test -f "${basefile}"; then + echo "Building using base file: ${basefile}" + else + echo "Did not find expected Wazuh Dashboard base file: ${basefile} in output path. Exiting..." + exit 0 + fi + fi # Build the Docker image From cd22e1e488f9a174381560b05ce9115cfd193e0f Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Mon, 18 Sep 2023 17:38:21 +0200 Subject: [PATCH 766/994] Fixed redirection to file --- .github/actions/upgrade-indexer/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/upgrade-indexer/common.sh b/.github/actions/upgrade-indexer/common.sh index 78f27904f3..e9be978e93 100644 --- a/.github/actions/upgrade-indexer/common.sh +++ b/.github/actions/upgrade-indexer/common.sh @@ -78,7 +78,7 @@ function read_files() { # Change only the old files if [ "${2}" == "old" ]; then - echo "# Adding a new line to force changed checksum" >> ${f} + echo "# Adding a new line to force changed checksum" >> ${file} echo "Changed file." fi checksum=`md5sum ${file} | cut -d " " -f1` From 526b7d8ea905b0a6ece4df4f1d7fafa2ea6ae3f9 Mon Sep 17 00:00:00 2001 From: Deblintrake09 Date: Mon, 18 Sep 2023 14:19:20 -0300 Subject: [PATCH 767/994] fix: handle version when using reference option --- stack/dashboard/deb/build_package.sh | 10 +++++++--- stack/dashboard/rpm/build_package.sh | 11 +++++++---- stack/indexer/deb/build_package.sh | 10 +++++++--- stack/indexer/rpm/build_package.sh | 10 +++++++--- 4 files changed, 28 insertions(+), 13 deletions(-) diff --git a/stack/dashboard/deb/build_package.sh b/stack/dashboard/deb/build_package.sh index ccf1b456dd..79dd7271d9 100755 --- a/stack/dashboard/deb/build_package.sh +++ b/stack/dashboard/deb/build_package.sh @@ -59,13 +59,17 @@ build_deb() { fi ../base/generate_base.sh -s ${outdir} -r ${revision} ${base_cmd} else - version=$(cat ${current_path}/../../../VERSION) + if [ "${reference}" ];then + version=$(curl -sL https://raw.githubusercontent.com/wazuh/wazuh-packages/${reference}/VERSION | cat) + else + version=$(cat ${current_path}/../../../VERSION) + fi basefile="${outdir}/wazuh-dashboard-base-${version}-${revision}-linux-x64.tar.xz" if test -f "${basefile}"; then echo "Building using base file: ${basefile}" else - echo "Did not find expected Wazuh Dashboard base file: ${basefile} in output path. Exiting..." - exit 0 + echo "Did not find expected Wazuh dashboard base file: ${basefile} in output path. Exiting..." + exit 1 fi fi diff --git a/stack/dashboard/rpm/build_package.sh b/stack/dashboard/rpm/build_package.sh index 1a3cd3c735..7dc5dd6c3e 100755 --- a/stack/dashboard/rpm/build_package.sh +++ b/stack/dashboard/rpm/build_package.sh @@ -59,15 +59,18 @@ build_rpm() { fi ../base/generate_base.sh -s ${outdir} -r ${revision} ${base_cmd} else - version=$(cat ${current_path}/../../../VERSION) + if [ "${reference}" ];then + version=$(curl -sL https://raw.githubusercontent.com/wazuh/wazuh-packages/${reference}/VERSION | cat) + else + version=$(cat ${current_path}/../../../VERSION) + fi basefile="${outdir}/wazuh-dashboard-base-${version}-${revision}-linux-x64.tar.xz" if test -f "${basefile}"; then echo "Building using base file: ${basefile}" else - echo "Did not find expected Wazuh Dashboard base file: ${basefile} in output path. Exiting..." - exit 0 + echo "Did not find expected Wazuh dashboard base file: ${basefile} in output path. Exiting..." + exit 1 fi - fi # Build the Docker image diff --git a/stack/indexer/deb/build_package.sh b/stack/indexer/deb/build_package.sh index 590d7ef6e7..759d32cc93 100755 --- a/stack/indexer/deb/build_package.sh +++ b/stack/indexer/deb/build_package.sh @@ -51,13 +51,17 @@ build_deb() { fi ../base/generate_base.sh -s ${outdir} -r ${revision} ${base_cmd} else - version=$(cat ${current_path}/../../../VERSION) + if [ "${reference}" ];then + version=$(curl -sL https://raw.githubusercontent.com/wazuh/wazuh-packages/${reference}/VERSION | cat) + else + version=$(cat ${current_path}/../../../VERSION) + fi basefile="${outdir}/wazuh-indexer-base-${version}-${revision}-linux-x64.tar.xz" if test -f "${basefile}"; then echo "Building using base file: ${basefile}" else - echo "Did not find expected Wazuh Indexer base file: ${basefile} in output path. Exiting..." - exit 0 + echo "Did not find expected Wazuh indexer base file: ${basefile} in output path. Exiting..." + exit 1 fi fi diff --git a/stack/indexer/rpm/build_package.sh b/stack/indexer/rpm/build_package.sh index 2567de82f3..f7bb1a2aa8 100755 --- a/stack/indexer/rpm/build_package.sh +++ b/stack/indexer/rpm/build_package.sh @@ -51,13 +51,17 @@ build_rpm() { fi ../base/generate_base.sh -s ${outdir} -r ${revision} ${base_cmd} else - version=$(cat ${current_path}/../../../VERSION) + if [ "${reference}" ];then + version=$(curl -sL https://raw.githubusercontent.com/wazuh/wazuh-packages/${reference}/VERSION | cat) + else + version=$(cat ${current_path}/../../../VERSION) + fi basefile="${outdir}/wazuh-indexer-base-${version}-${revision}-linux-x64.tar.xz" if test -f "${basefile}"; then echo "Building using base file: ${basefile}" else - echo "Did not find expected Wazuh Indexer base file: ${basefile} in output path. Exiting..." - exit 0 + echo "Did not find expected Wazuh indexer base file: ${basefile} in output path. Exiting..." + exit 1 fi fi From 3a595c6dd9c63d52a3174e44b1b9d86673cbfe51 Mon Sep 17 00:00:00 2001 From: Deblintrake09 Date: Mon, 18 Sep 2023 16:51:24 -0300 Subject: [PATCH 768/994] fix: remove unnecesary message --- stack/dashboard/deb/build_package.sh | 4 +--- stack/dashboard/rpm/build_package.sh | 6 ++---- stack/indexer/deb/build_package.sh | 4 +--- stack/indexer/rpm/build_package.sh | 6 ++---- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/stack/dashboard/deb/build_package.sh b/stack/dashboard/deb/build_package.sh index 79dd7271d9..7e4f5c6d20 100755 --- a/stack/dashboard/deb/build_package.sh +++ b/stack/dashboard/deb/build_package.sh @@ -65,9 +65,7 @@ build_deb() { version=$(cat ${current_path}/../../../VERSION) fi basefile="${outdir}/wazuh-dashboard-base-${version}-${revision}-linux-x64.tar.xz" - if test -f "${basefile}"; then - echo "Building using base file: ${basefile}" - else + if ! test -f "${basefile}"; then echo "Did not find expected Wazuh dashboard base file: ${basefile} in output path. Exiting..." exit 1 fi diff --git a/stack/dashboard/rpm/build_package.sh b/stack/dashboard/rpm/build_package.sh index 7dc5dd6c3e..b56e325884 100755 --- a/stack/dashboard/rpm/build_package.sh +++ b/stack/dashboard/rpm/build_package.sh @@ -65,10 +65,8 @@ build_rpm() { version=$(cat ${current_path}/../../../VERSION) fi basefile="${outdir}/wazuh-dashboard-base-${version}-${revision}-linux-x64.tar.xz" - if test -f "${basefile}"; then - echo "Building using base file: ${basefile}" - else - echo "Did not find expected Wazuh dashboard base file: ${basefile} in output path. Exiting..." + if ! test -f "${basefile}"; then + echo "Did not find expected Wazuh dndexer base file: ${basefile} in output path. Exiting..." exit 1 fi fi diff --git a/stack/indexer/deb/build_package.sh b/stack/indexer/deb/build_package.sh index 759d32cc93..d67dac9f7b 100755 --- a/stack/indexer/deb/build_package.sh +++ b/stack/indexer/deb/build_package.sh @@ -57,9 +57,7 @@ build_deb() { version=$(cat ${current_path}/../../../VERSION) fi basefile="${outdir}/wazuh-indexer-base-${version}-${revision}-linux-x64.tar.xz" - if test -f "${basefile}"; then - echo "Building using base file: ${basefile}" - else + if ! test -f "${basefile}"; then echo "Did not find expected Wazuh indexer base file: ${basefile} in output path. Exiting..." exit 1 fi diff --git a/stack/indexer/rpm/build_package.sh b/stack/indexer/rpm/build_package.sh index f7bb1a2aa8..b9fcec92a7 100755 --- a/stack/indexer/rpm/build_package.sh +++ b/stack/indexer/rpm/build_package.sh @@ -51,15 +51,13 @@ build_rpm() { fi ../base/generate_base.sh -s ${outdir} -r ${revision} ${base_cmd} else - if [ "${reference}" ];then + if ! [ "${reference}" ];then version=$(curl -sL https://raw.githubusercontent.com/wazuh/wazuh-packages/${reference}/VERSION | cat) else version=$(cat ${current_path}/../../../VERSION) fi basefile="${outdir}/wazuh-indexer-base-${version}-${revision}-linux-x64.tar.xz" - if test -f "${basefile}"; then - echo "Building using base file: ${basefile}" - else + if ! test -f "${basefile}"; then echo "Did not find expected Wazuh indexer base file: ${basefile} in output path. Exiting..." exit 1 fi From 20a8767b766c36c7a76787cf0fea0efb1b6d53ef Mon Sep 17 00:00:00 2001 From: DFolchA Date: Wed, 20 Sep 2023 10:12:59 +0200 Subject: [PATCH 769/994] Bump version to 4.7.1 --- CHANGELOG.md | 4 ++++ VERSION | 2 +- aix/SPECS/wazuh-agent-aix.spec | 4 +++- debs/SPECS/wazuh-agent/debian/changelog | 6 ++++++ debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 6 ++++++ debs/SPECS/wazuh-manager/debian/copyright | 2 +- macos/specs/wazuh-agent-arm64.pkgproj | 4 ++-- macos/specs/wazuh-agent-intel64.pkgproj | 4 ++-- rpms/SPECS/wazuh-agent.spec | 4 +++- rpms/SPECS/wazuh-manager.spec | 4 +++- solaris/solaris10/pkginfo | 4 ++-- stack/dashboard/deb/debian/changelog | 6 ++++++ stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 ++ stack/indexer/deb/debian/changelog | 6 ++++++ stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 ++ tests/unattended/unit/suites/test-common.sh | 4 ++-- tests/unattended/unit/suites/test-dashboard.sh | 10 +++++----- tests/unattended/unit/suites/test-indexer.sh | 8 ++++---- .../install_functions/installVariables.sh | 2 +- 22 files changed, 64 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c287e6653..a28cfced9d 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. +## [4.7.1] + +- https://github.com/wazuh/wazuh-packages/releases/tag/v4.7.1 + ## [v4.7.0] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.7.0 diff --git a/VERSION b/VERSION index f6cdf40983..7c66fca579 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.7.0 +4.7.1 diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index bc9d77aca1..624104c1f7 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.7.0 +Version: 4.7.1 Release: 1 License: GPL URL: https://www.wazuh.com/ @@ -290,6 +290,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog +* Tue Nov 14 2023 support - 4.7.1 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html * Sat Oct 28 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Mon Sep 04 2023 support - 4.6.0 diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 8fbedff7c4..0cf60307e6 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -1,3 +1,9 @@ +wazuh-agent (4.7.1-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html + + -- Wazuh, Inc Tue, 14 Nov 2023 00:00:00 +0000 + wazuh-agent (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 3fb5364be4..445f431406 100644 --- a/debs/SPECS/wazuh-agent/debian/copyright +++ b/debs/SPECS/wazuh-agent/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 07 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 14 Nov 2023 00:00:00 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index 8ba3f24212..bbc19cc0c4 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -1,3 +1,9 @@ +wazuh-manager (4.7.1-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html + + -- Wazuh, Inc Tue, 14 Nov 2023 00:00:00 +0000 + wazuh-manager (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 3fb5364be4..445f431406 100644 --- a/debs/SPECS/wazuh-manager/debian/copyright +++ b/debs/SPECS/wazuh-manager/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 07 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 14 Nov 2023 00:00:00 +0000 It was downloaded from: diff --git a/macos/specs/wazuh-agent-arm64.pkgproj b/macos/specs/wazuh-agent-arm64.pkgproj index 8427187bfa..5f71ee5336 100644 --- a/macos/specs/wazuh-agent-arm64.pkgproj +++ b/macos/specs/wazuh-agent-arm64.pkgproj @@ -812,7 +812,7 @@ USE_HFS+_COMPRESSION VERSION - 4.7.0-1 + 4.7.1-1 TYPE 0 @@ -1240,7 +1240,7 @@ NAME - wazuh-agent-4.7.0-1.arm64 + wazuh-agent-4.7.1-1.arm64 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/macos/specs/wazuh-agent-intel64.pkgproj b/macos/specs/wazuh-agent-intel64.pkgproj index 9c9f5b5041..5e69a5bed0 100644 --- a/macos/specs/wazuh-agent-intel64.pkgproj +++ b/macos/specs/wazuh-agent-intel64.pkgproj @@ -812,7 +812,7 @@ USE_HFS+_COMPRESSION VERSION - 4.6.0-1 + 4.7.1-1 TYPE 0 @@ -1203,7 +1203,7 @@ NAME - wazuh-agent-4.7.0-1.intel64 + wazuh-agent-4.7.1-1.intel64 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index cef3ca9cf2..1b3013b3f1 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -7,7 +7,7 @@ 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.7.0 +Version: 4.7.1 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -599,6 +599,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* Tue Nov 14 2023 support - 4.7.1 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html * Tue Nov 07 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Mon Oct 16 2023 support - 4.6.0 diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index b54247a0cd..80b4dd0dcf 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -7,7 +7,7 @@ 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.7.0 +Version: 4.7.1 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -822,6 +822,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* Tue Nov 14 2023 support - 4.7.1 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html * Tue Nov 07 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Mon Oct 16 2023 support - 4.6.0 diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index 00eea0c658..6d2862d5a6 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -1,11 +1,11 @@ NAME=Wazuh - Wazuh unifies historically separate functions into a single agent and platform architecture. Providing protection for public clouds, private clouds, and on-premise data centers. PKG="wazuh-agent" -VERSION="4.7.0" +VERSION="4.7.1" ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="07Nov2023" +PSTAMP="14Nov2023" EMAIL="info@wazuh.com" ISTATES="S s 1 2 3" RSTATES="S s 1 2 3" diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 6eafbc5d8a..73e03596f1 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -1,3 +1,9 @@ +wazuh-dashboard (4.7.1-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html + + -- Wazuh, Inc Tue, 14 Nov 2023 00:00:00 +0000 + wazuh-dashboard (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index feb59cc7da..60c162bbd6 100644 --- a/stack/dashboard/deb/debian/copyright +++ b/stack/dashboard/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 07 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 14 Nov 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 11b5154b16..0999f620eb 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 +* Tue Nov 14 2023 support - 4.7.1 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html * Tue Nov 07 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Mon Oct 16 2023 support - 4.6.0 diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 3f1230a19f..2011d58638 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -1,3 +1,9 @@ +wazuh-indexer (4.7.1-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html + + -- Wazuh, Inc Tue, 14 Nov 2023 00:00:00 +0000 + wazuh-indexer (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index feb59cc7da..60c162bbd6 100644 --- a/stack/indexer/deb/debian/copyright +++ b/stack/indexer/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 07 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 14 Nov 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 4d70e205e4..bec77b2aa2 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1444,6 +1444,8 @@ rm -fr %{buildroot} %changelog +* Tue Nov 14 2023 support - 4.7.1 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html * Tue Nov 07 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Mon Oct 16 2023 support - 4.6.0 diff --git a/tests/unattended/unit/suites/test-common.sh b/tests/unattended/unit/suites/test-common.sh index 140dc40c6b..787d974232 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.7.0-1 @wazuh + @mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.7.1-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-05-common_checkInstalled-all-installed-yum-assert() { - @echo "wazuh-manager.x86_64 4.7.0-1 @wazuh" + @echo "wazuh-manager.x86_64 4.7.1-1 @wazuh" @echo 1 @echo "wazuh-indexer.x86_64 4.6.0-1 @wazuh" diff --git a/tests/unattended/unit/suites/test-dashboard.sh b/tests/unattended/unit/suites/test-dashboard.sh index c32795c004..3a7a716ae7 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.7.0" + wazuh_version="4.7.1" elasticsearch_oss_version="7.10.2" wazuh_kibana_plugin_revision="1" repobaseurl="https://packages.wazuh.com/4.x" @@ -55,7 +55,7 @@ test-03-dashboard_install-yum() { load-dashboard_install sys_type="yum" sep="-" - wazuh_version="4.5.3" + wazuh_version="4.7.1" wazuh_revision="1" dashboard_install } @@ -68,7 +68,7 @@ test-ASSERT-FAIL-04-dashboard_install-yum-error() { load-dashboard_install sys_type="yum" sep="-" - wazuh_version="4.5.3" + wazuh_version="4.7.1" wazuh_revision="1" @mockfalse yum install wazuh-dashboard-1.13.2-1 -y dashboard_install @@ -78,7 +78,7 @@ test-05-dashboard_install-apt() { load-dashboard_install sys_type="apt-get" sep="=" - wazuh_version="4.5.3" + wazuh_version="4.7.1" wazuh_revision="1" dashboard_install } @@ -91,7 +91,7 @@ test-ASSERT-FAIL-06-dashboard_install-apt-error() { load-dashboard_install sys_type="apt-get" sep="=" - wazuh_version="4.5.3" + wazuh_version="4.7.1" wazuh_revision="1" @mockfalse apt install wazuh-dashboard=1.13.2-1 -y dashboard_install diff --git a/tests/unattended/unit/suites/test-indexer.sh b/tests/unattended/unit/suites/test-indexer.sh index 48e5a1d0f9..281027be57 100644 --- a/tests/unattended/unit/suites/test-indexer.sh +++ b/tests/unattended/unit/suites/test-indexer.sh @@ -49,7 +49,7 @@ test-03-indexer_install-yum() { load-indexer_install sys_type="yum" sep="-" - wazuh_version="4.6.0" + wazuh_version="4.7.1" wazuh_revision="1" indexer_install } @@ -63,7 +63,7 @@ test-ASSERT-FAIL-04-indexer_install-yum-error() { load-indexer_install sys_type="yum" sep="-" - wazuh_version="4.6.0" + wazuh_version="4.7.1" wazuh_revision="1" @mockfalse yum install wazuh-indexer-1.13.2-1 -y indexer_install @@ -73,7 +73,7 @@ test-05-indexer_install-apt() { load-indexer_install sys_type="apt-get" sep="=" - wazuh_version="4.6.0" + wazuh_version="4.7.1" wazuh_revision="1" indexer_install } @@ -87,7 +87,7 @@ test-ASSERT-FAIL-06-indexer_install-apt-error() { load-indexer_install sys_type="apt-get" sep="=" - wazuh_version="4.6.0" + wazuh_version="4.7.1" wazuh_revision="1" @mockfalse apt install wazuh-indexer=1.13.2-1 -y indexer_install diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index 6342dd19c4..f51e8a7ecc 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.7" -readonly wazuh_version="4.7.0" +readonly wazuh_version="4.7.1" readonly filebeat_version="7.10.2" readonly wazuh_install_vesion="0.1" readonly source_branch="v${wazuh_version}" From 2b1be920e4b109faea551c3e41132f563e557f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Wed, 20 Sep 2023 17:29:18 +0200 Subject: [PATCH 770/994] Added debug variable to more commands --- .../cert_tool/certFunctions.sh | 6 +++--- .../common_functions/common.sh | 5 +++-- .../install_functions/checks.sh | 4 ++-- .../install_functions/dashboard.sh | 4 ++-- .../install_functions/indexer.sh | 2 +- .../install_functions/installCommon.sh | 18 +++++++++--------- .../wazuh-offline-download.sh | 18 +++++++++--------- .../passwords_tool/passwordsFunctions.sh | 10 +++++----- 8 files changed, 34 insertions(+), 33 deletions(-) diff --git a/unattended_installer/cert_tool/certFunctions.sh b/unattended_installer/cert_tool/certFunctions.sh index b97a9322a6..bde065b5b5 100644 --- a/unattended_installer/cert_tool/certFunctions.sh +++ b/unattended_installer/cert_tool/certFunctions.sh @@ -424,9 +424,9 @@ function cert_setpermisions() { function cert_convertCRLFtoLF() { if [[ ! -d "/tmp/wazuh-install-files" ]]; then - mkdir "/tmp/wazuh-install-files" + mkdir "/tmp/wazuh-install-files" "${debug}" fi eval "chmod -R 755 /tmp/wazuh-install-files ${debug}" - eval "tr -d '\015' < $1 > /tmp/wazuh-install-files/new_config.yml" - eval "mv /tmp/wazuh-install-files/new_config.yml $1" + eval "tr -d '\015' < $1 > /tmp/wazuh-install-files/new_config.yml ${debug}" + eval "mv /tmp/wazuh-install-files/new_config.yml $1 ${debug}" } diff --git a/unattended_installer/common_functions/common.sh b/unattended_installer/common_functions/common.sh index 7be078bb1a..df8ad9099f 100644 --- a/unattended_installer/common_functions/common.sh +++ b/unattended_installer/common_functions/common.sh @@ -62,6 +62,7 @@ function common_checkRoot() { function common_checkInstalled() { + common_logger -d "Checking Wazuh installation." wazuh_installed="" indexer_installed="" filebeat_installed="" @@ -160,14 +161,14 @@ 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}' ) - rpm -e "${key}" + rpm -e "${key}" "${debug}" else 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" + rm -rf "/usr/share/keyrings/wazuh.gpg" "${debug}" else common_logger "Wazuh GPG key not found in the system" return 1 diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index 6fb8881595..6026896991 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -215,7 +215,7 @@ function check_dist() { function checks_health() { - logger "Verifying that your system meets the recommended minimum hardware requirements." + common_logger "Verifying that your system meets the recommended minimum hardware requirements." checks_specifications @@ -346,7 +346,7 @@ function checks_ports() { if [ "${used_port}" -eq 1 ]; then common_logger "The installation can not continue due to port usage by other processes." - installCommon_rollBack + installCommon_rollBack exit 1 fi diff --git a/unattended_installer/install_functions/dashboard.sh b/unattended_installer/install_functions/dashboard.sh index eeb2b7ab7e..80bcfc93b5 100644 --- a/unattended_installer/install_functions/dashboard.sh +++ b/unattended_installer/install_functions/dashboard.sh @@ -19,10 +19,10 @@ function dashboard_configure() { if [ -n "${AIO}" ]; then eval "installCommon_getConfig dashboard/dashboard_unattended.yml /etc/wazuh-dashboard/opensearch_dashboards.yml ${debug}" - dashboard_copyCertificates + dashboard_copyCertificates "${debug}" else eval "installCommon_getConfig dashboard/dashboard_unattended_distributed.yml /etc/wazuh-dashboard/opensearch_dashboards.yml ${debug}" - dashboard_copyCertificates + dashboard_copyCertificates "${debug}" if [ "${#dashboard_node_names[@]}" -eq 1 ]; then pos=0 ip=${dashboard_node_ips[0]} diff --git a/unattended_installer/install_functions/indexer.sh b/unattended_installer/install_functions/indexer.sh index ad359fb2cd..340eeba820 100644 --- a/unattended_installer/install_functions/indexer.sh +++ b/unattended_installer/install_functions/indexer.sh @@ -96,7 +96,7 @@ function indexer_copyCertificates() { eval "tar -xf ${tar_file} -C ${indexer_cert_path} wazuh-install-files/root-ca.pem --strip-components 1 ${debug}" eval "tar -xf ${tar_file} -C ${indexer_cert_path} wazuh-install-files/admin.pem --strip-components 1 ${debug}" eval "tar -xf ${tar_file} -C ${indexer_cert_path} wazuh-install-files/admin-key.pem --strip-components 1 ${debug}" - eval "rm -rf ${indexer_cert_path}/wazuh-install-files/" + eval "rm -rf ${indexer_cert_path}/wazuh-install-files/ ${debug}" eval "chown -R wazuh-indexer:wazuh-indexer ${indexer_cert_path} ${debug}" eval "chmod 500 ${indexer_cert_path} ${debug}" eval "chmod 400 ${indexer_cert_path}/* ${debug}" diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index b13a3088fa..842ef69d9b 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -219,11 +219,11 @@ function installCommon_createInstallFiles() { fi gen_file="/tmp/wazuh-install-files/wazuh-passwords.txt" passwords_generatePasswordFile - eval "cp '${config_file}' '/tmp/wazuh-install-files/config.yml'" - eval "chown root:root /tmp/wazuh-install-files/*" + eval "cp '${config_file}' '/tmp/wazuh-install-files/config.yml' ${debug}" + eval "chown root:root /tmp/wazuh-install-files/* ${debug}" eval "tar -zcf '${tar_file}' -C '/tmp/' wazuh-install-files/ ${debug}" eval "rm -rf '/tmp/wazuh-install-files' ${debug}" - eval "rm -rf ${config_file} ${debug}" + eval "rm -rf ${config_file} ${debug}" common_logger "Created ${tar_file_name}. It contains the Wazuh cluster key, certificates, and passwords necessary for installation." else common_logger -e "Unable to create /tmp/wazuh-install-files" @@ -355,7 +355,7 @@ function installCommon_installChrome() { if [ "${sys_type}" == "yum" ]; then chrome_package="/tmp/wazuh-install-files/chrome.rpm" - common_curl -sSo "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm --max-time 100 --retry 5 --retry-delay 5 --fail "${debug}" + common_curl -sSo "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm --max-time 100 --retry 5 --retry-delay 5 --fail eval "yum install ${chrome_package} -y ${debug}" if [ "${PIPESTATUS[0]}" != 0 ]; then @@ -364,7 +364,7 @@ function installCommon_installChrome() { elif [ "${sys_type}" == "apt-get" ]; then chrome_package="/tmp/wazuh-install-files/chrome.deb" - common_curl -sSo "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb --max-time 100 --retry 5 --retry-delay 5 --fail "${debug}" + common_curl -sSo "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb --max-time 100 --retry 5 --retry-delay 5 --fail installCommon_aptInstall "${chrome_package}" if [ "${install_result}" != 0 ]; then @@ -530,11 +530,11 @@ function installCommon_rollBack() { fi if [ -f "/etc/yum.repos.d/wazuh.repo" ]; then - eval "rm /etc/yum.repos.d/wazuh.repo" + eval "rm /etc/yum.repos.d/wazuh.repo ${debug}" elif [ -f "/etc/zypp/repos.d/wazuh.repo" ]; then - eval "rm /etc/zypp/repos.d/wazuh.repo" + eval "rm /etc/zypp/repos.d/wazuh.repo ${debug}" elif [ -f "/etc/apt/sources.list.d/wazuh.list" ]; then - eval "rm /etc/apt/sources.list.d/wazuh.list" + eval "rm /etc/apt/sources.list.d/wazuh.list ${debug}" fi if [[ -n "${wazuh_installed}" && ( -n "${wazuh}" || -n "${AIO}" || -n "${uninstall}" ) ]];then @@ -612,7 +612,7 @@ function installCommon_rollBack() { "/lib/firewalld/services/dashboard.xml" "/lib/firewalld/services/opensearch.xml" ) - eval "rm -rf ${elements_to_remove[*]}" + eval "rm -rf ${elements_to_remove[*]} ${debug}" common_remove_gpg_key diff --git a/unattended_installer/install_functions/wazuh-offline-download.sh b/unattended_installer/install_functions/wazuh-offline-download.sh index 24fe2f221b..cbe53e8631 100755 --- a/unattended_installer/install_functions/wazuh-offline-download.sh +++ b/unattended_installer/install_functions/wazuh-offline-download.sh @@ -15,10 +15,10 @@ function offline_download() { dest_path="${base_dest_folder}/wazuh-packages" if [ -d "${dest_path}" ]; then - eval "rm -f ${dest_path}/*" # Clean folder before downloading specific versions - eval "chmod 700 ${dest_path}" + eval "rm -f ${dest_path}/* ${debug}" # Clean folder before downloading specific versions + eval "chmod 700 ${dest_path} ${debug}" else - eval "mkdir -m700 -p ${dest_path}" # Create folder if it does not exist + eval "mkdir -m700 -p ${dest_path} ${debug}" # Create folder if it does not exist fi packages_to_download=( "manager" "filebeat" "indexer" "dashboard" ) @@ -133,10 +133,10 @@ function offline_download() { dest_path="${base_dest_folder}/wazuh-files" if [ -d "${dest_path}" ]; then - eval "rm -f ${dest_path}/*" # Clean folder before downloading specific versions - eval "chmod 700 ${dest_path}" + eval "rm -f ${dest_path}/* ${debug}" # Clean folder before downloading specific versions + eval "chmod 700 ${dest_path} ${debug}" else - eval "mkdir -m700 -p ${dest_path}" # Create folder if it does not exist + eval "mkdir -m700 -p ${dest_path} ${debug}" # Create folder if it does not exist fi files_to_download=( "${wazuh_gpg_key}" "${filebeat_config_file}" "${filebeat_wazuh_template}" "${filebeat_wazuh_module}" ) @@ -156,12 +156,12 @@ function offline_download() { done eval "cd - > /dev/null" - eval "chmod 500 ${base_dest_folder}" + eval "chmod 500 ${base_dest_folder} ${debug}" common_logger "The configuration files and assets are in wazuh-offline.tar.gz" - eval "tar -czf ${base_dest_folder}.tar.gz ${base_dest_folder}" - eval "chmod -R 700 ${base_dest_folder} && rm -rf ${base_dest_folder}" + eval "tar -czf ${base_dest_folder}.tar.gz ${base_dest_folder} ${debug}" + eval "chmod -R 700 ${base_dest_folder} && rm -rf ${base_dest_folder} ${debug}" common_logger "You can follow the installation guide here https://documentation.wazuh.com/current/deployment-options/offline-installation.html" diff --git a/unattended_installer/passwords_tool/passwordsFunctions.sh b/unattended_installer/passwords_tool/passwordsFunctions.sh index 7360d34a6d..d18f42dc19 100644 --- a/unattended_installer/passwords_tool/passwordsFunctions.sh +++ b/unattended_installer/passwords_tool/passwordsFunctions.sh @@ -10,8 +10,8 @@ function passwords_changePassword() { 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" + eval "mkdir /etc/wazuh-indexer/backup/ ${debug}" + eval "cp /etc/wazuh-indexer/opensearch-security/* /etc/wazuh-indexer/backup/ ${debug}" passwords_createBackUp fi for i in "${!passwords[@]}" @@ -29,8 +29,8 @@ 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" + eval "mkdir /etc/wazuh-indexer/backup/ ${debug}" + eval "cp /etc/wazuh-indexer/opensearch-security/* /etc/wazuh-indexer/backup/ ${debug}" passwords_createBackUp fi if [ -n "${indexer_installed}" ] && [ -f "/etc/wazuh-indexer/backup/internal_users.yml" ]; then @@ -118,7 +118,7 @@ function passwords_changeDashboardApiPassword() { j=0 until [ -n "${file_exists}" ] || [ "${j}" -eq "12" ]; do if [ -f "/usr/share/wazuh-dashboard/data/wazuh/config/wazuh.yml" ]; then - eval "sed -i 's|password: .*|password: \"${1}\"|g' /usr/share/wazuh-dashboard/data/wazuh/config/wazuh.yml" + eval "sed -i 's|password: .*|password: \"${1}\"|g' /usr/share/wazuh-dashboard/data/wazuh/config/wazuh.yml ${debug}" if [ -z "${AIO}" ] && [ -z "${indexer}" ] && [ -z "${dashboard}" ] && [ -z "${wazuh}" ] && [ -z "${start_indexer_cluster}" ]; then common_logger "Updated wazuh-wui user password in wazuh dashboard. Remember to restart the service." fi From 8d8e55564836f13730d201df38e564d94b36026e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 21 Sep 2023 13:04:23 +0200 Subject: [PATCH 771/994] Added more debug messages --- unattended_installer/cert_tool/certFunctions.sh | 16 +++++++++++++++- unattended_installer/common_functions/common.sh | 15 ++++++++++++--- unattended_installer/install_functions/checks.sh | 12 ++++++++++++ .../install_functions/dashboard.sh | 5 +++++ .../install_functions/filebeat.sh | 4 ++++ .../install_functions/indexer.sh | 2 ++ .../install_functions/installCommon.sh | 7 +++++++ .../install_functions/manager.sh | 1 + .../install_functions/wazuh-offline-download.sh | 7 +++++-- .../passwords_tool/passwordsFunctions.sh | 3 +++ 10 files changed, 66 insertions(+), 6 deletions(-) diff --git a/unattended_installer/cert_tool/certFunctions.sh b/unattended_installer/cert_tool/certFunctions.sh index bde065b5b5..d6107541d4 100644 --- a/unattended_installer/cert_tool/certFunctions.sh +++ b/unattended_installer/cert_tool/certFunctions.sh @@ -8,7 +8,8 @@ function cert_cleanFiles() { - + + common_logger -d "Cleaning certificate files." eval "rm -f ${cert_tmp_path}/*.csr ${debug}" eval "rm -f ${cert_tmp_path}/*.srl ${debug}" eval "rm -f ${cert_tmp_path}/*.conf ${debug}" @@ -18,6 +19,8 @@ function cert_cleanFiles() { function cert_checkOpenSSL() { + common_logger -d "Checking if OpenSSL is installed." + if [ -z "$(command -v openssl)" ]; then common_logger -e "OpenSSL not installed." exit 1 @@ -27,6 +30,8 @@ function cert_checkOpenSSL() { function cert_checkRootCA() { + common_logger -d "Checking if the root CA exists." + if [[ -n ${rootca} || -n ${rootcakey} ]]; then # Verify variables match keys if [[ ${rootca} == *".key" ]]; then @@ -57,6 +62,7 @@ function cert_checkRootCA() { function cert_generateAdmincertificate() { + common_logger -d "Generating Admin certificates." eval "openssl genrsa -out ${cert_tmp_path}/admin-key-temp.pem 2048 ${debug}" eval "openssl pkcs8 -inform PEM -outform PEM -in ${cert_tmp_path}/admin-key-temp.pem -topk8 -nocrypt -v1 PBE-SHA1-3DES -out ${cert_tmp_path}/admin-key.pem ${debug}" eval "openssl req -new -key ${cert_tmp_path}/admin-key.pem -out ${cert_tmp_path}/admin.csr -batch -subj '/C=US/L=California/O=Wazuh/OU=Wazuh/CN=admin' ${debug}" @@ -66,6 +72,7 @@ function cert_generateAdmincertificate() { function cert_generateCertificateconfiguration() { + common_logger -d "Generating certificate configuration." cat > "${cert_tmp_path}/${1}.conf" <<- EOF [ req ] prompt = no @@ -119,6 +126,7 @@ function cert_generateCertificateconfiguration() { function cert_generateIndexercertificates() { + common_logger -d "Generating Wazuh indexer certificates." if [ ${#indexer_node_names[@]} -gt 0 ]; then common_logger -d "Creating the Wazuh indexer certificates." @@ -136,6 +144,7 @@ function cert_generateIndexercertificates() { function cert_generateFilebeatcertificates() { + common_logger -d "Generating Filebeat certificates." if [ ${#server_node_names[@]} -gt 0 ]; then common_logger -d "Creating the Wazuh server certificates." @@ -155,6 +164,7 @@ function cert_generateFilebeatcertificates() { function cert_generateDashboardcertificates() { + common_logger -d "Generating Wazuh dashboard certificates." if [ ${#dashboard_node_names[@]} -gt 0 ]; then common_logger -d "Creating the Wazuh dashboard certificates." @@ -294,7 +304,9 @@ function cert_parseYaml() { } function cert_checkPrivateIp() { + local ip=$1 + common_logger -d "Checking if ${ip} is private." # Check private IPv4 ranges if [[ $ip =~ ^10\.|^192\.168\.|^172\.(1[6-9]|2[0-9]|3[0-1])\.|^(127\.) ]]; then @@ -312,6 +324,8 @@ function cert_checkPrivateIp() { function cert_readConfig() { + common_logger -d "Reading configuration file." + if [ -f "${config_file}" ]; then if [ ! -s "${config_file}" ]; then common_logger -e "File ${config_file} is empty" diff --git a/unattended_installer/common_functions/common.sh b/unattended_installer/common_functions/common.sh index df8ad9099f..738590996d 100644 --- a/unattended_installer/common_functions/common.sh +++ b/unattended_installer/common_functions/common.sh @@ -53,6 +53,7 @@ function common_logger() { function common_checkRoot() { + common_logger -d "Checking root permissions." if [ "$EUID" -ne 0 ]; then echo "This script must be run as root." exit 1; @@ -75,6 +76,7 @@ function common_checkInstalled() { fi if [ -d "/var/ossec" ]; then + common_logger -d "There are Wazuh remaining files." wazuh_remaining_files=1 fi @@ -85,6 +87,7 @@ function common_checkInstalled() { fi if [ -d "/var/lib/wazuh-indexer/" ] || [ -d "/usr/share/wazuh-indexer" ] || [ -d "/etc/wazuh-indexer" ] || [ -f "${base_path}/search-guard-tlstool*" ]; then + common_logger -d "There are Wazuh indexer remaining files." indexer_remaining_files=1 fi @@ -95,6 +98,7 @@ function common_checkInstalled() { fi if [ -d "/var/lib/filebeat/" ] || [ -d "/usr/share/filebeat" ] || [ -d "/etc/filebeat" ]; then + common_logger -d "There are Filebeat remaining files." filebeat_remaining_files=1 fi @@ -105,6 +109,7 @@ function common_checkInstalled() { fi if [ -d "/var/lib/wazuh-dashboard/" ] || [ -d "/usr/share/wazuh-dashboard" ] || [ -d "/etc/wazuh-dashboard" ] || [ -d "/run/wazuh-dashboard/" ]; then + common_logger -d "There are Wazuh dashboard remaining files." dashboard_remaining_files=1 fi @@ -115,9 +120,11 @@ function common_checkSystem() { if [ -n "$(command -v yum)" ]; then sys_type="yum" sep="-" + common_logger -d "YUM package manager will be used." elif [ -n "$(command -v apt-get)" ]; then sys_type="apt-get" sep="=" + common_logger -d "APT package manager will be used." else common_logger -e "Couldn't find type of system" exit 1 @@ -127,6 +134,7 @@ function common_checkSystem() { function common_checkWazuhConfigYaml() { + common_logger -d "Checking Wazuh YAML configuration file." filecorrect=$(cert_parseYaml "${config_file}" | grep -Ev '^#|^\s*$' | grep -Pzc "\A(\s*(nodes_indexer__name|nodes_indexer__ip|nodes_server__name|nodes_server__ip|nodes_server__node_type|nodes_dashboard__name|nodes_dashboard__ip)=.*?)+\Z") if [[ "${filecorrect}" -ne 1 ]]; then common_logger -e "The configuration file ${config_file} does not have a correct format." @@ -139,16 +147,16 @@ function common_checkWazuhConfigYaml() { function common_curl() { if [ -n "${curl_has_connrefused}" ]; then - eval "curl $@ --retry-connrefused" + eval "curl $@ --retry-connrefused ${debug}" e_code="${PIPESTATUS[0]}" else retries=0 - eval "curl $@" + eval "curl $@ ${debug}" e_code="${PIPESTATUS[0]}" while [ "${e_code}" -eq 7 ] && [ "${retries}" -ne 12 ]; do retries=$((retries+1)) sleep 5 - eval "curl $@" + eval "curl $@ ${debug}" e_code="${PIPESTATUS[0]}" done fi @@ -158,6 +166,7 @@ function common_curl() { function common_remove_gpg_key() { + common_logger -d "Removing GPG key from system." 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 6026896991..6edb845aa1 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -8,6 +8,7 @@ function checks_arch() { + common_logger -d "Checking system architecture." arch=$(uname -m) if [ "${arch}" != "x86_64" ]; then @@ -178,6 +179,7 @@ function checks_arguments() { # Checks if the --retry-connrefused is available in curl function check_curlVersion() { + common_logger -d "Checking curl tool version." # --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 @@ -187,6 +189,7 @@ function check_curlVersion() { } function check_dist() { + common_logger -d "Checking system distribution." dist_detect if [ "${DIST_NAME}" != "centos" ] && [ "${DIST_NAME}" != "rhel" ] && [ "${DIST_NAME}" != "amzn" ] && [ "${DIST_NAME}" != "ubuntu" ]; then notsupported=1 @@ -211,6 +214,9 @@ function check_dist() { common_logger -e "The recommended systems are: Red Hat Enterprise Linux 7, 8, 9; CentOS 7, 8; Amazon Linux 2; Ubuntu 16.04, 18.04, 20.04, 22.04. The current system does not match this list. Use -i|--ignore-check to skip this check." exit 1 fi + common_logger -d "Detected distribution name: ${DIST_NAME}" + common_logger -d "Detected distribution version: ${DIST_VER}" + } function checks_health() { @@ -219,6 +225,9 @@ function checks_health() { checks_specifications + common_logger -d "CPU cores detected: ${cores}" + common_logger -d "Free RAM memory detected: ${ram_gb}" + if [ -n "${indexer}" ]; then if [ "${cores}" -lt 2 ] || [ "${ram_gb}" -lt 3700 ]; then common_logger -e "Your system does not meet the recommended minimum hardware requirements of 4Gb of RAM and 2 CPU cores. If you want to proceed with the installation use the -i option to ignore these requirements." @@ -252,6 +261,7 @@ function checks_health() { # This function ensures different names in the config.yml file. function checks_names() { + common_logger -d "Checking node names in the configuration file." if [ -n "${indxname}" ] && [ -n "${dashname}" ] && [ "${indxname}" == "${dashname}" ]; then common_logger -e "The node names for Wazuh indexer and Wazuh dashboard must be different." exit 1 @@ -291,6 +301,7 @@ function checks_names() { # This function checks if the target certificates are created before to start the installation. function checks_previousCertificate() { + common_logger -d "Checking previous certificate existence." if [ ! -f "${tar_file}" ]; then common_logger -e "Cannot find ${tar_file}. Run the script with the option -g|--generate-config-files to create it or copy it from another node." exit 1 @@ -327,6 +338,7 @@ function checks_specifications() { function checks_ports() { + common_logger -d "Checking ports availability." used_port=0 ports=("$@") diff --git a/unattended_installer/install_functions/dashboard.sh b/unattended_installer/install_functions/dashboard.sh index 80bcfc93b5..a52626c81c 100644 --- a/unattended_installer/install_functions/dashboard.sh +++ b/unattended_installer/install_functions/dashboard.sh @@ -17,6 +17,7 @@ function dashboard_changePort() { function dashboard_configure() { + common_logger -d "Configuring Wazuh dashboard." if [ -n "${AIO}" ]; then eval "installCommon_getConfig dashboard/dashboard_unattended.yml /etc/wazuh-dashboard/opensearch_dashboards.yml ${debug}" dashboard_copyCertificates "${debug}" @@ -59,6 +60,7 @@ function dashboard_configure() { function dashboard_copyCertificates() { + common_logger -d "Copying Wazuh dashboard certificates." eval "rm -f ${dashboard_cert_path}/* ${debug}" name=${dashboard_node_names[pos]} @@ -112,9 +114,11 @@ function dashboard_initialize() { until [ "$(curl -XGET https://"${nodes_dashboard_ip}":"${http_port}"/status -uadmin:"${u_pass}" -k -w %"{http_code}" -s -o /dev/null)" -eq "200" ] || [ "${j}" -eq "12" ]; do sleep 10 j=$((j+1)) + common_logger -d "Retrying Wazuh dashboard connection..." done if [ ${j} -lt 12 ]; then + common_logger -d "Wazuh dashboard connection was successful." if [ "${#server_node_names[@]}" -eq 1 ]; then wazuh_api_address=${server_node_ips[0]} else @@ -220,6 +224,7 @@ function dashboard_installReportDependencies() { # Flags that indicates that is an optional installation. optional_installation=1 report_dependencies=1 + common_logger -d "Installing Wazuh dashboard report dependencies." installCommon_checkChromium diff --git a/unattended_installer/install_functions/filebeat.sh b/unattended_installer/install_functions/filebeat.sh index df06396fa3..ccfe62304b 100644 --- a/unattended_installer/install_functions/filebeat.sh +++ b/unattended_installer/install_functions/filebeat.sh @@ -8,12 +8,14 @@ function filebeat_configure(){ + common_logger -d "Configuring Filebeat." eval "common_curl -sSo /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 + common_logger -d "Filebeat template was download successfully." eval "chmod go+r /etc/filebeat/wazuh-template.json ${debug}" eval "(common_curl -sS ${filebeat_wazuh_module} --max-time 300 --retry 5 --retry-delay 5 --fail | tar -xvz -C /usr/share/filebeat/module)" "${debug}" @@ -22,6 +24,7 @@ function filebeat_configure(){ installCommon_rollBack exit 1 fi + common_logger -d "Filebeat module was downloaded successfully." if [ -n "${AIO}" ]; then eval "installCommon_getConfig filebeat/filebeat_unattended.yml /etc/filebeat/filebeat.yml ${debug}" @@ -50,6 +53,7 @@ function filebeat_configure(){ function filebeat_copyCertificates() { + common_logger -d "Copying Filebeat certificates." if [ -f "${tar_file}" ]; then if [ -n "${AIO}" ]; then if ! tar -tvf "${tar_file}" | grep -q "${server_node_names[0]}" ; then diff --git a/unattended_installer/install_functions/indexer.sh b/unattended_installer/install_functions/indexer.sh index 340eeba820..c851fa323b 100644 --- a/unattended_installer/install_functions/indexer.sh +++ b/unattended_installer/install_functions/indexer.sh @@ -79,6 +79,7 @@ function indexer_configure() { function indexer_copyCertificates() { + common_logger -d "Copying Wazuh indexer certificates." eval "rm -f ${indexer_cert_path}/* ${debug}" name=${indexer_node_names[pos]} @@ -158,6 +159,7 @@ function indexer_install() { function indexer_startCluster() { + common_logger -d "Starting Wazuh indexer cluster." for ip_to_test in "${indexer_node_ips[@]}"; do eval "common_curl -XGET https://"${ip_to_test}":9200/ -k -s -o /dev/null" e_code="${PIPESTATUS[0]}" diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 842ef69d9b..2c93cb60dd 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -125,6 +125,8 @@ function installCommon_aptInstallList(){ function installCommon_changePasswordApi() { + common_logger -d "Changing API passwords." + #Change API password tool if [ -n "${changeall}" ]; then for i in "${!api_passwords[@]}"; do @@ -171,6 +173,7 @@ function installCommon_checkOptionalInstallation() { function installCommon_createCertificates() { + common_logger -d "Creating Wazuh certificates." if [ -n "${AIO}" ]; then eval "installCommon_getConfig certificate/config_aio.yml ${config_file} ${debug}" fi @@ -301,6 +304,7 @@ function installCommon_checkChromium() { function installCommon_extractConfig() { + common_logger -d "Extracting Wazuh configuration." if ! tar -tf "${tar_file}" | grep -q wazuh-install-files/config.yml; then common_logger -e "There is no config.yml file in ${tar_file}." exit 1 @@ -336,6 +340,7 @@ function installCommon_getPass() { function installCommon_installCheckDependencies() { + common_logger -d "Installing check dependencies." if [ "${sys_type}" == "yum" ]; then dependencies=( systemd grep tar coreutils sed procps-ng gawk lsof curl openssl ) installCommon_yumInstallList "${dependencies[@]}" @@ -376,6 +381,7 @@ function installCommon_installChrome() { function installCommon_installPrerequisites() { + common_logger -d "Installing prerequisites dependencies." if [ "${sys_type}" == "yum" ]; then dependencies=( libcap gnupg2 ) installCommon_yumInstallList "${dependencies[@]}" @@ -508,6 +514,7 @@ For Wazuh API users, the file must have this format: function installCommon_restoreWazuhrepo() { + common_logger -d "Restoring Wazuh repository." if [ -n "${development}" ]; then if [ "${sys_type}" == "yum" ] && [ -f "/etc/yum.repos.d/wazuh.repo" ]; then file="/etc/yum.repos.d/wazuh.repo" diff --git a/unattended_installer/install_functions/manager.sh b/unattended_installer/install_functions/manager.sh index 61f687b41d..3f94b3497c 100644 --- a/unattended_installer/install_functions/manager.sh +++ b/unattended_installer/install_functions/manager.sh @@ -8,6 +8,7 @@ function manager_startCluster() { + common_logger -d "Starting Wazuh manager cluster." for i in "${!server_node_names[@]}"; do if [[ "${server_node_names[i]}" == "${winame}" ]]; then pos="${i}"; diff --git a/unattended_installer/install_functions/wazuh-offline-download.sh b/unattended_installer/install_functions/wazuh-offline-download.sh index cbe53e8631..cd81f19693 100755 --- a/unattended_installer/install_functions/wazuh-offline-download.sh +++ b/unattended_installer/install_functions/wazuh-offline-download.sh @@ -70,6 +70,7 @@ function offline_download() { manager_deb_package="wazuh-manager_${wazuh_version}-${manager_revision}_amd64.deb" fi fi + common_logger -d "Wazuh manager package revision fetched." 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)) @@ -89,6 +90,7 @@ function offline_download() { indexer_deb_package="wazuh-indexer_${wazuh_version}-${indexer_revision}_amd64.deb" fi fi + common_logger -d "Wazuh indexer package revision fetched." 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)) @@ -108,10 +110,11 @@ function offline_download() { dashboard_deb_package="wazuh-dashboard_${wazuh_version}-${dashboard_revision}_amd64.deb" fi fi + common_logger -d "Wazuh dashboard package revision fetched." for package in "${packages_to_download[@]}" do - + common_logger -d "Downloading Wazuh ${package} package..." package_name="${package}_${package_type}_package" eval "package_base_url=${package}_${package_type}_base_url" @@ -144,7 +147,7 @@ function offline_download() { eval "cd ${dest_path}" for file in "${files_to_download[@]}" do - + common_logger -d "Downloading ${file}..." if output=$(common_curl -sSO ${file} --max-time 300 --retry 5 --retry-delay 5 --fail 2>&1); then common_logger "The resource ${file} was downloaded." else diff --git a/unattended_installer/passwords_tool/passwordsFunctions.sh b/unattended_installer/passwords_tool/passwordsFunctions.sh index d18f42dc19..f60cab47f3 100644 --- a/unattended_installer/passwords_tool/passwordsFunctions.sh +++ b/unattended_installer/passwords_tool/passwordsFunctions.sh @@ -260,6 +260,7 @@ function passwords_generatePassword() { function passwords_generatePasswordFile() { + common_logger -d "Generating password file." users=( admin kibanaserver kibanaro logstash readall snapshotrestore ) api_users=( wazuh wazuh-wui ) user_description=( @@ -499,6 +500,7 @@ function passwords_readUsers() { function passwords_restartService() { + common_logger -d "Restarting ${1} service..." if [ "$#" -ne 1 ]; then common_logger -e "passwords_restartService must be called with 1 argument." exit 1 @@ -559,6 +561,7 @@ function passwords_restartService() { function passwords_runSecurityAdmin() { + common_logger -d "Running security admin tool." if [ -z "${indexer_installed}" ] && [ -z "${dashboard_installed}" ] && [ -z "${filebeat_installed}" ]; then common_logger -e "Cannot find Wazuh indexer, Wazuh dashboard or Filebeat on the system." exit 1; From d5e7df8fb9bac4b4a6ec8168f1f2e29910dc7354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 21 Sep 2023 14:34:01 +0200 Subject: [PATCH 772/994] Removed whitespace --- 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 6edb845aa1..75f9591f7d 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -358,7 +358,7 @@ function checks_ports() { if [ "${used_port}" -eq 1 ]; then common_logger "The installation can not continue due to port usage by other processes." - installCommon_rollBack + installCommon_rollBack exit 1 fi From f5bd6fb510d766e73959d1280bf7de808a763f80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 21 Sep 2023 17:03:17 +0200 Subject: [PATCH 773/994] Removed some incorrect debug variables --- unattended_installer/cert_tool/certFunctions.sh | 2 +- unattended_installer/common_functions/common.sh | 6 +++--- unattended_installer/install_functions/filebeat.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/unattended_installer/cert_tool/certFunctions.sh b/unattended_installer/cert_tool/certFunctions.sh index d6107541d4..725f52d79d 100644 --- a/unattended_installer/cert_tool/certFunctions.sh +++ b/unattended_installer/cert_tool/certFunctions.sh @@ -441,6 +441,6 @@ function cert_convertCRLFtoLF() { mkdir "/tmp/wazuh-install-files" "${debug}" fi eval "chmod -R 755 /tmp/wazuh-install-files ${debug}" - eval "tr -d '\015' < $1 > /tmp/wazuh-install-files/new_config.yml ${debug}" + eval "tr -d '\015' < $1 > /tmp/wazuh-install-files/new_config.yml" eval "mv /tmp/wazuh-install-files/new_config.yml $1 ${debug}" } diff --git a/unattended_installer/common_functions/common.sh b/unattended_installer/common_functions/common.sh index 738590996d..9581f45b74 100644 --- a/unattended_installer/common_functions/common.sh +++ b/unattended_installer/common_functions/common.sh @@ -147,16 +147,16 @@ function common_checkWazuhConfigYaml() { function common_curl() { if [ -n "${curl_has_connrefused}" ]; then - eval "curl $@ --retry-connrefused ${debug}" + eval "curl $@ --retry-connrefused" e_code="${PIPESTATUS[0]}" else retries=0 - eval "curl $@ ${debug}" + eval "curl $@" e_code="${PIPESTATUS[0]}" while [ "${e_code}" -eq 7 ] && [ "${retries}" -ne 12 ]; do retries=$((retries+1)) sleep 5 - eval "curl $@ ${debug}" + eval "curl $@" e_code="${PIPESTATUS[0]}" done fi diff --git a/unattended_installer/install_functions/filebeat.sh b/unattended_installer/install_functions/filebeat.sh index ccfe62304b..f5be5efb71 100644 --- a/unattended_installer/install_functions/filebeat.sh +++ b/unattended_installer/install_functions/filebeat.sh @@ -9,7 +9,7 @@ function filebeat_configure(){ common_logger -d "Configuring Filebeat." - eval "common_curl -sSo /etc/filebeat/wazuh-template.json ${filebeat_wazuh_template} --max-time 300 --retry 5 --retry-delay 5 --fail ${debug}" + eval "common_curl -sSo /etc/filebeat/wazuh-template.json ${filebeat_wazuh_template} --max-time 300 --retry 5 --retry-delay 5 --fail" if [ ! -f "/etc/filebeat/wazuh-template.json" ]; then common_logger -e "Error downloading wazuh-template.json file." installCommon_rollBack @@ -18,7 +18,7 @@ function filebeat_configure(){ common_logger -d "Filebeat template was download successfully." eval "chmod go+r /etc/filebeat/wazuh-template.json ${debug}" - eval "(common_curl -sS ${filebeat_wazuh_module} --max-time 300 --retry 5 --retry-delay 5 --fail | tar -xvz -C /usr/share/filebeat/module)" "${debug}" + eval "(common_curl -sS ${filebeat_wazuh_module} --max-time 300 --retry 5 --retry-delay 5 --fail | tar -xvz -C /usr/share/filebeat/module)" if [ ! -d "/usr/share/filebeat/module" ]; then common_logger -e "Error downloading wazuh filebeat module." installCommon_rollBack From 8b878a7be32646282dbcd24fb922752131a13c63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 21 Sep 2023 17:47:54 +0200 Subject: [PATCH 774/994] Silenced tar output of Filebeat module --- unattended_installer/install_functions/filebeat.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/filebeat.sh b/unattended_installer/install_functions/filebeat.sh index f5be5efb71..d4061d640d 100644 --- a/unattended_installer/install_functions/filebeat.sh +++ b/unattended_installer/install_functions/filebeat.sh @@ -18,7 +18,7 @@ function filebeat_configure(){ common_logger -d "Filebeat template was download successfully." eval "chmod go+r /etc/filebeat/wazuh-template.json ${debug}" - eval "(common_curl -sS ${filebeat_wazuh_module} --max-time 300 --retry 5 --retry-delay 5 --fail | tar -xvz -C /usr/share/filebeat/module)" + eval "(common_curl -sS ${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 From 4dd0d6bfc040f2d8993a6aef86ebfe6190810a50 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Thu, 21 Sep 2023 22:32:32 +0200 Subject: [PATCH 775/994] Bump readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0c74d32329..13200feafe 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ The following table shows the references for the versions of each component. |-----------------|-----------------------| | 4.3.x | 1.2.0 | | 4.4.0 | 2.4.1 | -| 4.4.1 - 4.5.1 | 2.6.0 | +| 4.4.1 - 4.5.x | 2.6.0 | ### Wazuh indexer @@ -44,7 +44,7 @@ The following table shows the references for the versions of each component. |-----------------|-----------------------| | 4.3.x | 1.2.4 | | 4.4.0 | 2.4.1 | -| 4.4.1 - 4.5.2 | 2.6.0 | +| 4.4.1 - 4.5.x | 2.6.0 | ## Contribute From dd21557b8f52a39ed00821e9774c8f5245f4b15a Mon Sep 17 00:00:00 2001 From: Facundo Dalmau Date: Fri, 1 Sep 2023 17:37:22 -0300 Subject: [PATCH 776/994] Add new AWS files to Solaris SPECS --- solaris/solaris11/SPECS/template_agent.json | 192 ++++++++++++++++++++ 1 file changed, 192 insertions(+) diff --git a/solaris/solaris11/SPECS/template_agent.json b/solaris/solaris11/SPECS/template_agent.json index 81bc2c8fd0..4ae294a37f 100644 --- a/solaris/solaris11/SPECS/template_agent.json +++ b/solaris/solaris11/SPECS/template_agent.json @@ -1839,6 +1839,198 @@ "type": "file", "user": "root" }, + "/var/ossec/wodles/aws/__init__.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/aws/aws_tools.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/aws/wazuh_integration.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/aws/buckets_s3": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "drwxr-x---", + "type": "directory", + "user": "root" + }, + "/var/ossec/wodles/aws/buckets_s3/__init__.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/aws/buckets_s3/aws_bucket.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/aws/buckets_s3/cloudtrail.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/aws/buckets_s3/config.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/aws/buckets_s3/guardduty.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/aws/buckets_s3/load_balancers.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/aws/buckets_s3/server_access.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/aws/buckets_s3/umbrella.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/aws/buckets_s3/vpcflow.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/aws/buckets_s3/waf.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/aws/services": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "drwxr-x---", + "type": "directory", + "user": "root" + }, + "/var/ossec/wodles/aws/services/__init__.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/aws/services/was_service.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/aws/services/cloudwatchlogs.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/aws/services/inspector.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/aws/subscribers": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "drwxr-x---", + "type": "directory", + "user": "root" + }, + "/var/ossec/wodles/aws/subscribers/__init__.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/aws/subscribers/s3_log_handler.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/aws/subscribers/sqs_message_processor.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/aws/subscribers/sqs_queue.pyv": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, "/var/ossec/wodles/azure": { "class": "static", "group": "wazuh", From 98360535182d9e64ad15b96c8b5d38a1a5e44619 Mon Sep 17 00:00:00 2001 From: Facundo Dalmau Date: Fri, 1 Sep 2023 17:52:02 -0300 Subject: [PATCH 777/994] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 052ab6e62e..774118ee84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file. ## [4.8.0] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.8.0 + ## [4.7.1] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.7.1 From cce99e0f2bfec315850513a45c91284d31b0eadc Mon Sep 17 00:00:00 2001 From: Facundo Dalmau Date: Mon, 4 Sep 2023 10:51:25 -0300 Subject: [PATCH 778/994] Fix file content mistype --- solaris/solaris11/SPECS/template_agent.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/solaris/solaris11/SPECS/template_agent.json b/solaris/solaris11/SPECS/template_agent.json index 4ae294a37f..818341a493 100644 --- a/solaris/solaris11/SPECS/template_agent.json +++ b/solaris/solaris11/SPECS/template_agent.json @@ -1967,7 +1967,7 @@ "type": "file", "user": "root" }, - "/var/ossec/wodles/aws/services/was_service.py": { + "/var/ossec/wodles/aws/services/aws_service.py": { "class": "static", "group": "wazuh", "mode": "0750", @@ -2023,7 +2023,7 @@ "type": "file", "user": "root" }, - "/var/ossec/wodles/aws/subscribers/sqs_queue.pyv": { + "/var/ossec/wodles/aws/subscribers/sqs_queue.py": { "class": "static", "group": "wazuh", "mode": "0750", From e9128dfc6ab4e21440ce32430003d6e574aa5c56 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Thu, 28 Sep 2023 15:10:56 +0200 Subject: [PATCH 779/994] Update release date 4.5.3 --- aix/SPECS/wazuh-agent-aix.spec | 2 +- debs/SPECS/wazuh-agent/debian/changelog | 2 +- debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 3 +-- debs/SPECS/wazuh-manager/debian/copyright | 2 +- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- solaris/solaris10/pkginfo | 2 +- stack/dashboard/deb/debian/changelog | 2 +- stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- stack/indexer/deb/debian/changelog | 2 +- stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 14 files changed, 14 insertions(+), 15 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 7f04ae94a0..3fd17aadf2 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 Sep 28 2023 support - 4.5.3 +* Thu Oct 03 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 091aaa1c59..f0ba961d2f 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,7 +2,7 @@ wazuh-agent (4.5.3-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html - -- Wazuh, Inc Thu, 28 Sep 2023 00:00:00 +0000 + -- Wazuh, Inc Thu, 03 Oct 2023 00:00:00 +0000 wazuh-agent (4.5.2-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 77cc28d2fe..3d753e4b9f 100644 --- a/debs/SPECS/wazuh-agent/debian/copyright +++ b/debs/SPECS/wazuh-agent/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Thu, 28 Sep 2023 00:00:00 +0000 + Wazuh, Inc on Thu, 03 Oct 2023 00:00:00 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index 24a4976350..9051a81e29 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,7 +2,7 @@ wazuh-manager (4.5.3-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html - -- Wazuh, Inc Thu, 28 Sep 2023 00:00:00 +0000 + -- Wazuh, Inc Thu, 03 Oct 2023 00:00:00 +0000 wazuh-manager (4.5.2-RELEASE) stable; urgency=low @@ -10,7 +10,6 @@ wazuh-manager (4.5.2-RELEASE) stable; urgency=low -- Wazuh, Inc Thu, 31 Aug 2023 00:00:00 +0000 - wazuh-manager (4.5.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-1.html diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 77cc28d2fe..3d753e4b9f 100644 --- a/debs/SPECS/wazuh-manager/debian/copyright +++ b/debs/SPECS/wazuh-manager/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Thu, 28 Sep 2023 00:00:00 +0000 + Wazuh, Inc on Thu, 03 Oct 2023 00:00:00 +0000 It was downloaded from: diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 5a5e002408..1debae951a 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -619,7 +619,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Thu Sep 28 2023 support - 4.5.3 +* Thu Oct 03 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index f6f28b81c6..bbd0a95b9d 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -841,7 +841,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Thu Sep 28 2023 support - 4.5.3 +* Thu Oct 03 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index e13d825342..6d9deee52c 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -5,7 +5,7 @@ ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="28Sep2023" +PSTAMP="03Oct2023" EMAIL="info@wazuh.com" ISTATES="S s 1 2 3" RSTATES="S s 1 2 3" diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index ddfa5a233d..dbe7c89051 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-dashboard (4.5.3-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html - -- Wazuh, Inc Thu, 28 Sep 2023 00:00:00 +0000 + -- Wazuh, Inc Thu, 03 Oct 2023 00:00:00 +0000 wazuh-dashboard (4.5.2-RELEASE) stable; urgency=low diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index f5cb42a7f0..cc5604dbef 100644 --- a/stack/dashboard/deb/debian/copyright +++ b/stack/dashboard/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Thu, 28 Sep 2023 00:00:00 +0000 + Wazuh, Inc on Thu, 03 Oct 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 974e4ee876..eaf63ee6a2 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -397,7 +397,7 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog -* Thu Sep 28 2023 support - 4.5.3 +* Thu Oct 03 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 9cde7d337a..f67500df19 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-indexer (4.5.3-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html - -- Wazuh, Inc Thu, 28 Sep 2023 00:00:00 +0000 + -- Wazuh, Inc Thu, 03 Oct 2023 00:00:00 +0000 wazuh-indexer (4.5.2-RELEASE) stable; urgency=low diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index f5cb42a7f0..cc5604dbef 100644 --- a/stack/indexer/deb/debian/copyright +++ b/stack/indexer/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Thu, 28 Sep 2023 00:00:00 +0000 + Wazuh, Inc on Thu, 03 Oct 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 88d18d1c31..1c3e96e662 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1384,7 +1384,7 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/blocked.certs %changelog -* Thu Sep 28 2023 support - 4.5.3 +* Thu Oct 03 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html From def1f28187037bf496ca9b4380a0bf082908e00a Mon Sep 17 00:00:00 2001 From: DFolchA Date: Thu, 28 Sep 2023 15:54:16 +0200 Subject: [PATCH 780/994] Fix weekday --- aix/SPECS/wazuh-agent-aix.spec | 2 +- debs/SPECS/wazuh-agent/debian/changelog | 2 +- debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 2 +- debs/SPECS/wazuh-manager/debian/copyright | 2 +- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- stack/dashboard/deb/debian/changelog | 2 +- stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- stack/indexer/deb/debian/changelog | 2 +- stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 3fd17aadf2..bb7c5ff978 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 Oct 03 2023 support - 4.5.3 +* Tue Oct 03 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index f0ba961d2f..9062cc21c8 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,7 +2,7 @@ wazuh-agent (4.5.3-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html - -- Wazuh, Inc Thu, 03 Oct 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 03 Oct 2023 00:00:00 +0000 wazuh-agent (4.5.2-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 3d753e4b9f..20688425c6 100644 --- a/debs/SPECS/wazuh-agent/debian/copyright +++ b/debs/SPECS/wazuh-agent/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Thu, 03 Oct 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 03 Oct 2023 00:00:00 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index 9051a81e29..1e2f209ba7 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,7 +2,7 @@ wazuh-manager (4.5.3-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html - -- Wazuh, Inc Thu, 03 Oct 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 03 Oct 2023 00:00:00 +0000 wazuh-manager (4.5.2-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 3d753e4b9f..20688425c6 100644 --- a/debs/SPECS/wazuh-manager/debian/copyright +++ b/debs/SPECS/wazuh-manager/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Thu, 03 Oct 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 03 Oct 2023 00:00:00 +0000 It was downloaded from: diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 1debae951a..4d5ab16504 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -619,7 +619,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Thu Oct 03 2023 support - 4.5.3 +* Tue Oct 03 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index bbd0a95b9d..2c80a5f222 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -841,7 +841,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Thu Oct 03 2023 support - 4.5.3 +* Tue Oct 03 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index dbe7c89051..8c7cc8b7d5 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-dashboard (4.5.3-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html - -- Wazuh, Inc Thu, 03 Oct 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 03 Oct 2023 00:00:00 +0000 wazuh-dashboard (4.5.2-RELEASE) stable; urgency=low diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index cc5604dbef..90005279d8 100644 --- a/stack/dashboard/deb/debian/copyright +++ b/stack/dashboard/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Thu, 03 Oct 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 03 Oct 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index eaf63ee6a2..4c55a7c526 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -397,7 +397,7 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog -* Thu Oct 03 2023 support - 4.5.3 +* Tue Oct 03 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index f67500df19..3d00db4d65 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-indexer (4.5.3-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html - -- Wazuh, Inc Thu, 03 Oct 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 03 Oct 2023 00:00:00 +0000 wazuh-indexer (4.5.2-RELEASE) stable; urgency=low diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index cc5604dbef..90005279d8 100644 --- a/stack/indexer/deb/debian/copyright +++ b/stack/indexer/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Thu, 03 Oct 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 03 Oct 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 1c3e96e662..238b2e3261 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1384,7 +1384,7 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/blocked.certs %changelog -* Thu Oct 03 2023 support - 4.5.3 +* Tue Oct 03 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html From 0c8501df7eae53d323e9469a3a872b1757232987 Mon Sep 17 00:00:00 2001 From: jnasselle Date: Thu, 28 Sep 2023 11:49:16 -0300 Subject: [PATCH 781/994] Fix common WPK container --- wpk/common/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wpk/common/Dockerfile b/wpk/common/Dockerfile index eae449e527..cf76ec51e0 100644 --- a/wpk/common/Dockerfile +++ b/wpk/common/Dockerfile @@ -1,6 +1,7 @@ FROM debian:9 - -RUN apt-get update && \ +RUN echo "deb http://archive.debian.org/debian stretch contrib main non-free" > /etc/apt/sources.list && \ + echo "deb http://archive.debian.org/debian-security stretch/updates main" >> /etc/apt/sources.list && \ + apt-get update && \ apt-get -y install --allow-change-held-packages python git curl jq python3 python3-pip libffi-dev && \ pip3 install --upgrade cryptography==2.9.2 awscli From 25a8359c84a556cc47b69c62719eeafeef329141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Mon, 2 Oct 2023 15:23:06 +0200 Subject: [PATCH 782/994] Fixed dashboard dependencies in RHEL systems --- .../install_functions/dashboard.sh | 5 ++ .../install_functions/installCommon.sh | 59 +++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/unattended_installer/install_functions/dashboard.sh b/unattended_installer/install_functions/dashboard.sh index 0e66a71465..2e22db640a 100644 --- a/unattended_installer/install_functions/dashboard.sh +++ b/unattended_installer/install_functions/dashboard.sh @@ -228,6 +228,11 @@ function dashboard_installReportDependencies() { if [ "${sys_type}" == "yum" ]; then dashboard_dependencies+=( nss xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-utils xorg-x11-fonts-cyrillic xorg-x11-fonts-Type1 xorg-x11-fonts-misc fontconfig freetype ) installCommon_yumInstallList "${dashboard_dependencies[@]}" + + # In RHEL cases, remove the CentOS repositories configuration + if [ "${centos_repos_configured}" == 1 ]; then + installCommon_removeCentOSrepositories + fi elif [ "${sys_type}" == "apt-get" ]; then dashboard_dependencies+=( libnss3-dev fonts-liberation libfontconfig1 ) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 243057be3e..f801e4c4b2 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -6,6 +6,23 @@ # License (version 2) as published by the FSF - Free Software # Foundation. +function installCommon_addCentOSRepository() { + + local repo_name="$1" + local repo_description="$2" + local repo_baseurl="$3" + + echo "[$repo_name]" >> "${centos_repo}" + echo "name=${repo_description}" >> "${centos_repo}" + echo "baseurl=${repo_baseurl}" >> "${centos_repo}" + echo 'gpgcheck=1' >> "${centos_repo}" + echo 'enabled=1' >> "${centos_repo}" + echo "gpgkey=file://${centos_key}" >> "${centos_repo}" + echo '' >> "${centos_repo}" + +} + + function installCommon_cleanExit() { rollback_conf="" @@ -282,6 +299,9 @@ function installCommon_checkChromium() { installCommon_installChrome elif [[ "${DIST_NAME}" == "centos" ]] && [[ "${DIST_VER}" == "7" ]]; then installCommon_installChrome + elif [[ "${DIST_NAME}" == "rhel" ]] && [[ "${DIST_VER}" == "8" || "${DIST_VER}" == "9" ]]; then + installCommon_configureCentOSRepositories + dashboard_dependencies=(chromium) else dashboard_dependencies=(chromium) fi @@ -301,6 +321,35 @@ function installCommon_checkChromium() { } +# Adds the CentOS repository to install the dashboard dependencies. +function installCommon_configureCentOSRepositories() { + + centos_repos_configured=1 + centos_key="/etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial" + curl -so "${centos_key}" 'https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official' + + if [ ! -f "${centos_key}" ]; then + common_logger -w "The CentOS key could not be added. Chromium package skipped." + pdf_warning=1 + else + centos_repo="/etc/yum.repos.d/centos.repo" + eval "touch ${centos_repo} ${debug}" + common_logger -d "CentOS repository file created." + + if [ "${DIST_VER}" == "9" ]; then + installCommon_addCentOSRepository "appstream" "CentOS Stream \$releasever - AppStream" "https://mirror.stream.centos.org/9-stream/AppStream/\$basearch/os/" + installCommon_addCentOSRepository "baseos" "CentOS Stream \$releasever - BaseOS" "https://mirror.stream.centos.org/9-stream/BaseOS/\$basearch/os/" + elif [ "${DIST_VER}" == "8" ]; then + installCommon_addCentOSRepository "extras" "CentOS Linux \$releasever - Extras" "http://vault.centos.org/centos/\$releasever/extras/\$basearch/os/" + installCommon_addCentOSRepository "baseos" "CentOS Linux \$releasever - BaseOS" "http://vault.centos.org/centos/\$releasever/BaseOS/\$basearch/os/" + installCommon_addCentOSRepository "appstream" "CentOS Linux \$releasever - AppStream" "http://vault.centos.org/centos/\$releasever/AppStream/\$basearch/os/" + fi + + common_logger -d "CentOS repositories added." + fi + +} + function installCommon_extractConfig() { if ! tar -tf "${tar_file}" | grep -q wazuh-install-files/config.yml; then @@ -525,6 +574,16 @@ function installCommon_restoreWazuhrepo() { } +function installCommon_removeCentOSrepositories() { + + eval "rm -f ${centos_repo} ${debug}" + eval "rm -f ${centos_key} ${debug}" + eval "yum clean all ${debug}" + centos_repos_configured=0 + common_logger -d "CentOS repositories and key deleted." + +} + function installCommon_rollBack() { if [ -z "${uninstall}" ]; then From 75b6a253504d880ff804694be1e423aa7a4b2255 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Mon, 2 Oct 2023 15:27:49 +0200 Subject: [PATCH 783/994] Removed extra empty line --- unattended_installer/install_functions/installCommon.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index f801e4c4b2..e97fae1f6e 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -22,7 +22,6 @@ function installCommon_addCentOSRepository() { } - function installCommon_cleanExit() { rollback_conf="" From 96757e02279c7c4cce756edc8eeeff370e181505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Mon, 2 Oct 2023 17:05:37 +0200 Subject: [PATCH 784/994] Fixed Wazuh indexer remaining files --- .../install_functions/installCommon.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 6e6ada6f98..dd30cdba55 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -489,13 +489,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 855e3ef44087b576a76a3bfc342b8833f46a5c4a Mon Sep 17 00:00:00 2001 From: Luis Enrique Chico Capistrano Date: Mon, 2 Oct 2023 20:33:49 -0300 Subject: [PATCH 785/994] Enable the option to install wazuh-agent from intel pkg on arm --- macos/specs/wazuh-agent-intel64.pkgproj | 36 +++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/macos/specs/wazuh-agent-intel64.pkgproj b/macos/specs/wazuh-agent-intel64.pkgproj index 5e69a5bed0..864b7c66da 100644 --- a/macos/specs/wazuh-agent-intel64.pkgproj +++ b/macos/specs/wazuh-agent-intel64.pkgproj @@ -994,6 +994,42 @@ LIST + + BEHAVIOR + 2 + DICTIONARY + + IC_REQUIREMENT_CPU_ARCHITECTURE_FAMILY + 2 + IC_REQUIREMENT_CPU_INTEL_ARCHITECTURE_TYPE + 2 + IC_REQUIREMENT_CPU_MINIMUM_CPU_CORES_COUNT + 1 + IC_REQUIREMENT_CPU_MINIMUM_FREQUENCY + 866666 + IC_REQUIREMENT_CPU_POWERPC_ARCHITECTURE_TYPE + 0 + + IC_REQUIREMENT_CHECK_TYPE + 0 + IDENTIFIER + fr.whitebox.Packages.requirement.cpu + MESSAGE + + + LANGUAGE + English + SECONDARY_VALUE + + VALUE + This installer has been built for 64-bit Intel architecture. + + + NAME + Processor + STATE + + BEHAVIOR 3 From 106b97ad75ef62b82a2c3facc6715b42f326adef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 3 Oct 2023 10:26:02 +0200 Subject: [PATCH 786/994] Improved CentOS key curl command --- unattended_installer/install_functions/installCommon.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index e97fae1f6e..84e4cc7b88 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -325,7 +325,7 @@ function installCommon_configureCentOSRepositories() { centos_repos_configured=1 centos_key="/etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial" - curl -so "${centos_key}" 'https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official' + eval "common_curl -sLo ${centos_key} 'https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official' --max-time 300 --retry 5 --retry-delay 5 --fail" if [ ! -f "${centos_key}" ]; then common_logger -w "The CentOS key could not be added. Chromium package skipped." From 2906a345b1c60d728f24c2a94ba1764f5fdb0166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 3 Oct 2023 12:46:56 +0200 Subject: [PATCH 787/994] Fixed debug redirection in packages installation in the Assistant --- .../install_functions/installCommon.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 243057be3e..6a51dea5cf 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -81,18 +81,20 @@ function installCommon_aptInstall() { else installer=${package} fi - command="DEBIAN_FRONTEND=noninteractive apt-get install ${installer} -y -q ${debug}" + command="DEBIAN_FRONTEND=noninteractive apt-get install ${installer} -y -q" seconds=30 - eval "${command}" + apt_output=$(eval "${command} 2>&1") install_result="${PIPESTATUS[0]}" + eval "echo \${apt_output} ${debug}" eval "tail -n 2 ${logfile} | grep -q 'Could not get lock'" grep_result="${PIPESTATUS[0]}" while [ "${grep_result}" -eq 0 ] && [ "${attempt}" -lt 10 ]; do attempt=$((attempt+1)) common_logger "An external process is using APT. This process has to end to proceed with the Wazuh installation. Next retry in ${seconds} seconds (${attempt}/10)" sleep "${seconds}" - eval "${command}" + apt_output=$(eval "${command} 2>&1") install_result="${PIPESTATUS[0]}" + eval "echo \${apt_output} ${debug}" eval "tail -n 2 ${logfile} | grep -q 'Could not get lock'" grep_result="${PIPESTATUS[0]}" done @@ -700,8 +702,11 @@ function installCommon_yumInstallList(){ common_logger "--- Dependencies ---" for dep in "${not_installed[@]}"; do common_logger "Installing $dep." - eval "yum install ${dep} -y ${debug}" - if [ "${PIPESTATUS[0]}" != 0 ]; then + yum_output=$(yum install ${dep} -y 2>&1) + yum_code="${PIPESTATUS[0]}" + + eval "echo \${yum_output} ${debug}" + if [ "${yum_code}" != 0 ]; then installCommon_checkOptionalInstallation fi done From 2380d5b002af34d18bf9f81efbe6927f47cfe6b8 Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Tue, 3 Oct 2023 16:04:01 -0300 Subject: [PATCH 788/994] Replace requestHeadersWhitelist with requestHeadersAllowlist due too deprecation --- stack/dashboard/base/files/etc/opensearch_dashboards.yml | 2 +- unattended_installer/config/dashboard/dashboard.yml | 2 +- unattended_installer/config/dashboard/dashboard_all_in_one.yml | 2 +- unattended_installer/config/dashboard/dashboard_unattended.yml | 2 +- .../config/dashboard/dashboard_unattended_distributed.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stack/dashboard/base/files/etc/opensearch_dashboards.yml b/stack/dashboard/base/files/etc/opensearch_dashboards.yml index 5d7c2d0bdd..ccdac621c6 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.requestHeadersWhitelist: ["securitytenant","Authorization"] +opensearch.requestHeadersAllowlist: ["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.yml b/unattended_installer/config/dashboard/dashboard.yml index 0df1afc25e..30994d2ef5 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.requestHeadersWhitelist: ["securitytenant","Authorization"] +opensearch.requestHeadersAllowlist: ["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 b84717408b..8165c78cb1 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.requestHeadersWhitelist: ["securitytenant","Authorization"] +opensearch.requestHeadersAllowlist: ["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 8700bcb7da..68ea04dcf8 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.requestHeadersWhitelist: ["securitytenant","Authorization"] +opensearch.requestHeadersAllowlist: ["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 afaafa893a..c0cc8d2cbf 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.requestHeadersWhitelist: ["securitytenant","Authorization"] +opensearch.requestHeadersAllowlist: ["securitytenant","Authorization"] opensearch_security.multitenancy.enabled: false opensearch_security.readonly_mode.roles: ["kibana_read_only"] server.ssl.enabled: true From 932fd2013326b93df423ec6a17ebb2b16ae1acb4 Mon Sep 17 00:00:00 2001 From: Dwordcito Date: Thu, 5 Oct 2023 14:28:36 -0300 Subject: [PATCH 789/994] Update release date 4.5.3 --- aix/SPECS/wazuh-agent-aix.spec | 2 +- debs/SPECS/wazuh-agent/debian/changelog | 2 +- debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 2 +- debs/SPECS/wazuh-manager/debian/copyright | 2 +- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- solaris/solaris10/pkginfo | 2 +- stack/dashboard/deb/debian/changelog | 2 +- stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- stack/indexer/deb/debian/changelog | 2 +- stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index bb7c5ff978..9c3ef7b99a 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 -* Tue Oct 03 2023 support - 4.5.3 +* Tue Oct 10 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 9062cc21c8..d8e327cdec 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,7 +2,7 @@ wazuh-agent (4.5.3-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html - -- Wazuh, Inc Tue, 03 Oct 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 10 Oct 2023 00:00:00 +0000 wazuh-agent (4.5.2-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 20688425c6..cadd1b6e86 100644 --- a/debs/SPECS/wazuh-agent/debian/copyright +++ b/debs/SPECS/wazuh-agent/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 03 Oct 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 10 Oct 2023 00:00:00 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index 1e2f209ba7..a2ccafcd64 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,7 +2,7 @@ wazuh-manager (4.5.3-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html - -- Wazuh, Inc Tue, 03 Oct 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 10 Oct 2023 00:00:00 +0000 wazuh-manager (4.5.2-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 20688425c6..cadd1b6e86 100644 --- a/debs/SPECS/wazuh-manager/debian/copyright +++ b/debs/SPECS/wazuh-manager/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 03 Oct 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 10 Oct 2023 00:00:00 +0000 It was downloaded from: diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 4d5ab16504..f65045cfd9 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -619,7 +619,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Tue Oct 03 2023 support - 4.5.3 +* Tue Oct 10 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 2c80a5f222..23c87fe7dd 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -841,7 +841,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Tue Oct 03 2023 support - 4.5.3 +* Tue Oct 10 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index 6d9deee52c..f62eb32a62 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -5,7 +5,7 @@ ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="03Oct2023" +PSTAMP="10Oct2023" EMAIL="info@wazuh.com" ISTATES="S s 1 2 3" RSTATES="S s 1 2 3" diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 8c7cc8b7d5..0b248b3fb5 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-dashboard (4.5.3-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html - -- Wazuh, Inc Tue, 03 Oct 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 10 Oct 2023 00:00:00 +0000 wazuh-dashboard (4.5.2-RELEASE) stable; urgency=low diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index 90005279d8..30e4027b5e 100644 --- a/stack/dashboard/deb/debian/copyright +++ b/stack/dashboard/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 03 Oct 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 10 Oct 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 4c55a7c526..60b9fe2637 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -397,7 +397,7 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog -* Tue Oct 03 2023 support - 4.5.3 +* Tue Oct 10 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 3d00db4d65..4cf4e96573 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-indexer (4.5.3-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html - -- Wazuh, Inc Tue, 03 Oct 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 10 Oct 2023 00:00:00 +0000 wazuh-indexer (4.5.2-RELEASE) stable; urgency=low diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index 90005279d8..30e4027b5e 100644 --- a/stack/indexer/deb/debian/copyright +++ b/stack/indexer/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 03 Oct 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 10 Oct 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 238b2e3261..8af518b3b4 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1384,7 +1384,7 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/blocked.certs %changelog -* Tue Oct 03 2023 support - 4.5.3 +* Tue Oct 10 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html From 54cae37ace41898633111df3a730e5d670c83210 Mon Sep 17 00:00:00 2001 From: Dwordcito Date: Fri, 6 Oct 2023 10:28:04 -0300 Subject: [PATCH 790/994] Update release date 4.6.0 --- aix/SPECS/wazuh-agent-aix.spec | 2 +- debs/SPECS/wazuh-agent/debian/changelog | 2 +- debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 2 +- debs/SPECS/wazuh-manager/debian/copyright | 2 +- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- solaris/solaris10/pkginfo | 2 +- stack/dashboard/deb/debian/changelog | 2 +- stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- stack/indexer/deb/debian/changelog | 2 +- stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 84c7577e00..4440d59275 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 -* Mon Oct 16 2023 support - 4.6.0 +* Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html * Tue Oct 10 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 9fa6eec93f..4e547d5768 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,7 +2,7 @@ wazuh-agent (4.6.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html - -- Wazuh, Inc Mon, 16 Oct 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 24 Oct 2023 00:00:00 +0000 wazuh-agent (4.5.3-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 85feb586f4..0950ba55a8 100644 --- a/debs/SPECS/wazuh-agent/debian/copyright +++ b/debs/SPECS/wazuh-agent/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 16 Oct 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 24 Oct 2023 00:00:00 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index 368ac120ef..63acc9e54c 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,7 +2,7 @@ wazuh-manager (4.6.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html - -- Wazuh, Inc Mon, 16 Oct 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 24 Oct 2023 00:00:00 +0000 wazuh-manager (4.5.3-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 85feb586f4..0950ba55a8 100644 --- a/debs/SPECS/wazuh-manager/debian/copyright +++ b/debs/SPECS/wazuh-manager/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 16 Oct 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 24 Oct 2023 00:00:00 +0000 It was downloaded from: diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index a9ca27aaeb..d1645845c4 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -599,7 +599,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Mon Oct 16 2023 support - 4.6.0 +* Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html * Tue Oct 10 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 55953fcd8f..7f679d62cd 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -822,7 +822,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Mon Oct 16 2023 support - 4.6.0 +* Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html * Tue Oct 10 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index 347415b00d..d4cd57bb77 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -5,7 +5,7 @@ ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="16Oct2023" +PSTAMP="24Oct2023" EMAIL="info@wazuh.com" ISTATES="S s 1 2 3" RSTATES="S s 1 2 3" diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index b5b401e4e1..188df6bcc2 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-dashboard (4.6.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html - -- Wazuh, Inc Mon, 16 Oct 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 24 Oct 2023 00:00:00 +0000 wazuh-dashboard (4.5.3-RELEASE) stable; urgency=low diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index 63e23389c0..67d1ccb788 100644 --- a/stack/dashboard/deb/debian/copyright +++ b/stack/dashboard/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 16 Oct 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 24 Oct 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index ead9b87526..0ddb480cc3 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -408,7 +408,7 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog -* Mon Oct 16 2023 support - 4.6.0 +* Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html * Tue Oct 10 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 2194cd29dd..71123ca2ca 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-indexer (4.6.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html - -- Wazuh, Inc Mon, 16 Oct 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 24 Oct 2023 00:00:00 +0000 wazuh-indexer (4.5.3-RELEASE) stable; urgency=low diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index 7febc51fcf..be3e4b1203 100644 --- a/stack/indexer/deb/debian/copyright +++ b/stack/indexer/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc Mon, 16 Oct 2023 00:00:00 +0000 + Wazuh, Inc Tue, 24 Oct 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 2a068f9f1c..543e130ddf 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1444,7 +1444,7 @@ rm -fr %{buildroot} %changelog -* Mon Oct 16 2023 support - 4.6.0 +* Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html * Tue Oct 10 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html From 688eb3d292410b0881be2fba00ac57ed0e94a133 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Wed, 11 Oct 2023 19:31:39 +0200 Subject: [PATCH 791/994] Bumped readme with Wazuh indexer 2.10.0 --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index dcae8bd2db..f358cd9a23 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,8 @@ The following table shows the references for the versions of each component. | 4.3.x | 1.2.4 | | 4.4.0 | 2.4.1 | | 4.4.1 - 4.5.x | 2.6.0 | -| 4.6.0 - current | 2.8.0 | +| 4.6.x - 4.7.x | 2.8.0 | +| 4.8.x - current | 2.10.0 | ## Contribute From 61280803b40e0e8c9080db8b61e6cca5d2649e60 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Wed, 11 Oct 2023 20:27:40 +0200 Subject: [PATCH 792/994] Removed negation from the reference condition --- stack/indexer/rpm/build_package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/indexer/rpm/build_package.sh b/stack/indexer/rpm/build_package.sh index b9fcec92a7..41abeee729 100755 --- a/stack/indexer/rpm/build_package.sh +++ b/stack/indexer/rpm/build_package.sh @@ -51,7 +51,7 @@ build_rpm() { fi ../base/generate_base.sh -s ${outdir} -r ${revision} ${base_cmd} else - if ! [ "${reference}" ];then + if [ "${reference}" ];then version=$(curl -sL https://raw.githubusercontent.com/wazuh/wazuh-packages/${reference}/VERSION | cat) else version=$(cat ${current_path}/../../../VERSION) From bf0fc4aef05c079f4c2c3e6cedac98584a65c362 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Wed, 11 Oct 2023 22:32:40 +0200 Subject: [PATCH 793/994] Added Wazuh indexer ignored directories --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 822b7b01b9..7863a66cc8 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,10 @@ ova/Config_files/filebeat.yml .java stack/dashboard/base/output stack/indexer/base/output +stack/indexer/rpm/output +stack/indexer/debian/output .cache +.m2 wpk/versions solaris/packer/builds/ solaris/packer/packer-solaris11_3-virtualbox/ From b58a9837e4b3fccded253be59b788d9f42492ee2 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Wed, 11 Oct 2023 22:32:57 +0200 Subject: [PATCH 794/994] Bumped to 2.10.0 --- stack/indexer/base/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/indexer/base/builder.sh b/stack/indexer/base/builder.sh index bf864c9bf6..ebc681c4d3 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.8.0" +opensearch_version="2.10.0" base_dir=/opt/wazuh-indexer-base # ----------------------------------------------------------------------------- From b22b71fb0475cfb9fbc823dab0cd606c580ae0b5 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Wed, 11 Oct 2023 22:34:03 +0200 Subject: [PATCH 795/994] Improved specs files attribute references --- stack/indexer/rpm/wazuh-indexer.spec | 644 +++------------------------ 1 file changed, 55 insertions(+), 589 deletions(-) diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 8f42edcdde..9a08729825 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -331,673 +331,184 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/NOTICE.txt %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/opensearch-job-scheduler-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/failureaccess-1.0.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/opensearch-job-scheduler-spi-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/guava-31.0.1-jre.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/common-utils-2.8.0.0.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/tokenizers-0.19.0.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/opensearch-ml-algorithms-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jline-reader-3.21.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-ml-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/randomcutforest-parkservices-3.0-rc3.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/reflections-0.9.12.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-common-libsvm-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/protostuff-core-1.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/api-0.19.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/j2objc-annotations-1.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/gson-2.9.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/randomcutforest-testutils-3.0-rc3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-rest-client-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-anomaly-core-4.2.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/tribuo-regression-core-4.2.1.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/protostuff-runtime-1.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jsr305-3.0.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jansi-2.4.0.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/commons-beanutils-1.9.4.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-io-2.11.0.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-anomaly-libsvm-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-clustering-core-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/commons-compress-1.21.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jackson-databind-2.15.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jline-terminal-jansi-3.21.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/commons-collections4-4.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jackson-annotations-2.15.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-core-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-common-sgd-4.2.1.jar -%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/commons-logging-1.2.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 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/httpcore-nio-4.4.15.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/pytorch-engine-0.19.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-math-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/onnxruntime_gpu-1.13.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/jline-terminal-3.21.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/opensearch-ml-common-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/libsvm-3.25.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/jline-style-3.21.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/failureaccess-1.0.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-clustering-kmeans-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/commons-collections-3.2.2.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/opencsv-5.4.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/commons-lang3-3.10.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/protostuff-api-1.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/httpcore-4.4.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/randomcutforest-core-3.0-rc3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/protostuff-collectionschema-1.8.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/plugin-descriptor.properties -%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/tribuo-regression-sgd-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/tribuo-data-4.2.1.jar -%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/commons-codec-1.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/guava-31.0.1-jre.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/woodstox-core-6.4.0.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/*.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/ %attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/securityadmin.sh %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/SECURITY_ADMIN_TESTS.md %attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/audit_config_migrater.sh %attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/hash.sh -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/minimal-json-0.9.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/parent-join-client-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-transport-native-unix-common-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/mapper-extras-client-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/error_prone_annotations-2.3.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-lang-2.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-saml-impl-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/json-smart-2.4.10.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/j2objc-annotations-1.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-buffer-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/stax2-api-4.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/transport-netty4-client-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/zxcvbn-1.7.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jakarta.xml.bind-api-2.3.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-resolver-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-rest-client-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-codec-1.14.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jakarta.activation-1.2.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/java-saml-core-2.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/lang-mustache-client-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/json-path-2.4.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-common-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jsr305-3.0.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/bcpkix-jdk15on-1.70.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-lang3-3.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/eventbus-3.2.0.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/guava-30.0-jre.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-xmlsec-impl-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/xmlschema-core-2.2.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-handler-4.1.91.Final.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/jackson-databind-2.15.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-core-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/aggs-matrix-stats-client-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jackson-annotations-2.15.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/cxf-core-3.5.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-soap-impl-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/xmlsec-2.2.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/ldaptive-1.2.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/httpclient-cache-4.5.13.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/compiler-0.9.10.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-logging-1.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/zstd-jni-1.5.2-1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/zjsonpatch-0.4.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/httpcore-nio-4.4.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/cxf-rt-rs-security-jose-3.5.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-messaging-api-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-storage-api-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/lz4-java-1.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-profile-api-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/java-saml-2.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-xmlsec-api-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensaml-security-api-3.4.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/cryptacular-1.2.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/java-support-7.5.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-transport-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/asm-9.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-security-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/cxf-rt-security-3.5.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-codec-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/rank-eval-client-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/failureaccess-1.0.1.jar -%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/slf4j-api-1.7.30.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/accessors-smart-2.4.7.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/commons-cli-1.3.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/opensearch-rest-high-level-client-2.8.0.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/cxf-rt-rs-json-basic-3.5.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/netty-codec-http-4.1.91.Final.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/kafka-clients-3.4.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/json-flattener-0.5.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/commons-collections-3.2.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/log4j-slf4j-impl-2.17.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/metrics-core-3.1.2.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/httpcore-4.4.15.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/snappy-java-1.1.8.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/jaxb-runtime-2.3.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/txw2-2.3.4.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/istack-commons-runtime-3.0.12.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/httpasyncclient-4.1.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/httpclient-4.5.13.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/bcprov-jdk15on-1.67.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/common-utils-2.8.0.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/annotations-13.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/NOTICE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/opensearch-index-management-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/opensearch-index-management-spi-2.8.0.0.jar -%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/kotlin-stdlib-1.8.21.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/kotlin-stdlib-common-1.8.21.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/LICENSE.txt -%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-jdk7-1.8.21.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/plugin-security.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/httpclient-4.5.13.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/common-utils-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/javassist-3.29.2-GA.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/reflections-0.9.12.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/NOTICE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/opensearch-neural-search-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/opensearch-ml-client-2.8.0.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/LICENSE.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/plugin-security.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/common-utils-2.8.0.0.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/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/opensearch-notifications-2.8.0.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/kotlin-stdlib-common-1.6.10.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/common-utils-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/opensearch-asynchronous-search-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/plugin-security.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/common-utils-2.8.0.0.jar -%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/annotations-13.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/commons-digester-2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/j2objc-annotations-1.3.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-rest-client-2.8.0.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/jsr305-3.0.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/kotlin-stdlib-1.6.10.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/kotlinx-coroutines-core-common-1.1.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/cron-utils-9.1.6.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/guava-30.0-jre.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/ipaddress-5.3.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/commons-codec-1.13.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/commons-logging-1.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/httpcore-nio-4.4.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/javassist-3.27.0-GA.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/failureaccess-1.0.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/slf4j-api-1.7.30.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/javax.el-3.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/kotlinx-coroutines-core-1.1.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/alerting-core-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/checker-qual-3.5.0.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/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/percolator-client-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/commons-validator-1.7.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/httpcore-4.4.15.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/opensearch-alerting-2.8.0.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/httpasyncclient-4.1.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/httpclient-4.5.13.jar -%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/google-java-format-1.10.0.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/common-utils-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/datasources-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-sql-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/okhttp-4.9.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/parent-join-client-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/commons-math3-3.6.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/json-20230227.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/core-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/reflections-0.9.12.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/annotations-13.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/j2objc-annotations-1.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/opensearch-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/bcprov-ext-jdk15on-1.70.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-rest-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/NOTICE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/icu4j-58.2.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/ion-java-1.0.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/vavr-0.10.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/jsr305-3.0.2.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/checker-qual-3.12.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/sql-2.8.0.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/opensearch-ssl-config-2.8.0.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/ST4-4.0.8.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/org.abego.treelayout.core-1.0.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/jackson-databind-2.15.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/druid-1.0.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/legacy-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/jackson-annotations-2.15.1.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/kotlin-reflect-1.4.30.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/aws-encryption-sdk-java-2.4.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/commons-codec-1.13.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/geo-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/jmespath-java-1.12.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/antlr4-runtime-4.7.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/commons-logging-1.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/javassist-3.26.0-GA.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/commons-io-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/antlr-runtime-3.5.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/vavr-match-0.10.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/opensearch-ml-client-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/reindex-client-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/protocol-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/prometheus-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/failureaccess-1.0.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/commons-lang3-3.12.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/antlr4-4.7.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/ppl-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/LICENSE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/httpcore-4.4.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/aws-java-sdk-core-1.12.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/aws-java-sdk-sts-1.12.1.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/slf4j-api-1.7.36.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/common-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/resilience4j-retry-1.5.0.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/httpasyncclient-4.1.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/httpclient-4.5.13.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/gson-2.8.9.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/presto-matching-0.240.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/guava-31.0.1-jre.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/NOTICE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/geo-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/opensearch-geospatial-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/commons-lang3-3.12.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/h3-2.8.0.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/LICENSE.txt %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/plugin-security.policy %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/common-utils-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/json-20230227.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/json-flattener-0.15.1.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/json-base-2.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/opensearch-reports-scheduler-2.8.0.0.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/jackson-annotations-2.14.1.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/jackson-databind-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/plugin-security.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/gson-2.8.9.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/common-utils-2.8.0.0.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/opensearch-cross-cluster-replication-2.8.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/ipaddress-5.3.3.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/kotlin-stdlib-jdk8-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/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/plugin-descriptor.properties +%dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-custom-codecs/ +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-custom-codecs/LICENSE.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-custom-codecs/NOTICE.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-custom-codecs/*.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-custom-codecs/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-custom-codecs/plugin-security.policy %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/*.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/LICENSE.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/plugin-descriptor.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/NOTICE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/opensearch-knn-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/guava-30.0-jre.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/libopensearchknn_common.so %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/libopensearchknn_nmslib.so %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/libgomp.so.1 %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/libopensearchknn_faiss.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/failureaccess-1.0.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/LICENSE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/commons-lang-2.6.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/common-utils-2.8.0.0.jar -%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/opensearch-anomaly-detection-2.8.0.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/randomcutforest-parkservices-3.0-rc3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/protostuff-core-1.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/opensearch-rest-client-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/protostuff-runtime-1.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/randomcutforest-serialization-3.0-rc3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/jackson-annotations-2.14.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/commons-logging-1.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/org.jacoco.agent-0.8.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/httpcore-nio-4.4.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/sketches-core-0.13.4.jar -%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-pool2-2.10.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/jackson-databind-2.14.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/httpcore-4.4.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/randomcutforest-core-3.0-rc3.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/plugin-security.policy -%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/memory-0.12.2.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/httpasyncclient-4.1.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/httpclient-4.5.13.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/org.jacoco.ant-0.8.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/gson-2.8.9.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/commons-codec-1.15.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/aws-java-sdk-ses-1.12.48.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/jackson-databind-2.15.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/aws-java-sdk-sns-1.12.48.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/jackson-annotations-2.15.1.jar -%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/commons-logging-1.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/opensearch-notifications-core-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/activation-1.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/opensearch-notifications-core-spi-2.8.0.0.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/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/aws-java-sdk-core-1.12.48.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/plugin-descriptor.properties -%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/kotlin-stdlib-common-1.6.10.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/common-utils-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/opensearch-rest-client-2.8.0.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/cron-utils-9.1.6.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/opensearch-security-analytics-2.8.0.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/httpcore-nio-4.4.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/antlr4-runtime-4.10.1.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/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/plugin-security.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/plugin-descriptor.properties -%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/commons-codec-1.15.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/common-utils-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/json-20230227.jar -%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/json-flattener-0.15.1.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/json-base-2.2.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/jackson-annotations-2.14.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/opensearch-observability-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/jackson-databind-2.14.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/plugin-security.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jackson-module-paranamer-2.15.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/opensearch-performance-analyzer-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-transport-native-unix-common-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/performance-analyzer-commons-1.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/j2objc-annotations-1.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-buffer-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-resolver-4.1.91.Final.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/netty-handler-proxy-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-common-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/objenesis-3.0.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jsr305-3.0.2.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/byte-buddy-1.9.7.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-handler-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-codec-socks-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jackson-databind-2.15.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/jackson-annotations-2.15.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-codec-http2-4.1.91.Final.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/netty-transport-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-codec-4.1.91.Final.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/commons-lang3-3.12.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/netty-codec-http-4.1.91.Final.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/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/checker-qual-3.29.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/mockito-core-2.23.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/byte-buddy-agent-1.9.7.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/guava-31.1-jre.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/error_prone_annotations-2.9.0.jar %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/opensearch-grok-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/joni-2.1.44.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/opensearch-dissect-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/ingest-common-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/jcodings-1.0.58.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/repository-url-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/plugin-security.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/percolator/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/percolator/percolator-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/percolator/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/percolator/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/search-pipeline-common/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/search-pipeline-common/search-pipeline-common-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/search-pipeline-common/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/search-pipeline-common/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/opensearch-rest-client-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/opensearch-ssl-config-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/opensearch-dashboards-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/commons-logging-1.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/httpcore-nio-4.4.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/reindex-client-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/httpcore-4.4.15.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/httpasyncclient-4.1.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/httpclient-4.5.13.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/commons-codec-1.15.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/lang-painless-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/asm-tree-9.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/asm-analysis-9.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/antlr4-runtime-4.11.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/asm-9.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/opensearch-scripting-painless-spi-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/asm-util-9.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/asm-commons-9.5.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/analysis-common/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/analysis-common/analysis-common-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/analysis-common/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/analysis-common/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/rank-eval/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/rank-eval/rank-eval-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/rank-eval/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/rank-eval/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/aggs-matrix-stats/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/aggs-matrix-stats/aggs-matrix-stats-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/aggs-matrix-stats/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/aggs-matrix-stats/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/geo/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/geo/geo-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/geo/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/geo/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.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/mapper-extras/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/mapper-extras/plugin-descriptor.properties %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.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-user-agent/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-user-agent/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd/systemd-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd/plugin-security.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-transport-native-unix-common-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-buffer-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/transport-netty4-client-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-resolver-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-common-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-handler-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-transport-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-codec-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/netty-codec-http-4.1.91.Final.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/plugin-security.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/parent-join/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/parent-join/parent-join-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/parent-join/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/parent-join/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/lang-mustache-client-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/compiler-0.9.10.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/plugin-security.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/GeoLite2-ASN.mmdb -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/maxmind-db-2.1.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/jackson-databind-2.15.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/ingest-geoip-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/jackson-annotations-2.15.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/GeoLite2-Country.mmdb -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/geoip2-3.0.2.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/GeoLite2-City.mmdb %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/plugin-security.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/opensearch-rest-client-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/opensearch-ssl-config-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/commons-logging-1.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/httpcore-nio-4.4.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/reindex-client-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/*.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/transport-netty4/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/transport-netty4/plugin-security.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/transport-netty4/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/parent-join/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/parent-join/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/httpcore-4.4.15.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/httpasyncclient-4.1.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/httpclient-4.5.13.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/commons-codec-1.15.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/asm-tree-9.5.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/lang-expression-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/lucene-expressions-9.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/antlr4-runtime-4.11.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/asm-9.5.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/asm-commons-9.5.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/plugin-descriptor.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/opensearch-upgrade-cli-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-core-2.15.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-databind-2.15.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/jackson-annotations-2.15.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/*.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/plugin-cli/ -%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/commons-compress-1.23.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/plugin-cli/bcpg-fips-1.0.7.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/plugin-cli/opensearch-plugin-cli-2.8.0.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/plugin-cli/*.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/keystore-cli/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/keystore-cli/keystore-cli-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/log4j-core-2.17.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-misc-9.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-launchers-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-cli-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-core-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-core-2.15.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-spatial-extras-9.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jna-5.5.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-memory-9.6.0.jar -%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/jts-core-1.15.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-secure-sm-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-x-content-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-backward-codecs-9.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-core-9.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/java-version-checker-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-yaml-2.15.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-plugin-classloader-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-spatial3d-9.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-common-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-cbor-2.15.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-suggest-9.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/t-digest-3.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/opensearch-geo-2.8.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-grouping-9.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jopt-simple-5.0.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-sandbox-9.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-queryparser-9.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-highlighter-9.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-join-9.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/jackson-dataformat-smile-2.15.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/snakeyaml-2.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/joda-time-2.12.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/protobuf-java-3.22.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-analysis-common-9.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/log4j-jul-2.17.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/lucene-queries-9.6.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/spatial4j-0.7.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/HdrHistogram-2.1.12.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/keystore-cli/*.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/*.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/ @@ -1155,7 +666,7 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libsplashscreen.so %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libj2pcsc.so %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libverify.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jrt-fs.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/*.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libsyslookup.so %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libmanagement_ext.so %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libj2pkcs11.so @@ -1372,52 +883,7 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/supervisord.conf %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/opensearch_security.policy %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/log4j-core-2.17.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-transport-native-unix-common-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/commons-lang3-3.9.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jackson-core-2.15.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/performance-analyzer-commons-1.0.0-SNAPSHOT.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/j2objc-annotations-1.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-buffer-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-resolver-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/log4j-api-2.17.1.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/jooq-3.10.8.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-handler-proxy-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-common-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/performance-analyzer-rca-2.8.0.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jsr305-3.0.2.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/netty-handler-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-socks-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jackson-databind-2.15.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/jackson-annotations-2.15.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-stub-1.52.1.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/netty-codec-http2-4.1.91.Final.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/grpc-context-1.52.1.jar -%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/error_prone_annotations-2.14.0.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-api-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/javax.annotation-api-1.3.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/annotations-4.1.1.4.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-transport-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-4.1.91.Final.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/failureaccess-1.0.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-protobuf-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/netty-codec-http-4.1.91.Final.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-netty-1.52.1.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-protobuf-lite-1.52.1.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/sqlite-jdbc-3.41.2.2.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/checker-qual-3.29.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/protobuf-java-3.22.3.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/guava-31.1-jre.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/grpc-core-1.52.1.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/*.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/bin/ %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/bin/performance-analyzer-agent %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/bin/performance-analyzer-rca From 310bf063dc959df8f7f59a5d2a2719d91e91197a Mon Sep 17 00:00:00 2001 From: DFolchA Date: Fri, 13 Oct 2023 09:41:12 +0200 Subject: [PATCH 796/994] Update 4.7.0 release date --- aix/SPECS/wazuh-agent-aix.spec | 2 +- debs/SPECS/wazuh-agent/debian/changelog | 2 +- debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 2 +- debs/SPECS/wazuh-manager/debian/copyright | 2 +- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- stack/dashboard/deb/debian/changelog | 2 +- stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- stack/indexer/deb/debian/changelog | 2 +- stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 81c65e08dd..f02abcf9e5 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 -* Sat Oct 28 2023 support - 4.7.0 +* Wed Nov 08 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 51f2f286f0..c59f655b7e 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,7 +2,7 @@ wazuh-agent (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Tue, 07 Nov 2023 00:00:00 +0000 + -- Wazuh, Inc Wed, 08 Nov 2023 00:00:00 +0000 wazuh-agent (4.6.0-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 0950ba55a8..347633fd46 100644 --- a/debs/SPECS/wazuh-agent/debian/copyright +++ b/debs/SPECS/wazuh-agent/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 24 Oct 2023 00:00:00 +0000 + Wazuh, Inc on Wed, 08 Nov 2023 00:00:00 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index 574976a0c4..a5ef3691cd 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,7 +2,7 @@ wazuh-manager (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Tue, 07 Nov 2023 00:00:00 +0000 + -- Wazuh, Inc Wed, 08 Nov 2023 00:00:00 +0000 wazuh-manager (4.6.0-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 0950ba55a8..347633fd46 100644 --- a/debs/SPECS/wazuh-manager/debian/copyright +++ b/debs/SPECS/wazuh-manager/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 24 Oct 2023 00:00:00 +0000 + Wazuh, Inc on Wed, 08 Nov 2023 00:00:00 +0000 It was downloaded from: diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 45f6b19087..aae3eab9e2 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -599,7 +599,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Tue Nov 07 2023 support - 4.7.0 +* Wed Nov 08 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 4145737f05..2a1289fc81 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -822,7 +822,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Tue Nov 07 2023 support - 4.7.0 +* Wed Nov 08 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index a97f1ea4a4..1207151fcf 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-dashboard (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Tue, 07 Nov 2023 00:00:00 +0000 + -- Wazuh, Inc Wed, 08 Nov 2023 00:00:00 +0000 wazuh-dashboard (4.6.0-RELEASE) stable; urgency=low diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index feb59cc7da..6edb5d9d84 100644 --- a/stack/dashboard/deb/debian/copyright +++ b/stack/dashboard/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 07 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Wed, 08 Nov 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index f1736114e4..a192218e91 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -408,7 +408,7 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog -* Tue Nov 07 2023 support - 4.7.0 +* Wed Nov 08 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 267484155d..e4aa662206 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-indexer (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Tue, 07 Nov 2023 00:00:00 +0000 + -- Wazuh, Inc Wed, 08 Nov 2023 00:00:00 +0000 wazuh-indexer (4.6.0-RELEASE) stable; urgency=low diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index be3e4b1203..d0501ba381 100644 --- a/stack/indexer/deb/debian/copyright +++ b/stack/indexer/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc Tue, 24 Oct 2023 00:00:00 +0000 + Wazuh, Inc Wed, 08 Nov 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 44f55889a8..3f6f94223f 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1444,7 +1444,7 @@ rm -fr %{buildroot} %changelog -* Tue Nov 07 2023 support - 4.7.0 +* Wed Nov 08 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html From 1a4e02d49e30c74000a32d5216e28e0d28b7cf24 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Mon, 16 Oct 2023 15:40:10 +0200 Subject: [PATCH 797/994] Bumped and improved version references --- stack/indexer/rpm/wazuh-indexer.spec | 496 ++++++++------------------- 1 file changed, 138 insertions(+), 358 deletions(-) diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 9a08729825..35c99b0335 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -328,178 +328,167 @@ rm -fr %{buildroot} %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/NOTICE.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/*.txt %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-job-scheduler/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-ml/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/*.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/ -%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/securityadmin.sh -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/SECURITY_ADMIN_TESTS.md -%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/audit_config_migrater.sh -%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/hash.sh -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/plugin-descriptor.properties +%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/*.sh +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/*.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/*.yml +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/NOTICE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/LICENSE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/*.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-index-management/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/NOTICE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/LICENSE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/*.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-neural-search/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-asynchronous-search/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-alerting/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/NOTICE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/LICENSE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/*.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-sql/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/NOTICE.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/*.txt %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/LICENSE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/*.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-geospatial/*.policy %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-reports-scheduler/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-cross-cluster-replication/*.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/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-custom-codecs/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-custom-codecs/LICENSE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-custom-codecs/NOTICE.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-custom-codecs/*.txt %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-custom-codecs/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-custom-codecs/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-custom-codecs/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-custom-codecs/*.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-custom-codecs/*.policy %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/LICENSE.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/plugin-descriptor.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/NOTICE.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/*.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/*.txt %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/libopensearchknn_common.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/libopensearchknn_nmslib.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/libgomp.so.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/libopensearchknn_faiss.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/*.so.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-knn/lib/*.so %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-anomaly-detection/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-notifications-core/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security-analytics/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-observability/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-performance-analyzer/*.properties %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/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-common/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/repository-url/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/percolator/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/percolator/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/percolator/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/percolator/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/search-pipeline-common/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/search-pipeline-common/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/search-pipeline-common/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/search-pipeline-common/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/opensearch-dashboards/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-painless/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/analysis-common/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/analysis-common/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/analysis-common/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/analysis-common/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/rank-eval/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/rank-eval/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/rank-eval/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/rank-eval/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/aggs-matrix-stats/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/aggs-matrix-stats/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/aggs-matrix-stats/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/aggs-matrix-stats/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/geo/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/geo/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/geo/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/geo/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/mapper-extras/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/mapper-extras/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/mapper-extras/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/mapper-extras/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-user-agent/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-user-agent/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-user-agent/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-user-agent/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/systemd/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/transport-netty4/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/parent-join/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/parent-join/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/parent-join/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/parent-join/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-mustache/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/GeoLite2-ASN.mmdb +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/*.mmdb %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/GeoLite2-Country.mmdb -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/GeoLite2-City.mmdb -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/ingest-geoip/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/transport-netty4/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/transport-netty4/plugin-security.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/transport-netty4/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/transport-netty4/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/transport-netty4/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/parent-join/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/parent-join/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/reindex/parent-join/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/plugin-security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/*.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/plugin-descriptor.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/modules/lang-expression/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/lib/tools/upgrade-cli/ @@ -512,225 +501,58 @@ rm -fr %{buildroot} %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jmap.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jconsole.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jstack.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jrunscript.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jstatd.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jdb.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jinfo.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/javap.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/javadoc.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/javac.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/keytool.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/java.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jcmd.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jstat.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jhsdb.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jshell.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jps.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jfr.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jdeprscan.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jar.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jlink.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/serialver.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jmod.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/rmiregistry.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jpackage.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jdeps.1 -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/jarsigner.1 +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/man/man1/*.1 %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.xml.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.management.rmi.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.attach.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.localedata.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.opt.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.naming.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.sql.rowset.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.le.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.dynalink.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jfr.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.smartcardio.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.editpad.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.security.jgss.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.crypto.cryptoki.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.nio.mapmode.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jsobject.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.incubator.vector.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.accessibility.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.compiler.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.prefs.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jdwp.agent.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.instrument.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.javadoc.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.unsupported.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.vm.compiler.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.xml.dom.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jstatd.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.jvmstat.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.security.auth.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.security.jgss.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.sql.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.management.agent.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.naming.dns.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.zipfs.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.transaction.xa.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.management.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.ed.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.incubator.foreign.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.crypto.ec.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jshell.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.xml.crypto.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jcmd.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.management.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jpackage.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.compiler.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.logging.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.se.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.unsupported.desktop.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.httpserver.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.charsets.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.datatransfer.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.naming.rmi.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.scripting.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jlink.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jartool.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.rmi.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.net.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.net.http.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.management.jfr.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.hotspot.agent.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.security.sasl.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.sctp.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jdeps.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.random.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.vm.ci.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.desktop.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/java.base.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jdi.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.jconsole.jmod -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/jdk.internal.vm.compiler.management.jmod +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/jmods/*.jmod %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/NOTICE %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/classfile_constants.h +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/*.h %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/linux/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/linux/jni_md.h -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/linux/jawt_md.h -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/jdwpTransport.h -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/jvmticmlr.h -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/jni.h -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/jvmti.h -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/jawt.h +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/include/linux/*.h %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jvm.cfg -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libawt_xawt.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libawt_headless.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/*.cfg +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/*.so +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jspawnhelper +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/*.properties.ja +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/*.dat +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/*.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/*.sym +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/classlist +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/*.jar +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jexec %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/blocked.certs -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/default.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/*.certs +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/*.policy %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/cacerts -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/public_suffix_list.dat -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjava.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libextnet.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjimage.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libnio.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libprefs.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjaas.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjawt.so -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jspawnhelper -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjdwp.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libawt.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/psfont.properties.ja -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libmanagement.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjsig.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/tzdb.dat +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/*.dat %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/modules %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server/libjsig.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server/classes.jsa -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server/classes_nocoops.jsa -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server/libjvm.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server/*.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/server/*.jsa %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jfr/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jfr/profile.jfc -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jfr/default.jfc -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libattach.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libdt_socket.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjsound.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/psfontj2d.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjavajpeg.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/ct.sym -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libnet.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/classlist -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libj2gss.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libmanagement_agent.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libsplashscreen.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libj2pcsc.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libverify.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/*.jar -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libsyslookup.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libmanagement_ext.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libj2pkcs11.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjsvml.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libsaproc.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libinstrument.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libjli.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libsctp.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libfontmanager.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/liblcms.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/librmi.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jexec -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libzip.so -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/libmlib_image.so +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/jfr/*.jfc %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/ -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/javadoc -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jmod -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jpackage -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jrunscript -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jhsdb -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jstat -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jdb -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jdeprscan -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/java -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/rmiregistry -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/javac -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jconsole -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jlink -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jfr -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jinfo -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/serialver -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jps -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jcmd -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/javap -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/keytool -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jstatd -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jstack -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jdeps -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jshell -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jimage -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jmap -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jarsigner -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/jar +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/bin/* %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/release %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.instrument/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.net/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.crypto.cryptoki/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.crypto.cryptoki/pkcs11cryptotoken.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.crypto.cryptoki/pkcs11wrapper.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.crypto.cryptoki/*.md %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.security.auth/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.smartcardio/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.smartcardio/pcsclite.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.smartcardio/*.md %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.zipfs/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.localedata/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.localedata/thaidict.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.localedata/*.md %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.prefs/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.dynalink/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.dynalink/dynalink.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.dynalink/*.md %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.jpackage/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.management/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.jvmstat/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml.crypto/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml.crypto/santuario.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml.crypto/*.md %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.net.http/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.unsupported/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.datatransfer/ @@ -745,26 +567,16 @@ rm -fr %{buildroot} %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.editpad/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.httpserver/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/c-libutl.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/icu.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/aes.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/cldr.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/public_suffix.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/*.md %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/ASSEMBLY_EXCEPTION %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/ADDITIONAL_LICENSE_INFO -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/asm.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/unicode.md %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.base/LICENSE %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.jcmd/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.opt/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.opt/jopt-simple.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.opt/*.md %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.scripting/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/xalan.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/bcel.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/jcup.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/xerces.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/dom.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.xml/*.md %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.jdeps/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.jstatd/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.management.agent/ @@ -790,7 +602,7 @@ rm -fr %{buildroot} %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.naming.rmi/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.xml.dom/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.le/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.le/jline.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.internal.le/*.md %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.jsobject/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.jdwp.agent/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.se/ @@ -798,90 +610,62 @@ rm -fr %{buildroot} %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.incubator.foreign/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.jshell/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.javadoc/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.javadoc/jquery.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.javadoc/jqueryUI.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.javadoc/*.md %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.compiler/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.security.jgss/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.jconsole/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.naming.dns/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.management.rmi/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/xwd.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/harfbuzz.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/libpng.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/jpeg.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/colorimaging.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/mesa3d.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/giflib.md -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/lcms.md +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/java.desktop/*.md %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/legal/jdk.jlink/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/java.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/java.security +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/*.security %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/limited/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/limited/exempt_local.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/limited/default_local.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/limited/default_US_export.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/limited/*.policy %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/unlimited/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/unlimited/default_local.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/unlimited/default_US_export.policy -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/README.txt -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/logging.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/net.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/sound.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/unlimited/*.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/security/policy/*.txt +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/sdp/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/sdp/sdp.conf.template +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/sdp/*.template %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/management/ -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/management/jmxremote.access -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/management/management.properties -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/management/jmxremote.password.template +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/management/*.access +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/management/*.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/conf/management/*.template %dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/ -%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/internal_users.yml -%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/audit.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/tenants.yml -%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/whitelist.yml -%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/action_groups.yml -%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/allowlist.yml -%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/roles_mapping.yml -%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/nodes_dn.yml -%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/config.yml +%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/*.yml +%config(noreplace) %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-security/*.example %dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-notifications/ -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-notifications/notifications.yml +%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-notifications/*.yml %config(noreplace) %attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/jvm.options %dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/jvm.options.d/ %dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-reports-scheduler/ -%attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-reports-scheduler/reports-scheduler.yml -%config(noreplace) %attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/log4j2.properties +%attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-reports-scheduler/*.yml +%config(noreplace) %attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/*.properties %dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-notifications-core/ -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-notifications-core/notifications-core.yml -%config(noreplace) %attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch.yml +%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-notifications-core/*.yml +%config(noreplace) %attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/*.yml %dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-observability/ -%attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-observability/observability.yml +%attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-observability/*.yml %dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/ %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/agent-stats-metadata -%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/log4j2.xml -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/rca.conf -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/performance-analyzer.properties +%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/*.conf +%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/*.xml +%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/*.properties %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/plugin-stats-metadata -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/supervisord.conf -%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/opensearch_security.policy +%attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/*.policy %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/ %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/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/log4j2.xml -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/rca.conf -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/performance-analyzer.properties +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/*.conf +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/*.xml +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/*.properties %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/plugin-stats-metadata -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/supervisord.conf -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/opensearch_security.policy +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/*.policy %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/lib/*.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/bin/ @@ -897,16 +681,12 @@ rm -fr %{buildroot} %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-node %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-env %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-env-from-file +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/indexer-security-init.sh %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-keystore %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-performance-analyzer/ %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-performance-analyzer/performance-analyzer-agent-cli %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-performance-analyzer/performance-analyzer-agent -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/LICENSE.txt %attr(440, %{USER}, %{GROUP}) %{INSTALL_DIR}/VERSION -%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/indexer-security-init.sh -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/config.yml -%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/wazuh-certs-tool.sh -%attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/wazuh-passwords-tool.sh %changelog From c1c44d75fadef6468eacaa42c8ad09730c2064fc Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Mon, 16 Oct 2023 18:54:40 +0200 Subject: [PATCH 798/994] Fixed permissions in internal user and role files --- stack/indexer/deb/debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index 62beff43a8..c05e796ec3 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -152,6 +152,9 @@ override_dh_fixperms: chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/jvm.options chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/aggs-matrix-stats chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/opensearch.yml + chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/roles_mapping.yml + chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/internal_users.yml + chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/roles.yml chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/jvm.options.d chmod 440 $(TARGET_DIR)$(INSTALLATION_DIR)/VERSION chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/indexer-security-init.sh From 3983e4a94c636da93bb3cdfee4cd4f27bfcddcb3 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Mon, 16 Oct 2023 22:23:15 +0200 Subject: [PATCH 799/994] Fixed debian directory --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7863a66cc8..867e7a97a6 100644 --- a/.gitignore +++ b/.gitignore @@ -22,7 +22,7 @@ ova/Config_files/filebeat.yml stack/dashboard/base/output stack/indexer/base/output stack/indexer/rpm/output -stack/indexer/debian/output +stack/indexer/deb/output .cache .m2 wpk/versions From f21b2089c842385df1e5076e9bc9ebeeacabecc5 Mon Sep 17 00:00:00 2001 From: Vikman Fernandez-Castro Date: Tue, 17 Oct 2023 09:29:22 +0200 Subject: [PATCH 800/994] Bump version to 4.5.4 --- CHANGELOG.md | 3 + aix/SPECS/wazuh-agent-aix.spec | 4 +- bump_version.py | 188 ++++++++++++++++++ debs/SPECS/wazuh-agent/debian/changelog | 6 + debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 6 + debs/SPECS/wazuh-manager/debian/copyright | 2 +- macos/specs/wazuh-agent-arm64.pkgproj | 4 +- macos/specs/wazuh-agent-intel64.pkgproj | 4 +- rpms/SPECS/wazuh-agent.spec | 4 +- rpms/SPECS/wazuh-manager.spec | 4 +- solaris/solaris10/pkginfo | 4 +- stack/dashboard/deb/debian/changelog | 6 + stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 + stack/indexer/deb/debian/changelog | 6 + stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 + tests/unattended/unit/suites/test-common.sh | 4 +- .../unattended/unit/suites/test-dashboard.sh | 10 +- tests/unattended/unit/suites/test-indexer.sh | 8 +- .../install_functions/installVariables.sh | 2 +- 22 files changed, 250 insertions(+), 25 deletions(-) create mode 100644 bump_version.py diff --git a/CHANGELOG.md b/CHANGELOG.md index e1d07ffc09..3f61247a7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Change Log All notable changes to this project will be documented in this file. +## [4.5.4] + +- https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.4 ## [4.5.3] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.3 diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 9c3ef7b99a..4ed5813f8a 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.5.3 +Version: 4.5.4 Release: 1 License: GPL URL: https://www.wazuh.com/ @@ -290,6 +290,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog +* Tue Oct 24 2023 support - 4.5.4 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html * Tue Oct 10 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 diff --git a/bump_version.py b/bump_version.py new file mode 100644 index 0000000000..a6c4429041 --- /dev/null +++ b/bump_version.py @@ -0,0 +1,188 @@ +""" +This script is used to bump the version of the Wazuh packages repository. + Copyright (C) 2015-2020, Wazuh Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. +""" +import argparse +import datetime +import glob +import re +from packaging.version import Version + +FORMAT_STRING="%m-%d-%Y" + +arg_parser=argparse.ArgumentParser() +arg_parser.add_argument('-v', '--version', action='store', dest='version', + help='Version to bump to', required=True) +arg_parser.add_argument('-r', '--revision', action='store', dest='revision', + help='Revision to bump to. Default: 1', default=1) +arg_parser.add_argument('-d', '--date', action='store', dest='date', + help='Date to bump to. Format: m-d-Y. Default: today', + default=datetime.date.today().strftime(FORMAT_STRING)) +args=arg_parser.parse_args() + +date=datetime.datetime.strptime(args.date, FORMAT_STRING) +version=Version(args.version) + +## Find files to bump .spec, changelog, pkginfo, .pkgproj, test-*.sh, +## installVariables.sh, CHANGELOG.md +spec_files=glob.glob('**/*.spec', recursive=True) +changelog_files=glob.glob('**/changelog', recursive=True) +copyright_files=glob.glob('**/copyright', recursive=True) +pkginfo_files=glob.glob('**/pkginfo', recursive=True) +pkgproj_files=glob.glob('**/*.pkgproj', recursive=True) +test_files=glob.glob('**/test-*.sh', recursive=True) +install_variables_files=glob.glob('**/installVariables.sh', recursive=True) +changelog_md_files=glob.glob('**/CHANGELOG.md', recursive=True) + +## Bump version in .spec files +SPEC_FORMAT_STRING="%a %b %d %Y" +spec_date=date.strftime(SPEC_FORMAT_STRING) +for spec_file in spec_files: + with open(spec_file, 'r', encoding="utf-8") as file: + print('Bumping version in ' + spec_file) + filedata=file.read() + # Replace version and revision + REGEX=r'Version:\s*(\d+\.\d+\.\d+)' + filedata=re.sub(REGEX, f"Version: {version}", filedata) + REGEX=r'Revision:\s*(\d+)' + filedata=re.sub(REGEX, 'Revision: ' + str(args.revision), + filedata) + # Add new version to changelog + REGEX=r'%changelog' + changelog_string=(f"* {spec_date} support - {version}" + "\n- More info: https://documentation.wazuh.com/current/release-" + f"notes/release-{version.major}-{version.minor}-" + f"{version.micro}.html") + filedata=re.sub(REGEX, '%changelog\n' + changelog_string, filedata) + + with open(spec_file, 'w', encoding="utf-8") as file: + file.write(filedata) + +## Bump version in deb changelog files +DEB_FORMAT_STRING="%a, %d %b %Y %H:%M:%S +0000" +deb_changelog_date=date.strftime(DEB_FORMAT_STRING) +for changelog_file in changelog_files: + with open(changelog_file, 'r', encoding="utf-8") as file: + print('Bumping version in ' + changelog_file) + filedata=file.read() + install_type=re.search(r'(wazuh-(agent|manager|indexer|dashboard))', + filedata).group(1) + changelog_string=(f"wazuh-{install_type} ({version}-RELEASE) stable; " + "urgency=low\n\n * More info: https://documentation.wazuh.com/" + f"current/release-notes/release-{version.major}-{version.minor}-" + f"{version.micro}.html\n\n -- " + f"Wazuh, Inc {deb_changelog_date}\n\n") + # Add new version to changelog + filedata=changelog_string + filedata + + with open(changelog_file, 'w', encoding="utf-8") as file: + file.write(filedata) + +## Bump version in deb copyrigth files + +for copyrigth_file in copyright_files: + with open(copyrigth_file, 'r', encoding="utf-8") as file: + print('Bumping version in ' + copyrigth_file) + filedata=file.read() + # Replace version and revision + REGEX=(r'Wazuh, Inc on ' + r'(\w+),\s(\d+)\s(\w+)\s(\d+)\s(\d+):(\d+):(\d+)\s\+(\d+)') + filedata=re.sub(REGEX, + f"Wazuh, Inc on {deb_changelog_date}", + filedata) + + with open(copyrigth_file, 'w', encoding="utf-8") as file: + file.write(filedata) + +## Bump version in pkginfo files + +PKGINFO_FORMAT_STRING="%d%b%Y" + +for pkginfo_file in pkginfo_files: + with open(pkginfo_file, 'r', encoding="utf-8") as file: + print('Bumping version in ' + pkginfo_file) + filedata=file.read() + # Replace version and revision + REGEX=r'VERSION=\"(\d+\.\d+\.\d+)\"' + filedata=re.sub(REGEX, f'VERSION=\"{version}\"', filedata) + REGEX=r'PSTAMP=(.*)' + filedata=re.sub(REGEX, + f'PSTAMP=\"{date.strftime(PKGINFO_FORMAT_STRING)}\"', + filedata) + + with open(pkginfo_file, 'w', encoding="utf-8") as file: + file.write(filedata) + +## Bump version in .pkgproj files + +for pkgproj_file in pkgproj_files: + with open(pkgproj_file, 'r', encoding="utf-8") as file: + print('Bumping version in ' + pkgproj_file) + filedata=file.read() + # Replace version and revision + REGEX=r'(\d+\.\d+\.\d+)-(\d+)' + filedata=re.sub(REGEX, f'{version}-{args.revision}', + filedata) + REGEX=r'wazuh-agent-(\d+\.\d+\.\d+)-(\d+)' + filedata=re.sub(REGEX, + f'wazuh-agent-{version}-{args.revision}', + filedata) + + with open(pkgproj_file, 'w', encoding="utf-8") as file: + file.write(filedata) + +## Bump version in test-*.sh files + +for test_file in test_files: + with open(test_file, 'r', encoding="utf-8") as file: + print('Bumping version in ' + test_file) + filedata=file.read() + # Replace version and revision + REGEX=r'wazuh-manager.x86_64\s+(\d+\.\d+\.\d+)-(\d+)' + filedata=re.sub(REGEX, + f'wazuh-manager.x86_64 {version}-{args.revision}', + filedata) + REGEX=r'wazuh_version=\"(\d+\.\d+\.\d+)\"' + filedata=re.sub(REGEX, f'wazuh_version=\"{version}\"', filedata) + + with open(test_file, 'w', encoding="utf-8") as file: + file.write(filedata) + +## Bump version in installVariables.sh files + +for install_variables_file in install_variables_files: + with open(install_variables_file, 'r', encoding="utf-8") as file: + print('Bumping version in ' + install_variables_file) + filedata=file.read() + # Replace version and revision + REGEX=r'wazuh_major=\"(\d+\.\d+)\"' + filedata=re.sub(REGEX, + f'wazuh_major=\"{version.major}.{version.minor}\"', + filedata) + REGEX=r'wazuh_version=\"(\d+\.\d+\.\d+)\"' + filedata=re.sub(REGEX, f'wazuh_version=\"{version}\"', filedata) + + with open(install_variables_file, 'w', encoding="utf-8") as file: + file.write(filedata) + +## Bump version in CHANGELOG.md files + +for changelog_md_file in changelog_md_files: + with open(changelog_md_file, 'r', encoding="utf-8") as file: + print('Bumping version in ' + changelog_md_file) + filedata=file.read() + # Add new version to changelog + REGEX=(r'All notable changes to this project ' + r'will be documented in this file.') + changelog_string=(f"## [{version}]\n\n- https://github.com/wazuh/" + f"wazuh-packages/releases/tag/v{version}") + filedata=re.sub(REGEX, REGEX + '\n' + changelog_string, + filedata) + + with open(changelog_md_file, 'w', encoding="utf-8") as file: + file.write(filedata) diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index d8e327cdec..2c9c0a14bd 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -1,3 +1,9 @@ +wazuh-wazuh-agent (4.5.4-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html + + -- Wazuh, Inc Tue, 24 Oct 2023 00:00:00 +0000 + wazuh-agent (4.5.3-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index cadd1b6e86..0950ba55a8 100644 --- a/debs/SPECS/wazuh-agent/debian/copyright +++ b/debs/SPECS/wazuh-agent/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 10 Oct 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 24 Oct 2023 00:00:00 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index a2ccafcd64..276e07a498 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -1,3 +1,9 @@ +wazuh-wazuh-manager (4.5.4-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html + + -- Wazuh, Inc Tue, 24 Oct 2023 00:00:00 +0000 + wazuh-manager (4.5.3-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index cadd1b6e86..0950ba55a8 100644 --- a/debs/SPECS/wazuh-manager/debian/copyright +++ b/debs/SPECS/wazuh-manager/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 10 Oct 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 24 Oct 2023 00:00:00 +0000 It was downloaded from: diff --git a/macos/specs/wazuh-agent-arm64.pkgproj b/macos/specs/wazuh-agent-arm64.pkgproj index 592e7f8a0e..4656a75c23 100644 --- a/macos/specs/wazuh-agent-arm64.pkgproj +++ b/macos/specs/wazuh-agent-arm64.pkgproj @@ -812,7 +812,7 @@ USE_HFS+_COMPRESSION VERSION - 4.5.3-1 + 4.5.4-1 TYPE 0 @@ -1240,7 +1240,7 @@ NAME - wazuh-agent-4.5.3-1.arm64 + wazuh-agent-4.5.4-1.arm64 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/macos/specs/wazuh-agent-intel64.pkgproj b/macos/specs/wazuh-agent-intel64.pkgproj index 744eba8bf0..bebe498a7a 100644 --- a/macos/specs/wazuh-agent-intel64.pkgproj +++ b/macos/specs/wazuh-agent-intel64.pkgproj @@ -812,7 +812,7 @@ USE_HFS+_COMPRESSION VERSION - 4.5.3-1 + 4.5.4-1 TYPE 0 @@ -1203,7 +1203,7 @@ NAME - wazuh-agent-4.5.3-1.intel64 + wazuh-agent-4.5.4-1.intel64 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index f65045cfd9..b92c73dcf3 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -7,7 +7,7 @@ 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.5.3 +Version: 4.5.4 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -619,6 +619,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* Tue Oct 24 2023 support - 4.5.4 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html * Tue Oct 10 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 23c87fe7dd..6131fb8678 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -7,7 +7,7 @@ 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.5.3 +Version: 4.5.4 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -841,6 +841,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* Tue Oct 24 2023 support - 4.5.4 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html * Tue Oct 10 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index f62eb32a62..d029eb57fa 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -1,11 +1,11 @@ NAME=Wazuh - Wazuh unifies historically separate functions into a single agent and platform architecture. Providing protection for public clouds, private clouds, and on-premise data centers. PKG="wazuh-agent" -VERSION="4.5.3" +VERSION="4.5.4" ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="10Oct2023" +PSTAMP="24Oct2023" EMAIL="info@wazuh.com" ISTATES="S s 1 2 3" RSTATES="S s 1 2 3" diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 0b248b3fb5..916132d779 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -1,3 +1,9 @@ +wazuh-wazuh-dashboard (4.5.4-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html + + -- Wazuh, Inc Tue, 24 Oct 2023 00:00:00 +0000 + wazuh-dashboard (4.5.3-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index 30e4027b5e..67d1ccb788 100644 --- a/stack/dashboard/deb/debian/copyright +++ b/stack/dashboard/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 10 Oct 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 24 Oct 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 60b9fe2637..fea7cf7d31 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -397,6 +397,8 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog +* Tue Oct 24 2023 support - 4.5.4 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html * Tue Oct 10 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 4cf4e96573..bfeff8872b 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -1,3 +1,9 @@ +wazuh-wazuh-indexer (4.5.4-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html + + -- Wazuh, Inc Tue, 24 Oct 2023 00:00:00 +0000 + wazuh-indexer (4.5.3-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index 30e4027b5e..67d1ccb788 100644 --- a/stack/indexer/deb/debian/copyright +++ b/stack/indexer/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 10 Oct 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 24 Oct 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 8af518b3b4..20255bd7e5 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1384,6 +1384,8 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/blocked.certs %changelog +* Tue Oct 24 2023 support - 4.5.4 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html * Tue Oct 10 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 diff --git a/tests/unattended/unit/suites/test-common.sh b/tests/unattended/unit/suites/test-common.sh index 2a46d5b570..da3be38135 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.5.3-1 @wazuh + @mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.5.4-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-05-common_checkInstalled-all-installed-yum-assert() { - @echo "wazuh-manager.x86_64 4.5.3-1 @wazuh" + @echo "wazuh-manager.x86_64 4.5.4-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 ea847e88fa..66a4f58630 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.5.3" + wazuh_version="4.5.4" elasticsearch_oss_version="7.10.2" wazuh_kibana_plugin_revision="1" repobaseurl="https://packages.wazuh.com/4.x" @@ -55,7 +55,7 @@ test-03-dashboard_install-yum() { load-dashboard_install sys_type="yum" sep="-" - wazuh_version="4.5.3" + wazuh_version="4.5.4" wazuh_revision="1" dashboard_install } @@ -68,7 +68,7 @@ test-ASSERT-FAIL-04-dashboard_install-yum-error() { load-dashboard_install sys_type="yum" sep="-" - wazuh_version="4.5.3" + wazuh_version="4.5.4" wazuh_revision="1" @mockfalse yum install wazuh-dashboard-1.13.2-1 -y dashboard_install @@ -78,7 +78,7 @@ test-05-dashboard_install-apt() { load-dashboard_install sys_type="apt-get" sep="=" - wazuh_version="4.5.3" + wazuh_version="4.5.4" wazuh_revision="1" dashboard_install } @@ -91,7 +91,7 @@ test-ASSERT-FAIL-06-dashboard_install-apt-error() { load-dashboard_install sys_type="apt-get" sep="=" - wazuh_version="4.5.3" + wazuh_version="4.5.4" wazuh_revision="1" @mockfalse apt install wazuh-dashboard=1.13.2-1 -y dashboard_install diff --git a/tests/unattended/unit/suites/test-indexer.sh b/tests/unattended/unit/suites/test-indexer.sh index c706f17101..0fd4cf2980 100644 --- a/tests/unattended/unit/suites/test-indexer.sh +++ b/tests/unattended/unit/suites/test-indexer.sh @@ -49,7 +49,7 @@ test-03-indexer_install-yum() { load-indexer_install sys_type="yum" sep="-" - wazuh_version="4.5.3" + wazuh_version="4.5.4" wazuh_revision="1" indexer_install } @@ -63,7 +63,7 @@ test-ASSERT-FAIL-04-indexer_install-yum-error() { load-indexer_install sys_type="yum" sep="-" - wazuh_version="4.5.3" + wazuh_version="4.5.4" wazuh_revision="1" @mockfalse yum install wazuh-indexer-1.13.2-1 -y indexer_install @@ -73,7 +73,7 @@ test-05-indexer_install-apt() { load-indexer_install sys_type="apt-get" sep="=" - wazuh_version="4.5.3" + wazuh_version="4.5.4" wazuh_revision="1" indexer_install } @@ -87,7 +87,7 @@ test-ASSERT-FAIL-06-indexer_install-apt-error() { load-indexer_install sys_type="apt-get" sep="=" - wazuh_version="4.5.3" + wazuh_version="4.5.4" wazuh_revision="1" @mockfalse apt install wazuh-indexer=1.13.2-1 -y indexer_install diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index 1b00690921..db5c9164c7 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.5" -readonly wazuh_version="4.5.3" +readonly wazuh_version="4.5.4" readonly filebeat_version="7.10.2" readonly wazuh_install_vesion="0.1" From 17a31d23cfffa10885ebf8cf84098430d10ca5af Mon Sep 17 00:00:00 2001 From: DFolchA Date: Wed, 18 Oct 2023 10:14:04 +0200 Subject: [PATCH 801/994] Fix 4.5.4 changelog --- debs/SPECS/wazuh-agent/debian/changelog | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 2 +- stack/dashboard/deb/debian/changelog | 2 +- stack/indexer/deb/debian/changelog | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 2c9c0a14bd..7ff2d6ae36 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -1,4 +1,4 @@ -wazuh-wazuh-agent (4.5.4-RELEASE) stable; urgency=low +wazuh-agent (4.5.4-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index 276e07a498..06c1396077 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -1,4 +1,4 @@ -wazuh-wazuh-manager (4.5.4-RELEASE) stable; urgency=low +wazuh-manager (4.5.4-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 916132d779..bceab9e196 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -1,4 +1,4 @@ -wazuh-wazuh-dashboard (4.5.4-RELEASE) stable; urgency=low +wazuh-dashboard (4.5.4-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index bfeff8872b..f6df82ca9c 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -1,4 +1,4 @@ -wazuh-wazuh-indexer (4.5.4-RELEASE) stable; urgency=low +wazuh-indexer (4.5.4-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html From 9e140e59178612ca418c796b079033112bb72194 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Wed, 18 Oct 2023 10:35:07 +0200 Subject: [PATCH 802/994] Fix bump script for macos and deb --- bump_version.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bump_version.py b/bump_version.py index a6c4429041..d936b1a764 100644 --- a/bump_version.py +++ b/bump_version.py @@ -72,7 +72,7 @@ filedata=file.read() install_type=re.search(r'(wazuh-(agent|manager|indexer|dashboard))', filedata).group(1) - changelog_string=(f"wazuh-{install_type} ({version}-RELEASE) stable; " + changelog_string=(f"{install_type} ({version}-RELEASE) stable; " "urgency=low\n\n * More info: https://documentation.wazuh.com/" f"current/release-notes/release-{version.major}-{version.minor}-" f"{version.micro}.html\n\n -- " @@ -128,9 +128,9 @@ REGEX=r'(\d+\.\d+\.\d+)-(\d+)' filedata=re.sub(REGEX, f'{version}-{args.revision}', filedata) - REGEX=r'wazuh-agent-(\d+\.\d+\.\d+)-(\d+)' + REGEX=r'wazuh-agent-(\d+\.\d+\.\d+)-(\d+)' filedata=re.sub(REGEX, - f'wazuh-agent-{version}-{args.revision}', + f'wazuh-agent-{version}-{args.revision}', filedata) with open(pkgproj_file, 'w', encoding="utf-8") as file: From 63eba8f24afc8257cd2b44fbf762df886d9cb5b1 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Wed, 18 Oct 2023 10:29:42 -0300 Subject: [PATCH 803/994] Fixed mkdir wazuh-install-files error --- unattended_installer/cert_tool/certFunctions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/cert_tool/certFunctions.sh b/unattended_installer/cert_tool/certFunctions.sh index a6cd1c6cd2..4d31c559ad 100644 --- a/unattended_installer/cert_tool/certFunctions.sh +++ b/unattended_installer/cert_tool/certFunctions.sh @@ -438,7 +438,7 @@ function cert_setpermisions() { function cert_convertCRLFtoLF() { if [[ ! -d "/tmp/wazuh-install-files" ]]; then - mkdir "/tmp/wazuh-install-files" "${debug}" + eval "mkdir /tmp/wazuh-install-files ${debug}" fi eval "chmod -R 755 /tmp/wazuh-install-files ${debug}" eval "tr -d '\015' < $1 > /tmp/wazuh-install-files/new_config.yml" From 71ac81b12b66f8918f8ba1f79c194ab0e9b8e650 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Thu, 19 Oct 2023 11:58:52 +0200 Subject: [PATCH 804/994] Update version file and add function to bump_version script --- VERSION | 2 +- bump_version.py | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 4e298cc965..0ed2bfe96e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.5.3 +4.5.4 diff --git a/bump_version.py b/bump_version.py index d936b1a764..c709a2b1da 100644 --- a/bump_version.py +++ b/bump_version.py @@ -38,6 +38,7 @@ test_files=glob.glob('**/test-*.sh', recursive=True) install_variables_files=glob.glob('**/installVariables.sh', recursive=True) changelog_md_files=glob.glob('**/CHANGELOG.md', recursive=True) +VERSION_files=glob.glob('**/VERSION', recursive=True) ## Bump version in .spec files SPEC_FORMAT_STRING="%a %b %d %Y" @@ -186,3 +187,16 @@ with open(changelog_md_file, 'w', encoding="utf-8") as file: file.write(filedata) + +## Bump version in VERSION files + +for VERSION_file in VERSION_files: + with open(VERSION_file, 'r', encoding="utf-8") as file: + print('Bumping version in ' + VERSION_file) + filedata=file.read() + # Replace version and revision + REGEX=r'(\d+\.\d+\.\d+)' + filedata=re.sub(REGEX, f'{version}', filedata) + + with open(VERSION_file, 'w', encoding="utf-8") as file: + file.write(filedata) \ No newline at end of file From 0738ddeb7cd694c69e758d3b3d2e38374f0579d6 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Thu, 19 Oct 2023 12:13:14 +0200 Subject: [PATCH 805/994] Add lines between changelog versions --- CHANGELOG.md | 2 ++ bump_version.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f61247a7c..3e648d8e19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,9 +3,11 @@ All notable changes to this project will be documented in this file. ## [4.5.4] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.4 + ## [4.5.3] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.3 + ## [4.5.2] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.2 diff --git a/bump_version.py b/bump_version.py index c709a2b1da..2dddb27176 100644 --- a/bump_version.py +++ b/bump_version.py @@ -181,7 +181,7 @@ REGEX=(r'All notable changes to this project ' r'will be documented in this file.') changelog_string=(f"## [{version}]\n\n- https://github.com/wazuh/" - f"wazuh-packages/releases/tag/v{version}") + f"wazuh-packages/releases/tag/v{version}\n") filedata=re.sub(REGEX, REGEX + '\n' + changelog_string, filedata) @@ -199,4 +199,4 @@ filedata=re.sub(REGEX, f'{version}', filedata) with open(VERSION_file, 'w', encoding="utf-8") as file: - file.write(filedata) \ No newline at end of file + file.write(filedata) From 2f92495865e77d1ea973e0695426734be7c700fd Mon Sep 17 00:00:00 2001 From: c-bordon Date: Fri, 20 Oct 2023 15:57:41 -0300 Subject: [PATCH 806/994] Added firewalld validation --- unattended_installer/install_functions/checks.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index 6fb8881595..4a7d5f0eb9 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -330,6 +330,8 @@ function checks_ports() { used_port=0 ports=("$@") + checks_firewalld + if command -v lsof > /dev/null; then port_command="lsof -sTCP:LISTEN -i:" else @@ -376,3 +378,17 @@ function checks_available_port() { done fi } + +function checks_firewalld(){ + if [ "${sys_type}" == "yum" ]; then + if yum list installed 2>/dev/null | grep -q -E ^"firewalld"\\.;then + common_logger -e "The system has a firewall installed, remember to open the necessary ports for component communication." + exit 1 + fi + elif [ "${sys_type}" == "apt-get" ]; then + if apt list --installed 2>/dev/null | grep -q -E ^"firewalld"\/; then + common_logger -e "The system has a firewall installed, remember to open the necessary ports for component communication." + exit 1 + fi + fi +} From 3e08cf95bbf52e9b0a1ddff7d8c1f562b5bca677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Turina?= Date: Fri, 20 Oct 2023 21:17:59 +0200 Subject: [PATCH 807/994] Update Debian copyright for 4.6.0 Co-authored-by: Juan Nicolas Asselle --- debs/SPECS/wazuh-agent/debian/changelog | 2 ++ debs/SPECS/wazuh-manager/debian/changelog | 1 + stack/indexer/deb/debian/changelog | 1 + 3 files changed, 4 insertions(+) diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 74bf3a4dc0..28c6765992 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,6 +2,8 @@ wazuh-agent (4.6.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html + -- Wazuh, Inc Tue, 31 Oct 2023 00:00:00 +0000 + wazuh-agent (4.5.4-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index 21d1e0e770..e0225f8143 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,6 +2,7 @@ wazuh-manager (4.6.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html + -- Wazuh, Inc Tue, 31 Oct 2023 00:00:00 +0000 wazuh-manager (4.5.4-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index d169fa3175..0960431ad1 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,6 +2,7 @@ wazuh-indexer (4.6.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html + -- Wazuh, Inc Tue, 31 Oct 2023 00:00:00 +0000 wazuh-indexer (4.5.4-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html From 9cd9397238e143be7c7bf75c9044b454ffedf14a Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 23 Oct 2023 12:00:05 -0300 Subject: [PATCH 808/994] Added message for firewalld --- unattended_installer/install_functions/checks.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index 4a7d5f0eb9..f182246252 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -330,7 +330,7 @@ function checks_ports() { used_port=0 ports=("$@") - checks_firewalld + checks_firewalld "${ports}" if command -v lsof > /dev/null; then port_command="lsof -sTCP:LISTEN -i:" @@ -380,15 +380,15 @@ function checks_available_port() { } function checks_firewalld(){ + ports=("$@") + if [ "${sys_type}" == "yum" ]; then if yum list installed 2>/dev/null | grep -q -E ^"firewalld"\\.;then - common_logger -e "The system has a firewall installed, remember to open the necessary ports for component communication." - exit 1 + common_logger -w "The system has a firewalld installed. Consider that traffic should be allowed in these ports: ${ports}." fi elif [ "${sys_type}" == "apt-get" ]; then if apt list --installed 2>/dev/null | grep -q -E ^"firewalld"\/; then - common_logger -e "The system has a firewall installed, remember to open the necessary ports for component communication." - exit 1 + common_logger -w "The system has a firewalld installed. Consider that traffic should be allowed in these ports: ${ports}." fi fi } From 4081d6e246950cb5843d915071031f9b330a4a81 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 23 Oct 2023 16:36:24 -0300 Subject: [PATCH 809/994] Added validations --- .../install_functions/checks.sh | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index f182246252..9fe54e5daa 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -330,7 +330,7 @@ function checks_ports() { used_port=0 ports=("$@") - checks_firewalld "${ports}" + checks_firewalld "${ports[@]}" if command -v lsof > /dev/null; then port_command="lsof -sTCP:LISTEN -i:" @@ -380,15 +380,29 @@ function checks_available_port() { } function checks_firewalld(){ - ports=("$@") + ports_list=("$@") + f_ports="" + f_message="" + + if [ -n "${AIO}" ]; then + f_message="Please ensure that traffic is allowed on these ports: 1515 1514 ${http_port}" + elif [ -n "${dashboard}" ]; then + f_message="Please ensure that traffic is allowed on this port: ${http_port}" + else + for port in "${ports_list[@]}"; do + f_ports="${f_ports} ${port}" + done + f_message="Please ensure that traffic is allowed on these ports: ${f_ports}" + fi + if [ "${sys_type}" == "yum" ]; then if yum list installed 2>/dev/null | grep -q -E ^"firewalld"\\.;then - common_logger -w "The system has a firewalld installed. Consider that traffic should be allowed in these ports: ${ports}." + common_logger -w "The system has Firewalld installed. ${f_message}." fi elif [ "${sys_type}" == "apt-get" ]; then if apt list --installed 2>/dev/null | grep -q -E ^"firewalld"\/; then - common_logger -w "The system has a firewalld installed. Consider that traffic should be allowed in these ports: ${ports}." + common_logger -w "The system has Firewalld installed. ${f_message}." fi fi } From 1aec31a240f20d6270110e729bae7b6129c95395 Mon Sep 17 00:00:00 2001 From: Tomas Turina Date: Mon, 23 Oct 2023 20:27:48 +0000 Subject: [PATCH 810/994] Fix debian changelog sintax --- debs/SPECS/wazuh-agent/debian/changelog | 4 ++-- debs/SPECS/wazuh-manager/debian/changelog | 3 ++- stack/indexer/deb/debian/changelog | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index c77088fb93..7e20a8c9f1 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -19,8 +19,8 @@ wazuh-agent (4.6.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html - -- Wazuh, Inc Tue, 31 Oct 2023 00:00:00 +0000 - + -- Wazuh, Inc Tue, 31 Oct 2023 00:00:00 +0000 + wazuh-agent (4.5.4-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index de014283ef..5e0d140505 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -19,7 +19,8 @@ wazuh-manager (4.6.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html - -- Wazuh, Inc Tue, 31 Oct 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 31 Oct 2023 00:00:00 +0000 + wazuh-manager (4.5.4-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 17ac8b3c44..71b060a95b 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -20,7 +20,8 @@ wazuh-indexer (4.6.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html - -- Wazuh, Inc Tue, 31 Oct 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 31 Oct 2023 00:00:00 +0000 + wazuh-indexer (4.5.4-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html From 55f5480a9d54bbb81d8d53e7cc97b703d375709f Mon Sep 17 00:00:00 2001 From: Vikman Fernandez-Castro Date: Tue, 24 Oct 2023 09:55:54 +0200 Subject: [PATCH 811/994] Fix master branch version reference at workflows Co-authored-by: DFolchA --- .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 72b892111a..14f71a7c53 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -52,7 +52,7 @@ jobs: 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 - if [ $MAJOR == "4.8" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi + if [ $MAJOR == "4.9" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $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 8e180534a3..2b74397d13 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -53,7 +53,7 @@ jobs: 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 - if [ $MAJOR == "4.8" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi + if [ $MAJOR == "4.9" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(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 From 70d6b1e8ffff788e396fbc480f7833aee1d8f94f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Ruiz?= Date: Tue, 24 Oct 2023 13:33:56 +0200 Subject: [PATCH 812/994] Add new role to grant ISM API permissions It's mapped to the kibanaserver internal user by default. --- stack/indexer/deb/debian/rules | 1 + stack/indexer/rpm/wazuh-indexer.spec | 1 + .../config/indexer/roles/action_groups.yml | 12 ++++++++++++ unattended_installer/config/indexer/roles/roles.yml | 10 +++++++++- .../config/indexer/roles/roles_mapping.yml | 11 +++++++++-- 5 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 unattended_installer/config/indexer/roles/action_groups.yml diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index 62beff43a8..d2874bd4c2 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -100,6 +100,7 @@ override_dh_install: cp /root/documentation-templates/wazuh/config.yml $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/config.yml # Copy Wazuh's config files for the security plugin + cp -pr $(REPO_DIR)/config/indexer/roles/action_groups.yml $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/ cp -pr $(REPO_DIR)/config/indexer/roles/roles_mapping.yml $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/ cp -pr $(REPO_DIR)/config/indexer/roles/roles.yml $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/ cp -pr $(REPO_DIR)/config/indexer/roles/internal_users.yml $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/ diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index ee88666ca6..c52c3fb3a7 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -93,6 +93,7 @@ cp %{REPO_DIR}/wazuh-passwords-tool.sh ${RPM_BUILD_ROOT}%{INSTALL_DIR}/plugins/o cp /root/documentation-templates/wazuh/config.yml ${RPM_BUILD_ROOT}%{INSTALL_DIR}/plugins/opensearch-security/tools/config.yml # Copy Wazuh's config files for the security plugin +cp %{REPO_DIR}/config/indexer/roles/action_groups.yml ${RPM_BUILD_ROOT}%{CONFIG_DIR}/opensearch-security cp %{REPO_DIR}/config/indexer/roles/internal_users.yml ${RPM_BUILD_ROOT}%{CONFIG_DIR}/opensearch-security cp %{REPO_DIR}/config/indexer/roles/roles.yml ${RPM_BUILD_ROOT}%{CONFIG_DIR}/opensearch-security cp %{REPO_DIR}/config/indexer/roles/roles_mapping.yml ${RPM_BUILD_ROOT}%{CONFIG_DIR}/opensearch-security diff --git a/unattended_installer/config/indexer/roles/action_groups.yml b/unattended_installer/config/indexer/roles/action_groups.yml new file mode 100644 index 0000000000..04119c8a23 --- /dev/null +++ b/unattended_installer/config/indexer/roles/action_groups.yml @@ -0,0 +1,12 @@ +--- +_meta: + type: "actiongroups" + config_version: 2 + +# ISM API permissions group +manage_ism: + reserved: true + hidden: false + allowed_actions: + - "cluster:admin/opendistro/ism/*" + static: false \ No newline at end of file diff --git a/unattended_installer/config/indexer/roles/roles.yml b/unattended_installer/config/indexer/roles/roles.yml index ec669b2fe2..d64d6228ec 100644 --- a/unattended_installer/config/indexer/roles/roles.yml +++ b/unattended_installer/config/indexer/roles/roles.yml @@ -146,4 +146,12 @@ manage_wazuh_index: - "manage" - "index" tenant_permissions: [] - static: false \ No newline at end of file + static: false + +# ISM API permissions role +manage_ism: + reserved: true + hidden: false + cluster_permissions: + - "manage_ism" + static: false diff --git a/unattended_installer/config/indexer/roles/roles_mapping.yml b/unattended_installer/config/indexer/roles/roles_mapping.yml index 66d530d8e0..dc4e78e0b5 100644 --- a/unattended_installer/config/indexer/roles/roles_mapping.yml +++ b/unattended_installer/config/indexer/roles/roles_mapping.yml @@ -76,7 +76,7 @@ kibana_user: and_backend_roles: [] description: "Maps kibanauser to kibana_user" - # Wazuh monitoring and statistics index permissions +# Wazuh monitoring and statistics index permissions manage_wazuh_index: reserved: true hidden: false @@ -84,4 +84,11 @@ manage_wazuh_index: hosts: [] users: - "kibanaserver" - and_backend_roles: [] \ No newline at end of file + and_backend_roles: [] + +# ISM API permissions role mapping +manage_ism: + reserved: true + hidden: false + users: + - "kibanaserver" From 246403a306207aefc0e4a9415cbb70eb8ca04c4f Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 24 Oct 2023 11:57:18 -0300 Subject: [PATCH 813/994] Added validation for UFW --- .../install_functions/checks.sh | 41 +++++++++++++++---- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index 9fe54e5daa..ebd55d274f 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -330,7 +330,7 @@ function checks_ports() { used_port=0 ports=("$@") - checks_firewalld "${ports[@]}" + checks_firewall "${ports[@]}" if command -v lsof > /dev/null; then port_command="lsof -sTCP:LISTEN -i:" @@ -379,30 +379,53 @@ function checks_available_port() { fi } -function checks_firewalld(){ +function checks_firewall(){ ports_list=("$@") f_ports="" - f_message="" + f_message="The system has firewall installed. Please ensure that traffic is allowed on " + firewalld_installed=0 + ufw_installed=0 + + # Record of the ports that must be exposed according to the installation if [ -n "${AIO}" ]; then - f_message="Please ensure that traffic is allowed on these ports: 1515 1514 ${http_port}" + f_message+="these ports: 1515 1514 ${http_port}" elif [ -n "${dashboard}" ]; then - f_message="Please ensure that traffic is allowed on this port: ${http_port}" + f_message+="this port: ${http_port}" else for port in "${ports_list[@]}"; do f_ports="${f_ports} ${port}" done - f_message="Please ensure that traffic is allowed on these ports: ${f_ports}" + f_message+="these ports: ${f_ports}" fi - + # Check if the firewall is installed if [ "${sys_type}" == "yum" ]; then if yum list installed 2>/dev/null | grep -q -E ^"firewalld"\\.;then - common_logger -w "The system has Firewalld installed. ${f_message}." + firewalld_installed=1 + fi + if yum list installed 2>/dev/null | grep -q -E ^"ufw"\\.;then + ufw_installed=1 fi elif [ "${sys_type}" == "apt-get" ]; then if apt list --installed 2>/dev/null | grep -q -E ^"firewalld"\/; then - common_logger -w "The system has Firewalld installed. ${f_message}." + firewalld_installed=1 + fi + if apt list --installed 2>/dev/null | grep -q -E ^"ufw"\/; then + ufw_installed=1 + fi + fi + + # Check if the firewall is running + if [ "${firewalld_installed}" == "1" ]; then + if firewall-cmd --state 2>/dev/null | grep -q -w "running"; then + common_logger -w "${f_message/firewall/Firewalld}." fi fi + if [ "${ufw_installed}" == "1" ]; then + if ufw status 2>/dev/null | grep -q -w "active"; then + common_logger -w "${f_message/firewall/UFW}." + fi + fi + } From b74f5de072c06cf59695589d4aa418526cf60183 Mon Sep 17 00:00:00 2001 From: Luis Enrique Chico Capistrano Date: Mon, 23 Oct 2023 17:13:43 -0300 Subject: [PATCH 814/994] Update future version on wazuh-control script. Standardize alpine and archlinux future package versions to x.30.0 --- alpine/build_package.sh | 2 +- alpine/builder.sh | 7 ++++++- arch/build.sh | 5 ++++- arch/generate_arch_package.sh | 2 +- debs/build.sh | 4 +++- rpms/build.sh | 7 ++++--- 6 files changed, 19 insertions(+), 8 deletions(-) diff --git a/alpine/build_package.sh b/alpine/build_package.sh index 1c9b6880d4..b00cb64406 100755 --- a/alpine/build_package.sh +++ b/alpine/build_package.sh @@ -161,7 +161,7 @@ help() { echo -e " [Optional] Use the SPECS files stored in the host instead of downloading them from GitHub." echo -e "" echo -e " --future" - echo -e " [Optional] Build test future package 99.99.0 Used for development purposes." + echo -e " [Optional] Build test future package {MAJOR}.30.0 Used for development purposes." echo -e "" echo -e " -h, --help" echo -e " Show this help." diff --git a/alpine/builder.sh b/alpine/builder.sh index d193489170..c97470b725 100644 --- a/alpine/builder.sh +++ b/alpine/builder.sh @@ -41,7 +41,12 @@ fi export version="$(cat wazuh*/src/VERSION | cut -d 'v' -f 2)" if [ "${future}" = "yes" ]; then - export version="99.99.0" + old_version=$version + MAJOR=$(echo $version | cut -dv -f2 | cut -d. -f1) + export version="${MAJOR}.30.0" + sed -i "s/${old_version}/${version}/g" "/wazuh"*"/src/init/wazuh-server.sh" + sed -i "s/${old_version}/${version}/g" "/wazuh"*"/src/init/wazuh-client.sh" + sed -i "s/${old_version}/${version}/g" "/wazuh"*"/src/init/wazuh-local.sh" fi diff --git a/arch/build.sh b/arch/build.sh index a191c05160..ffd74d30d8 100755 --- a/arch/build.sh +++ b/arch/build.sh @@ -61,7 +61,7 @@ if [[ "${future}" == "yes" ]]; then base_version=${wazuh_version} MAJOR=$(echo ${base_version} | cut -dv -f2 | cut -d. -f1) MINOR=$(echo ${base_version} | cut -d. -f2) - wazuh_version="99.99.0" + wazuh_version="${MAJOR}.30.0" package_full_name=wazuh-${build_target}-${wazuh_version} # PREPARE FUTURE SPECS AND SOURCES @@ -70,6 +70,9 @@ if [[ "${future}" == "yes" ]]; then sources_dir="${tmp_sources_dir}" find "${sources_dir}" "${specs_path}" \( -name "*VERSION*" -o -name "*changelog*" \) -exec sed -i "s/${base_version}/${wazuh_version}/g" {} \; sed -i "s/\$(VERSION)/${MAJOR}.${MINOR}/g" "${sources_dir}/src/Makefile" + sed -i "s/${base_version}/${wazuh_version}/g" "${sources_dir}/src/init/wazuh-server.sh" + sed -i "s/${base_version}/${wazuh_version}/g" "${sources_dir}/src/init/wazuh-client.sh" + sed -i "s/${base_version}/${wazuh_version}/g" "${sources_dir}/src/init/wazuh-local.sh" fi cd ${sources_dir} && tar -czf ${pacman_dir}/${package_full_name}.tar.gz . diff --git a/arch/generate_arch_package.sh b/arch/generate_arch_package.sh index 55ec324135..b63a006f58 100755 --- a/arch/generate_arch_package.sh +++ b/arch/generate_arch_package.sh @@ -105,7 +105,7 @@ help() { 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 [Required] 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." - echo " --future [Optional] Build test future package 99.99.0 Used for development purposes." + echo " --future [Optional] Build test future package {MAJOR}.30.0 Used for development purposes." echo " -h, --help Show this help." echo exit $1 diff --git a/debs/build.sh b/debs/build.sh index 7a9090d9a8..7896c49081 100755 --- a/debs/build.sh +++ b/debs/build.sh @@ -73,6 +73,9 @@ if [[ "${future}" == "yes" ]]; then # PREPARE FUTURE SPECS AND SOURCES find "${build_dir}/${package_name}" "${specs_path}" \( -name "*VERSION*" -o -name "*changelog*" \) -exec sed -i "s/${base_version}/${wazuh_version}/g" {} \; sed -i "s/\$(VERSION)/${MAJOR}.${MINOR}/g" "${build_dir}/${build_target}/${package_full_name}/src/Makefile" + sed -i "s/${base_version}/${wazuh_version}/g" "${build_dir}/${build_target}/${package_full_name}/src/init/wazuh-server.sh" + sed -i "s/${base_version}/${wazuh_version}/g" "${build_dir}/${build_target}/${package_full_name}/src/init/wazuh-client.sh" + sed -i "s/${base_version}/${wazuh_version}/g" "${build_dir}/${build_target}/${package_full_name}/src/init/wazuh-local.sh" fi cp -pr ${specs_path}/wazuh-${build_target}/debian ${sources_dir}/debian cp -p ${package_files}/gen_permissions.sh ${sources_dir} @@ -125,4 +128,3 @@ 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/build.sh b/rpms/build.sh index 036d941e0f..93056d9e17 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) @@ -88,7 +88,9 @@ if [[ "${future}" == "yes" ]]; then mv "${build_dir}/${old_package_name}" "${build_dir}/${package_name}" find "${build_dir}/${package_name}" "${specs_path}/" \( -name "*VERSION*" -o -name "*.spec" \) -exec sed -i "s/${base_version}/${wazuh_version}/g" {} \; sed -i "s/\$(VERSION)/${MAJOR}.${MINOR}/g" "${build_dir}/${package_name}/src/Makefile" - + sed -i "s/${base_version}/${wazuh_version}/g" "${build_dir}/${package_name}/src/init/wazuh-server.sh" + sed -i "s/${base_version}/${wazuh_version}/g" "${build_dir}/${package_name}/src/init/wazuh-client.sh" + sed -i "s/${base_version}/${wazuh_version}/g" "${build_dir}/${package_name}/src/init/wazuh-local.sh" fi cp ${specs_path}/wazuh-${build_target}.spec ${rpm_build_dir}/SPECS/${package_name}.spec @@ -129,4 +131,3 @@ 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 093afd21b71cfc4f47e33de1dc36c6974d4b2f9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 24 Oct 2023 17:30:49 +0200 Subject: [PATCH 815/994] Updated Wazuh dashboard references in Installation Assistant --- unattended_installer/config/dashboard/dashboard.yml | 2 +- unattended_installer/config/dashboard/dashboard_all_in_one.yml | 2 +- unattended_installer/config/dashboard/dashboard_unattended.yml | 2 +- .../config/dashboard/dashboard_unattended_distributed.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/unattended_installer/config/dashboard/dashboard.yml b/unattended_installer/config/dashboard/dashboard.yml index 30994d2ef5..8123ca9905 100644 --- a/unattended_installer/config/dashboard/dashboard.yml +++ b/unattended_installer/config/dashboard/dashboard.yml @@ -11,5 +11,5 @@ server.ssl.enabled: true server.ssl.key: "/etc/wazuh-dashboard/certs/kibana-key.pem" server.ssl.certificate: "/etc/wazuh-dashboard/certs/kibana.pem" opensearch.ssl.certificateAuthorities: ["/etc/wazuh-dashboard/certs/root-ca.pem"] -server.defaultRoute: /app/wazuh +server.defaultRoute: /app/wz-home opensearch_security.cookie.secure: 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..7d4848207f 100644 --- a/unattended_installer/config/dashboard/dashboard_all_in_one.yml +++ b/unattended_installer/config/dashboard/dashboard_all_in_one.yml @@ -11,5 +11,5 @@ server.ssl.enabled: true server.ssl.key: "/etc/wazuh-dashboard/certs/kibana-key.pem" server.ssl.certificate: "/etc/wazuh-dashboard/certs/kibana.pem" opensearch.ssl.certificateAuthorities: ["/etc/wazuh-dashboard/certs/root-ca.pem"] -uiSettings.overrides.defaultRoute: /app/wazuh +uiSettings.overrides.defaultRoute: /app/wz-home opensearch_security.cookie.secure: true diff --git a/unattended_installer/config/dashboard/dashboard_unattended.yml b/unattended_installer/config/dashboard/dashboard_unattended.yml index a8a5f37c47..1763601aaa 100644 --- a/unattended_installer/config/dashboard/dashboard_unattended.yml +++ b/unattended_installer/config/dashboard/dashboard_unattended.yml @@ -11,5 +11,5 @@ server.ssl.enabled: true 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 +uiSettings.overrides.defaultRoute: /app/wz-home opensearch_security.cookie.secure: true diff --git a/unattended_installer/config/dashboard/dashboard_unattended_distributed.yml b/unattended_installer/config/dashboard/dashboard_unattended_distributed.yml index c0cc8d2cbf..50dbb8ae31 100644 --- a/unattended_installer/config/dashboard/dashboard_unattended_distributed.yml +++ b/unattended_installer/config/dashboard/dashboard_unattended_distributed.yml @@ -9,5 +9,5 @@ server.ssl.enabled: true 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 +uiSettings.overrides.defaultRoute: /app/wz-home opensearch_security.cookie.secure: true From aef7feb8a5ac3e213eb381743c4afac3009ae266 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 24 Oct 2023 15:01:19 -0300 Subject: [PATCH 816/994] Fixed double space in Warning message --- unattended_installer/install_functions/checks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index ebd55d274f..baa07cf5f4 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -396,7 +396,7 @@ function checks_firewall(){ for port in "${ports_list[@]}"; do f_ports="${f_ports} ${port}" done - f_message+="these ports: ${f_ports}" + f_message+="these ports:${f_ports}" fi # Check if the firewall is installed From 26c79cd8323eb02e345ea7f6d9c161eb41869eaf Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 24 Oct 2023 15:02:23 -0300 Subject: [PATCH 817/994] Changed installed for enabled --- unattended_installer/install_functions/checks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index baa07cf5f4..20d88c602d 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -382,7 +382,7 @@ function checks_available_port() { function checks_firewall(){ ports_list=("$@") f_ports="" - f_message="The system has firewall installed. Please ensure that traffic is allowed on " + f_message="The system has firewall enabled. Please ensure that traffic is allowed on " firewalld_installed=0 ufw_installed=0 From 101a1094b40a47adc9940d9c8dde4a198bc9daba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Wed, 25 Oct 2023 12:59:09 +0200 Subject: [PATCH 818/994] The internal users are updated before changing passwords --- .../passwords_tool/passwordsFunctions.sh | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/unattended_installer/passwords_tool/passwordsFunctions.sh b/unattended_installer/passwords_tool/passwordsFunctions.sh index d68059de80..98b123857e 100644 --- a/unattended_installer/passwords_tool/passwordsFunctions.sh +++ b/unattended_installer/passwords_tool/passwordsFunctions.sh @@ -34,7 +34,7 @@ function passwords_changePassword() { 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 @@ -495,6 +495,7 @@ For Wazuh API users, the file must have this format: function passwords_readUsers() { + passwords_updateInternalUsers susers=$(grep -B 1 hash: /etc/wazuh-indexer/opensearch-security/internal_users.yml | grep -v hash: | grep -v "-" | awk '{ print substr( $0, 1, length($0)-1 ) }') mapfile -t users <<< "${susers[@]}" @@ -605,3 +606,20 @@ function passwords_runSecurityAdmin() { fi } + +function passwords_updateInternalUsers() { + + common_logger "Updating the internal users." + backup_datetime=$(date +"%Y%m%d_%H%M%S") + passwords_getNetworkHost + passwords_createBackUp + + eval "mkdir -p /etc/wazuh-indexer/internalusers-backup" + eval "cp /etc/wazuh-indexer/backup/internal_users.yml /etc/wazuh-indexer/internalusers-backup/internal_users_${backup_datetime}.yml.bkp" + common_logger "A backup of the internal users has been saved in the /etc/wazuh-indexer/internalusers-backup folder." + + eval "cp /etc/wazuh-indexer/backup/internal_users.yml /etc/wazuh-indexer/opensearch-security/internal_users.yml" + eval "rm -rf /etc/wazuh-indexer/backup/ ${debug}" + common_logger -d "The internal users have been updated before changing the passwords." + +} From 8cfccde822fc01c208254be5b9311dc454eccc76 Mon Sep 17 00:00:00 2001 From: Carlos Bordon <64099752+c-bordon@users.noreply.github.com> Date: Wed, 25 Oct 2023 08:26:47 -0300 Subject: [PATCH 819/994] Update unattended_installer/install_functions/checks.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: David Correa Rodríguez <72193239+davidcr01@users.noreply.github.com> --- unattended_installer/install_functions/checks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index 20d88c602d..3c5dbd7b5e 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -389,7 +389,7 @@ function checks_firewall(){ # Record of the ports that must be exposed according to the installation if [ -n "${AIO}" ]; then - f_message+="these ports: 1515 1514 ${http_port}" + f_message+="these ports: 1515, 1514, ${http_port}" elif [ -n "${dashboard}" ]; then f_message+="this port: ${http_port}" else From d7db0a9a9122827c4defa6ea667ae2b22fb1bbed Mon Sep 17 00:00:00 2001 From: Carlos Bordon <64099752+c-bordon@users.noreply.github.com> Date: Wed, 25 Oct 2023 08:26:59 -0300 Subject: [PATCH 820/994] Update unattended_installer/install_functions/checks.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: David Correa Rodríguez <72193239+davidcr01@users.noreply.github.com> --- unattended_installer/install_functions/checks.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index 3c5dbd7b5e..ca1aba2ce2 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -393,10 +393,13 @@ function checks_firewall(){ elif [ -n "${dashboard}" ]; then f_message+="this port: ${http_port}" else + f_message+="these ports:" for port in "${ports_list[@]}"; do - f_ports="${f_ports} ${port}" + f_message+=" ${port}," done - f_message+="these ports:${f_ports}" + + # Deletes last comma + f_message="${f_message%,}" fi # Check if the firewall is installed From 67f2bd9b9d98a618f74ccb9e3b6252d27de19333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Wed, 25 Oct 2023 15:04:43 +0200 Subject: [PATCH 821/994] Added verbose option to password tool Actions --- .github/workflows/password-tool.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/password-tool.yml b/.github/workflows/password-tool.yml index 26001f9be5..561a16219f 100644 --- a/.github/workflows/password-tool.yml +++ b/.github/workflows/password-tool.yml @@ -33,7 +33,7 @@ jobs: name: scripts - name: Install wazuh run: | - sudo bash wazuh-install.sh -a + sudo bash wazuh-install.sh -a -v - name: Uncompress wazuh install files run: sudo tar -xvf wazuh-install-files.tar - name: Run script @@ -49,7 +49,7 @@ jobs: name: scripts - name: Install wazuh run: | - sudo bash wazuh-install.sh -a + sudo bash wazuh-install.sh -a -v - name: Uncompress wazuh install files run: sudo tar -xvf wazuh-install-files.tar - name: Run script From 04d81cfafcbb80021572b000e189165898e209e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 26 Oct 2023 12:08:34 +0200 Subject: [PATCH 822/994] Fixed `internalusers-backup` directory owner and permissions --- .../passwords_tool/passwordsFunctions.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/unattended_installer/passwords_tool/passwordsFunctions.sh b/unattended_installer/passwords_tool/passwordsFunctions.sh index 98b123857e..c40073a54e 100644 --- a/unattended_installer/passwords_tool/passwordsFunctions.sh +++ b/unattended_installer/passwords_tool/passwordsFunctions.sh @@ -611,14 +611,18 @@ function passwords_updateInternalUsers() { common_logger "Updating the internal users." backup_datetime=$(date +"%Y%m%d_%H%M%S") + internal_users_backup_path="/etc/wazuh-indexer/internalusers-backup" passwords_getNetworkHost passwords_createBackUp - eval "mkdir -p /etc/wazuh-indexer/internalusers-backup" - eval "cp /etc/wazuh-indexer/backup/internal_users.yml /etc/wazuh-indexer/internalusers-backup/internal_users_${backup_datetime}.yml.bkp" + eval "mkdir -p ${internal_users_backup_path} ${debug}" + eval "cp /etc/wazuh-indexer/backup/internal_users.yml ${internal_users_backup_path}/internal_users_${backup_datetime}.yml.bkp ${debug}" + eval "chmod 750 ${internal_users_backup_path} ${debug}" + eval "chmod 640 ${internal_users_backup_path}/internal_users_${backup_datetime}.yml.bkp" + eval "chown -R wazuh-indexer:wazuh-indexer ${internal_users_backup_path} ${debug}" common_logger "A backup of the internal users has been saved in the /etc/wazuh-indexer/internalusers-backup folder." - eval "cp /etc/wazuh-indexer/backup/internal_users.yml /etc/wazuh-indexer/opensearch-security/internal_users.yml" + eval "cp /etc/wazuh-indexer/backup/internal_users.yml /etc/wazuh-indexer/opensearch-security/internal_users.yml ${debug}" eval "rm -rf /etc/wazuh-indexer/backup/ ${debug}" common_logger -d "The internal users have been updated before changing the passwords." From 069cefbfad6fee4e849445aac73f60bc7b8bbb26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Wed, 3 May 2023 15:43:10 -0300 Subject: [PATCH 823/994] Add SPECS for SCA policy Amazon Linux 2023 --- debs/SPECS/wazuh-manager/debian/rules | 2 ++ rpms/SPECS/wazuh-agent.spec | 5 ++++- rpms/SPECS/wazuh-manager.spec | 5 ++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debs/SPECS/wazuh-manager/debian/rules b/debs/SPECS/wazuh-manager/debian/rules index cb30cc0dea..1ab7ba9753 100644 --- a/debs/SPECS/wazuh-manager/debian/rules +++ b/debs/SPECS/wazuh-manager/debian/rules @@ -118,6 +118,7 @@ override_dh_install: mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/generic mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/amzn/1 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/amzn/2 + mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/amzn/2023 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/centos/5 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/centos/6 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/centos/7 @@ -162,6 +163,7 @@ override_dh_install: cp etc/templates/config/amzn/1/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/amzn/1 cp etc/templates/config/amzn/2/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/amzn/2 + cp etc/templates/config/amzn/2023/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/amzn/2023 cp etc/templates/config/darwin/15/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/15 cp etc/templates/config/darwin/16/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/16 diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index a7ba1aab0e..133b5073d7 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -103,7 +103,7 @@ rm -f ${RPM_BUILD_ROOT}%{_localstatedir}/ruleset/sca/* # Install configuration assesment files and files templates mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/{generic} -mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amzn/{1,2} +mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amzn/{1,2,2023} mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/centos/{8,7,6,5} mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/rhel/{9,8,7,6,5} mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/sles/{11,12,15} @@ -117,6 +117,7 @@ cp etc/templates/config/generic/sca.files ${RPM_BUILD_ROOT}%{_localstatedir}/tmp cp etc/templates/config/amzn/1/sca.files ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amzn/1 cp etc/templates/config/amzn/2/sca.files ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amzn/2 +cp etc/templates/config/amzn/2023/sca.files ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amzn/2023 cp etc/templates/config/centos/sca.files ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/centos cp etc/templates/config/centos/8/sca.files ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/centos/8 @@ -561,6 +562,8 @@ rm -fr %{buildroot} %attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amzn/1/* %dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amzn/2 %attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amzn/2/* +%dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amzn/2023 +%attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amzn/2023/* %dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/centos %attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/centos/sca.files %dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/centos/5 diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index e5f914d084..bd6ab57171 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -113,7 +113,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/packages_files/manager_installation_ # Install configuration assesment files and files templates mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/{applications,generic} -mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amzn/{1,2} +mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amzn/{1,2,2023} mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/centos/{8,7,6,5} mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/darwin/{15,16,17,18,19,20,21,22} mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/debian/{7,8,9,10,11} @@ -132,6 +132,7 @@ cp etc/templates/config/generic/{sca.files,sca.manager.files} ${RPM_BUILD_ROOT}% cp etc/templates/config/amzn/1/sca.files ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amzn/1 cp etc/templates/config/amzn/2/sca.files ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amzn/2 +cp etc/templates/config/amzn/2023/sca.files ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amzn/2023 cp etc/templates/config/centos/sca.files ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/centos cp etc/templates/config/centos/8/sca.files ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/centos/8 @@ -757,6 +758,8 @@ rm -fr %{buildroot} %attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amzn/1/* %dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amzn/2 %attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amzn/2/* +%dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amzn/2023 +%attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amzn/2023/* %dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/centos %attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/centos/sca.files %dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/centos/5 From 476e773e0a6a38b747bc20938344e406a791fbdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 26 Oct 2023 12:46:54 +0200 Subject: [PATCH 824/994] Fixed fetching network host in Password tool --- unattended_installer/passwords_tool/passwordsFunctions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/passwords_tool/passwordsFunctions.sh b/unattended_installer/passwords_tool/passwordsFunctions.sh index aee929bb91..791aa71f46 100644 --- a/unattended_installer/passwords_tool/passwordsFunctions.sh +++ b/unattended_installer/passwords_tool/passwordsFunctions.sh @@ -362,7 +362,7 @@ function passwords_getApiUserId() { function passwords_getNetworkHost() { - IP=$(grep -hr "network.host:" /etc/wazuh-indexer/opensearch.yml) + IP=$(grep -hr "^network.host:" /etc/wazuh-indexer/opensearch.yml) NH="network.host: " IP="${IP//$NH}" From db3984a4cc5ff584ac65d7e1c86695d61acba8b1 Mon Sep 17 00:00:00 2001 From: Jose Luis Carreras Marin Date: Thu, 26 Oct 2023 16:01:46 +0200 Subject: [PATCH 825/994] Added 2023 to posible DIST_VER variable --- 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 133b5073d7..51ee06f2e3 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -307,7 +307,7 @@ elif [ -r "/etc/os-release" ]; then if [ "X$DIST_VER" = "X" ]; then DIST_VER="0" fi - if [ "$DIST_NAME" = "amzn" ] && [ "$DIST_VER" != "2" ]; then + if [ "$DIST_NAME" = "amzn" ] && [ "$DIST_VER" != "2" ] && [ "$DIST_VER" != "2023" ]; then DIST_VER="1" fi DIST_SUBVER=$(echo $VERSION_ID | sed -rn 's/[^0-9]*[0-9]+\.([0-9]+).*/\1/p') diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index bd6ab57171..a9ff1cccf6 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -384,7 +384,7 @@ elif [ -r "/etc/os-release" ]; then if [ "X$DIST_VER" = "X" ]; then DIST_VER="0" fi - if [ "$DIST_NAME" = "amzn" ] && [ "$DIST_VER" != "2" ]; then + if [ "$DIST_NAME" = "amzn" ] && [ "$DIST_VER" != "2" ] && [ "$DIST_VER" != "2023" ]; then DIST_VER="1" fi DIST_SUBVER=$(echo $VERSION_ID | sed -rn 's/[^0-9]*[0-9]+\.([0-9]+).*/\1/p') From 9e052c6cd81f310d5288f7dc30422123e7af3226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 26 Oct 2023 16:40:51 +0200 Subject: [PATCH 826/994] Changed offline download in Assistant help --- unattended_installer/install_functions/installMain.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index 9cd6f4a213..a0daef8a24 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -23,7 +23,7 @@ function getHelp() { echo -e " Path to the configuration file used to generate wazuh-install-files.tar file containing the files that will be needed for installation. By default, the Wazuh installation assistant will search for a file named config.yml in the same path as the script." echo -e "" echo -e " -dw, --download-wazuh " - echo -e " Download all the packages necessary for offline installation." + echo -e " Download all the packages necessary for offline installation. Type of packages to download for offline installation (rpm, deb)" echo -e "" echo -e " -fd, --force-install-dashboard" echo -e " Force Wazuh dashboard installation to continue even when it is not capable of connecting to the Wazuh indexer." From 95dcbcea3c93937ca5039b48779705d9664761f5 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Tue, 24 Oct 2023 18:14:16 +0200 Subject: [PATCH 827/994] Separate sign and notarize steps --- macos/generate_wazuh_packages.sh | 36 +++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/macos/generate_wazuh_packages.sh b/macos/generate_wazuh_packages.sh index ab4ad5bf1b..27779a102a 100755 --- a/macos/generate_wazuh_packages.sh +++ b/macos/generate_wazuh_packages.sh @@ -32,6 +32,7 @@ NOTARIZE="no" # Notarize the package for macOS Catalina. DEVELOPER_ID="" # Apple Developer ID. ALTOOL_PASS="" # Temporary Application password for altool. pkg_name="" +notarization_path="" trap ctrl_c INT @@ -55,8 +56,8 @@ function notarize_pkg() { build_timestamp="$(date +"%m%d%Y%H%M%S")" if [ "${NOTARIZE}" = "yes" ]; then if sudo xcrun altool --notarize-app --primary-bundle-id "com.wazuh.agent.${VERSION}.${REVISION}.${build_timestamp}" \ - --username "${DEVELOPER_ID}" --password "${ALTOOL_PASS}" --file ${DESTINATION}/${pkg_name} > request_info.txt ; then - echo "The package ${DESTINATION}/${pkg_name} was successfully upload for notarization." + --username "${DEVELOPER_ID}" --password "${ALTOOL_PASS}" --file ${1} > request_info.txt ; then + echo "The package ${1} was successfully upload for notarization." echo "Waiting ${sleep_time}s to get the results" sleep ${sleep_time} @@ -76,8 +77,9 @@ function notarize_pkg() { if grep "Status: success" request_result.txt > /dev/null 2>&1 ; then echo "Package is notarized and ready to go." echo "Adding the ticket to the package." - if xcrun stapler staple -v ${DESTINATION}/${pkg_name} ; then + if xcrun stapler staple -v ${1} ; then echo "Ticket added. Ready to release the package." + mkdir -p "${DESTINATION}" && cp -f "${1}" "${DESTINATION}/" return 0 else echo "Something went wrong while adding the package." @@ -153,7 +155,6 @@ function build_package() { echo "The wazuh agent package for macOS has been successfully built." pkg_name="wazuh-agent-${VERSION}-${REVISION}.${ARCH}.pkg" sign_pkg - notarize_pkg if [[ "${CHECKSUM}" == "yes" ]]; then mkdir -p ${CHECKSUMDIR} cd ${DESTINATION} && shasum -a512 "${pkg_name}" > "${CHECKSUMDIR}/${pkg_name}.sha512" @@ -186,7 +187,8 @@ function help() { echo " --keychain-password [Optional] Password of the keychain." echo " --application-certificate [Optional] Apple Developer ID certificate name to sign Apps and binaries." echo " --installer-certificate [Optional] Apple Developer ID certificate name to sign pkg." - echo " --notarize [Optional] Notarize the package for its distribution on macOS Catalina ." + echo " --notarize [Optional] Notarize the package for its distribution on macOS." + echo " --notarize-path [Optional] Path of the package to be notarized." echo " --developer-id [Optional] Your Apple Developer ID." echo " --altool-password [Optional] Temporary password to use altool from Xcode." echo @@ -368,6 +370,14 @@ function main() { NOTARIZE="yes" shift 1 ;; + "--notarize-path") + if [ -n "$2" ]; then + notarization_path="$2" + shift 2 + else + help 1 + fi + ;; "--developer-id") if [ -n "$2" ]; then DEVELOPER_ID="$2" @@ -410,8 +420,20 @@ function main() { AGENT_PKG_FILE="${CURRENT_PATH}/package_files/wazuh-agent-${ARCH}.pkgproj" build_package "${CURRENT_PATH}/uninstall.sh" - else - echo "The branch has not been specified. No package will be generated." + fi + if [ "${NOTARIZE}" = "yes" ]; then + if [ "${BUILD}" = "yes" ]; then + pkg_name="wazuh-agent-${VERSION}-${REVISION}.${ARCH}.pkg" + notarization_path="${DESTINATION}/${pkg_name}" + fi + if [ -z "${notarization_path}" ]; then + echo "The path of the package to be notarized has not been specified." + help 1 + fi + notarize_pkg "${notarization_path}" + fi + if [ "${BUILD}" = "no" ] && [ "${NOTARIZE}" = "no" ]; then + echo "The branch has not been specified and notarization has not been selected." help 1 fi From 2df1940cdc1cce342002b97ca9937b1a881ebfb9 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Fri, 27 Oct 2023 21:40:16 +0200 Subject: [PATCH 828/994] Add notarytool command --- macos/generate_wazuh_packages.sh | 56 ++++++++++++-------------------- 1 file changed, 21 insertions(+), 35 deletions(-) diff --git a/macos/generate_wazuh_packages.sh b/macos/generate_wazuh_packages.sh index 27779a102a..597cf17825 100755 --- a/macos/generate_wazuh_packages.sh +++ b/macos/generate_wazuh_packages.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -x # Program to build and package OSX wazuh-agent # Wazuh package generator # Copyright (C) 2015, Wazuh Inc. @@ -31,6 +32,7 @@ KC_PASS="" # Password of the keychain. NOTARIZE="no" # Notarize the package for macOS Catalina. DEVELOPER_ID="" # Apple Developer ID. ALTOOL_PASS="" # Temporary Application password for altool. +TEAM_ID="" # Team ID of the Apple Developer ID. pkg_name="" notarization_path="" @@ -55,45 +57,20 @@ function notarize_pkg() { sleep_time="120" build_timestamp="$(date +"%m%d%Y%H%M%S")" if [ "${NOTARIZE}" = "yes" ]; then - if sudo xcrun altool --notarize-app --primary-bundle-id "com.wazuh.agent.${VERSION}.${REVISION}.${build_timestamp}" \ - --username "${DEVELOPER_ID}" --password "${ALTOOL_PASS}" --file ${1} > request_info.txt ; then - echo "The package ${1} was successfully upload for notarization." - echo "Waiting ${sleep_time}s to get the results" - sleep ${sleep_time} - - uuid="$(grep -i requestuuid request_info.txt | cut -d' ' -f 3)" - - # Check notarization status - xcrun altool --notarization-info ${uuid} -u "${DEVELOPER_ID}" --password "${ALTOOL_PASS}" > request_result.txt - until ! grep -qi "in progress" request_result.txt ; do - echo "Package is not notarized yet. Waiting ${sleep_time}s" - sleep ${sleep_time} - xcrun altool --notarization-info ${uuid} -u "${DEVELOPER_ID}" --password "${ALTOOL_PASS}" > request_result.txt - done - - echo "Notarization ticket:" - cat request_result.txt - - if grep "Status: success" request_result.txt > /dev/null 2>&1 ; then - echo "Package is notarized and ready to go." - echo "Adding the ticket to the package." - if xcrun stapler staple -v ${1} ; then - echo "Ticket added. Ready to release the package." - mkdir -p "${DESTINATION}" && cp -f "${1}" "${DESTINATION}/" - return 0 - else - echo "Something went wrong while adding the package." - clean_and_exit 1 - fi + + if sudo xcrun notarytool submit ${1} --apple-id "${DEVELOPER_ID}" --team-id "${TEAM_ID}" --password "${ALTOOL_PASS}" --wait ; then + echo "Package is notarized and ready to go." + echo "Adding the ticket to the package." + if xcrun stapler staple -v "${1}" ; then + echo "Ticket added. Ready to release the package." + mkdir -p "${DESTINATION}" && cp "${1}" "${DESTINATION}/" + return 0 else - - echo "The package couldn't be notarized." - echo "Check notarization ticket for more info." + echo "Something went wrong while adding the package." clean_and_exit 1 fi - else - echo "Error while uploading the app to be notarized." + echo "Error notarizing the package." clean_and_exit 1 fi fi @@ -190,6 +167,7 @@ function help() { echo " --notarize [Optional] Notarize the package for its distribution on macOS." echo " --notarize-path [Optional] Path of the package to be notarized." echo " --developer-id [Optional] Your Apple Developer ID." + echo " --team-id [Optional] Your Apple Team ID." echo " --altool-password [Optional] Temporary password to use altool from Xcode." echo exit "$1" @@ -386,6 +364,14 @@ function main() { help 1 fi ;; + "--team-id") + if [ -n "$2" ]; then + TEAM_ID="$2" + shift 2 + else + help 1 + fi + ;; "--altool-password") if [ -n "$2" ]; then ALTOOL_PASS="$2" From 0e1896f97cdc0fac3a7b5807667b4f9c200d6e69 Mon Sep 17 00:00:00 2001 From: rafabailon Date: Tue, 31 Oct 2023 14:35:03 +0100 Subject: [PATCH 829/994] Rename Kibana as Dashboard --- wazuhapp/kibana/Docker/build.sh | 8 ++++---- wazuhapp/opensearch-dashboards/Docker/build.sh | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/wazuhapp/kibana/Docker/build.sh b/wazuhapp/kibana/Docker/build.sh index 14bcb5dde9..3da77df88c 100755 --- a/wazuhapp/kibana/Docker/build.sh +++ b/wazuhapp/kibana/Docker/build.sh @@ -16,8 +16,8 @@ checksum_dir="/var/local/checksum" git_clone_tmp_dir="/tmp/wazuh-app" # Repositories URLs -wazuh_app_clone_repo_url="https://github.com/wazuh/wazuh-kibana-app.git" -wazuh_app_raw_repo_url="https://raw.githubusercontent.com/wazuh/wazuh-kibana-app" +wazuh_app_clone_repo_url="https://github.com/wazuh/wazuh-dashboard-plugins.git" +wazuh_app_raw_repo_url="https://raw.githubusercontent.com/wazuh/wazuh-dashboard-plugins" kibana_app_repo_url="https://github.com/elastic/kibana.git" kibana_app_raw_repo_url="https://raw.githubusercontent.com/elastic/kibana" wazuh_app_package_json_url="${wazuh_app_raw_repo_url}/${wazuh_branch}/plugins/main/package.json" @@ -47,7 +47,7 @@ change_node_version () { prepare_env() { - echo "Downloading package.json from wazuh-kibana app repository" + echo "Downloading package.json from wazuh-dashboard-plugins repository" if ! curl $wazuh_app_package_json_url -o "/tmp/package.json" ; then echo "Error downloading package.json from GitHub." exit 1 @@ -105,7 +105,7 @@ install_dependencies () { download_wazuh_app_sources() { if ! git clone $wazuh_app_clone_repo_url --branch ${wazuh_branch} --depth=1 ${git_clone_tmp_dir} ; then - echo "Error downloading the source code from wazuh-kibana-app GitHub repository." + echo "Error downloading the source code from wazuh-dashboard-plugins GitHub repository." exit 1 fi diff --git a/wazuhapp/opensearch-dashboards/Docker/build.sh b/wazuhapp/opensearch-dashboards/Docker/build.sh index 776a767672..090c37eb42 100755 --- a/wazuhapp/opensearch-dashboards/Docker/build.sh +++ b/wazuhapp/opensearch-dashboards/Docker/build.sh @@ -16,8 +16,8 @@ checksum_dir="/var/local/checksum" git_clone_tmp_dir="/tmp/wazuh-app" # Repositories URLs -wazuh_app_clone_repo_url="https://github.com/wazuh/wazuh-kibana-app.git" -wazuh_app_raw_repo_url="https://raw.githubusercontent.com/wazuh/wazuh-kibana-app" +wazuh_app_clone_repo_url="https://github.com/wazuh/wazuh-dashboard-plugins.git" +wazuh_app_raw_repo_url="https://raw.githubusercontent.com/wazuh/wazuh-dashboard-plugins" plugin_platform_app_repo_url="https://github.com/opensearch-project/OpenSearch-Dashboards.git" plugin_platform_app_raw_repo_url="https://raw.githubusercontent.com/opensearch-project/OpenSearch-Dashboards" wazuh_app_package_json_url="${wazuh_app_raw_repo_url}/${wazuh_branch}/plugins/main/package.json" @@ -47,7 +47,7 @@ change_node_version () { prepare_env() { - echo "Downloading package.json and .nvmrc from wazuh-kibana-app repository" + echo "Downloading package.json and .nvmrc from wazuh-dashboard-plugins repository" if ! curl $wazuh_app_package_json_url -o "/tmp/package.json" ; then echo "Error downloading package.json from GitHub." exit 1 From 16e2e7bcd89709b733657ad3b3664d654a79fc0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 31 Oct 2023 16:54:39 +0100 Subject: [PATCH 830/994] Added YUM lock logic --- .../common_functions/common.sh | 6 ++- .../install_functions/installCommon.sh | 46 +++++++++++++++++-- .../install_functions/installVariables.sh | 1 + 3 files changed, 49 insertions(+), 4 deletions(-) diff --git a/unattended_installer/common_functions/common.sh b/unattended_installer/common_functions/common.sh index 9581f45b74..fe0c7e8d9b 100644 --- a/unattended_installer/common_functions/common.sh +++ b/unattended_installer/common_functions/common.sh @@ -70,6 +70,7 @@ function common_checkInstalled() { dashboard_installed="" if [ "${sys_type}" == "yum" ]; then + installCommon_checkYumLock wazuh_installed=$(yum list installed 2>/dev/null | grep wazuh-manager) elif [ "${sys_type}" == "apt-get" ]; then wazuh_installed=$(apt list --installed 2>/dev/null | grep wazuh-manager) @@ -81,6 +82,7 @@ function common_checkInstalled() { fi if [ "${sys_type}" == "yum" ]; then + installCommon_checkYumLock indexer_installed=$(yum list installed 2>/dev/null | grep wazuh-indexer) elif [ "${sys_type}" == "apt-get" ]; then indexer_installed=$(apt list --installed 2>/dev/null | grep wazuh-indexer) @@ -92,6 +94,7 @@ function common_checkInstalled() { fi if [ "${sys_type}" == "yum" ]; then + installCommon_checkYumLock filebeat_installed=$(yum list installed 2>/dev/null | grep filebeat) elif [ "${sys_type}" == "apt-get" ]; then filebeat_installed=$(apt list --installed 2>/dev/null | grep filebeat) @@ -103,6 +106,7 @@ function common_checkInstalled() { fi if [ "${sys_type}" == "yum" ]; then + installCommon_checkYumLock dashboard_installed=$(yum list installed 2>/dev/null | grep wazuh-dashboard) elif [ "${sys_type}" == "apt-get" ]; then dashboard_installed=$(apt list --installed 2>/dev/null | grep wazuh-dashboard) @@ -170,7 +174,7 @@ 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}' ) - rpm -e "${key}" "${debug}" + rpm -e "${key}" else common_logger "Wazuh GPG key not found in the system" return 1 diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index cca1b53122..f2b9f9275b 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -189,6 +189,19 @@ function installCommon_checkOptionalInstallation() { } +function installCommon_checkYumLock() { + + attempt=0 + seconds=30 + + while [ -f "${yum_lockfile}" ]; do + attempt=$((attempt+1)) + common_logger "Another process is using YUM. Waiting for it to release the lock. Next retry in ${seconds} seconds (${attempt}/10)" + sleep "${seconds}" + done + +} + function installCommon_createCertificates() { common_logger -d "Creating Wazuh certificates." @@ -298,6 +311,7 @@ function installCommon_changePasswords() { function installCommon_checkChromium() { if [ "${sys_type}" == "yum" ]; then + installCommon_checkYumLock if (! yum list installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\\.) && (! yum list installed 2>/dev/null | grep -q -E ^"chromium"\\.); then if [ "${DIST_NAME}" == "amzn" ]; then installCommon_installChrome @@ -609,6 +623,7 @@ function installCommon_rollBack() { if [[ -n "${wazuh_installed}" && ( -n "${wazuh}" || -n "${AIO}" || -n "${uninstall}" ) ]];then common_logger "Removing Wazuh manager." if [ "${sys_type}" == "yum" ]; then + installCommon_checkYumLock eval "yum remove wazuh-manager -y ${debug}" elif [ "${sys_type}" == "apt-get" ]; then eval "apt-get remove --purge wazuh-manager -y ${debug}" @@ -623,6 +638,7 @@ function installCommon_rollBack() { if [[ -n "${indexer_installed}" && ( -n "${indexer}" || -n "${AIO}" || -n "${uninstall}" ) ]]; then common_logger "Removing Wazuh indexer." if [ "${sys_type}" == "yum" ]; then + installCommon_checkYumLock eval "yum remove wazuh-indexer -y ${debug}" elif [ "${sys_type}" == "apt-get" ]; then eval "apt-get remove --purge wazuh-indexer -y ${debug}" @@ -639,6 +655,7 @@ function installCommon_rollBack() { if [[ -n "${filebeat_installed}" && ( -n "${wazuh}" || -n "${AIO}" || -n "${uninstall}" ) ]]; then common_logger "Removing Filebeat." if [ "${sys_type}" == "yum" ]; then + installCommon_checkYumLock eval "yum remove filebeat -y ${debug}" elif [ "${sys_type}" == "apt-get" ]; then eval "apt-get remove --purge filebeat -y ${debug}" @@ -655,6 +672,7 @@ function installCommon_rollBack() { if [[ -n "${dashboard_installed}" && ( -n "${dashboard}" || -n "${AIO}" || -n "${uninstall}" ) ]]; then common_logger "Removing Wazuh dashboard." if [ "${sys_type}" == "yum" ]; then + installCommon_checkYumLock eval "yum remove wazuh-dashboard -y ${debug}" elif [ "${sys_type}" == "apt-get" ]; then eval "apt-get remove --purge wazuh-dashboard -y ${debug}" @@ -758,6 +776,7 @@ function installCommon_yumInstallList(){ dependencies=("$@") not_installed=() for dep in "${dependencies[@]}"; do + installCommon_checkYumLock if ! yum list installed 2>/dev/null | grep -q -E ^"${dep}"\\.;then not_installed+=("${dep}") fi @@ -767,14 +786,35 @@ function installCommon_yumInstallList(){ common_logger "--- Dependencies ---" for dep in "${not_installed[@]}"; do common_logger "Installing $dep." - yum_output=$(yum install ${dep} -y 2>&1) + installCommon_yumInstall "${dep}" yum_code="${PIPESTATUS[0]}" - eval "echo \${yum_output} ${debug}" - if [ "${yum_code}" != 0 ]; then + if [ "${install_result}" != 0 ]; then installCommon_checkOptionalInstallation fi done fi } + +function installCommon_yumInstall() { + + package="${1}" + version="${2}" + install_result=1 + if [ -n "${version}" ]; then + installer="${package}-${version}" + else + installer="${package}" + fi + + command="yum install ${installer} -y" + installCommon_checkYumLock + + if [ ! -f "${yum_lockfile}" ]; then + yum_output=$(eval "${command} 2>&1") + install_result="${PIPESTATUS[0]}" + eval "echo \${yum_output} ${debug}" + fi + +} \ No newline at end of file diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index afb97f013a..cca3712ed1 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -30,6 +30,7 @@ readonly indexer_cert_path="/etc/wazuh-indexer/certs" readonly logfile="/var/log/wazuh-install.log" debug=">> ${logfile} 2>&1" +readonly yum_lockfile="/var/run/yum.pid" ## Offline Installation vars readonly base_dest_folder="wazuh-offline" From 01009628cc05d15784a7a7ddeb36b1510c50f590 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Wed, 1 Nov 2023 17:37:04 -0300 Subject: [PATCH 831/994] Testing ism --- unattended_installer/builder.sh | 7 +++++++ unattended_installer/install_functions/indexer.sh | 2 ++ 2 files changed, 9 insertions(+) diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index b3290b2948..7a17f6d084 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -118,6 +118,13 @@ function buildInstaller() { curl -s "https://raw.githubusercontent.com/wazuh/wazuh/${source_branch}/src/init/dist-detect.sh" | sed '/^#/d' >> "${output_script_path}" echo "}" >> "${output_script_path}" + ## indexerRolloverInit.sh + echo "function indexer_rollover_init() {" >> "${output_script_path}" + curl -s "https://packages-dev.wazuh.com/4.8/indexerRolloverInit.sh" | sed '/^#/d' >> "${output_script_path}" + echo "}" >> "${output_script_path}" + sed -i 's|INDEXER_PASSWORD|adminPassword|g' "${output_script_path}" + sed -i 's|INDEXER_HOSTNAME|indexer_node_ips[0]|g' "${output_script_path}" + ## Common functions sed -n '/^function [a-zA-Z_]\(\)/,/^}/p' "${resources_common}/common.sh" >> "${output_script_path}" diff --git a/unattended_installer/install_functions/indexer.sh b/unattended_installer/install_functions/indexer.sh index c851fa323b..8ad340de40 100644 --- a/unattended_installer/install_functions/indexer.sh +++ b/unattended_installer/install_functions/indexer.sh @@ -186,4 +186,6 @@ function indexer_startCluster() { common_logger -d "Inserted wazuh-alerts template into the Wazuh indexer cluster." fi + indexer_rollover_init + } \ No newline at end of file From baf5e4f0a37023568bea4eb6bd9d25806825d406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 2 Nov 2023 17:52:30 +0100 Subject: [PATCH 832/994] Improved APT lock logic --- .../install_functions/installCommon.sh | 42 ++++++++++++------- .../install_functions/installVariables.sh | 1 + 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index f2b9f9275b..4af3388778 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -98,22 +98,13 @@ function installCommon_aptInstall() { installer=${package} fi command="DEBIAN_FRONTEND=noninteractive apt-get install ${installer} -y -q" - seconds=30 - apt_output=$(eval "${command} 2>&1") - install_result="${PIPESTATUS[0]}" - eval "echo \${apt_output} ${debug}" - eval "tail -n 2 ${logfile} | grep -q 'Could not get lock'" - grep_result="${PIPESTATUS[0]}" - while [ "${grep_result}" -eq 0 ] && [ "${attempt}" -lt 10 ]; do - attempt=$((attempt+1)) - common_logger "An external process is using APT. This process has to end to proceed with the Wazuh installation. Next retry in ${seconds} seconds (${attempt}/10)" - sleep "${seconds}" + installCommon_checkAptLock + + if [ "${attempt}" -ne "${max_attempts}" ]; then apt_output=$(eval "${command} 2>&1") install_result="${PIPESTATUS[0]}" eval "echo \${apt_output} ${debug}" - eval "tail -n 2 ${logfile} | grep -q 'Could not get lock'" - grep_result="${PIPESTATUS[0]}" - done + fi } @@ -189,14 +180,29 @@ function installCommon_checkOptionalInstallation() { } +function installCommon_checkAptLock() { + + attempt=0 + seconds=30 + max_attempts=10 + + while fuser "${apt_lockfile}" >/dev/null 2>&1 && [ "${attempt}" -lt "${max_attempts}" ]; do + attempt=$((attempt+1)) + common_logger "Another process is using APT. Waiting for it to release the lock. Next retry in ${seconds} seconds (${attempt}/${max_attempts})" + sleep "${seconds}" + done + +} + function installCommon_checkYumLock() { attempt=0 seconds=30 + max_attempts=10 - while [ -f "${yum_lockfile}" ]; do + while [ -f "${yum_lockfile}" ] && [ "${attempt}" -lt "${max_attempts}" ]; do attempt=$((attempt+1)) - common_logger "Another process is using YUM. Waiting for it to release the lock. Next retry in ${seconds} seconds (${attempt}/10)" + common_logger "Another process is using YUM. Waiting for it to release the lock. Next retry in ${seconds} seconds (${attempt}/${max_attempts})" sleep "${seconds}" done @@ -626,6 +632,7 @@ function installCommon_rollBack() { installCommon_checkYumLock eval "yum remove wazuh-manager -y ${debug}" elif [ "${sys_type}" == "apt-get" ]; then + installCommon_checkAptLock eval "apt-get remove --purge wazuh-manager -y ${debug}" fi common_logger "Wazuh manager removed." @@ -641,6 +648,7 @@ function installCommon_rollBack() { installCommon_checkYumLock eval "yum remove wazuh-indexer -y ${debug}" elif [ "${sys_type}" == "apt-get" ]; then + installCommon_checkAptLock eval "apt-get remove --purge wazuh-indexer -y ${debug}" fi common_logger "Wazuh indexer removed." @@ -658,6 +666,7 @@ function installCommon_rollBack() { installCommon_checkYumLock eval "yum remove filebeat -y ${debug}" elif [ "${sys_type}" == "apt-get" ]; then + installCommon_checkAptLock eval "apt-get remove --purge filebeat -y ${debug}" fi common_logger "Filebeat removed." @@ -675,6 +684,7 @@ function installCommon_rollBack() { installCommon_checkYumLock eval "yum remove wazuh-dashboard -y ${debug}" elif [ "${sys_type}" == "apt-get" ]; then + installCommon_checkAptLock eval "apt-get remove --purge wazuh-dashboard -y ${debug}" fi common_logger "Wazuh dashboard removed." @@ -811,7 +821,7 @@ function installCommon_yumInstall() { command="yum install ${installer} -y" installCommon_checkYumLock - if [ ! -f "${yum_lockfile}" ]; then + if [ "${attempt}" -ne "${max_attempts}" ]; then yum_output=$(eval "${command} 2>&1") install_result="${PIPESTATUS[0]}" eval "echo \${yum_output} ${debug}" diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index cca3712ed1..f7aa93ae57 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -31,6 +31,7 @@ readonly indexer_cert_path="/etc/wazuh-indexer/certs" readonly logfile="/var/log/wazuh-install.log" debug=">> ${logfile} 2>&1" readonly yum_lockfile="/var/run/yum.pid" +readonly apt_lockfile="/var/lib/dpkg/lock" ## Offline Installation vars readonly base_dest_folder="wazuh-offline" From 741cbf7b8a98219575d8984af9b79f9eb1861f37 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Mon, 16 Oct 2023 22:27:38 +0200 Subject: [PATCH 833/994] Bumped readme with Wazuh dashboard 2.10.0 --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f358cd9a23..cc74389571 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,8 @@ The following table shows the references for the versions of each component. | 4.3.x | 1.2.0 | | 4.4.0 | 2.4.1 | | 4.4.1 - 4.5.x | 2.6.0 | -| 4.6.0 - current | 2.8.0 | +| 4.6.x - 4.7.x | 2.8.0 | +| 4.8.x - current | 2.10.0 | ### Wazuh indexer From d4268fd27ba428d847aa85215ad9b741f27fc8fd Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Mon, 16 Oct 2023 22:27:48 +0200 Subject: [PATCH 834/994] Bumped to 2.10.0 --- 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 b109ed1e66..a4d89dad86 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -16,7 +16,7 @@ revision="$2" future="$3" repository="$4" reference="$5" -opensearch_version="2.8.0" +opensearch_version="2.10.0" base_dir=/opt/wazuh-dashboard-base # ----------------------------------------------------------------------------- From 98acce658afb33bc05281be19dfaafc2b5454578 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Thu, 19 Oct 2023 15:25:25 +0200 Subject: [PATCH 835/994] Removed dashboard.chunk.1 references --- stack/dashboard/base/builder.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh index a4d89dad86..86156e22ae 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -124,10 +124,6 @@ brotli -c ./src/core/target/public/core.entry.js > ./src/core/target/public/core sed -i 's|updater\$:appUpdater\$|status:1|' ./src/plugins/opensearch_dashboards_overview/target/public/opensearchDashboardsOverview.plugin.js gzip -c ./src/plugins/opensearch_dashboards_overview/target/public/opensearchDashboardsOverview.plugin.js > ./src/plugins/opensearch_dashboards_overview/target/public/opensearchDashboardsOverview.plugin.js.gz brotli -c ./src/plugins/opensearch_dashboards_overview/target/public/opensearchDashboardsOverview.plugin.js > ./src/plugins/opensearch_dashboards_overview/target/public/opensearchDashboardsOverview.plugin.js.br -# Remove "New to OpenSearch Dashboards" message with link to OpenSearch Dashboards sample data in Dashboard plugin -sed -i 's|external_osdSharedDeps_React_default.a.createElement("p",null,external_osdSharedDeps_React_default.a.createElement(external_osdSharedDeps_OsdI18nReact_\["FormattedMessage"\],{id:"dashboard.listing.createNewDashboard.newToOpenSearchDashboardsDescription",defaultMessage:"New to OpenSearch Dashboards|false\&\&external_osdSharedDeps_React_default.a.createElement("p",null,external_osdSharedDeps_React_default.a.createElement(external_osdSharedDeps_OsdI18nReact_["FormattedMessage"],{id:"dashboard.listing.createNewDashboard.newToOpenSearchDashboardsDescription",defaultMessage:"New to OpenSearch Dashboards|' ./src/plugins/dashboard/target/public/dashboard.chunk.1.js -gzip -c ./src/plugins/dashboard/target/public/dashboard.chunk.1.js > ./src/plugins/dashboard/target/public/dashboard.chunk.1.js.gz -brotli -c ./src/plugins/dashboard/target/public/dashboard.chunk.1.js > ./src/plugins/dashboard/target/public/dashboard.chunk.1.js.br # 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 From d507c2999e680147339865e3258a36a094a106d9 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Thu, 19 Oct 2023 15:26:47 +0200 Subject: [PATCH 836/994] Improved configuration path config --- stack/dashboard/base/files/etc/services/default | 1 + .../dashboard/base/files/etc/services/wazuh-dashboard.service | 2 +- stack/dashboard/deb/debian/rules | 2 -- stack/dashboard/rpm/wazuh-dashboard.spec | 4 ---- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/stack/dashboard/base/files/etc/services/default b/stack/dashboard/base/files/etc/services/default index c4f94fd368..946d725967 100644 --- a/stack/dashboard/base/files/etc/services/default +++ b/stack/dashboard/base/files/etc/services/default @@ -5,3 +5,4 @@ chdir="/" nice="" KILL_ON_STOP_TIMEOUT=0 +OSD_PATH_CONF="/etc/wazuh-dashboard" \ No newline at end of file diff --git a/stack/dashboard/base/files/etc/services/wazuh-dashboard.service b/stack/dashboard/base/files/etc/services/wazuh-dashboard.service index 86e61a9aa2..ef1d2afd42 100644 --- a/stack/dashboard/base/files/etc/services/wazuh-dashboard.service +++ b/stack/dashboard/base/files/etc/services/wazuh-dashboard.service @@ -7,7 +7,7 @@ User=wazuh-dashboard Group=wazuh-dashboard EnvironmentFile=-/etc/default/wazuh-dashboard EnvironmentFile=-/etc/sysconfig/wazuh-dashboard -ExecStart=/usr/share/wazuh-dashboard/bin/opensearch-dashboards -c /etc/wazuh-dashboard/opensearch_dashboards.yml +ExecStart=/usr/share/wazuh-dashboard/bin/opensearch-dashboards WorkingDirectory=/usr/share/wazuh-dashboard [Install] diff --git a/stack/dashboard/deb/debian/rules b/stack/dashboard/deb/debian/rules index 6b4bcbb1ec..d7c83be509 100644 --- a/stack/dashboard/deb/debian/rules +++ b/stack/dashboard/deb/debian/rules @@ -58,8 +58,6 @@ override_dh_install: useradd -g $(GROUP) $(USER) tar -xf $(DASHBOARD_FILE) - sed -i 's/OSD_NODE_OPTS_PREFIX/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_NODE_OPTS_PREFIX/g' "wazuh-dashboard-base/bin/opensearch-dashboards" - sed -i 's/OSD_USE_NODE_JS_FILE_PATH/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_USE_NODE_JS_FILE_PATH/g' "wazuh-dashboard-base/bin/opensearch-dashboards-keystore" mkdir -p $(TARGET_DIR)$(CONFIG_DIR) mkdir -p $(TARGET_DIR)$(INSTALLATION_DIR) diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 6627f37401..a287fe9ed8 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -55,10 +55,6 @@ useradd -g %{GROUP} %{USER} tar -xf %{DASHBOARD_FILE} -# Set custom config dir -sed -i 's/OSD_NODE_OPTS_PREFIX/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_NODE_OPTS_PREFIX/g' "wazuh-dashboard-base/bin/opensearch-dashboards" -sed -i 's/OSD_USE_NODE_JS_FILE_PATH/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_USE_NODE_JS_FILE_PATH/g' "wazuh-dashboard-base/bin/opensearch-dashboards-keystore" - # ----------------------------------------------------------------------------- %install From 405403c7b33dde4293d0f606507a7fc72c4ac179 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Thu, 19 Oct 2023 15:28:00 +0200 Subject: [PATCH 837/994] Added setcap to fallback node --- stack/dashboard/deb/debian/postinst | 1 + stack/dashboard/rpm/wazuh-dashboard.spec | 1 + 2 files changed, 2 insertions(+) diff --git a/stack/dashboard/deb/debian/postinst b/stack/dashboard/deb/debian/postinst index 71d13281d7..e33c07afdb 100644 --- a/stack/dashboard/deb/debian/postinst +++ b/stack/dashboard/deb/debian/postinst @@ -27,6 +27,7 @@ case "$1" in chmod 750 "${TARGET_DIR}""${INSTALLATION_DIR}" chown -R "${NAME}":"${NAME}" "${TARGET_DIR}""${INSTALLATION_DIR}" setcap 'cap_net_bind_service=+ep' "${INSTALLATION_DIR}"/node/bin/node + setcap 'cap_net_bind_service=+ep' "${INSTALLATION_DIR}"/node/fallback/bin/node if [ -f "${INSTALLATION_DIR}"/"${NAME}".restart ]; then rm -f "${INSTALLATION_DIR}"/"${NAME}".restart if command -v systemctl > /dev/null 2>&1 && systemctl > /dev/null 2>&1 ; then diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index a287fe9ed8..1eac32416e 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -131,6 +131,7 @@ fi %post setcap 'cap_net_bind_service=+ep' %{INSTALL_DIR}/node/bin/node +setcap 'cap_net_bind_service=+ep' %{INSTALL_DIR}/node/fallback/bin/node # ----------------------------------------------------------------------------- From 4f9562543ddfa0212f6aabeec0565c28c0e99bb1 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Thu, 19 Oct 2023 18:21:43 +0200 Subject: [PATCH 838/994] Removed config sed --- stack/dashboard/base/builder.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh index 86156e22ae..613aa4f922 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -89,9 +89,6 @@ 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-keystore -sed -i "s'\$DIR/config'/etc/wazuh-dashboard'g" ./bin/opensearch-dashboards-plugin # Add fix to Node variables as Node is not using the NODE_OPTIONS environment variables sed -i 's/NODE_OPTIONS="$OSD_NODE_OPTS_PREFIX $OSD_NODE_OPTS $NODE_OPTIONS"/NODE_OPTIONS="$OSD_NODE_OPTS_PREFIX $OSD_NODE_OPTS $NODE_OPTIONS"\n/g' ./bin/use_node sed -i 's/exec "${NODE}"/NODE_ENV=production exec "${NODE}" ${NODE_OPTIONS} /g' ./bin/use_node From d97c95d2b4967574d25b59749e50ab456237dfbd Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Fri, 20 Oct 2023 00:45:33 +0200 Subject: [PATCH 839/994] Restore keystore sed --- stack/dashboard/deb/debian/rules | 4 ++++ stack/dashboard/rpm/wazuh-dashboard.spec | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/stack/dashboard/deb/debian/rules b/stack/dashboard/deb/debian/rules index d7c83be509..ee34c21978 100644 --- a/stack/dashboard/deb/debian/rules +++ b/stack/dashboard/deb/debian/rules @@ -59,6 +59,10 @@ override_dh_install: tar -xf $(DASHBOARD_FILE) + # Set custom config dir + sed -i 's/OSD_NODE_OPTS_PREFIX/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_NODE_OPTS_PREFIX/g' "wazuh-dashboard-base/bin/opensearch-dashboards" + sed -i 's/OSD_USE_NODE_JS_FILE_PATH/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_USE_NODE_JS_FILE_PATH/g' "wazuh-dashboard-base/bin/opensearch-dashboards-keystore" + mkdir -p $(TARGET_DIR)$(CONFIG_DIR) mkdir -p $(TARGET_DIR)$(INSTALLATION_DIR) mkdir -p $(TARGET_DIR)/etc/systemd/system diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 1eac32416e..ddf2749809 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -55,6 +55,10 @@ useradd -g %{GROUP} %{USER} tar -xf %{DASHBOARD_FILE} +# Set custom config dir +sed -i 's/OSD_NODE_OPTS_PREFIX/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_NODE_OPTS_PREFIX/g' "wazuh-dashboard-base/bin/opensearch-dashboards" +sed -i 's/OSD_USE_NODE_JS_FILE_PATH/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_USE_NODE_JS_FILE_PATH/g' "wazuh-dashboard-base/bin/opensearch-dashboards-keystore" + # ----------------------------------------------------------------------------- %install From 4f085b721dc5444a1da581e5197e73d426335723 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Fri, 20 Oct 2023 00:50:12 +0200 Subject: [PATCH 840/994] Changed Authorization to authorization to equate with OpenSearch Dashboard --- stack/dashboard/base/files/etc/opensearch_dashboards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/dashboard/base/files/etc/opensearch_dashboards.yml b/stack/dashboard/base/files/etc/opensearch_dashboards.yml index ccdac621c6..538728402d 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.requestHeadersAllowlist: ["securitytenant","authorization"] opensearch_security.multitenancy.enabled: false opensearch_security.readonly_mode.roles: ["kibana_read_only"] server.ssl.enabled: true From 28bb4cf8d0536747501ccf1ce839b0c79d01d11b Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Mon, 23 Oct 2023 15:12:19 +0200 Subject: [PATCH 841/994] Improved %files section --- stack/dashboard/rpm/wazuh-dashboard.spec | 202 +++++++---------------- 1 file changed, 60 insertions(+), 142 deletions(-) diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index ddf2749809..ac83c1c94a 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -213,15 +213,17 @@ rm -fr %{buildroot} %files %defattr(-,%{USER},%{GROUP}) -%dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR} -%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 +%dir %attr(750, %{USER}, %{GROUP}) %{CONFIG_DIR} %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR} +%dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/node" +%dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/node_modules" +%dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/data" +%dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/plugins" +%dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/bin" +%dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/config" %dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src" %dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/core" -%attr(-, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/core/*" %dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin" %dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/remove" %dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/list" @@ -241,7 +243,6 @@ rm -fr %{buildroot} %dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/optimize/bundles_route/__fixtures__/plugin" %dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/optimize/bundles_route/__fixtures__/plugin/foo" %dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/plugins" -%attr(-, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/plugins/* %dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli" %dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve" %dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/integration_tests" @@ -260,153 +261,70 @@ rm -fr %{buildroot} %dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/config" %dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/keystore" %dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui" +%dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/apm" %dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/ui_render" %dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/ui_render/bootstrap" -%dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/apm" %dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/docs" -%dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/node_modules" -%attr(-, %{USER}, %{GROUP}) "%{INSTALL_DIR}/node_modules/*" -%attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/node_modules/.yarn-integrity" -%dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/node" + +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/*.json" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/*.yml" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/*.txt" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/remove/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/list/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/install/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/install/downloaders/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/install/__fixtures__/replies/*.zip" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/install/__fixtures__/replies/*.jpg" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_keystore/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_keystore/utils/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/setup_node_env/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/setup_node_env/root/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/setup_node_env/harden/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/optimize/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/optimize/bundles_route/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/optimize/bundles_route/__fixtures__/plugin/foo/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/optimize/bundles_route/__fixtures__/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/integration_tests/__fixtures__/*.yml" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/integration_tests/__fixtures__/reload_logging_config/*.yml" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/lib/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/utils/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/logging/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/logging/rotate/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/core/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/i18n/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/i18n/localization/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/warnings/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/http/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/config/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/keystore/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/ui_render/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/ui_render/bootstrap/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/ui_render/bootstrap/*.hbs" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/apm/*.js" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/docs/*.js" + %attr(-, %{USER}, %{GROUP}) "%{INSTALL_DIR}/node/*" -%attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/node/bin/node" -%dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/data" -%dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/plugins" +%attr(-, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/core/*" +%attr(-, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/plugins/* +%attr(-, %{USER}, %{GROUP}) "%{INSTALL_DIR}/node_modules/*" %attr(-, %{USER}, %{GROUP}) "%{INSTALL_DIR}/plugins/*" -%dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/bin" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/remove/settings.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/remove/index.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/remove/remove.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/dev.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/list/index.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/list/list.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/lib/logger.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/lib/errors.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/lib/log_warnings.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/install/opensearch_dashboards.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/install/downloaders/file.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/install/downloaders/http.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/install/zip.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/install/download.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/install/install.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/install/settings.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/install/rename.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/install/index.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/install/__fixtures__/replies/invalid_name.zip" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/install/__fixtures__/replies/test_plugin_different_version.zip" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/install/__fixtures__/replies/banana.jpg" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/install/__fixtures__/replies/test_plugin_no_opensearch_dashboards.zip" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/install/__fixtures__/replies/test_plugin.zip" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/install/__fixtures__/replies/corrupt.zip" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/install/__fixtures__/replies/test_plugin_many.zip" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/install/cleanup.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/install/pack.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/install/progress.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/cli.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_plugin/dist.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_keystore/cli_keystore.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_keystore/add.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_keystore/create.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_keystore/utils/index.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_keystore/utils/prompt.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_keystore/dev.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_keystore/get_keystore.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_keystore/remove.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_keystore/dist.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli_keystore/list.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/apm.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/setup_node_env/root/force.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/setup_node_env/root/is_root.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/setup_node_env/root/index.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/setup_node_env/polyfill.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/setup_node_env/node_version_validator.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/setup_node_env/index.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/setup_node_env/harden/index.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/setup_node_env/harden/child_process.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/setup_node_env/harden/lodash_template.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/setup_node_env/no_transpilation.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/setup_node_env/exit_on_warning.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/setup_node_env/dist.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/optimize/np_ui_plugin_public_dirs.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/optimize/index.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/optimize/optimize_mixin.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/optimize/bundles_route/proxy_bundles_route.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/optimize/bundles_route/file_hash.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/optimize/bundles_route/file_hash_cache.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/optimize/bundles_route/index.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/optimize/bundles_route/__fixtures__/plugin/foo/plugin.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/optimize/bundles_route/__fixtures__/outside_output.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/optimize/bundles_route/bundles_route.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/optimize/bundles_route/dynamic_asset_response.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/command.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/help.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/cli.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/serve.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/read_keystore.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/integration_tests/__fixtures__/invalid_config.yml" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/integration_tests/__fixtures__/reload_logging_config/opensearch_dashboards_log_file.test.yml" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/integration_tests/__fixtures__/reload_logging_config/opensearch_dashboards_log_console.test.yml" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/integration_tests/__fixtures__/reload_logging_config/opensearch_dashboards.test.yml" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/dist.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/utils/index.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/utils/unset.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/utils/version.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/utils/artifact_type.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/utils/deep_clone_with_buffers.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/logging/rotate/index.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/logging/rotate/log_rotator.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/logging/apply_filters_to_keys.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/logging/log_format.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/logging/log_reporter.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/logging/log_format_json.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/logging/log_with_metadata.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/logging/index.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/logging/configuration.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/logging/log_interceptor.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/logging/log_format_string.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/core/index.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/i18n/localization/index.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/i18n/localization/telemetry_localization_collector.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/i18n/localization/file_integrity.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/i18n/index.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/i18n/get_translations_path.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/i18n/constants.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/osd_server.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/warnings/index.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/http/index.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/http/register_hapi_plugins.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/http/setup_base_path_provider.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/config/override.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/config/complete.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/config/index.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/config/schema.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/config/config.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/keystore/keystore.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/keystore/index.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/server/keystore/errors.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/ui_mixin.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/ui_render/ui_render_mixin.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/ui_render/index.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/ui_render/bootstrap/osd_bundles_loader_source.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/ui_render/bootstrap/index.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/ui_render/bootstrap/template.js.hbs" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/ui_render/bootstrap/app_bootstrap.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/index.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/legacy/ui/apm/index.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/docs/docs_repo.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/docs/cli.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/package.json" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/manifest.yml" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/LICENSE.txt" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/NOTICE.txt" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/README.txt" + +%attr(440, %{USER}, %{GROUP}) "%{INSTALL_DIR}/VERSION" +%attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/node_modules/.yarn-integrity" %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/bin/use_node" %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/bin/opensearch-dashboards" %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/bin/opensearch-dashboards-plugin" %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/bin/opensearch-dashboards-keystore" -%dir %attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/config" +%attr(750, %{USER}, %{GROUP}) "/etc/default/wazuh-dashboard" %attr(640, %{USER}, %{GROUP}) "%{CONFIG_DIR}/node.options" %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" +%config(noreplace) %attr(640, %{USER}, %{GROUP}) "%{CONFIG_DIR}/opensearch_dashboards.yml" %changelog * Fri Dec 15 2023 support - 4.8.0 From 7a51a26ecfe72619d3eaf5b7bb041349486e830a Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Mon, 23 Oct 2023 16:16:50 +0200 Subject: [PATCH 842/994] Fixed binaries sed --- stack/dashboard/deb/debian/rules | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/stack/dashboard/deb/debian/rules b/stack/dashboard/deb/debian/rules index ee34c21978..6b4bcbb1ec 100644 --- a/stack/dashboard/deb/debian/rules +++ b/stack/dashboard/deb/debian/rules @@ -58,10 +58,8 @@ override_dh_install: useradd -g $(GROUP) $(USER) tar -xf $(DASHBOARD_FILE) - - # Set custom config dir - sed -i 's/OSD_NODE_OPTS_PREFIX/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_NODE_OPTS_PREFIX/g' "wazuh-dashboard-base/bin/opensearch-dashboards" - sed -i 's/OSD_USE_NODE_JS_FILE_PATH/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_USE_NODE_JS_FILE_PATH/g' "wazuh-dashboard-base/bin/opensearch-dashboards-keystore" + sed -i 's/OSD_NODE_OPTS_PREFIX/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_NODE_OPTS_PREFIX/g' "wazuh-dashboard-base/bin/opensearch-dashboards" + sed -i 's/OSD_USE_NODE_JS_FILE_PATH/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_USE_NODE_JS_FILE_PATH/g' "wazuh-dashboard-base/bin/opensearch-dashboards-keystore" mkdir -p $(TARGET_DIR)$(CONFIG_DIR) mkdir -p $(TARGET_DIR)$(INSTALLATION_DIR) From 3e0901d3a8f84f83ede9da1915f8d74f41320965 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Mon, 23 Oct 2023 16:18:27 +0200 Subject: [PATCH 843/994] Added missing end line --- stack/dashboard/base/files/etc/services/default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/dashboard/base/files/etc/services/default b/stack/dashboard/base/files/etc/services/default index 946d725967..250239f4c8 100644 --- a/stack/dashboard/base/files/etc/services/default +++ b/stack/dashboard/base/files/etc/services/default @@ -5,4 +5,4 @@ chdir="/" nice="" KILL_ON_STOP_TIMEOUT=0 -OSD_PATH_CONF="/etc/wazuh-dashboard" \ No newline at end of file +OSD_PATH_CONF="/etc/wazuh-dashboard" From c85e0f02a0c743755cbd9a853e99e92f4613d8ef Mon Sep 17 00:00:00 2001 From: Antonio <34042064+Desvelao@users.noreply.github.com> Date: Mon, 23 Oct 2023 17:05:39 +0200 Subject: [PATCH 844/994] Modify the side menu and remove the mlCommonsDashboards plugin on Wazuh dashboard (#2540) * feat(wazuh-dashboard): replace default application to /app/wz-home (#2497) * Change the category of built-in applications on Wazuh dashboard (#2496) * feat(wazuh-dashboard): Change the category of built-in applications * feat(wazuh-dashboard): change order value to Explore app category * feat(wazuh-dashboard): change name to Management category * feat: replace order for built-in applications * feat(dashboard): replace icon for Explore app category * fix(dahsboard): icon for Explore app category * feat(dashboard): avoid the registration of Overview application of Management category and minor fixes * fix(dashbord): comment * fix: remove comment * feat(dashboard): remove mlCommonsDashboards plugin --- stack/dashboard/base/builder.sh | 107 +++++++++++++++++- .../base/files/etc/opensearch_dashboards.yml | 2 +- 2 files changed, 107 insertions(+), 2 deletions(-) diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh index 613aa4f922..aeca4c57a8 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -93,7 +93,7 @@ sed -i "90s|defaultValue: true|defaultValue: false|g" ./src/core/server/opensear sed -i 's/NODE_OPTIONS="$OSD_NODE_OPTS_PREFIX $OSD_NODE_OPTS $NODE_OPTIONS"/NODE_OPTIONS="$OSD_NODE_OPTS_PREFIX $OSD_NODE_OPTS $NODE_OPTIONS"\n/g' ./bin/use_node sed -i 's/exec "${NODE}"/NODE_ENV=production exec "${NODE}" ${NODE_OPTIONS} /g' ./bin/use_node # Replace the redirection to `home` in the header logo -sed -i "s'/app/home'/app/wazuh'g" ./src/core/target/public/core.entry.js +sed -i "s'/app/home'/app/wz-home'g" ./src/core/target/public/core.entry.js # Replace others redirections to `home` sed -i 's/navigateToApp("home")/navigateToApp("wazuh")/g' ./src/core/target/public/core.entry.js # Changed from Opensearch Documentation links to Wazuh Documentation @@ -143,6 +143,110 @@ brotli -c ./plugins/securityDashboards/target/public/securityDashboards.plugin.j # 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 + +# Define categories +category_explore='{id:"explore",label:"Explore",order:500,euiIconType:"search"}' +category_dashboard_management='{id:"management",label:"Indexer/dashboard Management",order:5e3,euiIconType:"managementApp"}' + +# Add custom categories (explore) to the built-in +sed -i -e "s|DEFAULT_APP_CATEGORIES=Object.freeze({|DEFAULT_APP_CATEGORIES=Object.freeze({explore:${category_explore},|" ./src/core/target/public/core.entry.js + +# Replace management built-in app category +sed -i -e "s|management:{id:\"management\",label:external_osdSharedDeps_OsdI18n_\[\"i18n\"\].translate(\"core.ui.managementNavList.label\",{defaultMessage:\"Management\"}),order:5e3,euiIconType:\"managementApp\"}|management:${category_dashboard_management}|" ./src/core/target/public/core.entry.js + +# Replace app category to Discover app +sed -i -e 's|category:core_public_\["DEFAULT_APP_CATEGORIES"\].opensearchDashboards|category:core_public_["DEFAULT_APP_CATEGORIES"].explore|' ./src/plugins/discover/target/public/discover.plugin.js + +# Replace app category to Dashboard app +sed -i -e 's|category:core_public_\["DEFAULT_APP_CATEGORIES"\].opensearchDashboards|category:core_public_["DEFAULT_APP_CATEGORIES"].explore|' ./src/plugins/dashboard/target/public/dashboard.plugin.js + +# Replace app category to Visualize app +sed -i -e 's|category:core_public_\["DEFAULT_APP_CATEGORIES"\].opensearchDashboards|category:core_public_["DEFAULT_APP_CATEGORIES"].explore|' ./src/plugins/visualize/target/public/visualize.plugin.js + +# Replace app category to Reporting app +sed -i -e "s|category:{id:\"opensearch\",label:_i18n.i18n.translate(\"opensearch.reports.categoryName\",{defaultMessage:\"OpenSearch Plugins\"}),order:2e3}|category:${category_explore}|" ./plugins/reportsDashboards/target/public/reportsDashboards.plugin.js + +# Replace app category to Alerting app +sed -i -e "s|category:{id:\"opensearch\",label:\"OpenSearch Plugins\",order:2e3}|category:${category_explore}|" ./plugins/alertingDashboards/target/public/alertingDashboards.plugin.js + +# Replace app category to Maps app +sed -i -e "s|category:{id:\"opensearch\",label:\"OpenSearch Plugins\",order:2e3}|category:${category_explore}|" ./plugins/customImportMapDashboards/target/public/customImportMapDashboards.plugin.js + +# Replace app category to Notifications app +sed -i -e "s|category:DEFAULT_APP_CATEGORIES.management|category:${category_explore}|" ./plugins/notificationsDashboards/target/public/notificationsDashboards.plugin.js + +# Replace app category to Index Management app +sed -i -e "s|category:DEFAULT_APP_CATEGORIES.management|category:${category_dashboard_management}|g" ./plugins/indexManagementDashboards/target/public/indexManagementDashboards.plugin.js + +# Replace app category to Dev Tools app +sed -i -e "s|category:public_["DEFAULT_APP_CATEGORIES"].management|category:${category_dashboard_management}|g" ./src/plugins/dev_tools/target/public/devTools.plugin.js + +# Replace app category to Dashboards Management (Stack management) app +sed -i -e "s|category:public_["DEFAULT_APP_CATEGORIES"].management|category:${category_dashboard_management}|g" ./src/plugins/management/target/public/management.plugin.js + +# Replace app category to Security app +sed -i -e "s|category:DEFAULT_APP_CATEGORIES.management|category:${category_dashboard_management}|g" ./plugins/securityDashboards/target/public/securityDashboards.plugin.js + +# Replace app order to Discover app +app_order_discover=1000 +sed -i -e "s|order:1e3|order:${app_order_discover}|g" ./src/plugins/discover/target/public/discover.plugin.js + +# Replace app order to Dashboard app +app_order_dashboard=1010 +sed -i -e "s|order:2500|order:${app_order_dashboard}|g" ./src/plugins/dashboard/target/public/dashboard.plugin.js + +# Replace app order to Visualize app +app_order_visualize=1020 +sed -i -e "s|order:8e3|order:${app_order_visualize}|g" ./src/plugins/visualize/target/public/visualize.plugin.js + +# Replace app order to Dev tools app +app_order_dev_tools=9010 +sed -i -e "s|order:9070|order:${app_order_dev_tools}|g" ./src/plugins/dev_tools/target/public/devTools.plugin.js + +# Replace app order to Dashboard management app +app_order_dashboard_management=9020 +sed -i -e "s|order:9030|order:${app_order_dashboard_management}|g" ./src/plugins/management/target/public/management.plugin.js + +# Replace app order to Security app +app_order_security=9030 +sed -i -e "s|order:9050|order:${app_order_security}|g" ./plugins/securityDashboards/target/public/securityDashboards.plugin.js + +# Replace app order to Index management app +app_order_index_management=9040 +sed -i -e "s|order:9010|order:${app_order_index_management}|g" ./plugins/indexManagementDashboards/target/public/indexManagementDashboards.plugin.js + +# Replace app order to Snapshot management app +app_order_snapshot_management=9050 +sed -i -e "s|order:9020|order:${app_order_snapshot_management}|g" ./plugins/indexManagementDashboards/target/public/indexManagementDashboards.plugin.js + +# Avoid the management Overview application is registered to feature catalogue +sed -i -e "s|home.featureCatalogue|false \&\& home.featureCatalogue|g" ./src/plugins/management_overview/target/public/managementOverview.plugin.js + +# Avoid the management Overview application is registered (appear on side menu) +sed -i -e "s|application.register|false \&\& application.register|g" ./src/plugins/management_overview/target/public/managementOverview.plugin.js + +files_to_recreate=( + ./src/core/target/public/core.entry.js + ./src/plugins/discover/target/public/discover.plugin.js + ./src/plugins/dashboard/target/public/dashboard.plugin.js + ./src/plugins/visualize/target/public/visualize.plugin.js + ./plugins/reportsDashboards/target/public/reportsDashboards.plugin.js + ./plugins/alertingDashboards/target/public/alertingDashboards.plugin.js + ./plugins/customImportMapDashboards/target/public/customImportMapDashboards.plugin.js + ./plugins/notificationsDashboards/target/public/notificationsDashboards.plugin.js + ./plugins/indexManagementDashboards/target/public/indexManagementDashboards.plugin.js + ./src/plugins/dev_tools/target/public/devTools.plugin.js + ./src/plugins/management/target/public/management.plugin.js + ./plugins/securityDashboards/target/public/securityDashboards.plugin.js + ./src/plugins/management_overview/target/public/managementOverview.plugin.js +) + +for value in "${files_to_recreate[@]}" +do + gzip -c "$value" > "$value.gz" + brotli -c "$value" > "$value.br" +done + # Add VERSION file cp /root/VERSION . # Add exception for wazuh plugin install @@ -164,6 +268,7 @@ mv ./package.json.tmp ./package.json /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 searchRelevanceDashboards --allow-root +/bin/bash ./bin/opensearch-dashboards-plugin remove mlCommonsDashboards --allow-root find -type d -exec chmod 750 {} \; find -type f -perm 644 -exec chmod 640 {} \; diff --git a/stack/dashboard/base/files/etc/opensearch_dashboards.yml b/stack/dashboard/base/files/etc/opensearch_dashboards.yml index 538728402d..b5a48982de 100644 --- a/stack/dashboard/base/files/etc/opensearch_dashboards.yml +++ b/stack/dashboard/base/files/etc/opensearch_dashboards.yml @@ -11,5 +11,5 @@ server.ssl.enabled: true 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 +uiSettings.overrides.defaultRoute: /app/wz-home From 340b9c9a7d15b1910c1d274b6c6b35d4c365d10b Mon Sep 17 00:00:00 2001 From: Antonio <34042064+Desvelao@users.noreply.github.com> Date: Wed, 25 Oct 2023 16:50:42 +0200 Subject: [PATCH 845/994] fix: header button navigation to home application (wz-home) (#2556) --- stack/dashboard/base/builder.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh index aeca4c57a8..77e626ddef 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -92,10 +92,12 @@ sed -i "90s|defaultValue: true|defaultValue: false|g" ./src/core/server/opensear # Add fix to Node variables as Node is not using the NODE_OPTIONS environment variables sed -i 's/NODE_OPTIONS="$OSD_NODE_OPTS_PREFIX $OSD_NODE_OPTS $NODE_OPTIONS"/NODE_OPTIONS="$OSD_NODE_OPTS_PREFIX $OSD_NODE_OPTS $NODE_OPTIONS"\n/g' ./bin/use_node sed -i 's/exec "${NODE}"/NODE_ENV=production exec "${NODE}" ${NODE_OPTIONS} /g' ./bin/use_node +# Replace the redirections to home app +app_home='wz-home' # Replace the redirection to `home` in the header logo -sed -i "s'/app/home'/app/wz-home'g" ./src/core/target/public/core.entry.js +sed -i "s'/app/home'/app/${app_home}'g" ./src/core/target/public/core.entry.js # Replace others redirections to `home` -sed -i 's/navigateToApp("home")/navigateToApp("wazuh")/g' ./src/core/target/public/core.entry.js +sed -i "s/navigateToApp(\"home\")/navigateToApp(\"${app_home}\")/g" ./src/core/target/public/core.entry.js # Changed from Opensearch Documentation links to Wazuh Documentation # Help menu ## Help header - Version From 376b9bb780658710e20344f1ef70b890790b86bf Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Thu, 26 Oct 2023 01:15:43 +0200 Subject: [PATCH 846/994] Improved customizations and adapted OpenSearch internal changes --- stack/dashboard/base/builder.sh | 170 +++++++++++++++++++++----------- 1 file changed, 113 insertions(+), 57 deletions(-) diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh index 77e626ddef..caf9f67e36 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -8,7 +8,7 @@ # License (version 2) as published by the FSF - Free Software # Foundation. -set -e +set -ex # Script parameters to build the package architecture="$1" @@ -19,6 +19,8 @@ reference="$5" opensearch_version="2.10.0" base_dir=/opt/wazuh-dashboard-base +# ----------------------------------------------------------------------------- +# Set environment # ----------------------------------------------------------------------------- if [ -z "${revision}" ]; then @@ -42,7 +44,7 @@ if [ "${future}" = "yes" ];then fi wazuh_minor=$(echo ${version} | cut -c1-3) -# Obtain Wazuh plugin URL +# Obtain the Wazuh plugin URL if [ "${repository}" ];then valid_url='(https?|ftp|file)://[-[:alnum:]\+&@#/%?=~_|!:,.;]*[-[:alnum:]\+&@#/%=~_|]' if [[ $repository =~ $valid_url ]];then @@ -58,11 +60,14 @@ else url="https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuh-${version}-${revision}.zip" fi -# ----------------------------------------------------------------------------- - +# Set directories mkdir -p /tmp/output cd /opt +# ----------------------------------------------------------------------------- +# Install OpenSeach Dashboards +# ----------------------------------------------------------------------------- + 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 @@ -74,31 +79,64 @@ cd "${base_dir}" find -type l -exec rm -rf {} \; rm -rf ./config/* cp -r /root/stack/dashboard/base/files/etc ./ + +# ----------------------------------------------------------------------------- +# OpenSeach Dashboards Node fixes +# ----------------------------------------------------------------------------- + +# Add fix to Node variables as Node is not using the NODE_OPTIONS environment variables +sed -i 's/NODE_OPTIONS="$OSD_NODE_OPTS_PREFIX $OSD_NODE_OPTS $NODE_OPTIONS"/NODE_OPTIONS="$OSD_NODE_OPTS_PREFIX $OSD_NODE_OPTS $NODE_OPTIONS"\n/g' ./bin/use_node +sed -i 's/exec "${NODE}"/NODE_ENV=production exec "${NODE}" ${NODE_OPTIONS} /g' ./bin/use_node + +# ----------------------------------------------------------------------------- +# Provision data (SVG, Styles) +# ----------------------------------------------------------------------------- + +# Styles cp ./etc/custom_welcome/template.js.hbs ./src/legacy/ui/ui_render/bootstrap/template.js.hbs cp ./etc/custom_welcome/light_theme.style.css ./src/core/server/core_app/assets/legacy_light_theme.css -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/ +# SVG +cp ./etc/custom_welcome/*svg ./src/core/server/core_app/assets/logos/ +# Copy Home button +cp ./etc/custom_welcome/Assets/default_branding/home.svg ./src/core/server/core_app/assets/logos/ +cp ./etc/custom_welcome/Assets/default_branding/home_dark_mode.svg ./src/core/server/core_app/assets/logos/ +# Copy favicons 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 +# Copy loaders cp ./etc/http_service.js ./src/core/server/http/http_service.js cp ./etc/template.js ./src/core/server/rendering/views/template.js cp ./etc/styles.js ./src/core/server/rendering/views/styles.js + +# ----------------------------------------------------------------------------- +# Customize OpenSearch Dashboards with Wazuh +# ----------------------------------------------------------------------------- + # 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 -# Add fix to Node variables as Node is not using the NODE_OPTIONS environment variables -sed -i 's/NODE_OPTIONS="$OSD_NODE_OPTS_PREFIX $OSD_NODE_OPTS $NODE_OPTIONS"/NODE_OPTIONS="$OSD_NODE_OPTS_PREFIX $OSD_NODE_OPTS $NODE_OPTIONS"\n/g' ./bin/use_node -sed -i 's/exec "${NODE}"/NODE_ENV=production exec "${NODE}" ${NODE_OPTIONS} /g' ./bin/use_node -# Replace the redirections to home app -app_home='wz-home' -# Replace the redirection to `home` in the header logo -sed -i "s'/app/home'/app/${app_home}'g" ./src/core/target/public/core.entry.js -# Replace others redirections to `home` -sed -i "s/navigateToApp(\"home\")/navigateToApp(\"${app_home}\")/g" ./src/core/target/public/core.entry.js -# Changed from Opensearch Documentation links to Wazuh Documentation + +## Remove OpenSearch from the upper bar with empty svg +cp ./etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg ./src/core/server/core_app/assets/logos/opensearch_dashboards.svg +cp ./etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg ./src/core/server/core_app/assets/logos/opensearch_dashboards_on_light.svg +cp ./etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg ./src/core/server/core_app/assets/logos/opensearch_dashboards_on_darke.svg + +# Remove the `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 + +# Remove OpenSearch login default configuration title and subtitle +sed -i 's|Log in to OpenSearch Dashboards||g' ./plugins/securityDashboards/server/index.js +sed -i 's|Log in to OpenSearch Dashboards||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/server/index.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 + +# Remove the Overview plugin from the OpenSearch Dashboards menu. +# Remove the "updater" property and set the plugin "status" as inaccessible (status:1) +sed -i 's|updater\$:appUpdater\$|status:1|' ./src/plugins/opensearch_dashboards_overview/target/public/opensearchDashboardsOverview.plugin.js + # Help menu ## Help header - Version sed -i 's|"core.ui.chrome.headerGlobalNav.helpMenuVersion",defaultMessage:"v {version}"|"core.ui.chrome.headerGlobalNav.helpMenuVersion",defaultMessage:"v'${version}'"|' ./src/core/target/public/core.entry.js @@ -108,43 +146,44 @@ sed -i 's|href:opensearchDashboardsDocLink,|href:"https://documentation.wazuh.co ## Help link - Ask OpenSearch sed -i 's|Ask OpenSearch|Ask Wazuh|' ./src/core/target/public/core.entry.js sed -i 's|OPENSEARCH_DASHBOARDS_ASK_OPENSEARCH_LINK="https://github.com/opensearch-project"|OPENSEARCH_DASHBOARDS_ASK_OPENSEARCH_LINK="https://wazuh.com/community/join-us-on-slack"|' ./src/core/target/public/core.entry.js +## Help link - Community +sed -i 's|OPENSEARCH_DASHBOARDS_ASK_OPENSEARCH_LINK="https://forum.opensearch.org/"|OPENSEARCH_DASHBOARDS_ASK_OPENSEARCH_LINK="https://wazuh.com/community/join-us-on-slack"|' ./src/core/target/public/core.entry.js +sed -i 's|OPENSEARCH_DASHBOARDS_ASK_OPENSEARCH_LINK="https://forum.opensearch.org/"|OPENSEARCH_DASHBOARDS_ASK_OPENSEARCH_LINK="https://wazuh.com/community/join-us-on-slack"|' ./plugins/alertingDashboards/target/public/alertingDashboards.plugin.js +sed -i 's|OPENSEARCH_DASHBOARDS_ASK_OPENSEARCH_LINK="https://forum.opensearch.org/"|OPENSEARCH_DASHBOARDS_ASK_OPENSEARCH_LINK="https://wazuh.com/community/join-us-on-slack"|' ./plugins/indexManagementDashboards/target/public/indexManagementDashboards.plugin.js +sed -i 's|OPENSEARCH_DASHBOARDS_ASK_OPENSEARCH_LINK="https://forum.opensearch.org/"|OPENSEARCH_DASHBOARDS_ASK_OPENSEARCH_LINK="https://wazuh.com/community/join-us-on-slack"|' ./plugins/notificationsDashboards/target/public/notificationsDashboards.plugin.js +sed -i 's|OPENSEARCH_DASHBOARDS_ASK_OPENSEARCH_LINK="https://forum.opensearch.org/"|OPENSEARCH_DASHBOARDS_ASK_OPENSEARCH_LINK="https://wazuh.com/community/join-us-on-slack"|' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js ## Help link - Give feedback -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 +sed -i 's|https://survey.opensearch.org|https://wazuh.com/community/join-us-on-slack|' src/core/server/opensearch_dashboards_config.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 -# 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 -gzip -c ./src/plugins/opensearch_dashboards_overview/target/public/opensearchDashboardsOverview.plugin.js > ./src/plugins/opensearch_dashboards_overview/target/public/opensearchDashboardsOverview.plugin.js.gz -brotli -c ./src/plugins/opensearch_dashboards_overview/target/public/opensearchDashboardsOverview.plugin.js > ./src/plugins/opensearch_dashboards_overview/target/public/opensearchDashboardsOverview.plugin.js.br -# 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|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|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, 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 -# 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 +# Custom logos +## Custom logos - Home button logo +sed -i 's|MARK_THEMED="ui/logos/opensearch_mark.svg"|MARK_THEMED="ui/logos/home.svg"|g' ./src/core/target/public/core.entry.js +sed -i 's|MARK_ON_LIGHT="ui/logos/opensearch_mark_on_light.svg"|MARK_ON_LIGHT="ui/logos/home.svg"|g' ./src/core/target/public/core.entry.js +sed -i 's|MARK_ON_DARK="ui/logos/opensearch_mark_on_dark.svg"|MARK_ON_DARK="ui/logos/home_dark_mode.svg"|g' ./src/core/target/public/core.entry.js +sed -i 's|MARK_THEMED="ui/logos/opensearch_mark.svg"|MARK_THEMED="ui/logos/home.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js +sed -i 's|MARK_ON_LIGHT="ui/logos/opensearch_mark_on_light.svg"|MARK_ON_LIGHT="ui/logos/home.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js +sed -i 's|MARK_ON_DARK="ui/logos/opensearch_mark_on_dark.svg"|MARK_ON_DARK="ui/logos/home_dark_mode.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js +## Custom logos - Login logo +sed -i 's|OPENSEARCH_ON_LIGHT="ui/logos/opensearch_on_light.svg"|OPENSEARCH_ON_LIGHT="ui/logos/Wazuh-Logo.svg"|g' ./plugins/alertingDashboards/target/public/alertingDashboards.plugin.js +sed -i 's|OPENSEARCH_ON_DARK="ui/logos/opensearch_on_dark.svg"|OPENSEARCH_ON_DARK="ui/logos/Wazuh-Logo.svg"|g' ./plugins/alertingDashboards/target/public/alertingDashboards.plugin.js +sed -i 's|OPENSEARCH_ON_LIGHT="ui/logos/opensearch_on_light.svg"|OPENSEARCH_ON_LIGHT="ui/logos/Wazuh-Logo.svg"|g' ./plugins/indexManagementDashboards/target/public/indexManagementDashboards.plugin.js +sed -i 's|OPENSEARCH_ON_DARK="ui/logos/opensearch_on_dark.svg"|OPENSEARCH_ON_DARK="ui/logos/Wazuh-Logo.svg"|g' ./plugins/indexManagementDashboards/target/public/indexManagementDashboards.plugin.js +sed -i 's|OPENSEARCH_ON_LIGHT="ui/logos/opensearch_on_light.svg"|OPENSEARCH_ON_LIGHT="ui/logos/Wazuh-Logo.svg"|g' ./plugins/notificationsDashboards/target/public/notificationsDashboards.plugin.js +sed -i 's|OPENSEARCH_ON_DARK="ui/logos/opensearch_on_dark.svg"|OPENSEARCH_ON_DARK="ui/logos/Wazuh-Logo.svg"|g' ./plugins/notificationsDashboards/target/public/notificationsDashboards.plugin.js +sed -i 's|OPENSEARCH_ON_LIGHT="ui/logos/opensearch_on_light.svg"|OPENSEARCH_ON_LIGHT="ui/logos/Wazuh-Logo.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js +sed -i 's|OPENSEARCH_ON_DARK="ui/logos/opensearch_on_dark.svg"|OPENSEARCH_ON_DARK="ui/logos/Wazuh-Logo.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js +sed -i 's|OPENSEARCH_ON_LIGHT="ui/logos/opensearch_on_light.svg"|OPENSEARCH_ON_LIGHT="ui/logos/Wazuh-Logo.svg"|g' ./src/core/target/public/core.entry.js +sed -i 's|OPENSEARCH_ON_DARK="ui/logos/opensearch_on_dark.svg"|OPENSEARCH_ON_DARK="ui/logos/Wazuh-Logo.svg"|g' ./src/core/target/public/core.entry.js + +# Redirections +## Redirections - Replace the redirections to the home app +app_home='wz-home' +## Redirections - Replace the redirection to `home` in the header logo +sed -i "s'/app/home'/app/${app_home}'g" ./src/core/target/public/core.entry.js +## Redirections - Replace others redirections to `home` +sed -i "s/navigateToApp(\"home\")/navigateToApp(\"${app_home}\")/g" ./src/core/target/public/core.entry.js # Define categories category_explore='{id:"explore",label:"Explore",order:500,euiIconType:"search"}' @@ -177,7 +216,7 @@ sed -i -e "s|category:{id:\"opensearch\",label:\"OpenSearch Plugins\",order:2e3} # Replace app category to Notifications app sed -i -e "s|category:DEFAULT_APP_CATEGORIES.management|category:${category_explore}|" ./plugins/notificationsDashboards/target/public/notificationsDashboards.plugin.js -# Replace app category to Index Management app +# Replace app category to Index Management app sed -i -e "s|category:DEFAULT_APP_CATEGORIES.management|category:${category_dashboard_management}|g" ./plugins/indexManagementDashboards/target/public/indexManagementDashboards.plugin.js # Replace app category to Dev Tools app @@ -221,12 +260,13 @@ sed -i -e "s|order:9010|order:${app_order_index_management}|g" ./plugins/indexMa app_order_snapshot_management=9050 sed -i -e "s|order:9020|order:${app_order_snapshot_management}|g" ./plugins/indexManagementDashboards/target/public/indexManagementDashboards.plugin.js -# Avoid the management Overview application is registered to feature catalogue +# Avoid the management Overview application is registered to feature catalog sed -i -e "s|home.featureCatalogue|false \&\& home.featureCatalogue|g" ./src/plugins/management_overview/target/public/managementOverview.plugin.js -# Avoid the management Overview application is registered (appear on side menu) +# Avoid the management Overview application is registered (appears on the side menu) sed -i -e "s|application.register|false \&\& application.register|g" ./src/plugins/management_overview/target/public/managementOverview.plugin.js +# Generate compressed files files_to_recreate=( ./src/core/target/public/core.entry.js ./src/plugins/discover/target/public/discover.plugin.js @@ -241,6 +281,8 @@ files_to_recreate=( ./src/plugins/management/target/public/management.plugin.js ./plugins/securityDashboards/target/public/securityDashboards.plugin.js ./src/plugins/management_overview/target/public/managementOverview.plugin.js + ./plugins/securityDashboards/target/public/securityDashboards.chunk.5.js + ./src/plugins/opensearch_dashboards_overview/target/public/opensearchDashboardsOverview.plugin.js ) for value in "${files_to_recreate[@]}" @@ -249,11 +291,17 @@ do brotli -c "$value" > "$value.br" done +# ----------------------------------------------------------------------------- +# Wazuh customizations +# ----------------------------------------------------------------------------- + # Add VERSION file cp /root/VERSION . -# Add exception for wazuh plugin install + +# Add an 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 + # Generate build number for package.json curl -sO ${url} unzip *.zip 'opensearch-dashboards/wazuh/package.json' @@ -263,6 +311,9 @@ rm -f ./*.zip jq ".build.number=${build_number}" ./package.json > ./package.json.tmp mv ./package.json.tmp ./package.json +# ----------------------------------------------------------------------------- +# Clean +# ----------------------------------------------------------------------------- # Remove plugins /bin/bash ./bin/opensearch-dashboards-plugin remove queryWorkbenchDashboards --allow-root @@ -272,12 +323,17 @@ mv ./package.json.tmp ./package.json /bin/bash ./bin/opensearch-dashboards-plugin remove searchRelevanceDashboards --allow-root /bin/bash ./bin/opensearch-dashboards-plugin remove mlCommonsDashboards --allow-root +# ----------------------------------------------------------------------------- +# Set permissions +# ----------------------------------------------------------------------------- + find -type d -exec chmod 750 {} \; find -type f -perm 644 -exec chmod 640 {} \; find -type f -perm 755 -exec chmod 750 {} \; find -type f -perm 744 -exec chmod 740 {} \; - +# ----------------------------------------------------------------------------- +# Create the base file # ----------------------------------------------------------------------------- # Base output From 3afd05e8d936ac4e113df53987de1eac704ddffd Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Thu, 26 Oct 2023 01:16:01 +0200 Subject: [PATCH 847/994] Updated to 2.10.0 changes --- .../etc/custom_welcome/light_theme.style.css | 236 ++++++++++++++---- 1 file changed, 192 insertions(+), 44 deletions(-) diff --git a/stack/dashboard/base/files/etc/custom_welcome/light_theme.style.css b/stack/dashboard/base/files/etc/custom_welcome/light_theme.style.css index 8532a673cc..e332ef08c8 100644 --- a/stack/dashboard/base/files/etc/custom_welcome/light_theme.style.css +++ b/stack/dashboard/base/files/etc/custom_welcome/light_theme.style.css @@ -1,7 +1,18 @@ +/* + * SPDX-License-Identifier: Apache-2.0 + * + * The OpenSearch Contributors require contributions made to + * this file be licensed under the Apache-2.0 license or a + * compatible open source license. + * + * Any modifications Copyright OpenSearch Contributors. See + * GitHub history for details. + */ + /*! * Bootstrap v3.3.6 (http://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) */ /* @notice * This product bundles bootstrap@3.3.6 which is available under a @@ -60,13 +71,71 @@ margin-left: -15px; margin-right: -15px; } -.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 { +.col-xs-1, +.col-sm-1, +.col-md-1, +.col-lg-1, +.col-xs-2, +.col-sm-2, +.col-md-2, +.col-lg-2, +.col-xs-3, +.col-sm-3, +.col-md-3, +.col-lg-3, +.col-xs-4, +.col-sm-4, +.col-md-4, +.col-lg-4, +.col-xs-5, +.col-sm-5, +.col-md-5, +.col-lg-5, +.col-xs-6, +.col-sm-6, +.col-md-6, +.col-lg-6, +.col-xs-7, +.col-sm-7, +.col-md-7, +.col-lg-7, +.col-xs-8, +.col-sm-8, +.col-md-8, +.col-lg-8, +.col-xs-9, +.col-sm-9, +.col-md-9, +.col-lg-9, +.col-xs-10, +.col-sm-10, +.col-md-10, +.col-lg-10, +.col-xs-11, +.col-sm-11, +.col-md-11, +.col-lg-11, +.col-xs-12, +.col-sm-12, +.col-md-12, +.col-lg-12 { position: relative; min-height: 1px; padding-left: 15px; padding-right: 15px; } -.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 { +.col-xs-1, +.col-xs-2, +.col-xs-3, +.col-xs-4, +.col-xs-5, +.col-xs-6, +.col-xs-7, +.col-xs-8, +.col-xs-9, +.col-xs-10, +.col-xs-11, +.col-xs-12 { float: left; } .col-xs-12 { @@ -223,7 +292,18 @@ margin-left: 0%; } @media (min-width: 768px) { - .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 { + .col-sm-1, + .col-sm-2, + .col-sm-3, + .col-sm-4, + .col-sm-5, + .col-sm-6, + .col-sm-7, + .col-sm-8, + .col-sm-9, + .col-sm-10, + .col-sm-11, + .col-sm-12 { float: left; } .col-sm-12 { @@ -381,7 +461,18 @@ } } @media (min-width: 992px) { - .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 { + .col-md-1, + .col-md-2, + .col-md-3, + .col-md-4, + .col-md-5, + .col-md-6, + .col-md-7, + .col-md-8, + .col-md-9, + .col-md-10, + .col-md-11, + .col-md-12 { float: left; } .col-md-12 { @@ -539,7 +630,18 @@ } } @media (min-width: 1200px) { - .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 { + .col-lg-1, + .col-lg-2, + .col-lg-3, + .col-lg-4, + .col-lg-5, + .col-lg-6, + .col-lg-7, + .col-lg-8, + .col-lg-9, + .col-lg-10, + .col-lg-11, + .col-lg-12 { float: left; } .col-lg-12 { @@ -829,7 +931,7 @@ table th[class*="col-"] { .table > thead > tr.info > th, .table > tbody > tr.info > th, .table > tfoot > tr.info > th { - background-color: #3595F9; + background-color: #006BB4; } .table-hover > tbody > tr > td.info:hover, .table-hover > tbody > tr > th.info:hover, @@ -941,12 +1043,16 @@ table th[class*="col-"] { background-image: none; border: 1px solid #D3DAE6; border-radius: 4px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; + -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; } .form-control:focus { - border-color: #3595F9; + border-color: #006BB4; outline: 0; + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(0, 107, 180, 0.6); box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(0, 107, 180, 0.6); } .form-control::-moz-placeholder { @@ -1164,10 +1270,12 @@ select[multiple].input-lg { } .has-success .form-control { border-color: #FFF; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .has-success .form-control:focus { border-color: #e6e6e6; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff; } .has-success .input-group-addon { @@ -1192,10 +1300,12 @@ select[multiple].input-lg { } .has-warning .form-control { border-color: #FFF; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .has-warning .form-control:focus { border-color: #e6e6e6; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff; } .has-warning .input-group-addon { @@ -1220,10 +1330,12 @@ select[multiple].input-lg { } .has-error .form-control { border-color: #FFF; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .has-error .form-control:focus { border-color: #e6e6e6; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff; } .has-error .input-group-addon { @@ -1381,7 +1493,7 @@ a.text-danger:focus { color: #e6e6e6; } .bg-info { - background-color: #3595F9; + background-color: #006BB4; } a.bg-info:hover, a.bg-info:focus { @@ -1407,6 +1519,8 @@ a.bg-info:focus { } .fade { opacity: 0; + -webkit-transition: opacity 0.15s linear; + -o-transition: opacity 0.15s linear; transition: opacity 0.15s linear; } .fade.in { @@ -1428,8 +1542,11 @@ tbody.collapse.in { position: relative; height: 0; overflow: hidden; + -webkit-transition-property: height, visibility; transition-property: height, visibility; + -webkit-transition-duration: 0.35s; transition-duration: 0.35s; + -webkit-transition-timing-function: ease; transition-timing-function: ease; } /** @@ -1475,6 +1592,7 @@ tbody.collapse.in { .btn.active { outline: 0; background-image: none; + -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); } .btn.disabled, @@ -1483,6 +1601,7 @@ fieldset[disabled] .btn { cursor: not-allowed; opacity: 0.65; filter: alpha(opacity=65); + -webkit-box-shadow: none; box-shadow: none; } a.btn.disabled, @@ -1491,8 +1610,8 @@ fieldset[disabled] a.btn { } .btn-default { color: #FFF; - background-color: #3595F9; - border-color: #3595F9; + background-color: #006BB4; + border-color: #006BB4; } .btn-default:focus, .btn-default.focus { @@ -1539,17 +1658,17 @@ fieldset[disabled] .btn-default:focus, .btn-default.disabled.focus, .btn-default[disabled].focus, fieldset[disabled] .btn-default.focus { - background-color: #3595F9; - border-color: #3595F9; + background-color: #006BB4; + border-color: #006BB4; } .btn-default .badge { - color: #3595F9; + color: #006BB4; background-color: #FFF; } .btn-primary { color: #FFF; - background-color: #3595F9; - border-color: #3595F9; + background-color: #006BB4; + border-color: #006BB4; } .btn-primary:focus, .btn-primary.focus { @@ -1596,11 +1715,11 @@ fieldset[disabled] .btn-primary:focus, .btn-primary.disabled.focus, .btn-primary[disabled].focus, fieldset[disabled] .btn-primary.focus { - background-color: #3595F9; - border-color: #3595F9; + background-color: #006BB4; + border-color: #006BB4; } .btn-primary .badge { - color: #3595F9; + color: #006BB4; background-color: #FFF; } .btn-xs { @@ -1803,6 +1922,7 @@ fieldset[disabled] .btn-primary.focus { padding: 10px 10px; border-top: 1px solid transparent; border-bottom: 1px solid transparent; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); margin-top: 6.5px; margin-bottom: 6.5px; @@ -1872,6 +1992,7 @@ fieldset[disabled] .btn-primary.focus { margin-right: 0; padding-top: 0; padding-bottom: 0; + -webkit-box-shadow: none; box-shadow: none; } } @@ -2123,10 +2244,19 @@ button.close { outline: 0; } .modal.fade .modal-dialog { + -webkit-transform: translate(0, -25%); + -ms-transform: translate(0, -25%); + -o-transform: translate(0, -25%); transform: translate(0, -25%); + -webkit-transition: -webkit-transform 0.3s ease-out; + -moz-transition: -moz-transform 0.3s ease-out; + -o-transition: -o-transform 0.3s ease-out; transition: transform 0.3s ease-out; } .modal.in .modal-dialog { + -webkit-transform: translate(0, 0); + -ms-transform: translate(0, 0); + -o-transform: translate(0, 0); transform: translate(0, 0); } .modal-open .modal { @@ -2144,6 +2274,7 @@ button.close { border: 1px solid #98A2B3; border: 1px solid rgba(0, 0, 0, 0.2); border-radius: 4px; + -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); background-clip: padding-box; outline: 0; @@ -2198,6 +2329,7 @@ button.close { margin: 30px auto; } .modal-content { + -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); } .modal-sm { @@ -2231,6 +2363,7 @@ button.close { margin-bottom: 20px; background-color: #b8bec8; border-radius: 4px; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); } .progress-bar { @@ -2242,40 +2375,53 @@ button.close { color: #FFF; text-align: center; background-color: #54B399; + -webkit-transition: width 0.6s ease; + -o-transition: width 0.6s ease; transition: width 0.6s ease; } .progress-striped .progress-bar, .progress-bar-striped { + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-size: 40px 40px; } .progress.active .progress-bar, .progress-bar.active { -webkit-animation: progress-bar-stripes 2s linear infinite; + -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; } .progress-bar-success { background-color: #017D73; } .progress-striped .progress-bar-success { + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .progress-bar-info { - background-color: #3595F9; + background-color: #006BB4; } .progress-striped .progress-bar-info { + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .progress-bar-warning { background-color: #F5A700; } .progress-striped .progress-bar-warning { + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .progress-bar-danger { background-color: #BD271E; } .progress-striped .progress-bar-danger { + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .list-group { @@ -2394,7 +2540,7 @@ button.list-group-item-success.active:focus { } .list-group-item-info { color: #FFF; - background-color: #3595F9; + background-color: #006BB4; } a.list-group-item-info, button.list-group-item-info { @@ -2520,7 +2666,7 @@ button.list-group-item-danger.active:focus { .nav .open > a:hover, .nav .open > a:focus { background-color: #D3DAE6; - border-color: #3595F9; + border-color: #006BB4; } .nav .nav-divider { height: 1px; @@ -2614,7 +2760,7 @@ button.list-group-item-danger.active:focus { .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus { color: #FFF; - background-color: #3595F9; + background-color: #006BB4; } .nav-stacked > li { float: none; @@ -2723,7 +2869,7 @@ button.list-group-item-danger.active:focus { color: #e6e6e6; } .alert-info { - background-color: #3595F9; + background-color: #006BB4; border-color: #004d81; color: #FFF; } @@ -3134,9 +3280,7 @@ button.list-group-item-danger.active:focus { white-space: nowrap; } .dropdown-menu > li > button { - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; + appearance: none; background: none; border: none; width: 100%; @@ -3359,7 +3503,7 @@ select[multiple].input-group-sm > .input-group-addon { padding: 5px 15px; line-height: 1.42857143; text-decoration: none; - color: #3595F9; + color: #006BB4; background-color: transparent; border: 1px solid transparent; margin-left: -1px; @@ -3380,7 +3524,7 @@ select[multiple].input-group-sm > .input-group-addon { .pagination > li > a:focus, .pagination > li > span:focus { z-index: 2; - color: #3595F9; + color: #006BB4; background-color: rgba(0, 0, 0, 0); border-color: transparent; } @@ -3479,7 +3623,7 @@ select[multiple].input-group-sm > .input-group-addon { } .label { display: inline; - padding: .2em .6em .3em; + padding: 0.2em 0.6em 0.3em; font-size: 75%; font-weight: bold; line-height: 1; @@ -3487,7 +3631,7 @@ select[multiple].input-group-sm > .input-group-addon { text-align: center; white-space: nowrap; vertical-align: baseline; - border-radius: .25em; + border-radius: 0.25em; } a.label:hover, a.label:focus { @@ -3499,7 +3643,7 @@ a.label:focus { display: none; } .label-default { - background-color: #3595F9; + background-color: #006BB4; } .label-default[href]:hover, .label-default[href]:focus { @@ -3520,7 +3664,7 @@ a.label:focus { background-color: #014a44; } .label-info { - background-color: #3595F9; + background-color: #006BB4; } .label-info[href]:hover, .label-info[href]:focus { @@ -3545,6 +3689,7 @@ a.label:focus { background-color: #FFF; border: 1px solid transparent; border-radius: 4px; + -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); } .panel-body { @@ -3833,14 +3978,14 @@ a.label:focus { } .panel-info > .panel-heading { color: #FFF; - background-color: #3595F9; + background-color: #006BB4; border-color: #004d81; } .panel-info > .panel-heading + .panel-collapse > .panel-body { border-top-color: #004d81; } .panel-info > .panel-heading .badge { - color: #3595F9; + color: #006BB4; background-color: #FFF; } .panel-info > .panel-footer + .panel-collapse > .panel-body { @@ -4113,12 +4258,12 @@ a.label:focus { background-color: #FFF; color: #F5F7FA; } -.navbar-inverse .kbnGlobalNav__logoBrand { +.navbar-inverse .osdGlobalNav__logoBrand { height: 45px; width: 252px; background-color: #4b4f5d; } -.navbar-inverse .kbnGlobalNav__smallLogoBrand { +.navbar-inverse .osdGlobalNav__smallLogoBrand { height: 45px; width: 45px; background-color: #4b4f5d; @@ -4130,10 +4275,7 @@ a.label:focus { .navbar-brand { cursor: default; font-size: 1.8em; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; + user-select: none; } .navbar-nav { font-size: 12px; @@ -4163,7 +4305,7 @@ a.label:focus { } .text-info, .text-info:hover { - color: #3595F9; + color: #006BB4; } table .success, .table .success, @@ -4196,10 +4338,12 @@ table .info a, .form-control, input { border-width: 1px; + -webkit-box-shadow: none; box-shadow: none; } .form-control:focus, input:focus { + -webkit-box-shadow: none; box-shadow: none; } .has-warning .help-block, @@ -4269,9 +4413,11 @@ input:focus { } .panel { border-radius: 0; + -webkit-box-shadow: 0 0 0 rgba(0, 0, 0, 0); box-shadow: 0 0 0 rgba(0, 0, 0, 0); } .progress { + -webkit-box-shadow: none; box-shadow: none; } .progress .progress-bar { @@ -4279,12 +4425,14 @@ input:focus { line-height: 10px; } .well { + -webkit-box-shadow: none; box-shadow: none; } + /*------------- WAZUH -------------*/ .wz-login { - background: url(./wazuh_wazuh_bg.svg) !important; + background: url(./logos/wazuh_wazuh_bg.svg) !important; width: 100% !important; height: 100% !important; background-size: cover !important; @@ -4345,5 +4493,5 @@ div.euiFormRow > div.euiFormRow__fieldWrapper > button { } .loginWelcome__logo { - background: url(./wazuh_logo_circle.svg) center center no-repeat !important; + background: url(./logos/Wazuh-Logo.svg) center center no-repeat !important; } From c6663177f7631ceeb569b5d21b1c545ec2a19b59 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Thu, 26 Oct 2023 17:10:01 +0200 Subject: [PATCH 848/994] Added APP defaultRoute replace to new wz-home --- stack/dashboard/deb/debian/postinst | 4 ++++ stack/dashboard/rpm/wazuh-dashboard.spec | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/stack/dashboard/deb/debian/postinst b/stack/dashboard/deb/debian/postinst index e33c07afdb..bd4afd0999 100644 --- a/stack/dashboard/deb/debian/postinst +++ b/stack/dashboard/deb/debian/postinst @@ -46,6 +46,10 @@ case "$1" in runuser "${NAME}" --shell="/bin/bash" --command="echo kibanaserver | ${INSTALLATION_DIR}/bin/opensearch-dashboards-keystore add opensearch.password --stdin" > /dev/null 2>&1 chmod 640 "${CONFIG_DIR}"/opensearch_dashboards.keystore fi + + if ! grep -q "/app/wz-home" "${CONFIG_DIR}"/opensearch_dashboards.yml; then + sed -i 's/\/app\/wazuh/\/app\/wz-home/g' "${CONFIG_DIR}"/opensearch_dashboards.yml + fi ;; diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index ac83c1c94a..3bd3792678 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -192,6 +192,10 @@ elif [ ! -f %{CONFIG_DIR}/opensearch_dashboards.keystore ]; then chmod 640 "%{CONFIG_DIR}"/opensearch_dashboards.keystore fi +if ! grep -q "/app/wz-home" %{CONFIG_DIR}/opensearch_dashboards.yml; then + sed -i 's/\/app\/wazuh/\/app\/wz-home/g' %{CONFIG_DIR}/opensearch_dashboards.yml +fi + if [ -f %{INSTALL_DIR}/wazuh-dashboard.restart ]; then rm -f %{INSTALL_DIR}/wazuh-dashboard.restart if command -v systemctl > /dev/null 2>&1 && systemctl > /dev/null 2>&1; then From b76f1d01f77597b134500eae3100753739d8805b Mon Sep 17 00:00:00 2001 From: Tomas Turina Date: Thu, 2 Nov 2023 17:16:12 +0000 Subject: [PATCH 849/994] Change ETA for v4.7.0 --- aix/SPECS/wazuh-agent-aix.spec | 2 +- debs/SPECS/wazuh-agent/debian/changelog | 4 ++-- debs/SPECS/wazuh-manager/debian/changelog | 2 +- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- solaris/solaris10/pkginfo | 2 +- stack/dashboard/deb/debian/changelog | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- stack/indexer/deb/debian/changelog | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index f118c30fe2..46a0d98d84 100644 --- a/aix/SPECS/wazuh-agent-aix.spec +++ b/aix/SPECS/wazuh-agent-aix.spec @@ -290,7 +290,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog -* Wed Nov 08 2023 support - 4.7.0 +* Tue Nov 21 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 4c5132e898..05485a304a 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,14 +2,14 @@ wazuh-agent (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Wed, 08 Nov 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 21 Nov 2023 00:00:00 +0000 wazuh-agent (4.6.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html -- Wazuh, Inc Tue, 31 Oct 2023 00:00:00 +0000 - + wazuh-agent (4.5.4-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index f452433317..77b04053ac 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,7 +2,7 @@ wazuh-manager (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Wed, 08 Nov 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 21 Nov 2023 00:00:00 +0000 wazuh-manager (4.6.0-RELEASE) stable; urgency=low diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 03ab0a239a..799390018d 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -599,7 +599,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Wed Nov 08 2023 support - 4.7.0 +* Tue Nov 21 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 917cedc0b5..3e8b9f2603 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -822,7 +822,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Wed Nov 08 2023 support - 4.7.0 +* Tue Nov 21 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index 92281a3863..17626f8d90 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -5,7 +5,7 @@ ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="24Oct2023" +PSTAMP="21Nov2023" EMAIL="info@wazuh.com" ISTATES="S s 1 2 3" RSTATES="S s 1 2 3" diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index ade74ea8f9..3ff3b3d95b 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-dashboard (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Wed, 08 Nov 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 21 Nov 2023 00:00:00 +0000 wazuh-dashboard (4.6.0-RELEASE) stable; urgency=low diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index fc4d5cf4ea..95c7be89a7 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -408,7 +408,7 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog -* Wed Nov 08 2023 support - 4.7.0 +* Tue Nov 21 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 471b47b9bd..0538fd0cd8 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-indexer (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Wed, 08 Nov 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 21 Nov 2023 00:00:00 +0000 wazuh-indexer (4.6.0-RELEASE) stable; urgency=low diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 29663c527d..ccd96707d7 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1444,7 +1444,7 @@ rm -fr %{buildroot} %changelog -* Wed Nov 08 2023 support - 4.7.0 +* Tue Nov 21 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html From ea213aa0c1eed0d05771e4ba70850a278a4cc5bd Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Thu, 26 Oct 2023 22:07:02 +0200 Subject: [PATCH 850/994] Added output directory --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 867e7a97a6..ac127f4468 100644 --- a/.gitignore +++ b/.gitignore @@ -19,8 +19,6 @@ ova/Config_files/filebeat.yml *.pkg.tar.zst .gradle .java -stack/dashboard/base/output -stack/indexer/base/output stack/indexer/rpm/output stack/indexer/deb/output .cache @@ -42,3 +40,4 @@ unattended_installer/wazuh-certs-tool.sh unattended_installer/wazuh-passwords-tool.sh unattended_installer/wazuh-passwords.txt tests/unattended/unit/*.log +output \ No newline at end of file From 5272da642b25d18f0ba5fdc2872e3d9a6433cccb Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Thu, 26 Oct 2023 22:07:23 +0200 Subject: [PATCH 851/994] Added end line --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ac127f4468..9b7c195b3c 100644 --- a/.gitignore +++ b/.gitignore @@ -40,4 +40,4 @@ unattended_installer/wazuh-certs-tool.sh unattended_installer/wazuh-passwords-tool.sh unattended_installer/wazuh-passwords.txt tests/unattended/unit/*.log -output \ No newline at end of file +output From 778ed8eaa20ceebde21b556d4908405cf594e99f Mon Sep 17 00:00:00 2001 From: c-bordon Date: Thu, 2 Nov 2023 17:14:30 -0300 Subject: [PATCH 852/994] Added new script for indexer ism --- stack/indexer/deb/debian/rules | 4 + stack/indexer/indexer-init.sh | 16 ++ stack/indexer/indexer-ism-init.sh | 305 +++++++++++++++++++++++++++ stack/indexer/rpm/wazuh-indexer.spec | 4 + 4 files changed, 329 insertions(+) create mode 100644 stack/indexer/indexer-init.sh create mode 100644 stack/indexer/indexer-ism-init.sh diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index 62beff43a8..1919f51867 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -105,6 +105,8 @@ override_dh_install: cp -pr $(REPO_DIR)/config/indexer/roles/internal_users.yml $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/ cp /root/stack/indexer/indexer-security-init.sh $(TARGET_DIR)$(INSTALLATION_DIR)/bin/ + cp /root/stack/indexer/indexer-ism-init.sh $(TARGET_DIR)$(INSTALLATION_DIR)/bin/ + cp /root/stack/indexer/indexer-init.sh $(TARGET_DIR)$(INSTALLATION_DIR)/bin/ # Create group and user in chroot environment groupadd -r $(GROUP) @@ -155,6 +157,8 @@ override_dh_fixperms: chmod 750 $(TARGET_DIR)$(CONFIG_DIR)/jvm.options.d chmod 440 $(TARGET_DIR)$(INSTALLATION_DIR)/VERSION chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/indexer-security-init.sh + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/indexer-ism-init.sh + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/indexer-init.sh chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/systemd-entrypoint chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/audit_config_migrater.sh chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/hash.sh diff --git a/stack/indexer/indexer-init.sh b/stack/indexer/indexer-init.sh new file mode 100644 index 0000000000..ad412c20f6 --- /dev/null +++ b/stack/indexer/indexer-init.sh @@ -0,0 +1,16 @@ +#!/bin/bash +# Wazuh Copyright (C) 2023 Wazuh Inc. (License GPLv2) +# Wazuh - indexer initialization script + +INSTALL_PATH="/usr/share/wazuh-indexer" +BIN_PATH="${INSTALL_PATH}/bin" + +main() { + + /bin/bash "${BIN_PATH}/indexer-ism-init.sh" + /bin/bash "${BIN_PATH}/indexer-security-init.sh" + +} + +main "$@" + diff --git a/stack/indexer/indexer-ism-init.sh b/stack/indexer/indexer-ism-init.sh new file mode 100644 index 0000000000..03a3509277 --- /dev/null +++ b/stack/indexer/indexer-ism-init.sh @@ -0,0 +1,305 @@ +#!/bin/bash +# Wazuh Copyright (C) 2023 Wazuh Inc. (License GPLv2) +# Wazuh - Indexer set rollover policy and templates + +# Policy settings +MIN_SHARD_SIZE="${MIN_SHARD_SIZE:-25}" +MIN_INDEX_AGE="${MIN_INDEX_AGE:-"7d"}" +MIN_DOC_COUNT="${MIN_DOC_COUNT:-200000000}" +ISM_INDEX_PATTERNS="${ISM_INDEX_PATTERNS:-'["wazuh-alerts-*", "wazuh-archives-*", "-wazuh-alerts-4.x-sample*"]'}" +ISM_PRIORITY="${ISM_PRIORITY:-50}" +INDEXER_PASSWORD="${INDEXER_PASSWORD:-admin}" +INDEXER_HOSTNAME="${INDEXER_HOSTNAME:-localhost}" + + +POLICY_NAME="rollover_policy" + +INDEXER_URL="https://${INDEXER_HOSTNAME}:9200" + +# curl settings shortcuts +C_AUTH="-u admin:${INDEXER_PASSWORD}" + +######################################################################### +# Creates the rollover_policy ISM policy. +# Globals: +# MIN_SHARD_SIZE: The minimum shard size in GB. +# MIN_INDEX_AGE: The minimum index age. +# MIN_DOC_COUNT: The minimum document count. +# ISM_INDEX_PATTERNS: The index patterns to apply the policy. +# ISM_PRIORITY: The policy priority. +# Arguments: +# None. +# Returns: +# The rollover policy as a JSON string +######################################################################### +function generate_rollover_policy() { + cat <<- EOF + { + "policy": { + "description": "Wazuh rollover and alias policy", + "default_state": "active", + "states": [ + { + "name": "active", + "actions": [ + { + "rollover": { + "min_primary_shard_size": "${MIN_SHARD_SIZE}gb", + "MIN_INDEX_AGE": "${MIN_INDEX_AGE}", + "MIN_DOC_COUNT": "${MIN_DOC_COUNT}" + } + } + ] + } + ], + "ism_template": { + "index_patterns": $ISM_INDEX_PATTERNS, + "priority": "${ISM_PRIORITY}" + } + } + } + EOF +} + + +######################################################################### +# Creates an index template with order 3 to set the rollover alias. +# Arguments: +# - The alias name, a string. Also used as index pattern. +# Returns: +# The index template as a JSON string. +######################################################################### +function generate_rollover_template() { + cat <<- EOF + { + "order": 3, + "index_patterns": ["$1-*"], + "settings": { + "index.plugins.index_state_management.rollover_alias": "$1" + } + } + EOF +} + + +######################################################################### +# Loads the index templates for the rollover policy to the indexer. +######################################################################### +function load_templates() { + # Note: the wazuh-template.json could also be loaded here. + for alias in "${aliases[@]}"; do + echo "TEMPLATES AND POLICIES - Uploading ${alias} template" + generate_rollover_template "${alias}" | curl -s -k ${C_AUTH} \ + -X PUT "$INDEXER_URL/_template/${alias}-rollover" -o /dev/null \ + -H 'Content-Type: application/json' -d @- + done +} + + +######################################################################### +# Uploads the rollover policy. +# If the policy does not exist, the policy "${POLICY_NAME}" is created. +# If the policy exists, but the rollover conditions are different, the +# policy is updated. +# Arguments: +# None. +######################################################################### +function upload_rollover_policy() { + policy_exists=$( + curl -s -k ${C_AUTH} \ + -X GET "$INDEXER_URL/_plugins/_ism/policies/${POLICY_NAME}" \ + -o /dev/null \ + -w "%{http_code}" + ) + + # Check if the ${POLICY_NAME} ISM policy was loaded (404 error if not found) + if [[ $policy_exists == "404" ]]; then + echo "TEMPLATES AND POLICIES - Uploading ${POLICY_NAME} ISM policy" + generate_rollover_policy | curl -s -k ${C_AUTH} -o /dev/null \ + -X PUT "$INDEXER_URL/_plugins/_ism/policies/${POLICY_NAME}" \ + -H 'Content-Type: application/json' -d @- + else + if [[ $policy_exists == "200" ]]; then + echo "TEMPLATES AND POLICIES - ${POLICY_NAME} policy already exists" + else + echo "TEMPLATES AND POLICIES - Error uploading ${POLICY_NAME} policy" + fi + fi +} + + +######################################################################### +# Check if an alias exists in the indexer. +# Arguments: +# 1. The alias to look for. String. +######################################################################### +function check_for_write_index() { + curl -s -k ${C_AUTH} "$INDEXER_URL/_cat/aliases" | \ + grep -i "${1}" | \ + grep -i true | \ + awk '{print $2}' +} + + +######################################################################### +# Creates the settings for the aliased write index. +# Arguments: +# 1. The alias. String. +######################################################################### +function generate_write_index_alias() { + cat <<- EOF + { + "aliases": { + "$1": { + "is_write_index": true + } + } + } + EOF +} + + +######################################################################### +# Creates the initial aliased write index. +# Arguments: +# 1. The alias. String. +######################################################################### +function create_write_index() { + curl -s -k ${C_AUTH} -o /dev/null \ + -X PUT "$INDEXER_URL/%3C${1}-4.x-%7Bnow%2Fd%7D-000001%3E?pretty" \ + -H 'Content-Type: application/json' -d "$(generate_write_index_alias "${1}")" +} + + +######################################################################### +# Creates the write indices for the aliases given as parameter. +# Arguments: +# 1. List of aliases to initialize. +######################################################################### +function create_indices() { + echo "TEMPLATES AND POLICIES - Creating write indices" + for alias in "${aliases[@]}"; do + # Check if there are any write indices for the current alias + write_index_exists=$(check_for_write_index "${alias}") + + # Create the write index if it does not exist + if [[ -z $write_index_exists ]]; then + create_write_index "${alias}" + fi + done +} + +function getHelp() { + + echo -e "" + echo -e "NAME" + echo -e " indexer-ism-init.sh - Manages the Index State Management plugin for Wazuh indexer index rollovers policies." + echo -e "" + echo -e "SYNOPSIS" + echo -e " indexer-ism-init.sh [OPTIONS]" + echo -e "" + echo -e "DESCRIPTION" + echo -e " -a, --min-index-age " + echo -e " Set the minimum index age. By default 7d." + echo -e "" + echo -e " -d, --min-doc-count " + echo -e " Set the minimum document count. By default 200000000." + echo -e "" + echo -e " -h, --help" + echo -e " Shows help." + echo -e "" + echo -e " -i, --indexer-hostname " + echo -e " Specifies the Wazuh indexer hostname or ip." + echo -e "" + echo -e " -p, --indexer-password " + echo -e " Specifies the Wazuh indexer admin user password." + echo -e "" + echo -e " -s, --min-shard-size " + echo -e " Set the minimum shard size to GB. By default 25 GB." + echo -e "" + exit 1 + +} + + +######################################################################### +# Main function. +######################################################################### +function main() { + # The list should contain every alias which indices implement the + # rollover policy + aliases=("wazuh-alerts" "wazuh-archives") + + while [ -n "${1}" ] + do + case "${1}" in + "-a"|"--min-index-age") + if [ -z "${2}" ]; then + echo "Error on arguments. Probably missing after -a|--min-index-age" + getHelp + exit 1 + else + MIN_SHARD_SIZE="${2}" + shift 1 + fi + ;; + "-d"|"--min-doc-count") + if [ -z "${2}" ]; then + echo "Error on arguments. Probably missing after -d|--min-doc-count" + getHelp + exit 1 + else + MIN_INDEX_AGE="${2}" + shift 1 + fi + ;; + "-h"|"--help") + getHelp + ;; + "-i"|"--indexer-hostname") + if [ -z "${2}" ]; then + echo "Error on arguments. Probably missing after -i|--indexer-hostname" + getHelp + exit 1 + else + INDEXER_HOSTNAME="${2}" + shift 1 + fi + ;; + "-p"|"--indexer-password") + if [ -z "${2}" ]; then + echo "Error on arguments. Probably missing after -p|--indexer-password" + getHelp + exit 1 + else + INDEXER_PASSWORD="${2}" + shift 1 + fi + ;; + "-s"|"--min-shard-size") + if [ -z "${2}" ]; then + echo "Error on arguments. Probably missing after -s|--min-shard-size" + getHelp + exit 1 + else + MIN_SHARD_SIZE="${2}" + shift 1 + fi + ;; + *) + echo "Unknow option: ${1}" + getHelp + esac + done + + # Load the Wazuh Indexer templates + load_templates + + # Upload the rollover policy + upload_rollover_policy + + # Create the initial write indices + create_indices "${aliases[@]}" +} + +main "$@" \ No newline at end of file diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index ee88666ca6..25eb8fcc3a 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -98,6 +98,8 @@ cp %{REPO_DIR}/config/indexer/roles/roles.yml ${RPM_BUILD_ROOT}%{CONFIG_DIR}/ope cp %{REPO_DIR}/config/indexer/roles/roles_mapping.yml ${RPM_BUILD_ROOT}%{CONFIG_DIR}/opensearch-security cp /root/stack/indexer/indexer-security-init.sh ${RPM_BUILD_ROOT}%{INSTALL_DIR}/bin/ +cp /root/stack/indexer/indexer-ism-init.sh ${RPM_BUILD_ROOT}%{INSTALL_DIR}/bin/ +cp /root/stack/indexer/indexer-init.sh ${RPM_BUILD_ROOT}%{INSTALL_DIR}/bin/ chmod 750 ${RPM_BUILD_ROOT}/etc/init.d/wazuh-indexer @@ -1438,6 +1440,8 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/LICENSE.txt %attr(440, %{USER}, %{GROUP}) %{INSTALL_DIR}/VERSION %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/indexer-security-init.sh +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/indexer-ism-init.sh +%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/indexer-init.sh %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/config.yml %attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/wazuh-certs-tool.sh %attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/wazuh-passwords-tool.sh From c1504e2db6bcf17edb60611060516e8df7309982 Mon Sep 17 00:00:00 2001 From: Antonio <34042064+Desvelao@users.noreply.github.com> Date: Fri, 3 Nov 2023 09:54:41 +0100 Subject: [PATCH 853/994] feat(dashboard): change the order of Explore category and title of Indexer/dashboard management category (#2578) --- stack/dashboard/base/builder.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh index caf9f67e36..229739ed64 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -186,8 +186,8 @@ sed -i "s'/app/home'/app/${app_home}'g" ./src/core/target/public/core.entry.js sed -i "s/navigateToApp(\"home\")/navigateToApp(\"${app_home}\")/g" ./src/core/target/public/core.entry.js # Define categories -category_explore='{id:"explore",label:"Explore",order:500,euiIconType:"search"}' -category_dashboard_management='{id:"management",label:"Indexer/dashboard Management",order:5e3,euiIconType:"managementApp"}' +category_explore='{id:"explore",label:"Explore",order:100,euiIconType:"search"}' +category_dashboard_management='{id:"management",label:"Indexer/dashboard management",order:5e3,euiIconType:"managementApp"}' # Add custom categories (explore) to the built-in sed -i -e "s|DEFAULT_APP_CATEGORIES=Object.freeze({|DEFAULT_APP_CATEGORIES=Object.freeze({explore:${category_explore},|" ./src/core/target/public/core.entry.js From 73c1862bd5d51644c571ebcb71db9dce8eeb92a4 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 6 Nov 2023 08:49:23 -0300 Subject: [PATCH 854/994] Fixing ism script for package execution --- stack/indexer/indexer-ism-init.sh | 72 +++++++++++++++---------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/stack/indexer/indexer-ism-init.sh b/stack/indexer/indexer-ism-init.sh index 03a3509277..e070fdd573 100644 --- a/stack/indexer/indexer-ism-init.sh +++ b/stack/indexer/indexer-ism-init.sh @@ -3,13 +3,13 @@ # Wazuh - Indexer set rollover policy and templates # Policy settings -MIN_SHARD_SIZE="${MIN_SHARD_SIZE:-25}" -MIN_INDEX_AGE="${MIN_INDEX_AGE:-"7d"}" -MIN_DOC_COUNT="${MIN_DOC_COUNT:-200000000}" -ISM_INDEX_PATTERNS="${ISM_INDEX_PATTERNS:-'["wazuh-alerts-*", "wazuh-archives-*", "-wazuh-alerts-4.x-sample*"]'}" -ISM_PRIORITY="${ISM_PRIORITY:-50}" -INDEXER_PASSWORD="${INDEXER_PASSWORD:-admin}" -INDEXER_HOSTNAME="${INDEXER_HOSTNAME:-localhost}" +MIN_SHARD_SIZE="25" +MIN_INDEX_AGE="7d" +MIN_DOC_COUNT="200000000" +ISM_INDEX_PATTERNS='["wazuh-alerts-*", "wazuh-archives-*", "-wazuh-alerts-4.x-sample*"]' +ISM_PRIORITY="50" +INDEXER_PASSWORD="admin" +INDEXER_HOSTNAME="localhost" POLICY_NAME="rollover_policy" @@ -36,26 +36,26 @@ function generate_rollover_policy() { cat <<- EOF { "policy": { - "description": "Wazuh rollover and alias policy", - "default_state": "active", - "states": [ - { - "name": "active", - "actions": [ + "description": "Wazuh rollover and alias policy", + "default_state": "active", + "states": [ { - "rollover": { - "min_primary_shard_size": "${MIN_SHARD_SIZE}gb", - "MIN_INDEX_AGE": "${MIN_INDEX_AGE}", - "MIN_DOC_COUNT": "${MIN_DOC_COUNT}" + "name": "active", + "actions": [ + { + "rollover": { + "min_primary_shard_size": "${MIN_SHARD_SIZE}gb", + "min_index_age": "${MIN_INDEX_AGE}", + "min_doc_count": "${MIN_DOC_COUNT}" + } + } + ] } - } - ] + ], + "ism_template": { + "index_patterns": ${ISM_INDEX_PATTERNS}, + "priority": "${ISM_PRIORITY}" } - ], - "ism_template": { - "index_patterns": $ISM_INDEX_PATTERNS, - "priority": "${ISM_PRIORITY}" - } } } EOF @@ -73,9 +73,9 @@ function generate_rollover_template() { cat <<- EOF { "order": 3, - "index_patterns": ["$1-*"], + "index_patterns": ["${1}-*"], "settings": { - "index.plugins.index_state_management.rollover_alias": "$1" + "index.plugins.index_state_management.rollover_alias": "${1}" } } EOF @@ -90,7 +90,7 @@ function load_templates() { for alias in "${aliases[@]}"; do echo "TEMPLATES AND POLICIES - Uploading ${alias} template" generate_rollover_template "${alias}" | curl -s -k ${C_AUTH} \ - -X PUT "$INDEXER_URL/_template/${alias}-rollover" -o /dev/null \ + -X PUT "${INDEXER_URL}/_template/${alias}-rollover" -o /dev/null \ -H 'Content-Type: application/json' -d @- done } @@ -107,19 +107,19 @@ function load_templates() { function upload_rollover_policy() { policy_exists=$( curl -s -k ${C_AUTH} \ - -X GET "$INDEXER_URL/_plugins/_ism/policies/${POLICY_NAME}" \ + -X GET "${INDEXER_URL}/_plugins/_ism/policies/${POLICY_NAME}" \ -o /dev/null \ -w "%{http_code}" ) # Check if the ${POLICY_NAME} ISM policy was loaded (404 error if not found) - if [[ $policy_exists == "404" ]]; then + if [[ "${policy_exists}" == "404" ]]; then echo "TEMPLATES AND POLICIES - Uploading ${POLICY_NAME} ISM policy" - generate_rollover_policy | curl -s -k ${C_AUTH} -o /dev/null \ - -X PUT "$INDEXER_URL/_plugins/_ism/policies/${POLICY_NAME}" \ - -H 'Content-Type: application/json' -d @- + curl -s -k ${C_AUTH} -o /dev/null \ + -X PUT "${INDEXER_URL}/_plugins/_ism/policies/${POLICY_NAME}" \ + -H 'Content-Type: application/json' -d "$(generate_rollover_policy)" else - if [[ $policy_exists == "200" ]]; then + if [[ "${policy_exists}" == "200" ]]; then echo "TEMPLATES AND POLICIES - ${POLICY_NAME} policy already exists" else echo "TEMPLATES AND POLICIES - Error uploading ${POLICY_NAME} policy" @@ -134,7 +134,7 @@ function upload_rollover_policy() { # 1. The alias to look for. String. ######################################################################### function check_for_write_index() { - curl -s -k ${C_AUTH} "$INDEXER_URL/_cat/aliases" | \ + curl -s -k ${C_AUTH} "${INDEXER_URL}/_cat/aliases" | \ grep -i "${1}" | \ grep -i true | \ awk '{print $2}' @@ -239,7 +239,7 @@ function main() { getHelp exit 1 else - MIN_SHARD_SIZE="${2}" + MIN_INDEX_AGE="${2}" shift 1 fi ;; @@ -249,7 +249,7 @@ function main() { getHelp exit 1 else - MIN_INDEX_AGE="${2}" + MIN_DOC_COUNT="${2}" shift 1 fi ;; From a4d52cedcdffb2b64462a59ae863a6f44fee7d51 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 6 Nov 2023 10:53:22 -0300 Subject: [PATCH 855/994] Changing order of scripts execution --- stack/indexer/indexer-init.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/indexer/indexer-init.sh b/stack/indexer/indexer-init.sh index ad412c20f6..b92b799273 100644 --- a/stack/indexer/indexer-init.sh +++ b/stack/indexer/indexer-init.sh @@ -7,8 +7,8 @@ BIN_PATH="${INSTALL_PATH}/bin" main() { - /bin/bash "${BIN_PATH}/indexer-ism-init.sh" /bin/bash "${BIN_PATH}/indexer-security-init.sh" + /bin/bash "${BIN_PATH}/indexer-ism-init.sh" } From edc958fcf58aef8203abbdbb66e3cdc903343fe8 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 6 Nov 2023 12:21:26 -0300 Subject: [PATCH 856/994] Changing order of scripts execution --- stack/indexer/indexer-init.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stack/indexer/indexer-init.sh b/stack/indexer/indexer-init.sh index b92b799273..27d50f8590 100644 --- a/stack/indexer/indexer-init.sh +++ b/stack/indexer/indexer-init.sh @@ -7,7 +7,9 @@ BIN_PATH="${INSTALL_PATH}/bin" main() { + echo "Executing Wazuh indexer security init script..." /bin/bash "${BIN_PATH}/indexer-security-init.sh" + echo "Executing Wazuh indexer ism init script..." /bin/bash "${BIN_PATH}/indexer-ism-init.sh" } From 253c4e8be68a7495842111e7693243d67f088e00 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 6 Nov 2023 15:20:21 -0300 Subject: [PATCH 857/994] removed unattended changes --- unattended_installer/builder.sh | 7 ------- unattended_installer/install_functions/indexer.sh | 2 -- 2 files changed, 9 deletions(-) diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index 7a17f6d084..b3290b2948 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -118,13 +118,6 @@ function buildInstaller() { curl -s "https://raw.githubusercontent.com/wazuh/wazuh/${source_branch}/src/init/dist-detect.sh" | sed '/^#/d' >> "${output_script_path}" echo "}" >> "${output_script_path}" - ## indexerRolloverInit.sh - echo "function indexer_rollover_init() {" >> "${output_script_path}" - curl -s "https://packages-dev.wazuh.com/4.8/indexerRolloverInit.sh" | sed '/^#/d' >> "${output_script_path}" - echo "}" >> "${output_script_path}" - sed -i 's|INDEXER_PASSWORD|adminPassword|g' "${output_script_path}" - sed -i 's|INDEXER_HOSTNAME|indexer_node_ips[0]|g' "${output_script_path}" - ## Common functions sed -n '/^function [a-zA-Z_]\(\)/,/^}/p' "${resources_common}/common.sh" >> "${output_script_path}" diff --git a/unattended_installer/install_functions/indexer.sh b/unattended_installer/install_functions/indexer.sh index 8ad340de40..c851fa323b 100644 --- a/unattended_installer/install_functions/indexer.sh +++ b/unattended_installer/install_functions/indexer.sh @@ -186,6 +186,4 @@ function indexer_startCluster() { common_logger -d "Inserted wazuh-alerts template into the Wazuh indexer cluster." fi - indexer_rollover_init - } \ No newline at end of file From 11599627077bbe02faa843fe4e8b392818a69a2e Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 6 Nov 2023 15:33:21 -0300 Subject: [PATCH 858/994] Testing ism in unattended --- unattended_installer/install_functions/indexer.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/unattended_installer/install_functions/indexer.sh b/unattended_installer/install_functions/indexer.sh index c851fa323b..54db84e4d9 100644 --- a/unattended_installer/install_functions/indexer.sh +++ b/unattended_installer/install_functions/indexer.sh @@ -177,6 +177,8 @@ function indexer_startCluster() { exit 1 else common_logger "Wazuh indexer cluster security configuration initialized." + eval "bash /usr/share/wazuh-indexer/bin/indexer-ism-init.sh ${debug}" + common_logger "Wazuh indexer cluster ISM initialized." fi eval "common_curl --silent ${filebeat_wazuh_template} --max-time 300 --retry 5 --retry-delay 5 ${debug}" | 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 From 88c79a3f37098ca21b49be7ed26b593f5d3ab9d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Ruiz?= Date: Mon, 6 Nov 2023 20:07:12 +0100 Subject: [PATCH 859/994] Apply code formatting --- stack/indexer/indexer-init.sh | 5 +- stack/indexer/indexer-ism-init.sh | 98 ++++++++++++++----------------- 2 files changed, 44 insertions(+), 59 deletions(-) diff --git a/stack/indexer/indexer-init.sh b/stack/indexer/indexer-init.sh index 27d50f8590..39d6766579 100644 --- a/stack/indexer/indexer-init.sh +++ b/stack/indexer/indexer-init.sh @@ -6,13 +6,10 @@ INSTALL_PATH="/usr/share/wazuh-indexer" BIN_PATH="${INSTALL_PATH}/bin" main() { - echo "Executing Wazuh indexer security init script..." /bin/bash "${BIN_PATH}/indexer-security-init.sh" - echo "Executing Wazuh indexer ism init script..." + echo "Executing Wazuh indexer ISM init script..." /bin/bash "${BIN_PATH}/indexer-ism-init.sh" - } main "$@" - diff --git a/stack/indexer/indexer-ism-init.sh b/stack/indexer/indexer-ism-init.sh index e070fdd573..781c5f9314 100644 --- a/stack/indexer/indexer-ism-init.sh +++ b/stack/indexer/indexer-ism-init.sh @@ -11,7 +11,6 @@ ISM_PRIORITY="50" INDEXER_PASSWORD="admin" INDEXER_HOSTNAME="localhost" - POLICY_NAME="rollover_policy" INDEXER_URL="https://${INDEXER_HOSTNAME}:9200" @@ -33,7 +32,7 @@ C_AUTH="-u admin:${INDEXER_PASSWORD}" # The rollover policy as a JSON string ######################################################################### function generate_rollover_policy() { - cat <<- EOF + cat <<-EOF { "policy": { "description": "Wazuh rollover and alias policy", @@ -61,7 +60,6 @@ function generate_rollover_policy() { EOF } - ######################################################################### # Creates an index template with order 3 to set the rollover alias. # Arguments: @@ -70,7 +68,7 @@ function generate_rollover_policy() { # The index template as a JSON string. ######################################################################### function generate_rollover_template() { - cat <<- EOF + cat <<-EOF { "order": 3, "index_patterns": ["${1}-*"], @@ -81,7 +79,6 @@ function generate_rollover_template() { EOF } - ######################################################################### # Loads the index templates for the rollover policy to the indexer. ######################################################################### @@ -90,12 +87,11 @@ function load_templates() { for alias in "${aliases[@]}"; do echo "TEMPLATES AND POLICIES - Uploading ${alias} template" generate_rollover_template "${alias}" | curl -s -k ${C_AUTH} \ - -X PUT "${INDEXER_URL}/_template/${alias}-rollover" -o /dev/null \ - -H 'Content-Type: application/json' -d @- + -X PUT "${INDEXER_URL}/_template/${alias}-rollover" -o /dev/null \ + -H 'Content-Type: application/json' -d @- done } - ######################################################################### # Uploads the rollover policy. # If the policy does not exist, the policy "${POLICY_NAME}" is created. @@ -107,47 +103,45 @@ function load_templates() { function upload_rollover_policy() { policy_exists=$( curl -s -k ${C_AUTH} \ - -X GET "${INDEXER_URL}/_plugins/_ism/policies/${POLICY_NAME}" \ - -o /dev/null \ - -w "%{http_code}" + -X GET "${INDEXER_URL}/_plugins/_ism/policies/${POLICY_NAME}" \ + -o /dev/null \ + -w "%{http_code}" ) # Check if the ${POLICY_NAME} ISM policy was loaded (404 error if not found) if [[ "${policy_exists}" == "404" ]]; then echo "TEMPLATES AND POLICIES - Uploading ${POLICY_NAME} ISM policy" curl -s -k ${C_AUTH} -o /dev/null \ - -X PUT "${INDEXER_URL}/_plugins/_ism/policies/${POLICY_NAME}" \ - -H 'Content-Type: application/json' -d "$(generate_rollover_policy)" + -X PUT "${INDEXER_URL}/_plugins/_ism/policies/${POLICY_NAME}" \ + -H 'Content-Type: application/json' -d "$(generate_rollover_policy)" else if [[ "${policy_exists}" == "200" ]]; then - echo "TEMPLATES AND POLICIES - ${POLICY_NAME} policy already exists" + echo "TEMPLATES AND POLICIES - ${POLICY_NAME} policy already exists" else - echo "TEMPLATES AND POLICIES - Error uploading ${POLICY_NAME} policy" + echo "TEMPLATES AND POLICIES - Error uploading ${POLICY_NAME} policy" fi fi } - ######################################################################### # Check if an alias exists in the indexer. # Arguments: # 1. The alias to look for. String. ######################################################################### function check_for_write_index() { - curl -s -k ${C_AUTH} "${INDEXER_URL}/_cat/aliases" | \ - grep -i "${1}" | \ - grep -i true | \ - awk '{print $2}' + curl -s -k ${C_AUTH} "${INDEXER_URL}/_cat/aliases" | + grep -i "${1}" | + grep -i true | + awk '{print $2}' } - ######################################################################### # Creates the settings for the aliased write index. # Arguments: # 1. The alias. String. ######################################################################### function generate_write_index_alias() { - cat <<- EOF + cat <<-EOF { "aliases": { "$1": { @@ -158,7 +152,6 @@ function generate_write_index_alias() { EOF } - ######################################################################### # Creates the initial aliased write index. # Arguments: @@ -170,7 +163,6 @@ function create_write_index() { -H 'Content-Type: application/json' -d "$(generate_write_index_alias "${1}")" } - ######################################################################### # Creates the write indices for the aliases given as parameter. # Arguments: @@ -184,13 +176,16 @@ function create_indices() { # Create the write index if it does not exist if [[ -z $write_index_exists ]]; then - create_write_index "${alias}" + create_write_index "${alias}" fi done } -function getHelp() { +######################################################################### +# Shows usage help. +######################################################################### +function show_help() { echo -e "" echo -e "NAME" echo -e " indexer-ism-init.sh - Manages the Index State Management plugin for Wazuh indexer index rollovers policies." @@ -218,10 +213,8 @@ function getHelp() { echo -e " Set the minimum shard size to GB. By default 25 GB." echo -e "" exit 1 - } - ######################################################################### # Main function. ######################################################################### @@ -230,57 +223,51 @@ function main() { # rollover policy aliases=("wazuh-alerts" "wazuh-archives") - while [ -n "${1}" ] - do + while [ -n "${1}" ]; do case "${1}" in - "-a"|"--min-index-age") + "-a" | "--min-index-age") if [ -z "${2}" ]; then echo "Error on arguments. Probably missing after -a|--min-index-age" - getHelp - exit 1 + show_help else MIN_INDEX_AGE="${2}" shift 1 fi ;; - "-d"|"--min-doc-count") + "-d" | "--min-doc-count") if [ -z "${2}" ]; then echo "Error on arguments. Probably missing after -d|--min-doc-count" - getHelp - exit 1 + show_help else MIN_DOC_COUNT="${2}" shift 1 fi ;; - "-h"|"--help") - getHelp + "-h" | "--help") + show_help ;; - "-i"|"--indexer-hostname") + "-i" | "--indexer-hostname") if [ -z "${2}" ]; then echo "Error on arguments. Probably missing after -i|--indexer-hostname" - getHelp - exit 1 + show_help else INDEXER_HOSTNAME="${2}" shift 1 fi ;; - "-p"|"--indexer-password") + "-p" | "--indexer-password") if [ -z "${2}" ]; then echo "Error on arguments. Probably missing after -p|--indexer-password" - getHelp - exit 1 + show_help else INDEXER_PASSWORD="${2}" shift 1 fi ;; - "-s"|"--min-shard-size") + "-s" | "--min-shard-size") if [ -z "${2}" ]; then echo "Error on arguments. Probably missing after -s|--min-shard-size" - getHelp - exit 1 + show_help else MIN_SHARD_SIZE="${2}" shift 1 @@ -288,18 +275,19 @@ function main() { ;; *) echo "Unknow option: ${1}" - getHelp + show_help + ;; esac done - # Load the Wazuh Indexer templates - load_templates + # Load the Wazuh Indexer templates + load_templates - # Upload the rollover policy - upload_rollover_policy + # Upload the rollover policy + upload_rollover_policy - # Create the initial write indices - create_indices "${aliases[@]}" + # Create the initial write indices + create_indices "${aliases[@]}" } -main "$@" \ No newline at end of file +main "$@" From b25a812782d930aa8df1a0e100c7c5ac505e45c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Ruiz?= Date: Mon, 6 Nov 2023 20:33:16 +0100 Subject: [PATCH 860/994] Fix bugs --- stack/indexer/indexer-ism-init.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/stack/indexer/indexer-ism-init.sh b/stack/indexer/indexer-ism-init.sh index 781c5f9314..eabdb81ca0 100644 --- a/stack/indexer/indexer-ism-init.sh +++ b/stack/indexer/indexer-ism-init.sh @@ -204,13 +204,13 @@ function show_help() { echo -e " Shows help." echo -e "" echo -e " -i, --indexer-hostname " - echo -e " Specifies the Wazuh indexer hostname or ip." + echo -e " Specifies the Wazuh indexer hostname or IP." echo -e "" echo -e " -p, --indexer-password " echo -e " Specifies the Wazuh indexer admin user password." echo -e "" echo -e " -s, --min-shard-size " - echo -e " Set the minimum shard size to GB. By default 25 GB." + echo -e " Set the minimum shard size in GB. By default 25." echo -e "" exit 1 } @@ -231,7 +231,7 @@ function main() { show_help else MIN_INDEX_AGE="${2}" - shift 1 + shift 2 fi ;; "-d" | "--min-doc-count") @@ -240,7 +240,7 @@ function main() { show_help else MIN_DOC_COUNT="${2}" - shift 1 + shift 2 fi ;; "-h" | "--help") @@ -252,7 +252,7 @@ function main() { show_help else INDEXER_HOSTNAME="${2}" - shift 1 + shift 2 fi ;; "-p" | "--indexer-password") @@ -261,7 +261,8 @@ function main() { show_help else INDEXER_PASSWORD="${2}" - shift 1 + C_AUTH="-u admin:${INDEXER_PASSWORD}" + shift 2 fi ;; "-s" | "--min-shard-size") @@ -270,7 +271,7 @@ function main() { show_help else MIN_SHARD_SIZE="${2}" - shift 1 + shift 2 fi ;; *) From 3656638ab39c2e3efe0d42aa0911647955acd310 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 7 Nov 2023 09:11:08 -0300 Subject: [PATCH 861/994] testing unattended --- unattended_installer/install_functions/indexer.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/unattended_installer/install_functions/indexer.sh b/unattended_installer/install_functions/indexer.sh index 54db84e4d9..4a5daf69f3 100644 --- a/unattended_installer/install_functions/indexer.sh +++ b/unattended_installer/install_functions/indexer.sh @@ -123,6 +123,8 @@ function indexer_initialize() { if [ -n "${AIO}" ]; then 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 ${indexer_cert_path}/root-ca.pem -cert ${indexer_cert_path}/admin.pem -key ${indexer_cert_path}/admin-key.pem -h 127.0.0.1 ${debug}" + eval "bash /usr/share/wazuh-indexer/bin/indexer-ism-init.sh ${debug}" + common_logger "Wazuh indexer cluster ISM initialized." fi if [ "${#indexer_node_names[@]}" -eq 1 ] && [ -z "${AIO}" ]; then From 8f38320410a6acb22a431cb225bd3f252cdd26e6 Mon Sep 17 00:00:00 2001 From: jnasselle Date: Sun, 16 Apr 2023 20:45:31 -0300 Subject: [PATCH 862/994] Changes related to manager compilation - Move rpm/deb folders to support manager compilation on CentOS7/Debian8 --- debs/Debian/{ => 7}/amd64/Dockerfile | 0 debs/Debian/{ => 7}/i386/Dockerfile | 0 debs/Debian/{ => 9}/arm64/Dockerfile | 0 debs/Debian/{ => 9}/armhf/Dockerfile | 0 debs/Debian/{ => 9}/ppc64le/Dockerfile | 0 rpms/CentOS/7/i386/CentOS-Base.repo | 47 ++++++++++++++++++ rpms/CentOS/7/i386/Dockerfile | 66 ++++++++++++++++++++++++++ rpms/CentOS/7/x86_64/CentOS-Base.repo | 54 +++++++++++++++++++++ rpms/CentOS/7/x86_64/Dockerfile | 66 ++++++++++++++++++++++++++ 9 files changed, 233 insertions(+) rename debs/Debian/{ => 7}/amd64/Dockerfile (100%) rename debs/Debian/{ => 7}/i386/Dockerfile (100%) rename debs/Debian/{ => 9}/arm64/Dockerfile (100%) rename debs/Debian/{ => 9}/armhf/Dockerfile (100%) rename debs/Debian/{ => 9}/ppc64le/Dockerfile (100%) create mode 100644 rpms/CentOS/7/i386/CentOS-Base.repo create mode 100644 rpms/CentOS/7/i386/Dockerfile create mode 100644 rpms/CentOS/7/x86_64/CentOS-Base.repo create mode 100644 rpms/CentOS/7/x86_64/Dockerfile diff --git a/debs/Debian/amd64/Dockerfile b/debs/Debian/7/amd64/Dockerfile similarity index 100% rename from debs/Debian/amd64/Dockerfile rename to debs/Debian/7/amd64/Dockerfile diff --git a/debs/Debian/i386/Dockerfile b/debs/Debian/7/i386/Dockerfile similarity index 100% rename from debs/Debian/i386/Dockerfile rename to debs/Debian/7/i386/Dockerfile diff --git a/debs/Debian/arm64/Dockerfile b/debs/Debian/9/arm64/Dockerfile similarity index 100% rename from debs/Debian/arm64/Dockerfile rename to debs/Debian/9/arm64/Dockerfile diff --git a/debs/Debian/armhf/Dockerfile b/debs/Debian/9/armhf/Dockerfile similarity index 100% rename from debs/Debian/armhf/Dockerfile rename to debs/Debian/9/armhf/Dockerfile diff --git a/debs/Debian/ppc64le/Dockerfile b/debs/Debian/9/ppc64le/Dockerfile similarity index 100% rename from debs/Debian/ppc64le/Dockerfile rename to debs/Debian/9/ppc64le/Dockerfile diff --git a/rpms/CentOS/7/i386/CentOS-Base.repo b/rpms/CentOS/7/i386/CentOS-Base.repo new file mode 100644 index 0000000000..1f492ab2b8 --- /dev/null +++ b/rpms/CentOS/7/i386/CentOS-Base.repo @@ -0,0 +1,47 @@ +# CentOS-Base.repo +# +# The mirror system uses the connecting IP address of the client and the +# update status of each mirror to pick mirrors that are updated to and +# geographically close to the client. You should use this for CentOS updates +# unless you are manually picking other mirrors. +# +# 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 +baseurl=http://mirror.nsc.liu.se/centos-store/6.10/os/i386/ +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 + +#released updates +[updates] +name=CentOS-$releasever - Updates +baseurl=http://mirror.nsc.liu.se/centos-store/6.10/updates/i386/ +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 + +#additional packages that may be useful +[extras] +name=CentOS-$releasever - Extras +baseurl=http://mirror.nsc.liu.se/centos-store/6.10/extras/i386/ +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 + +#additional packages that extend functionality of existing packages +[centosplus] +name=CentOS-$releasever - Plus +baseurl=http://mirror.nsc.liu.se/centos-store/6.10/centosplus/i386/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 + +#contrib - packages by Centos Users +[contrib] +name=CentOS-$releasever - Contrib +baseurl=http://mirror.nsc.liu.se/centos-store/6.10/contrib/i386/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 \ No newline at end of file diff --git a/rpms/CentOS/7/i386/Dockerfile b/rpms/CentOS/7/i386/Dockerfile new file mode 100644 index 0000000000..04cdb78fa5 --- /dev/null +++ b/rpms/CentOS/7/i386/Dockerfile @@ -0,0 +1,66 @@ +FROM i386/centos:6 + +# Install all the necessary tools to build the packages +RUN rm /etc/yum.repos.d/* && echo "exactarch=1" >> /etc/yum.conf +COPY CentOS-Base.repo /etc/yum.repos.d/CentOS-Base.repo +RUN yum clean all && yum update -y +RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 +RUN yum -y install util-linux-ng \ + gcc-multilib make wget git openssh-clients \ + sudo gnupg automake autoconf libtool \ + policycoreutils-python yum-utils epel-release \ + redhat-rpm-config rpm-devel autopoint gettext \ + zlib zlib-devel nspr nspr-devel \ + nss nss-devel kenel-headers magic magic-devel \ + db4 db4-devel rpm-build bison \ + sharutils bzip2-devel xz-devel lzo-devel \ + e2fsprogs-devel libacl-devel libattr-devel \ + openssl-devel libxml2-devel kexec-tools elfutils \ + libarchive-devel elfutils-libelf-devel \ + elfutils-libelf patchelf elfutils-devel libgcrypt-devel + +RUN yum-builddep python34 -y + +# Update rpmbuild, rpm and autoconf +RUN curl -O http://packages.wazuh.com/utils/autoconf/autoconf-2.69.tar.gz && \ + gunzip autoconf-2.69.tar.gz && tar xvf autoconf-2.69.tar && \ + cd autoconf-2.69 && linux32 ./configure && \ + linux32 make -j$(nproc) && linux32 make install && cd / && rm -rf autoconf-* + +RUN curl -O https://packages.wazuh.com/utils/libarchive/libarchive-3.1.2-12.el7.src.rpm && \ + linux32 rpmbuild --rebuild libarchive-3.1.2-12.el7.src.rpm --target i386 && \ + rpm -Uvh /root/rpmbuild/RPMS/i386/* --nodeps && rm -rf libarchive-* + +RUN curl -O http://packages.wazuh.com/utils/rpm/rpm-4.15.1.tar.bz2 && \ + tar -xjf rpm-4.15.1.tar.bz2 && cd rpm-4.15.1 && \ + linux32 ./configure --without-lua && linux32 make -j$(nproc) && \ + linux32 make install && cd / && rm -rf rpm-* + +RUN mkdir -p /usr/local/var/lib/rpm && \ + cp /var/lib/rpm/Packages /usr/local/var/lib/rpm/Packages && \ + /usr/local/bin/rpm --rebuilddb && rm -rf /root/rpmbuild + +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/ && \ + linux32 ./contrib/download_prerequisites && \ + 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-* + +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/" +ENV PATH "/usr/local/gcc-9.4.0/bin:${PATH}" + +RUN curl -OL http://packages.wazuh.com/utils/cmake/cmake-3.18.3.tar.gz && \ + tar -zxf cmake-3.18.3.tar.gz && cd cmake-3.18.3 && \ + linux32 ./bootstrap --no-system-curl CC=/usr/local/gcc-9.4.0/bin/gcc \ + CXX=/usr/local/gcc-9.4.0/bin/g++ && \ + linux32 make -j$(nproc) && linux32 make install && cd / && rm -rf cmake-* + +# Add the scripts to build the RPM package +ADD build.sh /usr/local/bin/build_package +RUN chmod +x /usr/local/bin/build_package + +# Set the entrypoint +ENTRYPOINT ["/usr/local/bin/build_package"] diff --git a/rpms/CentOS/7/x86_64/CentOS-Base.repo b/rpms/CentOS/7/x86_64/CentOS-Base.repo new file mode 100644 index 0000000000..42bbb92497 --- /dev/null +++ b/rpms/CentOS/7/x86_64/CentOS-Base.repo @@ -0,0 +1,54 @@ +# CentOS-Base.repo +# +# The mirror system uses the connecting IP address of the client and the +# update status of each mirror to pick mirrors that are updated to and +# geographically close to the client. You should use this for CentOS updates +# unless you are manually picking other mirrors. +# +# 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 +baseurl=http://mirror.nsc.liu.se/centos-store/6.10/os/$basearch/ +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 + +#released updates +[updates] +name=CentOS-$releasever - Updates +baseurl=http://mirror.nsc.liu.se/centos-store/6.10/updates/$basearch/ +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 + +#additional packages that may be useful +[extras] +name=CentOS-$releasever - Extras +baseurl=http://mirror.nsc.liu.se/centos-store/6.10/extras/$basearch/ +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 + +#additional packages that extend functionality of existing packages +[centosplus] +name=CentOS-$releasever - Plus +baseurl=http://mirror.nsc.liu.se/centos-store/6.10/centosplus/$basearch/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 + +#contrib - packages by Centos Users +[contrib] +name=CentOS-$releasever - Contrib +baseurl=http://mirror.nsc.liu.se/centos-store/6.10/contrib/$basearch/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 + +# SCLO - packages +[centos-sclo-sclo] +name=CentOS-$releasever - SCLO +baseurl=http://mirror.nsc.liu.se/centos-store/6.10/sclo/$basearch/rh/ +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 \ No newline at end of file diff --git a/rpms/CentOS/7/x86_64/Dockerfile b/rpms/CentOS/7/x86_64/Dockerfile new file mode 100644 index 0000000000..898fb35bf9 --- /dev/null +++ b/rpms/CentOS/7/x86_64/Dockerfile @@ -0,0 +1,66 @@ +FROM centos:6 + +# Install all the necessary tools to build the packages +RUN rm /etc/yum.repos.d/* && echo "exactarch=1" >> /etc/yum.conf +COPY CentOS-Base.repo /etc/yum.repos.d/CentOS-Base.repo +RUN yum clean all && yum update -y +RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 +RUN yum install -y gcc make wget git \ + openssh-clients sudo gnupg \ + automake autoconf libtool policycoreutils-python \ + yum-utils epel-release redhat-rpm-config rpm-devel \ + autopoint gettext nspr nspr-devel \ + nss nss-devel kenel-headers magic magic-devel \ + db4 db4-devel zlib zlib-devel rpm-build bison \ + sharutils bzip2-devel xz-devel lzo-devel \ + e2fsprogs-devel libacl-devel libattr-devel \ + openssl-devel libxml2-devel kexec-tools elfutils \ + libarchive-devel elfutils-libelf-devel \ + elfutils-libelf patchelf elfutils-devel libgcrypt-devel + +RUN yum-builddep python34 -y + +RUN curl --silent --location https://rpm.nodesource.com/setup_8.x | bash - +RUN yum install -y nodejs + +# Update rpmbuild, rpm and autoconf +RUN curl -O http://packages.wazuh.com/utils/autoconf/autoconf-2.69.tar.gz && \ + gunzip autoconf-2.69.tar.gz && tar xvf autoconf-2.69.tar && \ + cd autoconf-2.69 && ./configure && make -j$(nproc) && \ + make install && cd / && rm -rf autoconf-* + +RUN curl -O https://packages.wazuh.com/utils/libarchive/libarchive-3.1.2-12.el7.src.rpm && \ + rpmbuild --rebuild libarchive-3.1.2-12.el7.src.rpm && rpm -Uvh /root/rpmbuild/RPMS/x86_64/* --nodeps && rm -rf libarchive-* + +RUN curl -O http://packages.wazuh.com/utils/rpm/rpm-4.15.1.tar.bz2 && \ + tar -xjf rpm-4.15.1.tar.bz2 && cd rpm-4.15.1 && \ + ./configure --without-lua && make -j$(nproc) && make install && cd / && rm -rf rpm-* + +RUN mkdir -p /usr/local/var/lib/rpm && \ + cp /var/lib/rpm/Packages /usr/local/var/lib/rpm/Packages && \ + /usr/local/bin/rpm --rebuilddb && rm -rf /root/rpmbuild + +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/ && \ + ./contrib/download_prerequisites && \ + ./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-* + +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/" +ENV PATH "/usr/local/gcc-9.4.0/bin:${PATH}" + +RUN curl -OL http://packages.wazuh.com/utils/cmake/cmake-3.18.3.tar.gz && \ + tar -zxf cmake-3.18.3.tar.gz && cd cmake-3.18.3 && \ + ./bootstrap --no-system-curl CC=/usr/local/gcc-9.4.0/bin/gcc \ + CXX=/usr/local/gcc-9.4.0/bin/g++ && \ + make -j$(nproc) && make install && cd / && rm -rf cmake-* + +# Add the scripts to build the RPM package +ADD build.sh /usr/local/bin/build_package +RUN chmod +x /usr/local/bin/build_package + +# Set the entrypoint +ENTRYPOINT ["/usr/local/bin/build_package"] From 95f1831ceae6f6a10b67fc28529b264d04e8b35c Mon Sep 17 00:00:00 2001 From: jnasselle Date: Mon, 17 Apr 2023 15:57:59 -0300 Subject: [PATCH 863/994] Fix on generate_x_package.sh scripts --- debs/Debian/8/amd64/Dockerfile | 43 +++++++++++ debs/generate_debian_package.sh | 72 +++++++++-------- rpms/CentOS/7/i386/CentOS-Base.repo | 47 ----------- rpms/CentOS/7/i386/Dockerfile | 66 ---------------- rpms/CentOS/7/x86_64/CentOS-Base.repo | 54 ------------- rpms/CentOS/7/x86_64/Dockerfile | 40 +++++----- rpms/generate_rpm_package.sh | 107 +++++++++++++++----------- 7 files changed, 165 insertions(+), 264 deletions(-) create mode 100644 debs/Debian/8/amd64/Dockerfile delete mode 100644 rpms/CentOS/7/i386/CentOS-Base.repo delete mode 100644 rpms/CentOS/7/i386/Dockerfile delete mode 100644 rpms/CentOS/7/x86_64/CentOS-Base.repo diff --git a/debs/Debian/8/amd64/Dockerfile b/debs/Debian/8/amd64/Dockerfile new file mode 100644 index 0000000000..1c9d52a7a1 --- /dev/null +++ b/debs/Debian/8/amd64/Dockerfile @@ -0,0 +1,43 @@ +FROM debian/eol:jessie + +ENV DEBIAN_FRONTEND noninteractive + +# Installing necessary packages +RUN echo 'Acquire::Check-Valid-Until "false";' >> /etc/apt/apt.conf && \ + echo "deb http://archive.debian.org/debian jessie contrib main non-free" > /etc/apt/sources.list && \ + echo "deb http://archive.debian.org/debian-security jessie/updates main" >> /etc/apt/sources.list && \ + apt-get update && apt-get install -y --force-yes apt-utils && \ + apt-get install -y --force-yes \ + curl g++ bzip2 debhelper gcc rename make sudo wget expect gnupg perl-base perl \ + libc-bin libc6 libc6-dev build-essential dpkg-dev\ + cdbs devscripts equivs automake autoconf libtool libaudit-dev selinux-basics \ + libdb5.3 libdb5.3-dev libssl1.0.0 procps gawk libsigsegv2 + +RUN echo "deb-src http://archive.debian.org/debian jessie contrib main non-free" >> /etc/apt/sources.list && \ + apt-get update && apt-get build-dep python3 -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/ && \ + ./contrib/download_prerequisites && \ + ./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-* + +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}" +ENV PATH "/usr/local/gcc-9.4.0/bin:${PATH}" + +RUN curl -OL http://packages.wazuh.com/utils/cmake/cmake-3.18.3.tar.gz && \ + tar -zxf cmake-3.18.3.tar.gz && cd cmake-3.18.3 && \ + ./bootstrap --no-system-curl CXX=/usr/local/gcc-9.4.0/bin/g++ \ + CC=/usr/local/gcc-9.4.0/bin/gcc && \ + make -j$(nproc) && make install && ln -s /usr/local/bin/cmake /usr/bin/cmake && \ + cd / && rm -rf cmake-* + +# Add the script to build the Debian package +ADD build.sh /usr/local/bin/build_package +RUN chmod +x /usr/local/bin/build_package + +# Set the entrypoint +ENTRYPOINT ["/usr/local/bin/build_package"] diff --git a/debs/generate_debian_package.sh b/debs/generate_debian_package.sh index e3ccf969dc..2566ea81bc 100755 --- a/debs/generate_debian_package.sh +++ b/debs/generate_debian_package.sh @@ -18,16 +18,20 @@ DEBUG="no" BUILD_DOCKER="yes" DOCKER_TAG="latest" INSTALLATION_PATH="/var/ossec" -DEB_AMD64_BUILDER="deb_builder_amd64" -DEB_I386_BUILDER="deb_builder_i386" -DEB_PPC64LE_BUILDER="deb_builder_ppc64le" -DEB_ARM64_BUILDER="deb_builder_arm64" -DEB_ARMHF_BUILDER="deb_builder_armhf" -DEB_AMD64_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/amd64" -DEB_I386_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/i386" -DEB_PPC64LE_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/ppc64le" -DEB_ARM64_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/arm64" -DEB_ARMHF_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/armhf" +DEB_MANAGER_AMD64_BUILDER="deb_manager_builder_amd64" +DEB_MANAGER_ARM64_BUILDER="deb_builder_arm64" +DEB_MANAGER_PPC64LE_BUILDER="deb_builder_ppc64le" +DEB_AGENT_AMD64_BUILDER="deb_agent_builder_amd64" +DEB_AGENT_I386_BUILDER="deb_builder_i386" +DEB_AGENT_PPC64LE_BUILDER="deb_builder_ppc64le" +DEB_AGENT_ARM64_BUILDER="deb_builder_arm64" +DEB_AGENT_ARMHF_BUILDER="deb_builder_armhf" +DEB_MANAGER_AMD64_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/8/amd64" +DEB_AGENT_AMD64_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/7/amd64" +DEB_ARM64_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/9/arm64" +DEB_I386_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/8/i386" +DEB_PPC64LE_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/9/ppc64le" +DEB_ARMHF_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/9/armhf" CHECKSUMDIR="" CHECKSUM="no" PACKAGES_BRANCH="master" @@ -95,42 +99,46 @@ build() { ARCHITECTURE="armhf" fi - if [[ "${TARGET}" == "api" ]]; then - - if [[ "${ARCHITECTURE}" = "ppc64le" ]]; then - build_deb ${DEB_PPC64LE_BUILDER} ${DEB_PPC64LE_BUILDER_DOCKERFILE} || return 1 + if [[ "${TARGET}" == "manager" ]]; then + BUILD_NAME="" + FILE_PATH="" + if [[ "${ARCHITECTURE}" = "amd64" ]]; then + BUILD_NAME="${DEB_MANAGER_AMD64_BUILDER}" + FILE_PATH="${DEB_MANAGER_AMD64_BUILDER_DOCKERFILE}" elif [[ "${ARCHITECTURE}" = "arm64" ]]; then - build_deb ${DEB_ARM64_BUILDER} ${DEB_ARM64_BUILDER_DOCKERFILE} || return 1 - elif [[ "${ARCHITECTURE}" = "armhf" ]]; then - build_deb ${DEB_ARMHF_BUILDER} ${DEB_ARMHF_BUILDER_DOCKERFILE} || return 1 + BUILD_NAME="${DEB_MANAGER_ARM64_BUILDER}" + FILE_PATH="${DEB_ARM64_BUILDER_DOCKERFILE}" + elif [[ "${ARCHITECTURE}" = "ppc64le" ]]; then + BUILD_NAME="${DEB_MANAGER_PPC64LE_BUILDER}" + FILE_PATH="${DEB_PPC64LE_BUILDER_DOCKERFILE}" else - build_deb ${DEB_AMD64_BUILDER} ${DEB_AMD64_BUILDER_DOCKERFILE} || return 1 + echo "Invalid architecture '${ARCHITECTURE}' for '${TARGET}'. Choose one of amd64/arm64/ppc64le." + return 1 fi + build_deb ${BUILD_NAME} ${FILE_PATH} || return 1 - elif [[ "${TARGET}" == "manager" ]] || [[ "${TARGET}" == "agent" ]] ; then - - BUILD_NAME="" - FILE_PATH="" + elif [[ "${TARGET}" == "agent" ]] ; then if [[ "${ARCHITECTURE}" = "amd64" ]]; then - BUILD_NAME="${DEB_AMD64_BUILDER}" - FILE_PATH="${DEB_AMD64_BUILDER_DOCKERFILE}" + BUILD_NAME="${DEB_AGENT_AMD64_BUILDER}" + FILE_PATH="${DEB_AGENT_AMD64_BUILDER_DOCKERFILE}" elif [[ "${ARCHITECTURE}" = "i386" ]]; then - BUILD_NAME="${DEB_I386_BUILDER}" - FILE_PATH="${DEB_I386_BUILDER_DOCKERFILE}" - elif [[ "${ARCHITECTURE}" = "ppc64le" ]]; then - BUILD_NAME="${DEB_PPC64LE_BUILDER}" - FILE_PATH="${DEB_PPC64LE_BUILDER_DOCKERFILE}" + BUILD_NAME="${DEB_AGENT_I386_BUILDER}" + FILE_PATH="${DEB_AGENT_I386_BUILDER_DOCKERFILE}" elif [[ "${ARCHITECTURE}" = "arm64" ]]; then - BUILD_NAME="${DEB_ARM64_BUILDER}" + BUILD_NAME="${DEB_AGENT_ARM64_BUILDER}" FILE_PATH="${DEB_ARM64_BUILDER_DOCKERFILE}" + elif [[ "${ARCHITECTURE}" = "ppc64le" ]]; then + BUILD_NAME="${DEB_AGENT_PPC64LE_BUILDER}" + FILE_PATH="${DEB_PPC64LE_BUILDER_DOCKERFILE}" elif [[ "${ARCHITECTURE}" = "armhf" ]]; then - BUILD_NAME="${DEB_ARMHF_BUILDER}" + BUILD_NAME="${DEB_AGENT_ARMHF_BUILDER}" FILE_PATH="${DEB_ARMHF_BUILDER_DOCKERFILE}" else - echo "Invalid architecture. Choose one of amd64/i386/ppc64le/arm64/arm32." + echo "Invalid architecture '${ARCHITECTURE}' for '${TARGET}'. Choose one of amd64/i386/ppc64le/arm64/arm32." return 1 fi build_deb ${BUILD_NAME} ${FILE_PATH} || return 1 + else echo "Invalid target. Choose: manager or agent." return 1 diff --git a/rpms/CentOS/7/i386/CentOS-Base.repo b/rpms/CentOS/7/i386/CentOS-Base.repo deleted file mode 100644 index 1f492ab2b8..0000000000 --- a/rpms/CentOS/7/i386/CentOS-Base.repo +++ /dev/null @@ -1,47 +0,0 @@ -# CentOS-Base.repo -# -# The mirror system uses the connecting IP address of the client and the -# update status of each mirror to pick mirrors that are updated to and -# geographically close to the client. You should use this for CentOS updates -# unless you are manually picking other mirrors. -# -# 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 -baseurl=http://mirror.nsc.liu.se/centos-store/6.10/os/i386/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 - -#released updates -[updates] -name=CentOS-$releasever - Updates -baseurl=http://mirror.nsc.liu.se/centos-store/6.10/updates/i386/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 - -#additional packages that may be useful -[extras] -name=CentOS-$releasever - Extras -baseurl=http://mirror.nsc.liu.se/centos-store/6.10/extras/i386/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 - -#additional packages that extend functionality of existing packages -[centosplus] -name=CentOS-$releasever - Plus -baseurl=http://mirror.nsc.liu.se/centos-store/6.10/centosplus/i386/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 - -#contrib - packages by Centos Users -[contrib] -name=CentOS-$releasever - Contrib -baseurl=http://mirror.nsc.liu.se/centos-store/6.10/contrib/i386/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 \ No newline at end of file diff --git a/rpms/CentOS/7/i386/Dockerfile b/rpms/CentOS/7/i386/Dockerfile deleted file mode 100644 index 04cdb78fa5..0000000000 --- a/rpms/CentOS/7/i386/Dockerfile +++ /dev/null @@ -1,66 +0,0 @@ -FROM i386/centos:6 - -# Install all the necessary tools to build the packages -RUN rm /etc/yum.repos.d/* && echo "exactarch=1" >> /etc/yum.conf -COPY CentOS-Base.repo /etc/yum.repos.d/CentOS-Base.repo -RUN yum clean all && yum update -y -RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 -RUN yum -y install util-linux-ng \ - gcc-multilib make wget git openssh-clients \ - sudo gnupg automake autoconf libtool \ - policycoreutils-python yum-utils epel-release \ - redhat-rpm-config rpm-devel autopoint gettext \ - zlib zlib-devel nspr nspr-devel \ - nss nss-devel kenel-headers magic magic-devel \ - db4 db4-devel rpm-build bison \ - sharutils bzip2-devel xz-devel lzo-devel \ - e2fsprogs-devel libacl-devel libattr-devel \ - openssl-devel libxml2-devel kexec-tools elfutils \ - libarchive-devel elfutils-libelf-devel \ - elfutils-libelf patchelf elfutils-devel libgcrypt-devel - -RUN yum-builddep python34 -y - -# Update rpmbuild, rpm and autoconf -RUN curl -O http://packages.wazuh.com/utils/autoconf/autoconf-2.69.tar.gz && \ - gunzip autoconf-2.69.tar.gz && tar xvf autoconf-2.69.tar && \ - cd autoconf-2.69 && linux32 ./configure && \ - linux32 make -j$(nproc) && linux32 make install && cd / && rm -rf autoconf-* - -RUN curl -O https://packages.wazuh.com/utils/libarchive/libarchive-3.1.2-12.el7.src.rpm && \ - linux32 rpmbuild --rebuild libarchive-3.1.2-12.el7.src.rpm --target i386 && \ - rpm -Uvh /root/rpmbuild/RPMS/i386/* --nodeps && rm -rf libarchive-* - -RUN curl -O http://packages.wazuh.com/utils/rpm/rpm-4.15.1.tar.bz2 && \ - tar -xjf rpm-4.15.1.tar.bz2 && cd rpm-4.15.1 && \ - linux32 ./configure --without-lua && linux32 make -j$(nproc) && \ - linux32 make install && cd / && rm -rf rpm-* - -RUN mkdir -p /usr/local/var/lib/rpm && \ - cp /var/lib/rpm/Packages /usr/local/var/lib/rpm/Packages && \ - /usr/local/bin/rpm --rebuilddb && rm -rf /root/rpmbuild - -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/ && \ - linux32 ./contrib/download_prerequisites && \ - 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-* - -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/" -ENV PATH "/usr/local/gcc-9.4.0/bin:${PATH}" - -RUN curl -OL http://packages.wazuh.com/utils/cmake/cmake-3.18.3.tar.gz && \ - tar -zxf cmake-3.18.3.tar.gz && cd cmake-3.18.3 && \ - linux32 ./bootstrap --no-system-curl CC=/usr/local/gcc-9.4.0/bin/gcc \ - CXX=/usr/local/gcc-9.4.0/bin/g++ && \ - linux32 make -j$(nproc) && linux32 make install && cd / && rm -rf cmake-* - -# Add the scripts to build the RPM package -ADD build.sh /usr/local/bin/build_package -RUN chmod +x /usr/local/bin/build_package - -# Set the entrypoint -ENTRYPOINT ["/usr/local/bin/build_package"] diff --git a/rpms/CentOS/7/x86_64/CentOS-Base.repo b/rpms/CentOS/7/x86_64/CentOS-Base.repo deleted file mode 100644 index 42bbb92497..0000000000 --- a/rpms/CentOS/7/x86_64/CentOS-Base.repo +++ /dev/null @@ -1,54 +0,0 @@ -# CentOS-Base.repo -# -# The mirror system uses the connecting IP address of the client and the -# update status of each mirror to pick mirrors that are updated to and -# geographically close to the client. You should use this for CentOS updates -# unless you are manually picking other mirrors. -# -# 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 -baseurl=http://mirror.nsc.liu.se/centos-store/6.10/os/$basearch/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 - -#released updates -[updates] -name=CentOS-$releasever - Updates -baseurl=http://mirror.nsc.liu.se/centos-store/6.10/updates/$basearch/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 - -#additional packages that may be useful -[extras] -name=CentOS-$releasever - Extras -baseurl=http://mirror.nsc.liu.se/centos-store/6.10/extras/$basearch/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 - -#additional packages that extend functionality of existing packages -[centosplus] -name=CentOS-$releasever - Plus -baseurl=http://mirror.nsc.liu.se/centos-store/6.10/centosplus/$basearch/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 - -#contrib - packages by Centos Users -[contrib] -name=CentOS-$releasever - Contrib -baseurl=http://mirror.nsc.liu.se/centos-store/6.10/contrib/$basearch/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 - -# SCLO - packages -[centos-sclo-sclo] -name=CentOS-$releasever - SCLO -baseurl=http://mirror.nsc.liu.se/centos-store/6.10/sclo/$basearch/rh/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 \ No newline at end of file diff --git a/rpms/CentOS/7/x86_64/Dockerfile b/rpms/CentOS/7/x86_64/Dockerfile index 898fb35bf9..04ac405115 100644 --- a/rpms/CentOS/7/x86_64/Dockerfile +++ b/rpms/CentOS/7/x86_64/Dockerfile @@ -1,27 +1,25 @@ -FROM centos:6 +FROM centos:7 # Install all the necessary tools to build the packages -RUN rm /etc/yum.repos.d/* && echo "exactarch=1" >> /etc/yum.conf -COPY CentOS-Base.repo /etc/yum.repos.d/CentOS-Base.repo -RUN yum clean all && yum update -y -RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 RUN yum install -y gcc make wget git \ - openssh-clients sudo gnupg \ + openssh-clients sudo gnupg file-devel\ automake autoconf libtool policycoreutils-python \ - yum-utils epel-release redhat-rpm-config rpm-devel \ - autopoint gettext nspr nspr-devel \ - nss nss-devel kenel-headers magic magic-devel \ - db4 db4-devel zlib zlib-devel rpm-build bison \ + yum-utils system-rpm-config rpm-devel \ + gettext nspr nspr-devel \ + nss nss-devel libdb libdb-devel \ + zlib zlib-devel rpm-build bison \ sharutils bzip2-devel xz-devel lzo-devel \ e2fsprogs-devel libacl-devel libattr-devel \ openssl-devel libxml2-devel kexec-tools elfutils \ - libarchive-devel elfutils-libelf-devel \ - elfutils-libelf patchelf elfutils-devel libgcrypt-devel - -RUN yum-builddep python34 -y - -RUN curl --silent --location https://rpm.nodesource.com/setup_8.x | bash - -RUN yum install -y nodejs + libcurl-devel elfutils-libelf-devel \ + elfutils-libelf elfutils-devel libgcrypt-devel \ + libarchive-devel libarchive bluez-libs-devel bzip2 \ + desktop-file-utils expat-devel findutils gcc-c++ gdbm-devel \ + glibc-devel gmp-devel gnupg2 libappstream-glib \ + libffi-devel libtirpc-devel libGL-devel libuuid-devel \ + libX11-devel ncurses-devel pkgconfig readline-devel \ + redhat-rpm-config sqlite-devel gdb tar tcl-devel tix-devel tk-devel \ + valgrind-devel python-rpm-macros python3 # Update rpmbuild, rpm and autoconf RUN curl -O http://packages.wazuh.com/utils/autoconf/autoconf-2.69.tar.gz && \ @@ -29,9 +27,6 @@ RUN curl -O http://packages.wazuh.com/utils/autoconf/autoconf-2.69.tar.gz && \ cd autoconf-2.69 && ./configure && make -j$(nproc) && \ make install && cd / && rm -rf autoconf-* -RUN curl -O https://packages.wazuh.com/utils/libarchive/libarchive-3.1.2-12.el7.src.rpm && \ - rpmbuild --rebuild libarchive-3.1.2-12.el7.src.rpm && rpm -Uvh /root/rpmbuild/RPMS/x86_64/* --nodeps && rm -rf libarchive-* - RUN curl -O http://packages.wazuh.com/utils/rpm/rpm-4.15.1.tar.bz2 && \ tar -xjf rpm-4.15.1.tar.bz2 && cd rpm-4.15.1 && \ ./configure --without-lua && make -j$(nproc) && make install && cd / && rm -rf rpm-* @@ -46,7 +41,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/" @@ -63,4 +59,4 @@ ADD build.sh /usr/local/bin/build_package RUN chmod +x /usr/local/bin/build_package # Set the entrypoint -ENTRYPOINT ["/usr/local/bin/build_package"] +ENTRYPOINT ["/usr/local/bin/build_package"] \ No newline at end of file diff --git a/rpms/generate_rpm_package.sh b/rpms/generate_rpm_package.sh index 9371dec599..0eafa196c7 100755 --- a/rpms/generate_rpm_package.sh +++ b/rpms/generate_rpm_package.sh @@ -22,17 +22,22 @@ BUILD_DOCKER="yes" DOCKER_TAG="latest" USER_PATH="no" SRC="no" -RPM_AARCH64_BUILDER="rpm_builder_aarch64" -RPM_ARMV7HL_BUILDER="rpm_builder_armv7hl" -RPM_X86_BUILDER="rpm_builder_x86" -RPM_I386_BUILDER="rpm_builder_i386" -RPM_PPC64LE_BUILDER="rpm_builder_ppc64le" -RPM_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/6" -RPM_AARCH64_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/7" -RPM_ARMV7HL_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/7" -RPM_PPC64LE_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/7" +RPM_MANAGER_AARCH64_BUILDER="rpm_builder_aarch64" +RPM_MANAGER_X86_BUILDER="rpm_manager_builder_x86" +RPM_MANAGER_PPC64LE_BUILDER="rpm_builder_ppc64le" +RPM_AGENT_AARCH64_BUILDER="rpm_builder_aarch64" +RPM_AGENT_ARMV7HL_BUILDER="rpm_builder_armv7hl" +RPM_AGENT_X86_BUILDER="rpm_agent_builder_x86" +RPM_AGENT_I386_BUILDER="rpm_builder_i386" +RPM_AGENT_PPC64LE_BUILDER="rpm_builder_ppc64le" LEGACY_RPM_X86_BUILDER="rpm_legacy_builder_x86" LEGACY_RPM_I386_BUILDER="rpm_legacy_builder_i386" +RPM_AGENT_X86_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/6/i386" +RPM_MANAGER_X86_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/7/x86_64" +RPM_I386_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/6/i386" +RPM_AARCH64_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/7/aarch64" +RPM_ARMV7HL_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/7/armv7hl" +RPM_PPC64LE_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/7/ppc64le" LEGACY_RPM_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/5" LEGACY_TAR_FILE="${LEGACY_RPM_BUILDER_DOCKERFILE}/i386/centos-5-i386.tar.gz" TAR_URL="https://packages-dev.wazuh.com/utils/centos-5-i386-build/centos-5-i386.tar.gz" @@ -116,51 +121,67 @@ build() { ARCHITECTURE="armv7hl" fi - if [[ "${TARGET}" == "api" ]]; then - if [[ "${ARCHITECTURE}" = "ppc64le" ]]; then - build_rpm ${RPM_PPC64LE_BUILDER} ${RPM_PPC64LE_BUILDER_DOCKERFILE}/${ARCHITECTURE} || return 1 - elif [[ "${ARCHITECTURE}" = "aarch64" ]]; then - build_rpm ${RPM_AARCH64_BUILDER} ${RPM_AARCH64_BUILDER_DOCKERFILE}/${ARCHITECTURE} || return 1 - elif [[ "${ARCHITECTURE}" = "armv7hl" ]]; then - build_rpm ${RPM_ARMV7HL_BUILDER} ${RPM_ARMV7HL_BUILDER_DOCKERFILE}/${ARCHITECTURE} || return 1 + if [[ "${TARGET}" == "manager" ]]; then + + BUILD_NAME="" + FILE_PATH="" + if [[ "${LEGACY}" == "yes" ]]; then + echo "Legacy is only avaliable on 'agent' target." + return 1 + elif [[ "${ARCHITECTURE}" == "x86_64" ]]; then + BUILD_NAME="${RPM_MANAGER_X86_BUILDER}" + FILE_PATH="${RPM_MANAGER_X86_BUILDER_DOCKERFILE}" + elif [[ "${ARCHITECTURE}" == "ppc64le" ]]; then + BUILD_NAME="${RPM_MANAGER_PPC64LE_BUILDER}" + FILE_PATH="${RPM_PPC64LE_BUILDER_DOCKERFILE}" + elif [[ "${ARCHITECTURE}" == "aarch64" ]]; then + BUILD_NAME="${RPM_MANAGER_AARCH64_BUILDER}" + FILE_PATH="${RPM_AARCH64_BUILDER_DOCKERFILE}" else - build_rpm ${RPM_X86_BUILDER} ${RPM_BUILDER_DOCKERFILE}/${ARCHITECTURE} || return 1 + echo "Invalid architecture '${ARCHITECTURE}' for '${TARGET}'. Choose one of amd64/arm64/ppc64le" + return 1 fi + build_rpm ${BUILD_NAME} ${FILE_PATH} || return 1 - elif [[ "${TARGET}" == "manager" ]] || [[ "${TARGET}" == "agent" ]]; then + elif [[ "${TARGET}" == "agent" ]]; then BUILD_NAME="" FILE_PATH="" - if [[ "${LEGACY}" == "yes" ]] && [[ "${ARCHITECTURE}" == "x86_64" ]]; then - REVISION="${REVISION}.el5" - BUILD_NAME="${LEGACY_RPM_X86_BUILDER}" - FILE_PATH="${LEGACY_RPM_BUILDER_DOCKERFILE}/${ARCHITECTURE}" - elif [[ "${LEGACY}" == "yes" ]] && [[ "${ARCHITECTURE}" == "i386" ]]; then - REVISION="${REVISION}.el5" - BUILD_NAME="${LEGACY_RPM_I386_BUILDER}" - FILE_PATH="${LEGACY_RPM_BUILDER_DOCKERFILE}/${ARCHITECTURE}" - elif [[ "${LEGACY}" == "no" ]] && [[ "${ARCHITECTURE}" == "x86_64" ]]; then - BUILD_NAME="${RPM_X86_BUILDER}" - FILE_PATH="${RPM_BUILDER_DOCKERFILE}/${ARCHITECTURE}" - elif [[ "${LEGACY}" == "no" ]] && [[ "${ARCHITECTURE}" == "i386" ]]; then - BUILD_NAME="${RPM_I386_BUILDER}" - FILE_PATH="${RPM_BUILDER_DOCKERFILE}/${ARCHITECTURE}" - elif [[ "${LEGACY}" == "no" ]] && [[ "${ARCHITECTURE}" == "ppc64le" ]]; then - BUILD_NAME="${RPM_PPC64LE_BUILDER}" - FILE_PATH="${RPM_PPC64LE_BUILDER_DOCKERFILE}/${ARCHITECTURE}" - elif [[ "${LEGACY}" == "no" ]] && [[ "${ARCHITECTURE}" == "aarch64" ]]; then - BUILD_NAME="${RPM_AARCH64_BUILDER}" - FILE_PATH="${RPM_AARCH64_BUILDER_DOCKERFILE}/${ARCHITECTURE}" - elif [[ "${LEGACY}" == "no" ]] && [[ "${ARCHITECTURE}" == "armv7hl" ]]; then - BUILD_NAME="${RPM_ARMV7HL_BUILDER}" - FILE_PATH="${RPM_ARMV7HL_BUILDER_DOCKERFILE}/${ARCHITECTURE}" + if [[ "${LEGACY}" == "yes" ]]; then + if [[ "${ARCHITECTURE}" == "x86_64" ]]; then + REVISION="${REVISION}.el5" + BUILD_NAME="${LEGACY_RPM_I386_BUILDER}" + FILE_PATH="${LEGACY_RPM_BUILDER_DOCKERFILE}" + elif [[ "${ARCHITECTURE}" == "i386" ]]; then + REVISION="${REVISION}.el5" + BUILD_NAME="${LEGACY_RPM_X86_BUILDER}" + FILE_PATH="${LEGACY_RPM_BUILDER_DOCKERFILE}" + else + echo "Legacy is not available on '${ARCHITECTURE}'. Choose one of x86_64/i386" + return 1 + fi + elif [[ "${ARCHITECTURE}" == "x86_64" ]]; then + BUILD_NAME="${RPM_AGENT_X86_BUILDER}" + FILE_PATH="${RPM_AGENT_X86_BUILDER_DOCKERFILE}" + elif [[ "${ARCHITECTURE}" == "i386" ]]; then + BUILD_NAME="${RPM_AGENT_I386_BUILDER}" + FILE_PATH="${RPM_I386_BUILDER_DOCKERFILE}" + elif [[ "${ARCHITECTURE}" == "ppc64le" ]]; then + BUILD_NAME="${RPM_AGENT_PPC64LE_BUILDER}" + FILE_PATH="${RPM_PPC64LE_BUILDER_DOCKERFILE}" + elif [[ "${ARCHITECTURE}" == "aarch64" ]]; then + BUILD_NAME="${RPM_AGENT_AARCH64_BUILDER}" + FILE_PATH="${RPM_AARCH64_BUILDER_DOCKERFILE}" + elif [[ "${ARCHITECTURE}" == "armv7hl" ]]; then + BUILD_NAME="${RPM_AGENT_ARMV7HL_BUILDER}" + FILE_PATH="${RPM_ARMV7HL_BUILDER_DOCKERFILE}" else - echo "Invalid architecture. Choose: x86_64 (amd64 is accepted too), ppc64le or i386" + echo "Invalid architecture '${ARCHITECTURE}' for '${TARGET}'. Choose one of x86_64/i386/ppc64le/aarch64/armv7hl." return 1 fi build_rpm ${BUILD_NAME} ${FILE_PATH} || return 1 else - echo "Invalid target. Choose: manager, agent or api." + echo "Invalid target. Choose: manager or agent." return 1 fi From df704042a0ac81cc051839cdebd8cc5cdff2540d Mon Sep 17 00:00:00 2001 From: jnasselle Date: Tue, 18 Apr 2023 15:58:15 -0300 Subject: [PATCH 864/994] Add missing package on debian jessie Dockerfile --- debs/Debian/8/amd64/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debs/Debian/8/amd64/Dockerfile b/debs/Debian/8/amd64/Dockerfile index 1c9d52a7a1..a5f0d83a14 100644 --- a/debs/Debian/8/amd64/Dockerfile +++ b/debs/Debian/8/amd64/Dockerfile @@ -11,7 +11,7 @@ RUN echo 'Acquire::Check-Valid-Until "false";' >> /etc/apt/apt.conf && \ curl g++ bzip2 debhelper gcc rename make sudo wget expect gnupg perl-base perl \ libc-bin libc6 libc6-dev build-essential dpkg-dev\ cdbs devscripts equivs automake autoconf libtool libaudit-dev selinux-basics \ - libdb5.3 libdb5.3-dev libssl1.0.0 procps gawk libsigsegv2 + libdb5.3 libdb5.3-dev libssl1.0.0 libssl-dev procps gawk libsigsegv2 RUN echo "deb-src http://archive.debian.org/debian jessie contrib main non-free" >> /etc/apt/sources.list && \ apt-get update && apt-get build-dep python3 -y --force-yes From 2cf2b93583c17eb64b1fe000958c8a35b714814f Mon Sep 17 00:00:00 2001 From: jnasselle Date: Tue, 18 Apr 2023 17:32:51 -0300 Subject: [PATCH 865/994] Changes requested by the team - Align comparision operator con bash scripts - Replace debian/eol to debian --- debs/Debian/8/amd64/Dockerfile | 2 +- debs/generate_debian_package.sh | 20 ++++++++++---------- rpms/generate_rpm_package.sh | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/debs/Debian/8/amd64/Dockerfile b/debs/Debian/8/amd64/Dockerfile index a5f0d83a14..177a91925d 100644 --- a/debs/Debian/8/amd64/Dockerfile +++ b/debs/Debian/8/amd64/Dockerfile @@ -1,4 +1,4 @@ -FROM debian/eol:jessie +FROM debian:8 ENV DEBIAN_FRONTEND noninteractive diff --git a/debs/generate_debian_package.sh b/debs/generate_debian_package.sh index 2566ea81bc..2e2c30c4d5 100755 --- a/debs/generate_debian_package.sh +++ b/debs/generate_debian_package.sh @@ -91,9 +91,9 @@ build_deb() { build() { - if [[ "${ARCHITECTURE}" = "x86_64" ]] || [[ "${ARCHITECTURE}" = "amd64" ]]; then + if [[ "${ARCHITECTURE}" == "x86_64" ]] || [[ "${ARCHITECTURE}" == "amd64" ]]; then ARCHITECTURE="amd64" - elif [[ "${ARCHITECTURE}" = "aarch64" ]] || [[ "${ARCHITECTURE}" = "arm64" ]]; then + elif [[ "${ARCHITECTURE}" == "aarch64" ]] || [[ "${ARCHITECTURE}" == "arm64" ]]; then ARCHITECTURE="arm64" elif [[ ${ARCHITECTURE} == "arm32" ]] || [[ ${ARCHITECTURE} == "armhf" ]] || [[ ${ARCHITECTURE} == "armv7hl" ]] ; then ARCHITECTURE="armhf" @@ -102,13 +102,13 @@ build() { if [[ "${TARGET}" == "manager" ]]; then BUILD_NAME="" FILE_PATH="" - if [[ "${ARCHITECTURE}" = "amd64" ]]; then + if [[ "${ARCHITECTURE}" == "amd64" ]]; then BUILD_NAME="${DEB_MANAGER_AMD64_BUILDER}" FILE_PATH="${DEB_MANAGER_AMD64_BUILDER_DOCKERFILE}" - elif [[ "${ARCHITECTURE}" = "arm64" ]]; then + elif [[ "${ARCHITECTURE}" == "arm64" ]]; then BUILD_NAME="${DEB_MANAGER_ARM64_BUILDER}" FILE_PATH="${DEB_ARM64_BUILDER_DOCKERFILE}" - elif [[ "${ARCHITECTURE}" = "ppc64le" ]]; then + elif [[ "${ARCHITECTURE}" == "ppc64le" ]]; then BUILD_NAME="${DEB_MANAGER_PPC64LE_BUILDER}" FILE_PATH="${DEB_PPC64LE_BUILDER_DOCKERFILE}" else @@ -118,19 +118,19 @@ build() { build_deb ${BUILD_NAME} ${FILE_PATH} || return 1 elif [[ "${TARGET}" == "agent" ]] ; then - if [[ "${ARCHITECTURE}" = "amd64" ]]; then + if [[ "${ARCHITECTURE}" == "amd64" ]]; then BUILD_NAME="${DEB_AGENT_AMD64_BUILDER}" FILE_PATH="${DEB_AGENT_AMD64_BUILDER_DOCKERFILE}" - elif [[ "${ARCHITECTURE}" = "i386" ]]; then + elif [[ "${ARCHITECTURE}" == "i386" ]]; then BUILD_NAME="${DEB_AGENT_I386_BUILDER}" FILE_PATH="${DEB_AGENT_I386_BUILDER_DOCKERFILE}" - elif [[ "${ARCHITECTURE}" = "arm64" ]]; then + elif [[ "${ARCHITECTURE}" == "arm64" ]]; then BUILD_NAME="${DEB_AGENT_ARM64_BUILDER}" FILE_PATH="${DEB_ARM64_BUILDER_DOCKERFILE}" - elif [[ "${ARCHITECTURE}" = "ppc64le" ]]; then + elif [[ "${ARCHITECTURE}" == "ppc64le" ]]; then BUILD_NAME="${DEB_AGENT_PPC64LE_BUILDER}" FILE_PATH="${DEB_PPC64LE_BUILDER_DOCKERFILE}" - elif [[ "${ARCHITECTURE}" = "armhf" ]]; then + elif [[ "${ARCHITECTURE}" == "armhf" ]]; then BUILD_NAME="${DEB_AGENT_ARMHF_BUILDER}" FILE_PATH="${DEB_ARMHF_BUILDER_DOCKERFILE}" else diff --git a/rpms/generate_rpm_package.sh b/rpms/generate_rpm_package.sh index 0eafa196c7..1081454655 100755 --- a/rpms/generate_rpm_package.sh +++ b/rpms/generate_rpm_package.sh @@ -80,7 +80,7 @@ build_rpm() { # Download the legacy tar file if it is needed - if [ "${CONTAINER_NAME}" = "${LEGACY_RPM_I386_BUILDER}" ] && [ ! -f "${LEGACY_TAR_FILE}" ]; then + if [ "${CONTAINER_NAME}" == "${LEGACY_RPM_I386_BUILDER}" ] && [ ! -f "${LEGACY_TAR_FILE}" ]; then ${DOWNLOAD_TAR} fi From 39347ab9e73d090ea17bd7b43455cf2ead9e1722 Mon Sep 17 00:00:00 2001 From: jnasselle Date: Wed, 31 May 2023 16:24:25 -0300 Subject: [PATCH 866/994] GH Action related changes - Fix typo - Align ghaction with new container images and paths --- .github/workflows/upload-deb-images.yml | 13 ++++++++----- .github/workflows/upload-rpm-images.yml | 9 ++++++--- debs/generate_debian_package.sh | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index 5a01a68a13..8efe8aa8a3 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -15,7 +15,7 @@ jobs: 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}] + image: [ {CONTAINER_NAME: deb_manager_builder_amd64, DOCKERFILE_PATH: debs/Debian/8/amd64}, {CONTAINER_NAME: deb_agent_builder_amd64, DOCKERFILE_PATH: debs/Debian/7/amd64}, {CONTAINER_NAME: deb_builder_i386, DOCKERFILE_PATH: debs/Debian/7/i386}] fail-fast: false steps: - name: Cancel previous runs @@ -33,10 +33,13 @@ jobs: with: filters: | i386: - - 'debs/Debian/i386/**' + - 'debs/Debian/7/i386/**' - 'debs/build.sh' - amd64: - - 'debs/Debian/amd64/**' + manager_amd64: + - 'debs/Debian/8/amd64/**' + - 'debs/build.sh' + agent_amd64: + - 'debs/Debian/7/amd64/**' - 'debs/build.sh' - name: Copy build.sh to Dockerfile path @@ -48,7 +51,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.image.CONTAINER_NAME == 'deb_builder_i386' ) || ( steps.changes.outputs.amd64 == 'true' && matrix.image.CONTAINER_NAME == 'deb_builder_amd64' ) + if: ( steps.changes.outputs.i386 == 'true' && matrix.image.CONTAINER_NAME == 'deb_builder_i386' ) || ( steps.changes.outputs.manager_amd64 == 'true' && matrix.image.CONTAINER_NAME == 'deb_manager_builder_amd64') || ( steps.changes.outputs.agent_amd64 == 'true' && matrix.image.CONTAINER_NAME == 'deb_agent_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 9e414a8b22..f5243d4bac 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -15,7 +15,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}] + image: [ {CONTAINER_NAME: rpm_manager_builder_x86, DOCKERFILE_PATH: rpms/CentOS/7/x86_64}, {CONTAINER_NAME: rpm_agent_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 @@ -35,7 +35,10 @@ jobs: i386: - 'rpms/CentOS/6/i386/**' - 'rpms/build.sh' - x86_64: + manager_x86_64: + - 'rpms/CentOS/7/x86_64/**' + - 'rpms/build.sh' + agent_x86_64: - 'rpms/CentOS/6/x86_64/**' - 'rpms/build.sh' @@ -48,7 +51,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.image.CONTAINER_NAME == 'rpm_builder_i386' ) || ( steps.changes.outputs.x86_64 == 'true' && matrix.image.CONTAINER_NAME == 'rpm_builder_x86' ) + if: ( steps.changes.outputs.i386 == 'true' && matrix.image.CONTAINER_NAME == 'rpm_builder_i386' ) || ( steps.changes.outputs.manager_x86_64 == 'true' && matrix.image.CONTAINER_NAME == 'rpm_manager_builder_x86' ) || ( steps.changes.outputs.agent_x86_64 == 'true' && matrix.image.CONTAINER_NAME == 'rpm_agent_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 }} diff --git a/debs/generate_debian_package.sh b/debs/generate_debian_package.sh index 2e2c30c4d5..3f82700846 100755 --- a/debs/generate_debian_package.sh +++ b/debs/generate_debian_package.sh @@ -29,7 +29,7 @@ DEB_AGENT_ARMHF_BUILDER="deb_builder_armhf" DEB_MANAGER_AMD64_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/8/amd64" DEB_AGENT_AMD64_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/7/amd64" DEB_ARM64_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/9/arm64" -DEB_I386_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/8/i386" +DEB_I386_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/7/i386" DEB_PPC64LE_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/9/ppc64le" DEB_ARMHF_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/9/armhf" CHECKSUMDIR="" From e2cc25bab973c5fe1c91cd872d90777e58a6a180 Mon Sep 17 00:00:00 2001 From: jnasselle Date: Wed, 31 May 2023 21:48:33 -0300 Subject: [PATCH 867/994] Fix GH Actions to build rpm/deb packages --- .github/workflows/build-deb-packages.yml | 18 +++++++++++------- .github/workflows/build-rpm-packages.yml | 13 ++++++++----- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 14f71a7c53..ec879dfb5a 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -38,30 +38,34 @@ jobs: - 'debs/Debian/**' - 'debs/build.sh' deb_images_i386: - - 'debs/Debian/i386/**' + - 'debs/Debian/7/i386/**' - 'debs/build.sh' - deb_images_amd64: - - 'debs/Debian/amd64/**' + deb_images_manager_amd64: + - 'debs/Debian/8/md64/**' + - 'debs/build.sh' + deb_images_agent_amd64: + - 'debs/Debian/7/amd64/**' - 'debs/build.sh' deb_packages: - 'debs/SPECS/**' - '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') + if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || ((steps.changes.outputs.deb_images_manager_amd64 == 'true' || steps.changes.outputs.deb_images_agent_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 if [ $MAJOR == "4.9" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi echo "CONTAINER_NAME=deb_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV + if [ "${{ matrix.ARCHITECTURE }}" == "amd64" ]; then echo "CONTAINER_NAME=deb_{{ matrix.TYPE }}_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=deb_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; fi - 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') + if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || ((steps.changes.outputs.deb_images_manager_amd64 == 'true' || steps.changes.outputs.deb_images_agent_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 }} - 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') + if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || ((steps.changes.outputs.deb_images_manager_amd64 == 'true' || steps.changes.outputs.deb_images_agent_amd64 == 'true') && matrix.ARCHITECTURE == 'amd64') working-directory: ./debs run: | REVISION="${{ github.head_ref }}" @@ -69,7 +73,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') + if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || ((steps.changes.outputs.deb_images_manager_amd64 == 'true' || steps.changes.outputs.deb_images_agent_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 2b74397d13..e33b3f3b38 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -41,15 +41,18 @@ jobs: rpm_images_i386: - 'rpms/CentOS/6/i386/**' - 'rpms/build.sh' - rpm_images_x86_64: + rpm_images_agent_x86_64: - 'rpms/CentOS/6/x86_64/**' - 'rpms/build.sh' + rpm_images_manager_x86_64: + - 'rpms/CentOS/7/x86_64/**' + - 'rpms/build.sh' rpm_packages: - 'rpms/SPECS/**' - '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') + if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || ((steps.changes.outputs.rpm_images_manager_x86_64 == 'true' || steps.changes.outputs.rpm_images_agent_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 @@ -57,12 +60,12 @@ 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') + if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || ((steps.changes.outputs.rpm_images_manager_x86_64 == 'true' || steps.changes.outputs.rpm_images_agent_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 }} - 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_manager_x86_64 == 'true' || steps.changes.outputs.rpm_images_agent_x86_64 == 'true') && matrix.ARCHITECTURE == 'x86_64') working-directory: ./rpms run: | REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g' ) @@ -70,7 +73,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') + if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || ((steps.changes.outputs.rpm_images_manager_x86_64 == 'true' || steps.changes.outputs.rpm_images_agent_x86_64 == 'true') && matrix.ARCHITECTURE == 'x86_64') uses: actions/upload-artifact@v2 with: name: ${{ env.PACKAGE_NAME }} From 46cbdad5a617f50ae86f0d4c735c0be144e4429e Mon Sep 17 00:00:00 2001 From: jnasselle Date: Wed, 31 May 2023 22:20:16 -0300 Subject: [PATCH 868/994] Fix GH Action typo --- .github/workflows/build-deb-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index ec879dfb5a..7011003719 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -57,7 +57,7 @@ jobs: 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.9" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi echo "CONTAINER_NAME=deb_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV - if [ "${{ matrix.ARCHITECTURE }}" == "amd64" ]; then echo "CONTAINER_NAME=deb_{{ matrix.TYPE }}_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=deb_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; fi + if [ "${{ matrix.ARCHITECTURE }}" == "amd64" ]; then echo "CONTAINER_NAME=deb_${{ matrix.TYPE }}_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=deb_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; fi - 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_manager_amd64 == 'true' || steps.changes.outputs.deb_images_agent_amd64 == 'true') && matrix.ARCHITECTURE == 'amd64') From fe1e74df0c37cd903eb8cc6b335a0ee45a5748f7 Mon Sep 17 00:00:00 2001 From: jnasselle Date: Thu, 1 Jun 2023 00:17:06 -0300 Subject: [PATCH 869/994] Add GHA condition to container build and push --- .github/workflows/upload-deb-images.yml | 4 +++- .github/workflows/upload-rpm-images.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index 8efe8aa8a3..84465342e6 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -41,6 +41,8 @@ jobs: agent_amd64: - 'debs/Debian/7/amd64/**' - 'debs/build.sh' + generation_script: + - 'debs/generate_debian_package.sh' - name: Copy build.sh to Dockerfile path run: @@ -51,7 +53,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.image.CONTAINER_NAME == 'deb_builder_i386' ) || ( steps.changes.outputs.manager_amd64 == 'true' && matrix.image.CONTAINER_NAME == 'deb_manager_builder_amd64') || ( steps.changes.outputs.agent_amd64 == 'true' && matrix.image.CONTAINER_NAME == 'deb_agent_builder_amd64' ) + if: (steps.changes.outputs.generation_script == 'true' ) || ( steps.changes.outputs.i386 == 'true' && matrix.image.CONTAINER_NAME == 'deb_builder_i386' ) || ( steps.changes.outputs.manager_amd64 == 'true' && matrix.image.CONTAINER_NAME == 'deb_manager_builder_amd64') || ( steps.changes.outputs.agent_amd64 == 'true' && matrix.image.CONTAINER_NAME == 'deb_agent_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 f5243d4bac..aa340afa12 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -41,6 +41,8 @@ jobs: agent_x86_64: - 'rpms/CentOS/6/x86_64/**' - 'rpms/build.sh' + generation_script: + - 'rpms/generate_rpm_package.sh' - name: Copy build.sh to Dockerfile path run: @@ -51,7 +53,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.image.CONTAINER_NAME == 'rpm_builder_i386' ) || ( steps.changes.outputs.manager_x86_64 == 'true' && matrix.image.CONTAINER_NAME == 'rpm_manager_builder_x86' ) || ( steps.changes.outputs.agent_x86_64 == 'true' && matrix.image.CONTAINER_NAME == 'rpm_agent_builder_x86' ) + if: (steps.changes.outputs.generation_script == 'true' ) || ( steps.changes.outputs.i386 == 'true' && matrix.image.CONTAINER_NAME == 'rpm_builder_i386' ) || ( steps.changes.outputs.manager_x86_64 == 'true' && matrix.image.CONTAINER_NAME == 'rpm_manager_builder_x86' ) || ( steps.changes.outputs.agent_x86_64 == 'true' && matrix.image.CONTAINER_NAME == 'rpm_agent_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 82f52773c2d979ad08626046e0792315d5307568 Mon Sep 17 00:00:00 2001 From: jnasselle Date: Thu, 1 Jun 2023 03:38:15 -0300 Subject: [PATCH 870/994] Minor fixes on GH Actions --- .github/workflows/build-deb-packages.yml | 2 +- .github/workflows/build-rpm-packages.yml | 2 +- .github/workflows/test-install-deb.yml | 7 +++--- .github/workflows/test-install-rpm.yml | 27 ++++++++++++------------ rpms/CentOS/7/x86_64/Dockerfile | 2 +- 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 7011003719..474a9c3d4c 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -41,7 +41,7 @@ jobs: - 'debs/Debian/7/i386/**' - 'debs/build.sh' deb_images_manager_amd64: - - 'debs/Debian/8/md64/**' + - 'debs/Debian/8/amd64/**' - 'debs/build.sh' deb_images_agent_amd64: - 'debs/Debian/7/amd64/**' diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index e33b3f3b38..42869e82a4 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -57,7 +57,7 @@ jobs: 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.9" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(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_${{ matrix.TYPE }}_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_manager_x86_64 == 'true' || steps.changes.outputs.rpm_images_agent_x86_64 == 'true') && matrix.ARCHITECTURE == 'x86_64') diff --git a/.github/workflows/test-install-deb.yml b/.github/workflows/test-install-deb.yml index bd1fadc7fa..4d866999b7 100644 --- a/.github/workflows/test-install-deb.yml +++ b/.github/workflows/test-install-deb.yml @@ -11,8 +11,6 @@ jobs: Wait-for-package-building: runs-on: ubuntu-latest - strategy: - fail-fast: false steps: - name: Cancel previous runs uses: fkirc/skip-duplicate-actions@master @@ -56,10 +54,11 @@ jobs: - 'debs/Debian/**' - 'debs/build.sh' deb_images_i386: - - 'debs/Debian/i386/**' + - 'debs/Debian/7/i386/**' - 'debs/build.sh' deb_images_amd64: - - 'debs/Debian/amd64/**' + - 'debs/Debian/7/amd64/**' + - 'debs/Debian/8/amd64/**' - 'debs/build.sh' deb_packages: - 'debs/SPECS/**' diff --git a/.github/workflows/test-install-rpm.yml b/.github/workflows/test-install-rpm.yml index a44498a53a..c9eed2f4f9 100644 --- a/.github/workflows/test-install-rpm.yml +++ b/.github/workflows/test-install-rpm.yml @@ -10,8 +10,6 @@ on: jobs: Wait-for-package-building: runs-on: ubuntu-latest - strategy: - fail-fast: false steps: - name: Cancel previous runs uses: fkirc/skip-duplicate-actions@master @@ -34,18 +32,18 @@ jobs: 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"}, - {NAME: 'fedora:34', ARCH: "x86_64"}, - {NAME: 'centos:6.9', ARCH: "x86_64", INIT: "initd"}] + 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"} + - {NAME: 'fedora:34', ARCH: "x86_64"} + - {NAME: 'centos:6.9', ARCH: "x86_64", INIT: "initd"} type: [agent, manager] exclude: - system: {ARCH: "i386"} @@ -69,6 +67,7 @@ jobs: - 'rpms/build.sh' rpm_images_x86_64: - 'rpms/CentOS/6/x86_64/**' + - 'rpms/CentOS/7/x86_64/**' - 'rpms/build.sh' rpm_packages: - 'rpms/SPECS/**' diff --git a/rpms/CentOS/7/x86_64/Dockerfile b/rpms/CentOS/7/x86_64/Dockerfile index 04ac405115..e5bd06ac20 100644 --- a/rpms/CentOS/7/x86_64/Dockerfile +++ b/rpms/CentOS/7/x86_64/Dockerfile @@ -59,4 +59,4 @@ ADD build.sh /usr/local/bin/build_package RUN chmod +x /usr/local/bin/build_package # Set the entrypoint -ENTRYPOINT ["/usr/local/bin/build_package"] \ No newline at end of file +ENTRYPOINT ["/usr/local/bin/build_package"] From 2b5b0fe20033b8c1b7794f0fc45cbf3435d709ca Mon Sep 17 00:00:00 2001 From: Norberto Vicchi Date: Mon, 14 Aug 2023 09:42:44 -0300 Subject: [PATCH 871/994] Separated manager & client docker images names --- rpms/generate_rpm_package.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rpms/generate_rpm_package.sh b/rpms/generate_rpm_package.sh index 1081454655..0f63626ea0 100755 --- a/rpms/generate_rpm_package.sh +++ b/rpms/generate_rpm_package.sh @@ -22,14 +22,14 @@ BUILD_DOCKER="yes" DOCKER_TAG="latest" USER_PATH="no" SRC="no" -RPM_MANAGER_AARCH64_BUILDER="rpm_builder_aarch64" +RPM_MANAGER_AARCH64_BUILDER="rpm_manager_builder_aarch64" RPM_MANAGER_X86_BUILDER="rpm_manager_builder_x86" -RPM_MANAGER_PPC64LE_BUILDER="rpm_builder_ppc64le" -RPM_AGENT_AARCH64_BUILDER="rpm_builder_aarch64" -RPM_AGENT_ARMV7HL_BUILDER="rpm_builder_armv7hl" +RPM_MANAGER_PPC64LE_BUILDER="rpm_manager_builder_ppc64le" +RPM_AGENT_AARCH64_BUILDER="rpm_agent_builder_aarch64" +RPM_AGENT_ARMV7HL_BUILDER="rpm_agent_builder_armv7hl" RPM_AGENT_X86_BUILDER="rpm_agent_builder_x86" -RPM_AGENT_I386_BUILDER="rpm_builder_i386" -RPM_AGENT_PPC64LE_BUILDER="rpm_builder_ppc64le" +RPM_AGENT_I386_BUILDER="rpm_agent_builder_i386" +RPM_AGENT_PPC64LE_BUILDER="rpm_agent_builder_ppc64le" LEGACY_RPM_X86_BUILDER="rpm_legacy_builder_x86" LEGACY_RPM_I386_BUILDER="rpm_legacy_builder_i386" RPM_AGENT_X86_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/6/i386" @@ -359,4 +359,4 @@ main() { clean 0 } -main "$@" \ No newline at end of file +main "$@" From baa53669cb892743617c5f8efb6b3fb8d86224c1 Mon Sep 17 00:00:00 2001 From: Norberto Vicchi Date: Mon, 14 Aug 2023 09:43:18 -0300 Subject: [PATCH 872/994] Separated manager & client docker images names --- debs/generate_debian_package.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debs/generate_debian_package.sh b/debs/generate_debian_package.sh index 3f82700846..ab8226f8e0 100755 --- a/debs/generate_debian_package.sh +++ b/debs/generate_debian_package.sh @@ -19,13 +19,13 @@ BUILD_DOCKER="yes" DOCKER_TAG="latest" INSTALLATION_PATH="/var/ossec" DEB_MANAGER_AMD64_BUILDER="deb_manager_builder_amd64" -DEB_MANAGER_ARM64_BUILDER="deb_builder_arm64" -DEB_MANAGER_PPC64LE_BUILDER="deb_builder_ppc64le" +DEB_MANAGER_ARM64_BUILDER="deb_manager_builder_arm64" +DEB_MANAGER_PPC64LE_BUILDER="deb_manager_builder_ppc64le" DEB_AGENT_AMD64_BUILDER="deb_agent_builder_amd64" -DEB_AGENT_I386_BUILDER="deb_builder_i386" -DEB_AGENT_PPC64LE_BUILDER="deb_builder_ppc64le" -DEB_AGENT_ARM64_BUILDER="deb_builder_arm64" -DEB_AGENT_ARMHF_BUILDER="deb_builder_armhf" +DEB_AGENT_I386_BUILDER="deb_agent_builder_i386" +DEB_AGENT_PPC64LE_BUILDER="deb_agent_builder_ppc64le" +DEB_AGENT_ARM64_BUILDER="deb_agent_builder_arm64" +DEB_AGENT_ARMHF_BUILDER="deb_agent_builder_armhf" DEB_MANAGER_AMD64_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/8/amd64" DEB_AGENT_AMD64_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/7/amd64" DEB_ARM64_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/9/arm64" From f88ac803b01857878329b81ee23f0ead2c1627ae Mon Sep 17 00:00:00 2001 From: Jose Luis Carreras Marin Date: Mon, 14 Aug 2023 15:21:55 +0200 Subject: [PATCH 873/994] Adapted workflows to new naming for docker images --- .github/workflows/build-deb-packages.yml | 4 ++-- .github/workflows/build-rpm-packages.yml | 2 +- .github/workflows/upload-deb-images.yml | 4 ++-- .github/workflows/upload-rpm-images.yml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 474a9c3d4c..12f77096a1 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -56,8 +56,8 @@ jobs: 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.9" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi - echo "CONTAINER_NAME=deb_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV - if [ "${{ matrix.ARCHITECTURE }}" == "amd64" ]; then echo "CONTAINER_NAME=deb_${{ matrix.TYPE }}_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=deb_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; fi + echo "CONTAINER_NAME=deb_${{ matrix.TYPE }}_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV + if [ "${{ matrix.ARCHITECTURE }}" == "amd64" ]; then echo "CONTAINER_NAME=deb_${{ matrix.TYPE }}_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=deb_${{ matrix.TYPE }}_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; fi - 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_manager_amd64 == 'true' || steps.changes.outputs.deb_images_agent_amd64 == 'true') && matrix.ARCHITECTURE == 'amd64') diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 42869e82a4..ac9b54910c 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -57,7 +57,7 @@ jobs: 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.9" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi - if [ "${{ matrix.ARCHITECTURE }}" == "x86_64" ]; then echo "CONTAINER_NAME=rpm_${{ matrix.TYPE }}_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_${{ matrix.TYPE }}_builder_x86" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=rpm_${{ matrix.TYPE }}_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_manager_x86_64 == 'true' || steps.changes.outputs.rpm_images_agent_x86_64 == 'true') && matrix.ARCHITECTURE == 'x86_64') diff --git a/.github/workflows/upload-deb-images.yml b/.github/workflows/upload-deb-images.yml index 84465342e6..319981e65a 100644 --- a/.github/workflows/upload-deb-images.yml +++ b/.github/workflows/upload-deb-images.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - image: [ {CONTAINER_NAME: deb_manager_builder_amd64, DOCKERFILE_PATH: debs/Debian/8/amd64}, {CONTAINER_NAME: deb_agent_builder_amd64, DOCKERFILE_PATH: debs/Debian/7/amd64}, {CONTAINER_NAME: deb_builder_i386, DOCKERFILE_PATH: debs/Debian/7/i386}] + image: [ {CONTAINER_NAME: deb_manager_builder_amd64, DOCKERFILE_PATH: debs/Debian/8/amd64}, {CONTAINER_NAME: deb_agent_builder_amd64, DOCKERFILE_PATH: debs/Debian/7/amd64}, {CONTAINER_NAME: deb_agent_builder_i386, DOCKERFILE_PATH: debs/Debian/7/i386}] fail-fast: false steps: - name: Cancel previous runs @@ -53,7 +53,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.generation_script == 'true' ) || ( steps.changes.outputs.i386 == 'true' && matrix.image.CONTAINER_NAME == 'deb_builder_i386' ) || ( steps.changes.outputs.manager_amd64 == 'true' && matrix.image.CONTAINER_NAME == 'deb_manager_builder_amd64') || ( steps.changes.outputs.agent_amd64 == 'true' && matrix.image.CONTAINER_NAME == 'deb_agent_builder_amd64' ) + if: (steps.changes.outputs.generation_script == 'true' ) || ( steps.changes.outputs.i386 == 'true' && matrix.image.CONTAINER_NAME == 'deb_agent_builder_i386' ) || ( steps.changes.outputs.manager_amd64 == 'true' && matrix.image.CONTAINER_NAME == 'deb_manager_builder_amd64') || ( steps.changes.outputs.agent_amd64 == 'true' && matrix.image.CONTAINER_NAME == 'deb_agent_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 aa340afa12..a73d2849c7 100644 --- a/.github/workflows/upload-rpm-images.yml +++ b/.github/workflows/upload-rpm-images.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - image: [ {CONTAINER_NAME: rpm_manager_builder_x86, DOCKERFILE_PATH: rpms/CentOS/7/x86_64}, {CONTAINER_NAME: rpm_agent_builder_x86, DOCKERFILE_PATH: rpms/CentOS/6/x86_64}, {CONTAINER_NAME: rpm_builder_i386, DOCKERFILE_PATH: rpms/CentOS/6/i386}] + image: [ {CONTAINER_NAME: rpm_manager_builder_x86, DOCKERFILE_PATH: rpms/CentOS/7/x86_64}, {CONTAINER_NAME: rpm_agent_builder_x86, DOCKERFILE_PATH: rpms/CentOS/6/x86_64}, {CONTAINER_NAME: rpm_agent_builder_i386, DOCKERFILE_PATH: rpms/CentOS/6/i386}] fail-fast: false steps: - name: Cancel previous runs @@ -53,7 +53,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.generation_script == 'true' ) || ( steps.changes.outputs.i386 == 'true' && matrix.image.CONTAINER_NAME == 'rpm_builder_i386' ) || ( steps.changes.outputs.manager_x86_64 == 'true' && matrix.image.CONTAINER_NAME == 'rpm_manager_builder_x86' ) || ( steps.changes.outputs.agent_x86_64 == 'true' && matrix.image.CONTAINER_NAME == 'rpm_agent_builder_x86' ) + if: (steps.changes.outputs.generation_script == 'true' ) || ( steps.changes.outputs.i386 == 'true' && matrix.image.CONTAINER_NAME == 'rpm_agent_builder_i386' ) || ( steps.changes.outputs.manager_x86_64 == 'true' && matrix.image.CONTAINER_NAME == 'rpm_manager_builder_x86' ) || ( steps.changes.outputs.agent_x86_64 == 'true' && matrix.image.CONTAINER_NAME == 'rpm_agent_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 1fabb81db80cc74a5d88b634c3ce7cb30ac7b436 Mon Sep 17 00:00:00 2001 From: Norberto Vicchi Date: Mon, 14 Aug 2023 13:38:55 -0300 Subject: [PATCH 874/994] Fixed i386 arq --- debs/generate_debian_package.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debs/generate_debian_package.sh b/debs/generate_debian_package.sh index ab8226f8e0..8de94e9219 100755 --- a/debs/generate_debian_package.sh +++ b/debs/generate_debian_package.sh @@ -29,9 +29,9 @@ DEB_AGENT_ARMHF_BUILDER="deb_agent_builder_armhf" DEB_MANAGER_AMD64_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/8/amd64" DEB_AGENT_AMD64_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/7/amd64" DEB_ARM64_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/9/arm64" -DEB_I386_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/7/i386" +DEB_AGENT_I386_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/7/i386" DEB_PPC64LE_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/9/ppc64le" -DEB_ARMHF_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/9/armhf" +DEB_AGENT_ARMHF_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/9/armhf" CHECKSUMDIR="" CHECKSUM="no" PACKAGES_BRANCH="master" From 03898e19e6f3dbd1239e2e0301e9d82b08cba76b Mon Sep 17 00:00:00 2001 From: jnasselle Date: Tue, 22 Aug 2023 16:19:22 -0300 Subject: [PATCH 875/994] Several fixes - Fix RPM Dockerfile variables and proper selection - Add download helper on RPM generation - Fix DEB Dockerfile variables and propper selection --- debs/generate_debian_package.sh | 16 +++++----- rpms/generate_rpm_package.sh | 53 +++++++++++++++++++-------------- 2 files changed, 39 insertions(+), 30 deletions(-) diff --git a/debs/generate_debian_package.sh b/debs/generate_debian_package.sh index 8de94e9219..4f14917329 100755 --- a/debs/generate_debian_package.sh +++ b/debs/generate_debian_package.sh @@ -28,9 +28,11 @@ DEB_AGENT_ARM64_BUILDER="deb_agent_builder_arm64" DEB_AGENT_ARMHF_BUILDER="deb_agent_builder_armhf" DEB_MANAGER_AMD64_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/8/amd64" DEB_AGENT_AMD64_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/7/amd64" -DEB_ARM64_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/9/arm64" +DEB_MANAGER_ARM64_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/9/arm64" +DEB_AGENT_ARM64_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/9/arm64" DEB_AGENT_I386_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/7/i386" -DEB_PPC64LE_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/9/ppc64le" +DEB_AGENT_PPC64LE_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/9/ppc64le" +DEB_MANAGER_PPC64LE_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/9/ppc64le" DEB_AGENT_ARMHF_BUILDER_DOCKERFILE="${CURRENT_PATH}/Debian/9/armhf" CHECKSUMDIR="" CHECKSUM="no" @@ -107,10 +109,10 @@ build() { FILE_PATH="${DEB_MANAGER_AMD64_BUILDER_DOCKERFILE}" elif [[ "${ARCHITECTURE}" == "arm64" ]]; then BUILD_NAME="${DEB_MANAGER_ARM64_BUILDER}" - FILE_PATH="${DEB_ARM64_BUILDER_DOCKERFILE}" + FILE_PATH="${DEB_MANAGER_ARM64_BUILDER_DOCKERFILE}" elif [[ "${ARCHITECTURE}" == "ppc64le" ]]; then BUILD_NAME="${DEB_MANAGER_PPC64LE_BUILDER}" - FILE_PATH="${DEB_PPC64LE_BUILDER_DOCKERFILE}" + FILE_PATH="${DEB_MANAGER_PPC64LE_BUILDER_DOCKERFILE}" else echo "Invalid architecture '${ARCHITECTURE}' for '${TARGET}'. Choose one of amd64/arm64/ppc64le." return 1 @@ -126,13 +128,13 @@ build() { FILE_PATH="${DEB_AGENT_I386_BUILDER_DOCKERFILE}" elif [[ "${ARCHITECTURE}" == "arm64" ]]; then BUILD_NAME="${DEB_AGENT_ARM64_BUILDER}" - FILE_PATH="${DEB_ARM64_BUILDER_DOCKERFILE}" + FILE_PATH="${DEB_AGENT_ARM64_BUILDER_DOCKERFILE}" elif [[ "${ARCHITECTURE}" == "ppc64le" ]]; then BUILD_NAME="${DEB_AGENT_PPC64LE_BUILDER}" - FILE_PATH="${DEB_PPC64LE_BUILDER_DOCKERFILE}" + FILE_PATH="${DEB_AGENT_PPC64LE_BUILDER_DOCKERFILE}" elif [[ "${ARCHITECTURE}" == "armhf" ]]; then BUILD_NAME="${DEB_AGENT_ARMHF_BUILDER}" - FILE_PATH="${DEB_ARMHF_BUILDER_DOCKERFILE}" + FILE_PATH="${DEB_AGENT_ARMHF_BUILDER_DOCKERFILE}" else echo "Invalid architecture '${ARCHITECTURE}' for '${TARGET}'. Choose one of amd64/i386/ppc64le/arm64/arm32." return 1 diff --git a/rpms/generate_rpm_package.sh b/rpms/generate_rpm_package.sh index 0f63626ea0..b2c3ee8f36 100755 --- a/rpms/generate_rpm_package.sh +++ b/rpms/generate_rpm_package.sh @@ -32,13 +32,16 @@ RPM_AGENT_I386_BUILDER="rpm_agent_builder_i386" RPM_AGENT_PPC64LE_BUILDER="rpm_agent_builder_ppc64le" LEGACY_RPM_X86_BUILDER="rpm_legacy_builder_x86" LEGACY_RPM_I386_BUILDER="rpm_legacy_builder_i386" -RPM_AGENT_X86_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/6/i386" +RPM_AGENT_X86_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/6/x86_64" +RPM_AGENT_I386_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/6/i386" RPM_MANAGER_X86_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/7/x86_64" -RPM_I386_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/6/i386" -RPM_AARCH64_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/7/aarch64" -RPM_ARMV7HL_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/7/armv7hl" -RPM_PPC64LE_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/7/ppc64le" -LEGACY_RPM_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/5" +RPM_AGENT_AARCH64_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/7/aarch64" +RPM_MANAGER_AARCH64_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/7/aarch64" +RPM_AGENT_ARMV7HL_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/7/armv7hl" +RPM_AGENT_PPC64LE_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/7/ppc64le" +RPM_MANAGER_PPC64LE_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/7/ppc64le" +LEGACY_RPM_AGENT_I386_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/5/i386" +LEGACY_RPM_AGENT_X86_BUILDER_DOCKERFILE="${CURRENT_PATH}/CentOS/5/x86_64" LEGACY_TAR_FILE="${LEGACY_RPM_BUILDER_DOCKERFILE}/i386/centos-5-i386.tar.gz" TAR_URL="https://packages-dev.wazuh.com/utils/centos-5-i386-build/centos-5-i386.tar.gz" INSTALLATION_PATH="/var/ossec" @@ -52,11 +55,15 @@ FUTURE="no" trap ctrl_c INT -if command -v curl > /dev/null 2>&1 ; then - DOWNLOAD_TAR="curl ${TAR_URL} -o ${LEGACY_TAR_FILE} -s" -elif command -v wget > /dev/null 2>&1 ; then - DOWNLOAD_TAR="wget ${TAR_URL} -o ${LEGACY_TAR_FILE} -q" -fi +download_file() { + URL=$1 + DESTDIR=$2 + if command -v curl > /dev/null 2>&1 ; then + (cd ${DESTDIR} && curl -sO ${URL}) + elif command -v wget > /dev/null 2>&1 ; then + wget ${URL} -P ${DESTDIR} -q + fi +} clean() { exit_code=$1 @@ -80,8 +87,8 @@ build_rpm() { # Download the legacy tar file if it is needed - if [ "${CONTAINER_NAME}" == "${LEGACY_RPM_I386_BUILDER}" ] && [ ! -f "${LEGACY_TAR_FILE}" ]; then - ${DOWNLOAD_TAR} + if ([[ "${CONTAINER_NAME}" == "${LEGACY_RPM_I386_BUILDER}" ]] || [[ "${CONTAINER_NAME}" == "${LEGACY_RPM_X86_BUILDER}" ]] ) && [ ! -f "${LEGACY_TAR_FILE}" ]; then + download_file ${TAR_URL} ${DOCKERFILE_PATH} fi # Create an optional parameter to share the local source code as a volume @@ -133,10 +140,10 @@ build() { FILE_PATH="${RPM_MANAGER_X86_BUILDER_DOCKERFILE}" elif [[ "${ARCHITECTURE}" == "ppc64le" ]]; then BUILD_NAME="${RPM_MANAGER_PPC64LE_BUILDER}" - FILE_PATH="${RPM_PPC64LE_BUILDER_DOCKERFILE}" + FILE_PATH="${RPM_MANAGER_PPC64LE_BUILDER_DOCKERFILE}" elif [[ "${ARCHITECTURE}" == "aarch64" ]]; then BUILD_NAME="${RPM_MANAGER_AARCH64_BUILDER}" - FILE_PATH="${RPM_AARCH64_BUILDER_DOCKERFILE}" + FILE_PATH="${RPM_MANAGER_AARCH64_BUILDER_DOCKERFILE}" else echo "Invalid architecture '${ARCHITECTURE}' for '${TARGET}'. Choose one of amd64/arm64/ppc64le" return 1 @@ -150,12 +157,12 @@ build() { if [[ "${LEGACY}" == "yes" ]]; then if [[ "${ARCHITECTURE}" == "x86_64" ]]; then REVISION="${REVISION}.el5" - BUILD_NAME="${LEGACY_RPM_I386_BUILDER}" - FILE_PATH="${LEGACY_RPM_BUILDER_DOCKERFILE}" + BUILD_NAME="${LEGACY_RPM_X86_BUILDER}" + FILE_PATH="${LEGACY_RPM_AGENT_X86_BUILDER_DOCKERFILE}" elif [[ "${ARCHITECTURE}" == "i386" ]]; then REVISION="${REVISION}.el5" - BUILD_NAME="${LEGACY_RPM_X86_BUILDER}" - FILE_PATH="${LEGACY_RPM_BUILDER_DOCKERFILE}" + BUILD_NAME="${LEGACY_RPM_I386_BUILDER}" + FILE_PATH="${LEGACY_RPM_AGENT_I386_BUILDER_DOCKERFILE}" else echo "Legacy is not available on '${ARCHITECTURE}'. Choose one of x86_64/i386" return 1 @@ -165,16 +172,16 @@ build() { FILE_PATH="${RPM_AGENT_X86_BUILDER_DOCKERFILE}" elif [[ "${ARCHITECTURE}" == "i386" ]]; then BUILD_NAME="${RPM_AGENT_I386_BUILDER}" - FILE_PATH="${RPM_I386_BUILDER_DOCKERFILE}" + FILE_PATH="${RPM_AGENT_I386_BUILDER_DOCKERFILE}" elif [[ "${ARCHITECTURE}" == "ppc64le" ]]; then BUILD_NAME="${RPM_AGENT_PPC64LE_BUILDER}" - FILE_PATH="${RPM_PPC64LE_BUILDER_DOCKERFILE}" + FILE_PATH="${RPM_AGENT_PPC64LE_BUILDER_DOCKERFILE}" elif [[ "${ARCHITECTURE}" == "aarch64" ]]; then BUILD_NAME="${RPM_AGENT_AARCH64_BUILDER}" - FILE_PATH="${RPM_AARCH64_BUILDER_DOCKERFILE}" + FILE_PATH="${RPM_AGENT_AARCH64_BUILDER_DOCKERFILE}" elif [[ "${ARCHITECTURE}" == "armv7hl" ]]; then BUILD_NAME="${RPM_AGENT_ARMV7HL_BUILDER}" - FILE_PATH="${RPM_ARMV7HL_BUILDER_DOCKERFILE}" + FILE_PATH="${RPM_AGENT_ARMV7HL_BUILDER_DOCKERFILE}" else echo "Invalid architecture '${ARCHITECTURE}' for '${TARGET}'. Choose one of x86_64/i386/ppc64le/aarch64/armv7hl." return 1 From 64d987ee529d655acc9f6a7ef67daaa4b4401055 Mon Sep 17 00:00:00 2001 From: Norberto Vicchi Date: Mon, 4 Sep 2023 17:49:15 -0300 Subject: [PATCH 876/994] Change to a more coherent name some variables --- .github/workflows/build-deb-packages.yml | 10 +++++----- .github/workflows/build-rpm-packages.yml | 10 +++++----- .github/workflows/test-install-deb.yml | 10 +++++----- .github/workflows/test-install-rpm.yml | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 12f77096a1..c367bb4b94 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -37,7 +37,7 @@ jobs: deb_images: - 'debs/Debian/**' - 'debs/build.sh' - deb_images_i386: + deb_images_agent_i386: - 'debs/Debian/7/i386/**' - 'debs/build.sh' deb_images_manager_amd64: @@ -51,7 +51,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_manager_amd64 == 'true' || steps.changes.outputs.deb_images_agent_amd64 == 'true') && matrix.ARCHITECTURE == 'amd64') + if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_agent_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || ((steps.changes.outputs.deb_images_manager_amd64 == 'true' || steps.changes.outputs.deb_images_agent_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 @@ -60,12 +60,12 @@ jobs: if [ "${{ matrix.ARCHITECTURE }}" == "amd64" ]; then echo "CONTAINER_NAME=deb_${{ matrix.TYPE }}_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=deb_${{ matrix.TYPE }}_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; fi - 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_manager_amd64 == 'true' || steps.changes.outputs.deb_images_agent_amd64 == 'true') && matrix.ARCHITECTURE == 'amd64') + if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_agent_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || ((steps.changes.outputs.deb_images_manager_amd64 == 'true' || steps.changes.outputs.deb_images_agent_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 }} - 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_manager_amd64 == 'true' || steps.changes.outputs.deb_images_agent_amd64 == 'true') && matrix.ARCHITECTURE == 'amd64') + if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_agent_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || ((steps.changes.outputs.deb_images_manager_amd64 == 'true' || steps.changes.outputs.deb_images_agent_amd64 == 'true') && matrix.ARCHITECTURE == 'amd64') working-directory: ./debs run: | REVISION="${{ github.head_ref }}" @@ -73,7 +73,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_manager_amd64 == 'true' || steps.changes.outputs.deb_images_agent_amd64 == 'true') && matrix.ARCHITECTURE == 'amd64') + if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_agent_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || ((steps.changes.outputs.deb_images_manager_amd64 == 'true' || steps.changes.outputs.deb_images_agent_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 ac9b54910c..a2199e1e48 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -38,7 +38,7 @@ jobs: rpm_images: - 'rpms/CentOS/**' - 'rpms/build.sh' - rpm_images_i386: + rpm_images_agent_i386: - 'rpms/CentOS/6/i386/**' - 'rpms/build.sh' rpm_images_agent_x86_64: @@ -52,7 +52,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_manager_x86_64 == 'true' || steps.changes.outputs.rpm_images_agent_x86_64 == 'true') && matrix.ARCHITECTURE == 'x86_64') + if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_agent_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || ((steps.changes.outputs.rpm_images_manager_x86_64 == 'true' || steps.changes.outputs.rpm_images_agent_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 @@ -60,12 +60,12 @@ jobs: if [ "${{ matrix.ARCHITECTURE }}" == "x86_64" ]; then echo "CONTAINER_NAME=rpm_${{ matrix.TYPE }}_builder_x86" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=rpm_${{ matrix.TYPE }}_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_manager_x86_64 == 'true' || steps.changes.outputs.rpm_images_agent_x86_64 == 'true') && matrix.ARCHITECTURE == 'x86_64') + if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_agent_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || ((steps.changes.outputs.rpm_images_manager_x86_64 == 'true' || steps.changes.outputs.rpm_images_agent_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 }} - 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_manager_x86_64 == 'true' || steps.changes.outputs.rpm_images_agent_x86_64 == 'true') && matrix.ARCHITECTURE == 'x86_64') + if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_agent_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || ((steps.changes.outputs.rpm_images_manager_x86_64 == 'true' || steps.changes.outputs.rpm_images_agent_x86_64 == 'true') && matrix.ARCHITECTURE == 'x86_64') working-directory: ./rpms run: | REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g' ) @@ -73,7 +73,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_manager_x86_64 == 'true' || steps.changes.outputs.rpm_images_agent_x86_64 == 'true') && matrix.ARCHITECTURE == 'x86_64') + if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_agent_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || ((steps.changes.outputs.rpm_images_manager_x86_64 == 'true' || steps.changes.outputs.rpm_images_agent_x86_64 == 'true') && matrix.ARCHITECTURE == 'x86_64') uses: actions/upload-artifact@v2 with: name: ${{ env.PACKAGE_NAME }} diff --git a/.github/workflows/test-install-deb.yml b/.github/workflows/test-install-deb.yml index 4d866999b7..cdea85795c 100644 --- a/.github/workflows/test-install-deb.yml +++ b/.github/workflows/test-install-deb.yml @@ -53,7 +53,7 @@ jobs: deb_images: - 'debs/Debian/**' - 'debs/build.sh' - deb_images_i386: + deb_images_agent_i386: - 'debs/Debian/7/i386/**' - 'debs/build.sh' deb_images_amd64: @@ -65,14 +65,14 @@ jobs: - 'debs/generate_debian_package.sh' - 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') + if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_agent_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') + if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_agent_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,11 +83,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') + if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_agent_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') + if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_agent_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-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 c9eed2f4f9..d06d11ee4a 100644 --- a/.github/workflows/test-install-rpm.yml +++ b/.github/workflows/test-install-rpm.yml @@ -62,7 +62,7 @@ jobs: rpm_images: - 'rpms/CentOS/**' - 'rpms/build.sh' - rpm_images_i386: + rpm_images_agent_i386: - 'rpms/CentOS/6/i386/**' - 'rpms/build.sh' rpm_images_x86_64: @@ -74,14 +74,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_agent_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_agent_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 @@ -92,11 +92,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_agent_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_agent_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-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 c512416c6fb009aa0000e30d049a1a556075fecb Mon Sep 17 00:00:00 2001 From: Norberto Vicchi Date: Tue, 5 Sep 2023 18:15:50 -0300 Subject: [PATCH 877/994] Deprecated centos 6 for manager --- .github/workflows/test-install-rpm.yml | 2 +- rpms/build.sh | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-install-rpm.yml b/.github/workflows/test-install-rpm.yml index d06d11ee4a..2752d434c3 100644 --- a/.github/workflows/test-install-rpm.yml +++ b/.github/workflows/test-install-rpm.yml @@ -62,7 +62,7 @@ jobs: rpm_images: - 'rpms/CentOS/**' - 'rpms/build.sh' - rpm_images_agent_i386: + rpm_images_agent_i386: - 'rpms/CentOS/6/i386/**' - 'rpms/build.sh' rpm_images_x86_64: diff --git a/rpms/build.sh b/rpms/build.sh index 93056d9e17..05d1224fda 100755 --- a/rpms/build.sh +++ b/rpms/build.sh @@ -105,11 +105,19 @@ fi if [ "${legacy}" = "no" ]; then echo "%_source_filedigest_algorithm 8" >> /root/.rpmmacros echo "%_binary_filedigest_algorithm 8" >> /root/.rpmmacros - echo " %rhel 6" >> /root/.rpmmacros - echo " %centos 6" >> /root/.rpmmacros - echo " %centos_ver 6" >> /root/.rpmmacros - echo " %dist .el6" >> /root/.rpmmacros - echo " %el6 1" >> /root/.rpmmacros + if [ "${build_target}" = "agent" ]; then + echo " %rhel 6" >> /root/.rpmmacros + echo " %centos 6" >> /root/.rpmmacros + echo " %centos_ver 6" >> /root/.rpmmacros + echo " %dist .el6" >> /root/.rpmmacros + echo " %el6 1" >> /root/.rpmmacros + elif [ "${build_target}" = "manager" ]; then + echo " %rhel 7" >> /root/.rpmmacros + echo " %centos 7" >> /root/.rpmmacros + echo " %centos_ver 7" >> /root/.rpmmacros + echo " %dist .el7" >> /root/.rpmmacros + echo " %el7 1" >> /root/.rpmmacros + fi rpmbuild="/usr/local/bin/rpmbuild" fi From a498c8a8d154af8505dcba2e574abf525b77bed2 Mon Sep 17 00:00:00 2001 From: jnasselle Date: Thu, 5 Oct 2023 14:04:01 -0300 Subject: [PATCH 878/994] Add Python 3.10 support --- debs/SPECS/wazuh-manager/debian/rules | 8 ++++---- rpms/SPECS/wazuh-manager.spec | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debs/SPECS/wazuh-manager/debian/rules b/debs/SPECS/wazuh-manager/debian/rules index 1ab7ba9753..587d42bc9e 100644 --- a/debs/SPECS/wazuh-manager/debian/rules +++ b/debs/SPECS/wazuh-manager/debian/rules @@ -213,11 +213,11 @@ override_dh_install: override_dh_fixperms: dh_fixperms # Fix Python permissions - chmod 0750 ${TARGET_DIR}$(INSTALLATION_DIR)/framework/python/bin/2to3-3.9 - chmod 0750 ${TARGET_DIR}$(INSTALLATION_DIR)/framework/python/bin/pydoc3.9 + chmod 0750 ${TARGET_DIR}$(INSTALLATION_DIR)/framework/python/bin/2to3-3.10 + chmod 0750 ${TARGET_DIR}$(INSTALLATION_DIR)/framework/python/bin/pydoc3.10 chmod 0750 ${TARGET_DIR}$(INSTALLATION_DIR)/framework/python/bin/python3-config - chmod 0640 ${TARGET_DIR}$(INSTALLATION_DIR)/framework/python/lib/pkgconfig/python-3.9-embed.pc - chmod 0640 ${TARGET_DIR}$(INSTALLATION_DIR)/framework/python/lib/pkgconfig/python-3.9.pc + chmod 0640 ${TARGET_DIR}$(INSTALLATION_DIR)/framework/python/lib/pkgconfig/python-3.10-embed.pc + chmod 0640 ${TARGET_DIR}$(INSTALLATION_DIR)/framework/python/lib/pkgconfig/python-3.10.pc chmod 0640 ${TARGET_DIR}$(INSTALLATION_DIR)/framework/python/lib/pkgconfig/python3.pc override_dh_auto_clean: diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index f6c9be4bac..7c303922ad 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -682,7 +682,7 @@ rm -fr %{buildroot} %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 +%{_localstatedir}/lib/libpython3.10.so.1.0 %dir %attr(770, wazuh, wazuh) %{_localstatedir}/logs %attr(660, wazuh, wazuh) %ghost %{_localstatedir}/logs/active-responses.log %attr(660, wazuh, wazuh) %ghost %{_localstatedir}/logs/api.log From 37383a2173b831f46523bd97d274e16d9b0d06ce Mon Sep 17 00:00:00 2001 From: Jose Luis Carreras Marin Date: Wed, 8 Nov 2023 09:45:18 +0100 Subject: [PATCH 879/994] Fix some file format in the end line --- .github/workflows/test-install-deb.yml | 2 +- .github/workflows/test-install-rpm.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-install-deb.yml b/.github/workflows/test-install-deb.yml index cdea85795c..010086f86a 100644 --- a/.github/workflows/test-install-deb.yml +++ b/.github/workflows/test-install-deb.yml @@ -90,4 +90,4 @@ jobs: - name: Launch docker if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_agent_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-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 + 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 }} diff --git a/.github/workflows/test-install-rpm.yml b/.github/workflows/test-install-rpm.yml index 2752d434c3..46b96fa9d5 100644 --- a/.github/workflows/test-install-rpm.yml +++ b/.github/workflows/test-install-rpm.yml @@ -99,4 +99,4 @@ jobs: - name: Launch docker if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_agent_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-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 + 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 }} From 0a4ef53c86dd74a729fac23a00c7ab505c03cf54 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Wed, 8 Nov 2023 09:26:34 -0300 Subject: [PATCH 880/994] Fix ism script for distributed --- unattended_installer/install_functions/indexer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/indexer.sh b/unattended_installer/install_functions/indexer.sh index 4a5daf69f3..f373235819 100644 --- a/unattended_installer/install_functions/indexer.sh +++ b/unattended_installer/install_functions/indexer.sh @@ -179,7 +179,7 @@ function indexer_startCluster() { exit 1 else common_logger "Wazuh indexer cluster security configuration initialized." - eval "bash /usr/share/wazuh-indexer/bin/indexer-ism-init.sh ${debug}" + eval "bash /usr/share/wazuh-indexer/bin/indexer-ism-init.sh -i ${wazuh_indexer_ip} ${debug}" common_logger "Wazuh indexer cluster ISM initialized." fi eval "common_curl --silent ${filebeat_wazuh_template} --max-time 300 --retry 5 --retry-delay 5 ${debug}" | 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}" From 76f27d8edb24830e7cba06d9f07e5759092dabdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Ruiz?= Date: Wed, 8 Nov 2023 15:57:06 +0100 Subject: [PATCH 881/994] Fix bug with -i option --- stack/indexer/indexer-ism-init.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/stack/indexer/indexer-ism-init.sh b/stack/indexer/indexer-ism-init.sh index eabdb81ca0..d5568b26b7 100644 --- a/stack/indexer/indexer-ism-init.sh +++ b/stack/indexer/indexer-ism-init.sh @@ -209,6 +209,9 @@ function show_help() { echo -e " -p, --indexer-password " echo -e " Specifies the Wazuh indexer admin user password." echo -e "" + echo -e " -P, --priority " + echo -e " Specifies the policy's priority." + echo -e "" echo -e " -s, --min-shard-size " echo -e " Set the minimum shard size in GB. By default 25." echo -e "" @@ -252,6 +255,7 @@ function main() { show_help else INDEXER_HOSTNAME="${2}" + INDEXER_URL="https://${INDEXER_HOSTNAME}:9200" shift 2 fi ;; @@ -274,6 +278,15 @@ function main() { shift 2 fi ;; + "-P" | "--priority") + if [ -z "${2}" ]; then + echo "Error on arguments. Probably missing after -P|--priority" + show_help + else + ISM_PRIORITY="${2}" + shift 2 + fi + ;; *) echo "Unknow option: ${1}" show_help From b4da392007d1824f83e53495959083bef1d18737 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Wed, 8 Nov 2023 12:06:40 -0300 Subject: [PATCH 882/994] Moved ISM scripts from package to base --- stack/indexer/base/builder.sh | 2 ++ stack/indexer/deb/debian/rules | 2 -- stack/indexer/rpm/wazuh-indexer.spec | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/stack/indexer/base/builder.sh b/stack/indexer/base/builder.sh index ebc681c4d3..f89cfb79be 100644 --- a/stack/indexer/base/builder.sh +++ b/stack/indexer/base/builder.sh @@ -67,6 +67,8 @@ cp -r /root/stack/indexer/base/files/etc/wazuh-indexer/* ./etc/wazuh-indexer/ cp -r /root/stack/indexer/base/files/etc/sysconfig ./etc/ cp -r /root/stack/indexer/base/files/etc/init.d ./etc/ cp -r /root/stack/indexer/base/files/usr ./ +cp -r /root/stack/indexer/indexer-ism-init.sh bin/ +cp -r /root/stack/indexer/indexer-init.sh bin/ rm -rf ./plugins/opensearch-security/tools/install_demo_configuration.sh cp /root/VERSION . diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index 2181dac0db..d538c46dc1 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -106,8 +106,6 @@ override_dh_install: cp -pr $(REPO_DIR)/config/indexer/roles/internal_users.yml $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/ cp /root/stack/indexer/indexer-security-init.sh $(TARGET_DIR)$(INSTALLATION_DIR)/bin/ - cp /root/stack/indexer/indexer-ism-init.sh $(TARGET_DIR)$(INSTALLATION_DIR)/bin/ - cp /root/stack/indexer/indexer-init.sh $(TARGET_DIR)$(INSTALLATION_DIR)/bin/ # Create group and user in chroot environment groupadd -r $(GROUP) diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 70d4e8ced4..fd4c14afb8 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -99,8 +99,6 @@ cp %{REPO_DIR}/config/indexer/roles/roles.yml ${RPM_BUILD_ROOT}%{CONFIG_DIR}/ope cp %{REPO_DIR}/config/indexer/roles/roles_mapping.yml ${RPM_BUILD_ROOT}%{CONFIG_DIR}/opensearch-security cp /root/stack/indexer/indexer-security-init.sh ${RPM_BUILD_ROOT}%{INSTALL_DIR}/bin/ -cp /root/stack/indexer/indexer-ism-init.sh ${RPM_BUILD_ROOT}%{INSTALL_DIR}/bin/ -cp /root/stack/indexer/indexer-init.sh ${RPM_BUILD_ROOT}%{INSTALL_DIR}/bin/ chmod 750 ${RPM_BUILD_ROOT}/etc/init.d/wazuh-indexer From ff2d54c4e5cdacea099e78ff4faad7cfb48045dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Ruiz?= Date: Wed, 8 Nov 2023 18:18:12 +0100 Subject: [PATCH 883/994] Improve error handling --- stack/indexer/indexer-ism-init.sh | 59 +++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 18 deletions(-) diff --git a/stack/indexer/indexer-ism-init.sh b/stack/indexer/indexer-ism-init.sh index d5568b26b7..15998ed84f 100644 --- a/stack/indexer/indexer-ism-init.sh +++ b/stack/indexer/indexer-ism-init.sh @@ -85,10 +85,15 @@ function generate_rollover_template() { function load_templates() { # Note: the wazuh-template.json could also be loaded here. for alias in "${aliases[@]}"; do - echo "TEMPLATES AND POLICIES - Uploading ${alias} template" - generate_rollover_template "${alias}" | curl -s -k ${C_AUTH} \ - -X PUT "${INDEXER_URL}/_template/${alias}-rollover" -o /dev/null \ - -H 'Content-Type: application/json' -d @- + generate_rollover_template "${alias}" | + if ! curl -s -k ${C_AUTH} \ + -X PUT "${INDEXER_URL}/_template/${alias}-rollover" -o /dev/null \ + -H 'Content-Type: application/json' -d @-; then + echo "Error uploading ${alias} template" + return 1 + else + echo "${alias} template uploaded" + fi done } @@ -110,15 +115,21 @@ function upload_rollover_policy() { # Check if the ${POLICY_NAME} ISM policy was loaded (404 error if not found) if [[ "${policy_exists}" == "404" ]]; then - echo "TEMPLATES AND POLICIES - Uploading ${POLICY_NAME} ISM policy" - curl -s -k ${C_AUTH} -o /dev/null \ + if ! curl -s -k ${C_AUTH} -o /dev/null \ -X PUT "${INDEXER_URL}/_plugins/_ism/policies/${POLICY_NAME}" \ - -H 'Content-Type: application/json' -d "$(generate_rollover_policy)" + -H 'Content-Type: application/json' \ + -d "$(generate_rollover_policy)"; then + echo "Error uploading ${POLICY_NAME} policy" + return 1 + else + echo "${POLICY_NAME} policy uploaded" + fi else if [[ "${policy_exists}" == "200" ]]; then - echo "TEMPLATES AND POLICIES - ${POLICY_NAME} policy already exists" + echo "${POLICY_NAME} policy already exists" else - echo "TEMPLATES AND POLICIES - Error uploading ${POLICY_NAME} policy" + echo "Error checking if ${POLICY_NAME} exists" + return 1 fi fi } @@ -158,9 +169,15 @@ function generate_write_index_alias() { # 1. The alias. String. ######################################################################### function create_write_index() { - curl -s -k ${C_AUTH} -o /dev/null \ + if ! curl -s -k ${C_AUTH} -o /dev/null \ -X PUT "$INDEXER_URL/%3C${1}-4.x-%7Bnow%2Fd%7D-000001%3E?pretty" \ - -H 'Content-Type: application/json' -d "$(generate_write_index_alias "${1}")" + -H 'Content-Type: application/json' \ + -d "$(generate_write_index_alias "${1}")"; then + echo "Error creating ${1} write index" + exit 1 + else + echo "${1} write index created" + fi } ######################################################################### @@ -169,7 +186,6 @@ function create_write_index() { # 1. List of aliases to initialize. ######################################################################### function create_indices() { - echo "TEMPLATES AND POLICIES - Creating write indices" for alias in "${aliases[@]}"; do # Check if there are any write indices for the current alias write_index_exists=$(check_for_write_index "${alias}") @@ -181,7 +197,6 @@ function create_indices() { done } - ######################################################################### # Shows usage help. ######################################################################### @@ -215,6 +230,9 @@ function show_help() { echo -e " -s, --min-shard-size " echo -e " Set the minimum shard size in GB. By default 25." echo -e "" + echo -e " -v, --verbose" + echo -e " Set verbose mode. Prints more information." + echo -e "" exit 1 } @@ -287,6 +305,10 @@ function main() { shift 2 fi ;; + "-v" | "--verbose") + set -x + shift + ;; *) echo "Unknow option: ${1}" show_help @@ -295,13 +317,14 @@ function main() { done # Load the Wazuh Indexer templates - load_templates - # Upload the rollover policy - upload_rollover_policy - # Create the initial write indices - create_indices "${aliases[@]}" + if load_templates && upload_rollover_policy && create_indices "${aliases[@]}"; then + echo "Indexer ISM initialization finished successfully" + else + echo "Indexer ISM initialization failed" + exit 1 + fi } main "$@" From d5206a62cad0e73554b96497f0323157e1b31fe4 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Wed, 8 Nov 2023 14:48:57 -0300 Subject: [PATCH 884/994] Added validation for ISM error --- unattended_installer/install_functions/indexer.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/unattended_installer/install_functions/indexer.sh b/unattended_installer/install_functions/indexer.sh index f373235819..00196dc9d6 100644 --- a/unattended_installer/install_functions/indexer.sh +++ b/unattended_installer/install_functions/indexer.sh @@ -124,7 +124,11 @@ function indexer_initialize() { if [ -n "${AIO}" ]; then 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 ${indexer_cert_path}/root-ca.pem -cert ${indexer_cert_path}/admin.pem -key ${indexer_cert_path}/admin-key.pem -h 127.0.0.1 ${debug}" eval "bash /usr/share/wazuh-indexer/bin/indexer-ism-init.sh ${debug}" - common_logger "Wazuh indexer cluster ISM initialized." + if [ "${PIPESTATUS[0]}" != 0 ]; then + common_logger -w "The Wazuh indexer cluster ISM policy could not be created." + else + common_logger "The Wazuh indexer cluster ISM initialized." + fi fi if [ "${#indexer_node_names[@]}" -eq 1 ] && [ -z "${AIO}" ]; then @@ -180,7 +184,11 @@ function indexer_startCluster() { else common_logger "Wazuh indexer cluster security configuration initialized." eval "bash /usr/share/wazuh-indexer/bin/indexer-ism-init.sh -i ${wazuh_indexer_ip} ${debug}" - common_logger "Wazuh indexer cluster ISM initialized." + if [ "${PIPESTATUS[0]}" != 0 ]; then + common_logger -w "The Wazuh indexer cluster ISM policy could not be created." + else + common_logger "The Wazuh indexer cluster ISM initialized." + fi fi eval "common_curl --silent ${filebeat_wazuh_template} --max-time 300 --retry 5 --retry-delay 5 ${debug}" | 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 From 1926852384e8e101b9591a8c702da1c99b47d2c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 9 Nov 2023 13:11:31 +0100 Subject: [PATCH 885/994] Wazuh central components removal is now checked --- .../install_functions/installCommon.sh | 53 ++++++++++++++++--- 1 file changed, 45 insertions(+), 8 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 4af3388778..07bd4bf3a9 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -630,12 +630,22 @@ function installCommon_rollBack() { common_logger "Removing Wazuh manager." if [ "${sys_type}" == "yum" ]; then installCommon_checkYumLock - eval "yum remove wazuh-manager -y ${debug}" + if [ "${attempt}" -ne "${max_attempts}" ]; then + eval "yum remove wazuh-manager -y ${debug}" + manager_installed=$(yum list installed 2>/dev/null | grep wazuh-manager) + fi elif [ "${sys_type}" == "apt-get" ]; then installCommon_checkAptLock eval "apt-get remove --purge wazuh-manager -y ${debug}" + manager_installed=$(apt list --installed 2>/dev/null | grep wazuh-manager) fi - common_logger "Wazuh manager removed." + + if [ -n "${manager_installed}" ]; then + common_logger -w "The Wazuh manager package could not be removed." + else + common_logger "Wazuh manager removed." + fi + fi if [[ ( -n "${wazuh_remaining_files}" || -n "${wazuh_installed}" ) && ( -n "${wazuh}" || -n "${AIO}" || -n "${uninstall}" ) ]]; then @@ -646,12 +656,21 @@ function installCommon_rollBack() { common_logger "Removing Wazuh indexer." if [ "${sys_type}" == "yum" ]; then installCommon_checkYumLock - eval "yum remove wazuh-indexer -y ${debug}" + if [ "${attempt}" -ne "${max_attempts}" ]; then + eval "yum remove wazuh-indexer -y ${debug}" + indexer_installed=$(yum list installed 2>/dev/null | grep wazuh-indexer) + fi elif [ "${sys_type}" == "apt-get" ]; then installCommon_checkAptLock eval "apt-get remove --purge wazuh-indexer -y ${debug}" + indexer_installed=$(apt list --installed 2>/dev/null | grep wazuh-indexer) + fi + + if [ -n "${indexer_installed}" ]; then + common_logger -w "The Wazuh indexer package could not be removed." + else + common_logger "Wazuh indexer removed." fi - common_logger "Wazuh indexer removed." fi if [[ ( -n "${indexer_remaining_files}" || -n "${indexer_installed}" ) && ( -n "${indexer}" || -n "${AIO}" || -n "${uninstall}" ) ]]; then @@ -664,12 +683,21 @@ function installCommon_rollBack() { common_logger "Removing Filebeat." if [ "${sys_type}" == "yum" ]; then installCommon_checkYumLock - eval "yum remove filebeat -y ${debug}" + if [ "${attempt}" -ne "${max_attempts}" ]; then + eval "yum remove filebeat -y ${debug}" + filebeat_installed=$(yum list installed 2>/dev/null | grep filebeat) + fi elif [ "${sys_type}" == "apt-get" ]; then installCommon_checkAptLock eval "apt-get remove --purge filebeat -y ${debug}" + filebeat_installed=$(apt list --installed 2>/dev/null | grep filebeat) + fi + + if [ -n "${filebeat_installed}" ]; then + common_logger -w "The Filebeat package could not be removed." + else + common_logger "Filebeat removed." fi - common_logger "Filebeat removed." fi if [[ ( -n "${filebeat_remaining_files}" || -n "${filebeat_installed}" ) && ( -n "${wazuh}" || -n "${AIO}" || -n "${uninstall}" ) ]]; then @@ -682,12 +710,21 @@ function installCommon_rollBack() { common_logger "Removing Wazuh dashboard." if [ "${sys_type}" == "yum" ]; then installCommon_checkYumLock - eval "yum remove wazuh-dashboard -y ${debug}" + if [ "${attempt}" -ne "${max_attempts}" ]; then + eval "yum remove wazuh-dashboard -y ${debug}" + dashboard_installed=$(yum list installed 2>/dev/null | grep wazuh-dashboard) + fi elif [ "${sys_type}" == "apt-get" ]; then installCommon_checkAptLock eval "apt-get remove --purge wazuh-dashboard -y ${debug}" + dashboard_installed=$(apt list --installed 2>/dev/null | grep wazuh-dashboard) + fi + + if [ -n "${dashboard_installed}" ]; then + common_logger -w "The Wazuh dashboard package could not be removed." + else + common_logger "Wazuh dashboard removed." fi - common_logger "Wazuh dashboard removed." fi if [[ ( -n "${dashboard_remaining_files}" || -n "${dashboard_installed}" ) && ( -n "${dashboard}" || -n "${AIO}" || -n "${uninstall}" ) ]]; then From 57f0b9c2bd2412a3f58f4f4b12180ae73906bb07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Ruiz?= Date: Thu, 9 Nov 2023 19:29:59 +0100 Subject: [PATCH 886/994] Extend indexer-init.sh to accept arguments The arguments are sent the script that needs them --- stack/indexer/indexer-init.sh | 129 ++++++++++++++++++++++++- stack/indexer/indexer-security-init.sh | 4 +- 2 files changed, 128 insertions(+), 5 deletions(-) diff --git a/stack/indexer/indexer-init.sh b/stack/indexer/indexer-init.sh index 39d6766579..80882e290e 100644 --- a/stack/indexer/indexer-init.sh +++ b/stack/indexer/indexer-init.sh @@ -5,11 +5,134 @@ INSTALL_PATH="/usr/share/wazuh-indexer" BIN_PATH="${INSTALL_PATH}/bin" -main() { + +######################################################################### +# Parse arguments for security init script. +######################################################################### +function parse_security_args() { + security_args=() + + while [ -n "$1" ]; do + case "$1" in + "-h" | "--help") + security_args+=("${1}") + shift + ;; + "-ho" | "--host") + if [ -n "$2" ]; then + security_args+=("${1}" "${2}") + shift 2 + fi + ;; + "--port") + if [ -n "$2" ]; then + security_args+=("${1}" "${2}") + shift 2 + fi + ;; + "--options") + if [ -n "$2" ]; then + security_args+=("${1}" "${2}") + shift 2 + fi + ;; + *) + shift + ;; + esac + done +} + + +######################################################################### +# Run the security init script. +######################################################################### +function run_security_init() { echo "Executing Wazuh indexer security init script..." - /bin/bash "${BIN_PATH}/indexer-security-init.sh" + parse_security_args "$@" + /bin/bash "${BIN_PATH}/indexer-security-init.sh" "${security_args[@]}" +} + + +######################################################################### +# Parse arguments for ISM init script. +######################################################################### +function parse_ism_args() { + ism_args=() + + while [ -n "${1}" ]; do + case "${1}" in + "-a" | "--min-index-age") + if [ -n "${2}" ]; then + ism_args+=("${1}" "${2}") + shift 2 + fi + ;; + "-d" | "--min-doc-count") + if [ -n "${2}" ]; then + ism_args+=("${1}" "${2}") + shift 2 + fi + ;; + "-h" | "--help") + ism_args+=("${1}") + shift + ;; + "-i" | "--indexer-hostname") + if [ -n "${2}" ]; then + ism_args+=("${1}" "${2}") + shift 2 + fi + ;; + "-p" | "--indexer-password") + if [ -n "${2}" ]; then + ism_args+=("${1}" "${2}") + shift 2 + fi + ;; + "-s" | "--min-shard-size") + if [ -n "${2}" ]; then + ism_args+=("${1}" "${2}") + shift 2 + fi + ;; + "-P" | "--priority") + if [ -n "${2}" ]; then + ism_args+=("${1}" "${2}") + shift 2 + fi + ;; + "-v" | "--verbose") + ism_args+=("${1}") + shift + ;; + *) + shift + ;; + esac + done +} + + +######################################################################### +# Run the ISM init script. +######################################################################### +function run_ism_init() { echo "Executing Wazuh indexer ISM init script..." - /bin/bash "${BIN_PATH}/indexer-ism-init.sh" + parse_ism_args "$@" + /bin/bash "${BIN_PATH}/indexer-ism-init.sh" "${ism_args[@]}"; } + +######################################################################### +# Main function. +######################################################################### +function main() { + # If run_security_init returns 0, then run_ism_init + if run_security_init "$@" -gt 0; then + run_ism_init "$@" + fi +} + + main "$@" diff --git a/stack/indexer/indexer-security-init.sh b/stack/indexer/indexer-security-init.sh index 8c82b99a5d..b46eb3e47d 100644 --- a/stack/indexer/indexer-security-init.sh +++ b/stack/indexer/indexer-security-init.sh @@ -122,7 +122,7 @@ help() { echo "Usage: $0 [OPTIONS]" echo echo " -ho, --host [Optional] Target IP or DNS to configure security." - echo " -p, --port [Optional] wazuh-indexer security port." + echo " --port [Optional] wazuh-indexer security port." echo " --options [Optional] Custom securityadmin options." echo " -h, --help Show this help." echo @@ -156,7 +156,7 @@ main() { help 1 fi ;; - "-p"|"--port") + "--port") if [ -n "$2" ]; then PORT="$2" PORT=$(echo "${PORT}" | tr -d "[\"\']") From d5135ca2e842e282ad7b01cdd58dd53a3b302276 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Thu, 9 Nov 2023 22:22:26 +0100 Subject: [PATCH 887/994] Changed ISM script --- .../actions/offline-installation/common.sh | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/actions/offline-installation/common.sh b/.github/actions/offline-installation/common.sh index 7042ae644d..4fc3514481 100644 --- a/.github/actions/offline-installation/common.sh +++ b/.github/actions/offline-installation/common.sh @@ -77,10 +77,10 @@ function dashboard_installation() { 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 + fi sleep 10 - # In this context, 302 HTTP code refers to SSL certificates warning: success. + # 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 @@ -91,7 +91,7 @@ function dashboard_installation() { function download_resources() { - check_file "${ABSOLUTE_PATH}"/wazuh-install.sh + check_file "${ABSOLUTE_PATH}"/wazuh-install.sh bash "${ABSOLUTE_PATH}"/wazuh-install.sh -dw "${sys_type}" echo "INFO: Downloading the resources..." @@ -118,7 +118,7 @@ function download_resources() { } function enable_start_service() { - + systemctl daemon-reload systemctl enable "${1}" systemctl start "${1}" @@ -166,7 +166,7 @@ function filebeat_installation() { 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 + fi sleep 10 check_shards @@ -190,7 +190,7 @@ function indexer_initialize() { echo "ERROR: The indexer node is not started." exit 1 fi - /usr/share/wazuh-indexer/bin/indexer-security-init.sh + /usr/share/wazuh-indexer/bin/indexer-init.sh } @@ -199,10 +199,10 @@ function indexer_installation() { if [ "${sys_type}" == "rpm" ]; then rpm --import ./wazuh-offline/wazuh-files/GPG-KEY-WAZUH fi - - install_package "wazuh-indexer" + + 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 @@ -293,7 +293,7 @@ function install_package() { dpkg -i ./wazuh-offline/wazuh-packages/"${1}"*.deb elif [ "${sys_type}" == "rpm" ]; then rpm -ivh ./wazuh-offline/wazuh-packages/"${1}"*.rpm - fi + fi } @@ -306,6 +306,6 @@ function manager_installation() { enable_start_service "wazuh-manager" elif [ "${sys_type}" == "rpm" ]; then /var/ossec/bin/wazuh-control start - fi + fi } From bc48ccb896835cde084f77fea3ab37efd4e3320a Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Thu, 9 Nov 2023 22:24:16 +0100 Subject: [PATCH 888/994] Added workflow_dispatch --- .github/workflows/offline-installation.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/offline-installation.yml b/.github/workflows/offline-installation.yml index b1eea6ae07..f0abc40a59 100644 --- a/.github/workflows/offline-installation.yml +++ b/.github/workflows/offline-installation.yml @@ -3,7 +3,8 @@ on: pull_request: paths: - 'unattended_installer/install_functions/wazuh-offline-download.sh' - + workflow_dispatch: + jobs: Build-wazuh-install-script: runs-on: ubuntu-latest @@ -28,7 +29,7 @@ jobs: path: | unattended_installer/wazuh-install.sh if-no-files-found: error - + Test-offline-installation-debian: runs-on: ubuntu-latest needs: Build-wazuh-install-script @@ -41,7 +42,7 @@ jobs: - 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 @@ -54,9 +55,9 @@ jobs: - 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 From c28c2a014ec1e7fe43f512026840308fc8c2770b Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Fri, 10 Nov 2023 20:35:57 +0100 Subject: [PATCH 889/994] Added support to multiples Wazuh dashboard plugins --- .../opensearch-dashboards/Docker/build.sh | 40 +++++++++++-------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/wazuhapp/opensearch-dashboards/Docker/build.sh b/wazuhapp/opensearch-dashboards/Docker/build.sh index 090c37eb42..b9b80ce5f4 100755 --- a/wazuhapp/opensearch-dashboards/Docker/build.sh +++ b/wazuhapp/opensearch-dashboards/Docker/build.sh @@ -9,8 +9,8 @@ app_revision=$3 # Paths plugin_platform_dir="/tmp/source" -source_dir="${plugin_platform_dir}/plugins/wazuh" -build_dir="${source_dir}/build" +source_dir="${plugin_platform_dir}/plugins" +packages_list=( "main_wazuh" "wazuh-check-updates_wazuhCheckUpdates" "wazuh-core_wazuhCore" ) destination_dir="/wazuh_app" checksum_dir="/var/local/checksum" git_clone_tmp_dir="/tmp/wazuh-app" @@ -107,29 +107,35 @@ download_wazuh_app_sources() { exit 1 fi - cp -r ${git_clone_tmp_dir}/plugins/main ${source_dir} + for item in ${packages_list[@]}; do + array=(${item//_/ }) + cp -r "${git_clone_tmp_dir}/plugins/${array[0]}" "${source_dir}/${array[0]}" + done } build_package(){ - cd $source_dir + for item in ${packages_list[@]}; do - # Set pkg name - if [ -z "${app_revision}" ]; then - wazuh_app_pkg_name="wazuh-${wazuh_version}.zip" - else - wazuh_app_pkg_name="wazuh-${wazuh_version}-${app_revision}.zip" - fi + array=(${item//_/ }) - # Build the package - yarn - OPENSEARCH_DASHBOARDS_VERSION=${plugin_platform_version} yarn build --allow-root + if [ -z "${app_revision}" ]; then + wazuh_app_pkg_name="${array[1]}-${wazuh_version}.zip" + else + wazuh_app_pkg_name="${array[1]}-${wazuh_version}-${app_revision}.zip" + fi - find ${build_dir} -name "*.zip" -exec mv {} ${destination_dir}/${wazuh_app_pkg_name} \; + cd "${source_dir}/${array[0]}" + yarn + OPENSEARCH_DASHBOARDS_VERSION=${plugin_platform_version} yarn build --allow-root - if [ "${checksum}" = "yes" ]; then - cd ${destination_dir} && sha512sum "${wazuh_app_pkg_name}" > "${checksum_dir}/${wazuh_app_pkg_name}".sha512 - fi + find "${source_dir}/${array[0]}" -name "*.zip" -exec mv {} ${destination_dir}/${wazuh_app_pkg_name} \; + + if [ "${checksum}" = "yes" ]; then + cd ${destination_dir} && sha512sum "${wazuh_app_pkg_name}" > "${checksum_dir}/${wazuh_app_pkg_name}".sha512 + fi + + done exit 0 } From 4850fe14d235466ee6ea5987b9118925228d4084 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Mon, 13 Nov 2023 15:20:14 +0100 Subject: [PATCH 890/994] Improved help message --- .../generate_wazuh_app.sh | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/wazuhapp/opensearch-dashboards/generate_wazuh_app.sh b/wazuhapp/opensearch-dashboards/generate_wazuh_app.sh index 557fe9e0cc..7c799b67ca 100755 --- a/wazuhapp/opensearch-dashboards/generate_wazuh_app.sh +++ b/wazuhapp/opensearch-dashboards/generate_wazuh_app.sh @@ -21,16 +21,29 @@ OUTDIR="${CURRENT_PATH}/output/" trap ctrl_c INT help() { - - echo - echo "Usage: $0 [OPTIONS]" - echo - echo " -b, --branch [Required] Select Git branch or tag e.g. 3.8-6.7 or v3.7.2-6.5.4" - echo " -s, --store [Optional] Set the destination path of package, by default /tmp/wazuh-app." - echo " -r, --revision [Optional] Package revision that append to version e.g. x.x.x-rev" - echo " -c, --checksum [Optional] Generate checksum" - echo " -h, --help Show this help." - echo + echo -e "" + echo -e "NAME" + echo -e " $(basename "$0") - Build Wazuh plugin files." + echo -e "" + echo -e "SYNOPSIS" + echo -e " $(basename "$0") -b | -s | -r | -c | -h" + echo -e "" + echo -e "DESCRIPTION" + echo -e " -b, --branch " + echo -e " [Required] Select Git branch or tag." + echo -e "" + echo -e " -s, --store " + echo -e " [Optional] Set the destination path of package, by default /tmp/wazuh-app." + echo -e "" + echo -e " -r, --revision " + echo -e " [Optional] Package revision." + echo -e "" + echo -e " -c, --checksum " + echo -e " [Optional] Generate checksum." + echo -e "" + echo -e " -h, --help" + echo -e " Show this help." + echo -e "" exit $1 } From e85788df776f708a84430ec090b7d63d39790775 Mon Sep 17 00:00:00 2001 From: Juan Cabrera Carabaza Date: Mon, 13 Nov 2023 14:04:51 +0100 Subject: [PATCH 891/994] Updated 4.7.0 release date --- debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/copyright | 2 +- stack/dashboard/deb/debian/copyright | 2 +- stack/indexer/deb/debian/copyright | 2 +- tests/unattended/unit/suites/test-dashboard.sh | 8 ++++---- tests/unattended/unit/suites/test-indexer.sh | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 347633fd46..69851d429f 100644 --- a/debs/SPECS/wazuh-agent/debian/copyright +++ b/debs/SPECS/wazuh-agent/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Wed, 08 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 21 Nov 2023 00:00:00 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 347633fd46..69851d429f 100644 --- a/debs/SPECS/wazuh-manager/debian/copyright +++ b/debs/SPECS/wazuh-manager/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Wed, 08 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 21 Nov 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index 6edb5d9d84..e1363f5649 100644 --- a/stack/dashboard/deb/debian/copyright +++ b/stack/dashboard/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Wed, 08 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 21 Nov 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index 6edb5d9d84..e1363f5649 100644 --- a/stack/indexer/deb/debian/copyright +++ b/stack/indexer/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Wed, 08 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 21 Nov 2023 00:00:00 +0000 It was downloaded from: diff --git a/tests/unattended/unit/suites/test-dashboard.sh b/tests/unattended/unit/suites/test-dashboard.sh index 4b1e53200e..e1aec94544 100644 --- a/tests/unattended/unit/suites/test-dashboard.sh +++ b/tests/unattended/unit/suites/test-dashboard.sh @@ -55,7 +55,7 @@ test-03-dashboard_install-yum() { load-dashboard_install sys_type="yum" sep="-" - wazuh_version="4.5.4" + wazuh_version="4.7.0" wazuh_revision="1" dashboard_install } @@ -68,7 +68,7 @@ test-ASSERT-FAIL-04-dashboard_install-yum-error() { load-dashboard_install sys_type="yum" sep="-" - wazuh_version="4.5.4" + wazuh_version="4.7.0" wazuh_revision="1" @mockfalse yum install wazuh-dashboard-1.13.2-1 -y dashboard_install @@ -78,7 +78,7 @@ test-05-dashboard_install-apt() { load-dashboard_install sys_type="apt-get" sep="=" - wazuh_version="4.5.4" + wazuh_version="4.7.0" wazuh_revision="1" dashboard_install } @@ -91,7 +91,7 @@ test-ASSERT-FAIL-06-dashboard_install-apt-error() { load-dashboard_install sys_type="apt-get" sep="=" - wazuh_version="4.5.4" + wazuh_version="4.7.0" wazuh_revision="1" @mockfalse apt install wazuh-dashboard=1.13.2-1 -y dashboard_install diff --git a/tests/unattended/unit/suites/test-indexer.sh b/tests/unattended/unit/suites/test-indexer.sh index 48e5a1d0f9..45745b92ae 100644 --- a/tests/unattended/unit/suites/test-indexer.sh +++ b/tests/unattended/unit/suites/test-indexer.sh @@ -49,7 +49,7 @@ test-03-indexer_install-yum() { load-indexer_install sys_type="yum" sep="-" - wazuh_version="4.6.0" + wazuh_version="4.7.0" wazuh_revision="1" indexer_install } @@ -63,7 +63,7 @@ test-ASSERT-FAIL-04-indexer_install-yum-error() { load-indexer_install sys_type="yum" sep="-" - wazuh_version="4.6.0" + wazuh_version="4.7.0" wazuh_revision="1" @mockfalse yum install wazuh-indexer-1.13.2-1 -y indexer_install @@ -73,7 +73,7 @@ test-05-indexer_install-apt() { load-indexer_install sys_type="apt-get" sep="=" - wazuh_version="4.6.0" + wazuh_version="4.7.0" wazuh_revision="1" indexer_install } @@ -87,7 +87,7 @@ test-ASSERT-FAIL-06-indexer_install-apt-error() { load-indexer_install sys_type="apt-get" sep="=" - wazuh_version="4.6.0" + wazuh_version="4.7.0" wazuh_revision="1" @mockfalse apt install wazuh-indexer=1.13.2-1 -y indexer_install From f37d3790e1ca82916f36661880fc3e6e025341a0 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Mon, 13 Nov 2023 16:37:08 +0100 Subject: [PATCH 892/994] Added plugin revisions check --- .../opensearch-dashboards/Docker/Dockerfile | 5 ++++- .../opensearch-dashboards/Docker/build.sh | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/wazuhapp/opensearch-dashboards/Docker/Dockerfile b/wazuhapp/opensearch-dashboards/Docker/Dockerfile index 567ca7caf6..fb0ca1ddf3 100644 --- a/wazuhapp/opensearch-dashboards/Docker/Dockerfile +++ b/wazuhapp/opensearch-dashboards/Docker/Dockerfile @@ -8,7 +8,10 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centostesting && \ curl -sL https://rpm.nodesource.com/setup_10.x | bash - && \ yum install nodejs git gcc gcc-c++ make sudo zip python3 -y && \ alternatives --set python /usr/bin/python3 && \ - npm install -g n + npm install -g n + +RUN yum install -y \ + jq ADD build.sh / RUN chmod +x /build.sh diff --git a/wazuhapp/opensearch-dashboards/Docker/build.sh b/wazuhapp/opensearch-dashboards/Docker/build.sh index b9b80ce5f4..3a217b395f 100755 --- a/wazuhapp/opensearch-dashboards/Docker/build.sh +++ b/wazuhapp/opensearch-dashboards/Docker/build.sh @@ -113,6 +113,24 @@ download_wazuh_app_sources() { done } +check_revisions() { + dirs=() + for item in ${packages_list[@]}; do + dirs+=(${item//_/ }) + done + + main_revision=$(jq -r '.revision' ${source_dir}/${dirs[0]}/package.json) + check_update_revision=$(jq -r '.revision' ${source_dir}/${dirs[2]}/package.json) + core_revision=$(jq -r '.revision' ${source_dir}/${dirs[4]}/package.json) + + if [ "${main_revision}" != "${check_update_revision}" ] || [ "${check_update_revision}" != "${core_revision}" ]; then + echo "The package.json revisions do not match. All revisions must be equal." + exit 1 + else + echo "The package.json revision match." + fi +} + build_package(){ for item in ${packages_list[@]}; do @@ -145,4 +163,5 @@ prepare_env download_plugin_platform_sources install_dependencies download_wazuh_app_sources +check_revisions build_package \ No newline at end of file From 69b162919b760387f86971e656b1924f5ab4520c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Ruiz?= Date: Mon, 13 Nov 2023 18:14:44 +0100 Subject: [PATCH 893/994] Update min_doc_count value --- stack/indexer/indexer-ism-init.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/indexer/indexer-ism-init.sh b/stack/indexer/indexer-ism-init.sh index 15998ed84f..1db55b9ae7 100644 --- a/stack/indexer/indexer-ism-init.sh +++ b/stack/indexer/indexer-ism-init.sh @@ -5,7 +5,7 @@ # Policy settings MIN_SHARD_SIZE="25" MIN_INDEX_AGE="7d" -MIN_DOC_COUNT="200000000" +MIN_DOC_COUNT="600000000" ISM_INDEX_PATTERNS='["wazuh-alerts-*", "wazuh-archives-*", "-wazuh-alerts-4.x-sample*"]' ISM_PRIORITY="50" INDEXER_PASSWORD="admin" From 86e6c15c68c44b2a7c1576455d6298fdfef15da2 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 14 Nov 2023 12:19:09 -0300 Subject: [PATCH 894/994] Updated Filebeat module version to 0.3 --- 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 dc1b2ebd91..09fd9b8a96 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -71,7 +71,7 @@ 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="${repobaseurl}/filebeat/wazuh-filebeat-0.3.tar.gz"' >> "${output_script_path}" echo 'readonly bucket="packages-dev.wazuh.com"' >> "${output_script_path}" echo 'readonly repository="'"${devrepo}"'"' >> "${output_script_path}" sed -i 's|v${wazuh_version}|${wazuh_version}|g' "${resources_installer}/installVariables.sh" @@ -79,7 +79,7 @@ function buildInstaller() { echo 'readonly repogpg="https://packages.wazuh.com/key/GPG-KEY-WAZUH"' >> "${output_script_path}" echo 'readonly repobaseurl="https://packages.wazuh.com/4.x"' >> "${output_script_path}" echo 'readonly reporelease="stable"' >> "${output_script_path}" - echo 'readonly filebeat_wazuh_module="${repobaseurl}/filebeat/wazuh-filebeat-0.2.tar.gz"' >> "${output_script_path}" + echo 'readonly filebeat_wazuh_module="${repobaseurl}/filebeat/wazuh-filebeat-0.3.tar.gz"' >> "${output_script_path}" echo 'readonly bucket="packages.wazuh.com"' >> "${output_script_path}" echo 'readonly repository="4.x"' >> "${output_script_path}" fi From 20a3a65acad51b634ed51d8bb6d7293b58fb84f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Ruiz?= Date: Wed, 15 Nov 2023 18:54:20 +0100 Subject: [PATCH 895/994] Improve ISM init script --- stack/indexer/indexer-ism-init.sh | 57 +++++++++++++++++++------------ 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/stack/indexer/indexer-ism-init.sh b/stack/indexer/indexer-ism-init.sh index 1db55b9ae7..7a46a0308a 100644 --- a/stack/indexer/indexer-ism-init.sh +++ b/stack/indexer/indexer-ism-init.sh @@ -12,6 +12,7 @@ INDEXER_PASSWORD="admin" INDEXER_HOSTNAME="localhost" POLICY_NAME="rollover_policy" +LOG_FILE="/var/log/wazuh-indexer/ism-init.log" INDEXER_URL="https://${INDEXER_HOSTNAME}:9200" @@ -84,15 +85,17 @@ function generate_rollover_template() { ######################################################################### function load_templates() { # Note: the wazuh-template.json could also be loaded here. + echo "Will create index templates to configure the alias" for alias in "${aliases[@]}"; do generate_rollover_template "${alias}" | if ! curl -s -k ${C_AUTH} \ - -X PUT "${INDEXER_URL}/_template/${alias}-rollover" -o /dev/null \ + -X PUT "${INDEXER_URL}/_template/${alias}-rollover" \ + -o "${LOG_FILE}" \ -H 'Content-Type: application/json' -d @-; then - echo "Error uploading ${alias} template" + echo " ERROR: '${alias}' template creation failed" return 1 else - echo "${alias} template uploaded" + echo " SUCC: '${alias}' template created or updated" fi done } @@ -106,29 +109,36 @@ function load_templates() { # None. ######################################################################### function upload_rollover_policy() { + echo "Will create the '${POLICY_NAME}' policy" policy_exists=$( curl -s -k ${C_AUTH} \ -X GET "${INDEXER_URL}/_plugins/_ism/policies/${POLICY_NAME}" \ - -o /dev/null \ + -o "${LOG_FILE}" \ -w "%{http_code}" ) # Check if the ${POLICY_NAME} ISM policy was loaded (404 error if not found) if [[ "${policy_exists}" == "404" ]]; then - if ! curl -s -k ${C_AUTH} -o /dev/null \ - -X PUT "${INDEXER_URL}/_plugins/_ism/policies/${POLICY_NAME}" \ - -H 'Content-Type: application/json' \ - -d "$(generate_rollover_policy)"; then - echo "Error uploading ${POLICY_NAME} policy" - return 1 + policy_uploaded=$( + curl -s -k ${C_AUTH} \ + -X PUT "${INDEXER_URL}/_plugins/_ism/policies/${POLICY_NAME}" \ + -o "${LOG_FILE}" \ + -H 'Content-Type: application/json' \ + -d "$(generate_rollover_policy)" \ + -w "%{http_code}" + ) + + if [[ "${policy_uploaded}" == "201" ]]; then + echo " SUCC: '${POLICY_NAME}' policy created" else - echo "${POLICY_NAME} policy uploaded" + echo " ERROR: '${POLICY_NAME}' policy not created => ${policy_uploaded}" + return 1 fi else if [[ "${policy_exists}" == "200" ]]; then - echo "${POLICY_NAME} policy already exists" + echo " INFO: policy '${POLICY_NAME}' already exists. Skipping policy creation" else - echo "Error checking if ${POLICY_NAME} exists" + echo " ERROR: could not check if the policy '${POLICY_NAME}' exists => ${policy_exists}" return 1 fi fi @@ -155,9 +165,9 @@ function generate_write_index_alias() { cat <<-EOF { "aliases": { - "$1": { - "is_write_index": true - } + "$1": { + "is_write_index": true + } } } EOF @@ -169,14 +179,14 @@ function generate_write_index_alias() { # 1. The alias. String. ######################################################################### function create_write_index() { - if ! curl -s -k ${C_AUTH} -o /dev/null \ - -X PUT "$INDEXER_URL/%3C${1}-4.x-%7Bnow%2Fd%7D-000001%3E?pretty" \ + if ! curl -s -k ${C_AUTH} -o "${LOG_FILE}" \ + -X PUT "$INDEXER_URL/%3C${1}-4.x-%7Bnow%2Fd%7D-000001%3E" \ -H 'Content-Type: application/json' \ -d "$(generate_write_index_alias "${1}")"; then - echo "Error creating ${1} write index" + echo " ERROR: creating '${1}' write index" exit 1 else - echo "${1} write index created" + echo " SUCC: '${1}' write index created" fi } @@ -186,6 +196,7 @@ function create_write_index() { # 1. List of aliases to initialize. ######################################################################### function create_indices() { + echo "Will create initial indices for the aliases" for alias in "${aliases[@]}"; do # Check if there are any write indices for the current alias write_index_exists=$(check_for_write_index "${alias}") @@ -193,6 +204,8 @@ function create_indices() { # Create the write index if it does not exist if [[ -z $write_index_exists ]]; then create_write_index "${alias}" + else + echo " INFO: '${alias}' write index already exists. Skipping write index creation" fi done } @@ -320,9 +333,9 @@ function main() { # Upload the rollover policy # Create the initial write indices if load_templates && upload_rollover_policy && create_indices "${aliases[@]}"; then - echo "Indexer ISM initialization finished successfully" + echo "SUCC: Indexer ISM initialization finished successfully." else - echo "Indexer ISM initialization failed" + echo "ERROR: Indexer ISM initialization failed. Check ${LOG_FILE} for more information." exit 1 fi } From e3db1e9e57deb47d8a32a6b7db2f95d41122657e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Ruiz?= Date: Wed, 15 Nov 2023 19:13:49 +0100 Subject: [PATCH 896/994] Change log file path --- stack/indexer/indexer-ism-init.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stack/indexer/indexer-ism-init.sh b/stack/indexer/indexer-ism-init.sh index 7a46a0308a..3f2edc541a 100644 --- a/stack/indexer/indexer-ism-init.sh +++ b/stack/indexer/indexer-ism-init.sh @@ -12,7 +12,7 @@ INDEXER_PASSWORD="admin" INDEXER_HOSTNAME="localhost" POLICY_NAME="rollover_policy" -LOG_FILE="/var/log/wazuh-indexer/ism-init.log" +LOG_FILE="/tmp/wazuh-indexer/ism-init.log" INDEXER_URL="https://${INDEXER_HOSTNAME}:9200" @@ -90,7 +90,7 @@ function load_templates() { generate_rollover_template "${alias}" | if ! curl -s -k ${C_AUTH} \ -X PUT "${INDEXER_URL}/_template/${alias}-rollover" \ - -o "${LOG_FILE}" \ + -o "${LOG_FILE}" --create-dirs \ -H 'Content-Type: application/json' -d @-; then echo " ERROR: '${alias}' template creation failed" return 1 @@ -113,7 +113,7 @@ function upload_rollover_policy() { policy_exists=$( curl -s -k ${C_AUTH} \ -X GET "${INDEXER_URL}/_plugins/_ism/policies/${POLICY_NAME}" \ - -o "${LOG_FILE}" \ + -o "${LOG_FILE}" --create-dirs \ -w "%{http_code}" ) @@ -122,7 +122,7 @@ function upload_rollover_policy() { policy_uploaded=$( curl -s -k ${C_AUTH} \ -X PUT "${INDEXER_URL}/_plugins/_ism/policies/${POLICY_NAME}" \ - -o "${LOG_FILE}" \ + -o "${LOG_FILE}" --create-dirs \ -H 'Content-Type: application/json' \ -d "$(generate_rollover_policy)" \ -w "%{http_code}" @@ -179,7 +179,7 @@ function generate_write_index_alias() { # 1. The alias. String. ######################################################################### function create_write_index() { - if ! curl -s -k ${C_AUTH} -o "${LOG_FILE}" \ + if ! curl -s -k ${C_AUTH} -o "${LOG_FILE}" --create-dirs \ -X PUT "$INDEXER_URL/%3C${1}-4.x-%7Bnow%2Fd%7D-000001%3E" \ -H 'Content-Type: application/json' \ -d "$(generate_write_index_alias "${1}")"; then From 28ed9a7ba2f3326dcb6f4ea9e2ecace5d3e006a9 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Wed, 15 Nov 2023 23:41:12 +0100 Subject: [PATCH 897/994] Improved help message --- stack/dashboard/base/generate_base.sh | 36 +++++++++++++++++++-------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/stack/dashboard/base/generate_base.sh b/stack/dashboard/base/generate_base.sh index e1a665e83f..9904e6d397 100755 --- a/stack/dashboard/base/generate_base.sh +++ b/stack/dashboard/base/generate_base.sh @@ -69,16 +69,32 @@ build() { # ----------------------------------------------------------------------------- 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." - echo " -r, --revision [Optional] Package revision. By default ${revision}" - echo " -h, --help Show this help." - echo + echo -e "" + echo -e "NAME" + echo -e " $(basename "$0") - Build Wazuh dashboard base file." + echo -e "" + echo -e "SYNOPSIS" + echo -e " $(basename "$0") -a | -s | -b | -f | -r | -h" + echo -e "" + echo -e "DESCRIPTION" + echo -e " --app-url " + echo -e " [Optional] Set the repository from where the Wazuh plugin should be downloaded." + echo -e "" + echo -e " -s, --store " + echo -e " [Optional] Set the destination path of package. By default, an output folder will be created." + echo -e "" + echo -e " --reference " + echo -e " [Optional] wazuh-packages branch or tag." + echo -e "" + echo -e " --future" + echo -e " [Optional] Build test future package. Used for development purposes." + echo -e "" + echo -e " -r, --revision " + echo -e " [Optional] Package revision." + echo -e "" + echo -e " -h, --help" + echo -e " Show this help." + echo -e "" exit $1 } From 11adba416493bc192f86fb2247fa2bc7e5fdcaab Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Wed, 15 Nov 2023 23:43:01 +0100 Subject: [PATCH 898/994] Adapted package build to install the new wazuh plugins --- stack/dashboard/deb/build_package.sh | 123 ++++++++++++++++++---- stack/dashboard/deb/builder.sh | 34 ++++-- stack/dashboard/deb/debian/rules | 6 +- stack/dashboard/rpm/build_package.sh | 126 ++++++++++++++++++----- stack/dashboard/rpm/builder.sh | 34 ++++-- stack/dashboard/rpm/wazuh-dashboard.spec | 6 +- 6 files changed, 261 insertions(+), 68 deletions(-) diff --git a/stack/dashboard/deb/build_package.sh b/stack/dashboard/deb/build_package.sh index 7e4f5c6d20..c6c16c67b0 100755 --- a/stack/dashboard/deb/build_package.sh +++ b/stack/dashboard/deb/build_package.sh @@ -17,7 +17,10 @@ deb_amd64_builder="deb_dashboard_builder_amd64" deb_builder_dockerfile="${current_path}/docker" future="no" base_cmd="" -url="" +app_url="" +plugin_main="" +plugin_updates="" +plugin_core="" build_base="yes" trap ctrl_c INT @@ -39,8 +42,17 @@ build_deb() { container_name="$1" dockerfile_path="$2" - if [ "${repository}" ];then - url="${repository}" + if [ "${app_url_reference}" ]; then + app_url="${app_url_reference}" + fi + if [ "${plugin_main_reference}" ];then + plugin_main="${plugin_main_reference}" + fi + if [ "${plugin_updates_reference}" ];then + plugin_updates="${plugin_updates_reference}" + fi + if [ "${plugin_core_reference}" ];then + plugin_core="${plugin_core_reference}" fi # Copy the necessary files @@ -54,8 +66,8 @@ build_deb() { if [ "${reference}" ];then base_cmd+="--reference ${reference}" fi - if [ "${url}" ];then - base_cmd+="--app-url ${url}" + if [ "${app_url_reference}" ];then + base_cmd+="--app-url ${app_url}/${plugin_main}" fi ../base/generate_base.sh -s ${outdir} -r ${revision} ${base_cmd} else @@ -81,12 +93,12 @@ build_deb() { if [ "${reference}" ];then docker run -t --rm ${volumes} \ ${container_name} ${architecture} ${revision} \ - ${future} ${url} ${reference} || return 1 + ${future} ${app_url} ${plugin_main} ${plugin_updates} ${plugin_core} ${reference} || return 1 else docker run -t --rm ${volumes} \ -v ${current_path}/../../..:/root:Z \ ${container_name} ${architecture} ${revision} \ - ${future} ${url} || return 1 + ${future} ${app_url} ${plugin_main} ${plugin_updates} ${plugin_core} || return 1 fi echo "Package $(ls -Art ${outdir} | tail -n 1) added to ${outdir}." @@ -111,19 +123,50 @@ build() { } help() { - echo - 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." - echo " --dont-build-docker [Optional] Locally built docker image will be used instead of generating a new one." - echo " --future [Optional] Build test future package 99.99.0 Used for development purposes." - echo " -h, --help Show this help." - echo + echo -e "" + echo -e "NAME" + echo -e " $(basename "$0") - Build Wazuh dashboard base file." + echo -e "" + echo -e "SYNOPSIS" + echo -e " $(basename "$0") -a | -m | -u | -c | -s | -b | -f | -r | -h" + echo -e "" + echo -e "DESCRIPTION" + echo -e " -a, --architecture " + echo -e " [Optional] Target architecture of the package [amd64]." + echo -e "" + echo -e " -ar, --app-repo " + echo -e " [Optional] URL where Wazuh plugins are located." + echo -e "" + echo -e " -m, --main-app " + echo -e " [Required by '-ar, --app-repo'] Wazuh main plugin filename located at the URL provided, must include ZIP extension." + echo -e "" + echo -e " -u, --updates-app " + echo -e " [Required by '-ar, --app-repo'] Wazuh Check Updates plugin filename located at the URL provided, must include ZIP extension." + echo -e "" + echo -e " -c, --core-app " + echo -e " [Required by '-ar, --app-repo'] Wazuh Core plugin filename located at the URL provided, must include ZIP extension." + echo -e "" + echo -e " -b, --build-base " + echo -e " [Optional] Build a new base or use a existing one. By default, yes." + echo -e "" + echo -e " -r, --revision " + echo -e " [Optional] Package revision. By default: 1." + echo -e "" + echo -e " -s, --store " + echo -e " [Optional] Set the destination path of package. By default, an output folder will be created." + echo -e "" + echo -e " --reference " + echo -e " [Optional] wazuh-packages branch to download SPECs, not used by default." + echo -e "" + echo -e " --dont-build-docker" + echo -e " [Optional] Locally built docker image will be used instead of generating a new one." + echo -e "" + echo -e " --future" + echo -e " [Optional] Build test future package 99.99.0 Used for development purposes." + echo -e "" + echo -e " -h, --help" + echo -e " Show this help." + echo -e "" exit $1 } @@ -143,9 +186,33 @@ main() { help 1 fi ;; - "--app-url") + "-ar"|"--app-repo") + if [ -n "$2" ]; then + app_url_reference="$2" + shift 2 + else + help 1 + fi + ;; + "-m"|"--main-app-url") + if [ -n "$2" ]; then + plugin_main_reference="$2" + shift 2 + else + help 1 + fi + ;; + "-u"|"--updates-app-url") + if [ -n "$2" ]; then + plugin_updates_reference="$2" + shift 2 + else + help 1 + fi + ;; + "-c"|"--core-app-url") if [ -n "$2" ]; then - repository="$2" + plugin_core_reference="$2" shift 2 else help 1 @@ -196,6 +263,18 @@ main() { esac done + if [ ${app_url_reference} ] && [ ${plugin_main_reference} ] && [ ${plugin_updates_reference} ] && [ ${plugin_core_reference} ]; then + echo "The Wazuh dashboard package will be created using the following plugins URLs:" + echo "Wazuh main plugin: ${app_url_reference}/${plugin_main_reference}" + echo "Wazuh Check Updates plugin: ${app_url_reference}/${plugin_updates_reference}" + echo "Wazuh Core plugin: ${app_url_reference}/${plugin_core_reference}" + elif [ ! ${app_url_reference} ] && [ ! ${plugin_main_reference} ] && [ ! ${plugin_updates_reference} ] && [ ! ${plugin_core_reference} ]; then + echo "No Wazuh plugins have been defined, will use pre-release." + else + echo "The -ar, -m, -u, and -c options must be used together." + exit 1 + fi + build || clean 1 clean 0 diff --git a/stack/dashboard/deb/builder.sh b/stack/dashboard/deb/builder.sh index c3fd61076f..5642824a3b 100755 --- a/stack/dashboard/deb/builder.sh +++ b/stack/dashboard/deb/builder.sh @@ -14,8 +14,11 @@ target="wazuh-dashboard" architecture=$1 revision=$2 future=$3 -repository=$4 -reference=$5 +app_url=$4 +plugin_main=$5 +plugin_updates=$6 +plugin_core=$7 +reference=$8 directory_base="/usr/share/wazuh-dashboard" if [ -z "${revision}" ]; then @@ -32,19 +35,30 @@ else fi fi -if [ "${repository}" ];then +if [ "${app_url}" ];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}" + if [[ $app_url =~ $valid_url ]];then + if ! curl --output /dev/null --silent --head --fail "${app_url}/${plugin_main}"; then + echo "The given URL to download the Wazuh main plugin ZIP does not exist: ${app_url}/${plugin_main}" + exit 1 + fi + if ! curl --output /dev/null --silent --head --fail "${app_url}/${plugin_updates}"; then + echo "The given URL to download the Wazuh Check Updates plugin ZIP does not exist: ${app_url}/${plugin_updates}" + exit 1 + fi + if ! curl --output /dev/null --silent --head --fail "${app_url}/${plugin_core}"; then + echo "The given URL to download the Wazuh Core plugin ZIP does not exist: ${app_url}/${plugin_core}" exit 1 fi else - url="https://packages-dev.wazuh.com/${repository}/ui/dashboard/wazuh-${version}-${revision}.zip" + url_main="https://packages-dev.wazuh.com/${app_url}/ui/dashboard/wazuh-${version}-${revision}.zip" + url_updates="https://packages-dev.wazuh.com/${app_url}/ui/dashboard/wazuhCheckUpdates-${version}-${revision}.zip" + url_core="https://packages-dev.wazuh.com/${app_url}/ui/dashboard/wazuhCore-${version}-${revision}.zip" fi else - url="https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuh-${version}-${revision}.zip" + url_main="https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuh-${version}-${revision}.zip" + url_updates="https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuhCheckUpdates-${version}-${revision}.zip" + url_core="https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuhCore-${version}-${revision}.zip" fi # Build directories @@ -78,7 +92,7 @@ cd ${source_dir} mk-build-deps -ir -t "apt-get -o Debug::pkgProblemResolver=yes -y" # Build package -debuild --no-lintian -eINSTALLATION_DIR="${directory_base}" -eVERSION="${version}" -eREVISION="${revision}" -eURL="${url}" -b -uc -us +debuild --no-lintian -eINSTALLATION_DIR="${directory_base}" -eVERSION="${version}" -eREVISION="${revision}" -eURL="${app_url}" -ePLUGINMAIN="${plugin_main}" -ePLUGINUPDATES="${plugin_updates}" -ePLUGINCORE="${plugin_core}" -b -uc -us deb_file="${target}_${version}-${revision}_${architecture}.deb" diff --git a/stack/dashboard/deb/debian/rules b/stack/dashboard/deb/debian/rules index 6b4bcbb1ec..1d440adfe7 100644 --- a/stack/dashboard/deb/debian/rules +++ b/stack/dashboard/deb/debian/rules @@ -83,8 +83,12 @@ override_dh_install: if [ "$(VERSION)" = "99.99.0" ]; then \ runuser $(USER) --shell="/bin/bash" --command="$(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-dashboards-plugin install https://packages-dev.wazuh.com/futures/ui/dashboard/wazuh-99.99.0-$(REVISION).zip" ;\ + runuser $(USER) --shell="/bin/bash" --command="$(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-dashboards-plugin install https://packages-dev.wazuh.com/futures/ui/dashboard/wazuhCheckUpdates-99.99.0-$(REVISION).zip" ;\ + runuser $(USER) --shell="/bin/bash" --command="$(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-dashboards-plugin install https://packages-dev.wazuh.com/futures/ui/dashboard/wazuhCore-99.99.0-$(REVISION).zip" ;\ else \ - runuser $(USER) --shell="/bin/bash" --command="$(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-dashboards-plugin install $(URL)" ;\ + runuser $(USER) --shell="/bin/bash" --command="$(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-dashboards-plugin install $(URL)/${PLUGINMAIN}" ;\ + runuser $(USER) --shell="/bin/bash" --command="$(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-dashboards-plugin install $(URL)/${PLUGINUPDATES}" ;\ + runuser $(USER) --shell="/bin/bash" --command="$(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-dashboards-plugin install $(URL)/${PLUGINCORE}" ;\ fi find $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/wazuh/ -exec chown $(USER):$(GROUP) {} \; diff --git a/stack/dashboard/rpm/build_package.sh b/stack/dashboard/rpm/build_package.sh index b56e325884..0c43e4dd2a 100755 --- a/stack/dashboard/rpm/build_package.sh +++ b/stack/dashboard/rpm/build_package.sh @@ -17,7 +17,10 @@ rpm_x86_builder="rpm_dashboard_builder_x86" rpm_builder_dockerfile="${current_path}/docker" future="no" base_cmd="" -url="" +app_url="" +plugin_main="" +plugin_updates="" +plugin_core="" build_base="yes" trap ctrl_c INT @@ -39,8 +42,17 @@ build_rpm() { container_name="$1" dockerfile_path="$2" - if [ "${repository}" ];then - url="${repository}" + if [ "${app_url_reference}" ]; then + app_url="${app_url_reference}" + fi + if [ "${plugin_main_reference}" ];then + plugin_main="${plugin_main_reference}" + fi + if [ "${plugin_updates_reference}" ];then + plugin_updates="${plugin_updates_reference}" + fi + if [ "${plugin_core_reference}" ];then + plugin_core="${plugin_core_reference}" fi # Copy the necessary files @@ -54,8 +66,8 @@ build_rpm() { if [ "${reference}" ];then base_cmd+="--reference ${reference}" fi - if [ "${url}" ];then - base_cmd+="--app-url ${url}" + if [ "${app_url_reference}" ];then + base_cmd+="--app-url ${app_url}/${plugin_main}" fi ../base/generate_base.sh -s ${outdir} -r ${revision} ${base_cmd} else @@ -66,7 +78,7 @@ build_rpm() { fi basefile="${outdir}/wazuh-dashboard-base-${version}-${revision}-linux-x64.tar.xz" if ! test -f "${basefile}"; then - echo "Did not find expected Wazuh dndexer base file: ${basefile} in output path. Exiting..." + echo "Did not find expected Wazuh dashboard base file: ${basefile} in output path. Exiting..." exit 1 fi fi @@ -81,12 +93,12 @@ build_rpm() { if [ "${reference}" ];then docker run -t --rm ${volumes} \ ${container_name} ${architecture} ${revision} \ - ${future} ${url} ${reference} || return 1 + ${future} ${app_url} ${plugin_main} ${plugin_updates} ${plugin_core} ${reference} || return 1 else docker run -t --rm ${volumes} \ -v ${current_path}/../../..:/root:Z \ ${container_name} ${architecture} \ - ${revision} ${future} ${url} || return 1 + ${revision} ${future} ${app_url} ${plugin_main} ${plugin_updates} ${plugin_core} || return 1 fi echo "Package $(ls -Art ${outdir} | tail -n 1) added to ${outdir}." @@ -111,20 +123,50 @@ build() { } help() { - echo - 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." - echo " --dont-build-docker [Optional] Locally built docker image will be used instead of generating a new one." - echo " --future [Optional] Build test future package 99.99.0 Used for development purposes." - echo " --app-url [Optional] Valid URL for custom app." - echo " -h, --help Show this help." - echo + echo -e "" + echo -e "NAME" + echo -e " $(basename "$0") - Build Wazuh dashboard base file." + echo -e "" + echo -e "SYNOPSIS" + echo -e " $(basename "$0") -a | -m | -u | -c | -s | -b | -f | -r | -h" + echo -e "" + echo -e "DESCRIPTION" + echo -e " -a, --architecture " + echo -e " [Optional] Target architecture of the package [x86_64]." + echo -e "" + echo -e " -ar, --app-repo " + echo -e " [Optional] URL where Wazuh plugins are located." + echo -e "" + echo -e " -m, --main-app " + echo -e " [Required by '-ar, --app-repo'] Wazuh main plugin filename located at the URL provided, must include ZIP extension." + echo -e "" + echo -e " -u, --updates-app " + echo -e " [Required by '-ar, --app-repo'] Wazuh Check Updates plugin filename located at the URL provided, must include ZIP extension." + echo -e "" + echo -e " -c, --core-app " + echo -e " [Required by '-ar, --app-repo'] Wazuh Core plugin filename located at the URL provided, must include ZIP extension." + echo -e "" + echo -e " -b, --build-base " + echo -e " [Optional] Build a new base or use a existing one. By default, yes." + echo -e "" + echo -e " -r, --revision " + echo -e " [Optional] Package revision. By default: 1." + echo -e "" + echo -e " -s, --store " + echo -e " [Optional] Set the destination path of package. By default, an output folder will be created." + echo -e "" + echo -e " --reference " + echo -e " [Optional] wazuh-packages branch to download SPECs, not used by default." + echo -e "" + echo -e " --dont-build-docker" + echo -e " [Optional] Locally built docker image will be used instead of generating a new one." + echo -e "" + echo -e " --future" + echo -e " [Optional] Build test future package 99.99.0 Used for development purposes." + echo -e "" + echo -e " -h, --help" + echo -e " Show this help." + echo -e "" exit $1 } @@ -144,9 +186,33 @@ main() { help 1 fi ;; - "--app-url") + "-ar"|"--app-repo") + if [ -n "$2" ]; then + app_url_reference="$2" + shift 2 + else + help 1 + fi + ;; + "-m"|"--main-app-url") + if [ -n "$2" ]; then + plugin_main_reference="$2" + shift 2 + else + help 1 + fi + ;; + "-u"|"--updates-app-url") + if [ -n "$2" ]; then + plugin_updates_reference="$2" + shift 2 + else + help 1 + fi + ;; + "-c"|"--core-app-url") if [ -n "$2" ]; then - repository="$2" + plugin_core_reference="$2" shift 2 else help 1 @@ -197,6 +263,18 @@ main() { esac done + if [ ${app_url_reference} ] && [ ${plugin_main_reference} ] && [ ${plugin_updates_reference} ] && [ ${plugin_core_reference} ]; then + echo "The Wazuh dashboard package will be created using the following plugins URLs:" + echo "Wazuh main plugin: ${app_url_reference}/${plugin_main_reference}" + echo "Wazuh Check Updates plugin: ${app_url_reference}/${plugin_updates_reference}" + echo "Wazuh Core plugin: ${app_url_reference}/${plugin_core_reference}" + elif [ ! ${app_url_reference} ] && [ ! ${plugin_main_reference} ] && [ ! ${plugin_updates_reference} ] && [ ! ${plugin_core_reference} ]; then + echo "No Wazuh plugins have been defined, will use pre-release." + else + echo "The -ar, -m, -u, and -c options must be used together." + exit 1 + fi + build || clean 1 clean 0 diff --git a/stack/dashboard/rpm/builder.sh b/stack/dashboard/rpm/builder.sh index c4b9e2a652..9d01a6557e 100755 --- a/stack/dashboard/rpm/builder.sh +++ b/stack/dashboard/rpm/builder.sh @@ -14,8 +14,11 @@ target="wazuh-dashboard" architecture=$1 revision=$2 future=$3 -repository=$4 -reference=$5 +app_url=$4 +plugin_main=$5 +plugin_updates=$6 +plugin_core=$7 +reference=$8 directory_base="/usr/share/wazuh-dashboard" if [ -z "${revision}" ]; then @@ -32,19 +35,30 @@ else fi fi -if [ "${repository}" ];then +if [ "${app_url}" ];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}" + if [[ $app_url =~ $valid_url ]];then + if ! curl --output /dev/null --silent --head --fail "${app_url}/${plugin_main}"; then + echo "The given URL to download the Wazuh main plugin ZIP does not exist: ${app_url}/${plugin_main}" + exit 1 + fi + if ! curl --output /dev/null --silent --head --fail "${app_url}/${plugin_updates}"; then + echo "The given URL to download the Wazuh Check Updates plugin ZIP does not exist: ${app_url}/${plugin_updates}" + exit 1 + fi + if ! curl --output /dev/null --silent --head --fail "${app_url}/${plugin_core}"; then + echo "The given URL to download the Wazuh Core plugin ZIP does not exist: ${app_url}/${plugin_core}" exit 1 fi else - url="https://packages-dev.wazuh.com/${repository}/ui/dashboard/wazuh-${version}-${revision}.zip" + url_main="https://packages-dev.wazuh.com/${app_url}/ui/dashboard/wazuh-${version}-${revision}.zip" + url_updates="https://packages-dev.wazuh.com/${app_url}/ui/dashboard/wazuhCheckUpdates-${version}-${revision}.zip" + url_core="https://packages-dev.wazuh.com/${app_url}/ui/dashboard/wazuhCore-${version}-${revision}.zip" fi else - url="https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuh-${version}-${revision}.zip" + url_main="https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuh-${version}-${revision}.zip" + url_updates="https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuhCheckUpdates-${version}-${revision}.zip" + url_core="https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuhCore-${version}-${revision}.zip" fi # Build directories @@ -74,7 +88,7 @@ cd ${build_dir} && tar czf "${rpm_build_dir}/SOURCES/${pkg_name}.tar.gz" "${pkg_ # Building RPM /usr/bin/rpmbuild --define "_topdir ${rpm_build_dir}" --define "_version ${version}" \ --define "_release ${revision}" --define "_localstatedir ${directory_base}" \ - --define "_url ${url}" \ + --define "_url ${app_url}" --define "_plugin_main ${plugin_main}" --define "_plugin_updates ${plugin_updates}" --define "_plugin_core ${plugin_core}" \ --target ${architecture} -ba ${rpm_build_dir}/SPECS/${pkg_name}.spec cd ${pkg_path} && sha512sum ${rpm_file} > /tmp/${rpm_file}.sha512 diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 9cfe0603c9..44a1765d46 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -94,8 +94,12 @@ chown root:root %{buildroot}/etc/systemd/system/wazuh-dashboard.service 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" + runuser %{USER} --shell="/bin/bash" --command="%{buildroot}%{INSTALL_DIR}/bin/opensearch-dashboards-plugin install https://packages-dev.wazuh.com/futures/ui/dashboard/wazuhCheckUpdates-99.99.0-%{release}.zip" + runuser %{USER} --shell="/bin/bash" --command="%{buildroot}%{INSTALL_DIR}/bin/opensearch-dashboards-plugin install https://packages-dev.wazuh.com/futures/ui/dashboard/wazuhCore-99.99.0-%{release}.zip" else - runuser %{USER} --shell="/bin/bash" --command="%{buildroot}%{INSTALL_DIR}/bin/opensearch-dashboards-plugin install %{_url}" + runuser %{USER} --shell="/bin/bash" --command="%{buildroot}%{INSTALL_DIR}/bin/opensearch-dashboards-plugin install %{_url}/%{_plugin_main}" + runuser %{USER} --shell="/bin/bash" --command="%{buildroot}%{INSTALL_DIR}/bin/opensearch-dashboards-plugin install %{_url}/%{_plugin_updates}" + runuser %{USER} --shell="/bin/bash" --command="%{buildroot}%{INSTALL_DIR}/bin/opensearch-dashboards-plugin install %{_url}/%{_plugin_core}" fi find %{buildroot}%{INSTALL_DIR}/plugins/wazuh/ -exec chown %{USER}:%{GROUP} {} \; From faee7439f3bab9ac06cf6f1386b57caa268e3ee7 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Fri, 17 Nov 2023 00:42:50 +0100 Subject: [PATCH 899/994] Fixed URL definition --- stack/dashboard/deb/builder.sh | 27 ++++++++++++++++-------- stack/dashboard/deb/debian/rules | 6 +++--- stack/dashboard/rpm/builder.sh | 27 ++++++++++++++++-------- stack/dashboard/rpm/wazuh-dashboard.spec | 6 +++--- 4 files changed, 42 insertions(+), 24 deletions(-) diff --git a/stack/dashboard/deb/builder.sh b/stack/dashboard/deb/builder.sh index 5642824a3b..9a5d8ac420 100755 --- a/stack/dashboard/deb/builder.sh +++ b/stack/dashboard/deb/builder.sh @@ -35,24 +35,33 @@ else fi fi -if [ "${app_url}" ];then +if [ "${app_url}" ] && [ "${plugin_main}" ] && [ "${plugin_updates}" ] && [ "${plugin_core}" ] ;then valid_url='(https?|ftp|file)://[-[:alnum:]\+&@#/%?=~_|!:,.;]*[-[:alnum:]\+&@#/%=~_|]' - if [[ $app_url =~ $valid_url ]];then + if [[ "${app_url}/${plugin_main}" =~ $valid_url ]];then + url_main="${app_url}/${plugin_main}" if ! curl --output /dev/null --silent --head --fail "${app_url}/${plugin_main}"; then echo "The given URL to download the Wazuh main plugin ZIP does not exist: ${app_url}/${plugin_main}" exit 1 fi - if ! curl --output /dev/null --silent --head --fail "${app_url}/${plugin_updates}"; then - echo "The given URL to download the Wazuh Check Updates plugin ZIP does not exist: ${app_url}/${plugin_updates}" + else + url_main="https://packages-dev.wazuh.com/${app_url}/ui/dashboard/wazuh-${version}-${revision}.zip" + fi + if [[ "${app_url}/${plugin_updates}" =~ $valid_url ]];then + url_updates="${app_url}/${plugin_updates}" + if ! curl --output /dev/null --silent --head --fail "${url_updates}"; then + echo "The given URL to download the Wazuh Check Updates plugin ZIP does not exist: ${url_updates}" exit 1 fi - if ! curl --output /dev/null --silent --head --fail "${app_url}/${plugin_core}"; then - echo "The given URL to download the Wazuh Core plugin ZIP does not exist: ${app_url}/${plugin_core}" + else + url_updates="https://packages-dev.wazuh.com/${app_url}/ui/dashboard/wazuhCheckUpdates-${version}-${revision}.zip" + fi + if [[ "${app_url}/${plugin_core}" =~ $valid_url ]];then + url_core="${app_url}/${plugin_core}" + if ! curl --output /dev/null --silent --head --fail "${url_core}"; then + echo "The given URL to download the Wazuh Core plugin ZIP does not exist: ${url_core}" exit 1 fi else - url_main="https://packages-dev.wazuh.com/${app_url}/ui/dashboard/wazuh-${version}-${revision}.zip" - url_updates="https://packages-dev.wazuh.com/${app_url}/ui/dashboard/wazuhCheckUpdates-${version}-${revision}.zip" url_core="https://packages-dev.wazuh.com/${app_url}/ui/dashboard/wazuhCore-${version}-${revision}.zip" fi else @@ -92,7 +101,7 @@ cd ${source_dir} mk-build-deps -ir -t "apt-get -o Debug::pkgProblemResolver=yes -y" # Build package -debuild --no-lintian -eINSTALLATION_DIR="${directory_base}" -eVERSION="${version}" -eREVISION="${revision}" -eURL="${app_url}" -ePLUGINMAIN="${plugin_main}" -ePLUGINUPDATES="${plugin_updates}" -ePLUGINCORE="${plugin_core}" -b -uc -us +debuild --no-lintian -eINSTALLATION_DIR="${directory_base}" -eVERSION="${version}" -eREVISION="${revision}" -eURLPLUGINMAIN="${url_main}" -eURLPLUGINUPDATES="${url_updates}" -eURLPLUGINCORE="${url_core}" -b -uc -us deb_file="${target}_${version}-${revision}_${architecture}.deb" diff --git a/stack/dashboard/deb/debian/rules b/stack/dashboard/deb/debian/rules index 1d440adfe7..a25a426555 100644 --- a/stack/dashboard/deb/debian/rules +++ b/stack/dashboard/deb/debian/rules @@ -86,9 +86,9 @@ override_dh_install: runuser $(USER) --shell="/bin/bash" --command="$(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-dashboards-plugin install https://packages-dev.wazuh.com/futures/ui/dashboard/wazuhCheckUpdates-99.99.0-$(REVISION).zip" ;\ runuser $(USER) --shell="/bin/bash" --command="$(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-dashboards-plugin install https://packages-dev.wazuh.com/futures/ui/dashboard/wazuhCore-99.99.0-$(REVISION).zip" ;\ else \ - runuser $(USER) --shell="/bin/bash" --command="$(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-dashboards-plugin install $(URL)/${PLUGINMAIN}" ;\ - runuser $(USER) --shell="/bin/bash" --command="$(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-dashboards-plugin install $(URL)/${PLUGINUPDATES}" ;\ - runuser $(USER) --shell="/bin/bash" --command="$(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-dashboards-plugin install $(URL)/${PLUGINCORE}" ;\ + runuser $(USER) --shell="/bin/bash" --command="$(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-dashboards-plugin install $(URLPLUGINMAIN)" ;\ + runuser $(USER) --shell="/bin/bash" --command="$(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-dashboards-plugin install $(URLPLUGINUPDATES)" ;\ + runuser $(USER) --shell="/bin/bash" --command="$(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-dashboards-plugin install $(URLPLUGINCORE)" ;\ fi find $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/wazuh/ -exec chown $(USER):$(GROUP) {} \; diff --git a/stack/dashboard/rpm/builder.sh b/stack/dashboard/rpm/builder.sh index 9d01a6557e..bf10ac2fbe 100755 --- a/stack/dashboard/rpm/builder.sh +++ b/stack/dashboard/rpm/builder.sh @@ -35,24 +35,33 @@ else fi fi -if [ "${app_url}" ];then +if [ "${app_url}" ] && [ "${plugin_main}" ] && [ "${plugin_updates}" ] && [ "${plugin_core}" ] ;then valid_url='(https?|ftp|file)://[-[:alnum:]\+&@#/%?=~_|!:,.;]*[-[:alnum:]\+&@#/%=~_|]' - if [[ $app_url =~ $valid_url ]];then + if [[ "${app_url}/${plugin_main}" =~ $valid_url ]];then + url_main="${app_url}/${plugin_main}" if ! curl --output /dev/null --silent --head --fail "${app_url}/${plugin_main}"; then echo "The given URL to download the Wazuh main plugin ZIP does not exist: ${app_url}/${plugin_main}" exit 1 fi - if ! curl --output /dev/null --silent --head --fail "${app_url}/${plugin_updates}"; then - echo "The given URL to download the Wazuh Check Updates plugin ZIP does not exist: ${app_url}/${plugin_updates}" + else + url_main="https://packages-dev.wazuh.com/${app_url}/ui/dashboard/wazuh-${version}-${revision}.zip" + fi + if [[ "${app_url}/${plugin_updates}" =~ $valid_url ]];then + url_updates="${app_url}/${plugin_updates}" + if ! curl --output /dev/null --silent --head --fail "${url_updates}"; then + echo "The given URL to download the Wazuh Check Updates plugin ZIP does not exist: ${url_updates}" exit 1 fi - if ! curl --output /dev/null --silent --head --fail "${app_url}/${plugin_core}"; then - echo "The given URL to download the Wazuh Core plugin ZIP does not exist: ${app_url}/${plugin_core}" + else + url_updates="https://packages-dev.wazuh.com/${app_url}/ui/dashboard/wazuhCheckUpdates-${version}-${revision}.zip" + fi + if [[ "${app_url}/${plugin_core}" =~ $valid_url ]];then + url_core="${app_url}/${plugin_core}" + if ! curl --output /dev/null --silent --head --fail "${url_core}"; then + echo "The given URL to download the Wazuh Core plugin ZIP does not exist: ${url_core}" exit 1 fi else - url_main="https://packages-dev.wazuh.com/${app_url}/ui/dashboard/wazuh-${version}-${revision}.zip" - url_updates="https://packages-dev.wazuh.com/${app_url}/ui/dashboard/wazuhCheckUpdates-${version}-${revision}.zip" url_core="https://packages-dev.wazuh.com/${app_url}/ui/dashboard/wazuhCore-${version}-${revision}.zip" fi else @@ -88,7 +97,7 @@ cd ${build_dir} && tar czf "${rpm_build_dir}/SOURCES/${pkg_name}.tar.gz" "${pkg_ # Building RPM /usr/bin/rpmbuild --define "_topdir ${rpm_build_dir}" --define "_version ${version}" \ --define "_release ${revision}" --define "_localstatedir ${directory_base}" \ - --define "_url ${app_url}" --define "_plugin_main ${plugin_main}" --define "_plugin_updates ${plugin_updates}" --define "_plugin_core ${plugin_core}" \ + --define "_url_plugin_main ${url_main}" --define "_url_plugin_updates ${url_updates}" --define "_url_plugin_core ${url_core}" \ --target ${architecture} -ba ${rpm_build_dir}/SPECS/${pkg_name}.spec cd ${pkg_path} && sha512sum ${rpm_file} > /tmp/${rpm_file}.sha512 diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 44a1765d46..bd93aa68fb 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -97,9 +97,9 @@ 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/wazuhCheckUpdates-99.99.0-%{release}.zip" runuser %{USER} --shell="/bin/bash" --command="%{buildroot}%{INSTALL_DIR}/bin/opensearch-dashboards-plugin install https://packages-dev.wazuh.com/futures/ui/dashboard/wazuhCore-99.99.0-%{release}.zip" else - runuser %{USER} --shell="/bin/bash" --command="%{buildroot}%{INSTALL_DIR}/bin/opensearch-dashboards-plugin install %{_url}/%{_plugin_main}" - runuser %{USER} --shell="/bin/bash" --command="%{buildroot}%{INSTALL_DIR}/bin/opensearch-dashboards-plugin install %{_url}/%{_plugin_updates}" - runuser %{USER} --shell="/bin/bash" --command="%{buildroot}%{INSTALL_DIR}/bin/opensearch-dashboards-plugin install %{_url}/%{_plugin_core}" + runuser %{USER} --shell="/bin/bash" --command="%{buildroot}%{INSTALL_DIR}/bin/opensearch-dashboards-plugin install %{_url_plugin_main}" + runuser %{USER} --shell="/bin/bash" --command="%{buildroot}%{INSTALL_DIR}/bin/opensearch-dashboards-plugin install %{_url_plugin_updates}" + runuser %{USER} --shell="/bin/bash" --command="%{buildroot}%{INSTALL_DIR}/bin/opensearch-dashboards-plugin install %{_url_plugin_core}" fi find %{buildroot}%{INSTALL_DIR}/plugins/wazuh/ -exec chown %{USER}:%{GROUP} {} \; From 8d4574c7ca3c437a931b687e1cc182ff4a2fc85c Mon Sep 17 00:00:00 2001 From: Manuel Date: Fri, 17 Nov 2023 09:43:09 +0100 Subject: [PATCH 900/994] Added permissions change for merged.mg files in upgrade --- debs/SPECS/wazuh-manager/debian/postinst | 2 ++ rpms/SPECS/wazuh-manager.spec | 3 +++ 2 files changed, 5 insertions(+) diff --git a/debs/SPECS/wazuh-manager/debian/postinst b/debs/SPECS/wazuh-manager/debian/postinst index 16935a565d..ece01e5b0f 100644 --- a/debs/SPECS/wazuh-manager/debian/postinst +++ b/debs/SPECS/wazuh-manager/debian/postinst @@ -170,6 +170,8 @@ case "$1" in chmod 0660 ${DIR}/logs/active-responses.log chmod 0640 ${DIR}/logs/integrations.log + # Set merged.mg permissions to new ones + find ${DIR}/etc/shared/ -type f -name 'merged.mg' -exec chmod 644 {} \; if [ -f ${DIR}/etc/shared/ar.conf ]; then chown root:wazuh ${DIR}/etc/shared/ar.conf diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 53f1bca207..173e40b65f 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -330,6 +330,9 @@ fi rm -f %{_localstatedir}/etc/shared/ar.conf >/dev/null 2>&1 rm -f %{_localstatedir}/etc/shared/merged.mg >/dev/null 2>&1 +# Set merged.mg permissions to new ones +find %{_localstatedir}/etc/shared/ -type f -name 'merged.mg' -exec chmod 644 {} \; + # CentOS if [ -r "/etc/centos-release" ]; then DIST_NAME="centos" From 54f733fed71c7a70fd6b958dea436f2b9205ae76 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Fri, 17 Nov 2023 18:45:13 +0100 Subject: [PATCH 901/994] Fixed typo in logo name --- 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 229739ed64..ad465f8665 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -119,7 +119,7 @@ sed -i "90s|defaultValue: true|defaultValue: false|g" ./src/core/server/opensear ## Remove OpenSearch from the upper bar with empty svg cp ./etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg ./src/core/server/core_app/assets/logos/opensearch_dashboards.svg cp ./etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg ./src/core/server/core_app/assets/logos/opensearch_dashboards_on_light.svg -cp ./etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg ./src/core/server/core_app/assets/logos/opensearch_dashboards_on_darke.svg +cp ./etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg ./src/core/server/core_app/assets/logos/opensearch_dashboards_on_dark.svg # Remove the `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 From 8e54bf0b21a6c3081816e40098b07ace251713df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20David=20Guti=C3=A9rrez?= Date: Mon, 20 Nov 2023 09:51:08 +0100 Subject: [PATCH 902/994] feat(wazuh-dashboard): add branding image to headers - Added branding images to header when the expanded header is enabled or disabled - Refactored the definition of loading logos to use assets instead of images defined in compiled JS. - Removed old images to customize Wazuh dashboards - Added images to replace the default assets of OpenSearch Dashboards - Renamed files of mark and background files of the login page - Adapted the light_theme.style.css - Renamed the login page background image - Removed styles for unused loginWelcome__logo class --- stack/dashboard/CUSTOM_BRANDING.md | 37 +++++++++++++++++++ stack/dashboard/base/builder.sh | 27 +------------- .../Assets/default_branding/home.svg | 7 ---- .../default_branding/home_dark_mode.svg | 8 ---- .../default_branding/logo_full_alpha.svg | 11 ------ ...h_mark_default_mode.svg => opensearch.svg} | 0 .../opensearch_center_mark.svg | 13 +++++++ ...de.svg => opensearch_center_mark_dark.svg} | 0 .../opensearch_dashboards_on_dark.svg | 32 ++++++++++++++++ .../opensearch_dashboards_on_light.svg | 23 ++++++++++++ .../default_branding/opensearch_mark.svg | 13 +++++++ .../opensearch_mark_on_dark.svg | 14 +++++++ .../opensearch_mark_on_light.svg | 13 +++++++ .../default_branding/opensearch_on_dark.svg | 14 +++++++ .../default_branding/opensearch_on_light.svg | 13 +++++++ .../default_branding/opensearch_spinner.svg | 23 ++++++++++++ .../opensearch_spinner_on_dark.svg | 16 ++++++++ .../opensearch_spinner_on_light.svg | 14 +++++++ .../wazuh_dashboard_login_background.svg} | 0 .../wazuh_dashboard_login_mark.svg} | 0 .../default_branding/wazuh_logo_white.svg | 23 ------------ .../etc/custom_welcome/light_theme.style.css | 18 +-------- 22 files changed, 228 insertions(+), 91 deletions(-) create mode 100644 stack/dashboard/CUSTOM_BRANDING.md delete mode 100644 stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/home.svg delete mode 100644 stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/home_dark_mode.svg delete mode 100644 stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg rename stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/{wazuh_mark_default_mode.svg => opensearch.svg} (100%) create mode 100644 stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_center_mark.svg rename stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/{wazuh_mark_dark_mode.svg => opensearch_center_mark_dark.svg} (100%) create mode 100644 stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_dashboards_on_dark.svg create mode 100644 stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_dashboards_on_light.svg create mode 100644 stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_mark.svg create mode 100644 stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_mark_on_dark.svg create mode 100644 stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_mark_on_light.svg create mode 100644 stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_on_dark.svg create mode 100644 stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_on_light.svg create mode 100644 stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_spinner.svg create mode 100644 stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_spinner_on_dark.svg create mode 100644 stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_spinner_on_light.svg rename stack/dashboard/base/files/etc/custom_welcome/{wazuh_wazuh_bg.svg => Assets/default_branding/wazuh_dashboard_login_background.svg} (100%) rename stack/dashboard/base/files/etc/custom_welcome/{Wazuh-Logo.svg => Assets/default_branding/wazuh_dashboard_login_mark.svg} (100%) delete mode 100644 stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/wazuh_logo_white.svg diff --git a/stack/dashboard/CUSTOM_BRANDING.md b/stack/dashboard/CUSTOM_BRANDING.md new file mode 100644 index 0000000000..aa56a16c4a --- /dev/null +++ b/stack/dashboard/CUSTOM_BRANDING.md @@ -0,0 +1,37 @@ +# Custom branding + +Wazuh dashboard allows to apply a custom branding. + +## Customize through OpenSearch Dashboards settings + +This uses the built-in settings of OpenSearch Dashboards, for more information, see: https://opensearch.org/docs/2.10/dashboards/branding/. + +## Replace the default assets of Wazuh dashboard + +This approach is useful for users that want to replace the default assets of the Wazuh dashboard as fallback instead of using the custom branding settings of OpenSearch Dashboards. Use case: revendors, IT security companies, custom package, etc... + +The Wazuh dashboard package replaces the original files of OpenSearch Dashboards distribuible and rename it placing the files at `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/` directory. The customization can be done by replacing the assets. + +| File | Theme | Description | +| --- | --- | --- | +| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch.svg` | - | Unused* | +| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_center_mark.svg` | - | Unused* | +| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_center_mark_on_dark.svg` | Dark | Unused* | +| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_center_mark_on_light.svg` | Dark | Unused* | +| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_dashboards.svg` | - | Unused* | +| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_dashboards_on_dark.svg` | Dark | Branding logo on expanded header | +| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_dashboards_on_light.svg` | Light | Branding logo on expanded header | +| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/wazuh_dashboard_login_background.svg` | Dark | Background of login page | +| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/wazuh_dashboard_login_mark.svg` | Dark | Branding logo on the login page | +| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_dashboards_spinner.svg` | - | Unused* | +| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_dashboards_spinner_on_dark.svg` | Dark | Loading logo | +| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_dashboards_spinner_on_light.svg` | Light | Loading logo | +| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_mark.svg` | - | Unused* | +| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_mark_on_light.svg` | Light | ISO Branding logo when the expanded header is disabled | +| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_mark_on_dark.svg` | Dark | ISO Branding logo when the expanded header is disabled | +| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_on_light.svg` | Light | Unused* | +| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_on_dark.svg` | Dark | Unused* | + +*The file was replaced. + +> Note: The name of images includes the reference to `wazuh`, to customize this, it is needed to do changes in the production code of the Wazuh dashboard package, see `base/builder.sh`. This is not recommended if you don't know what should be done. diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh index 229739ed64..6fb1f7fe47 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -96,10 +96,8 @@ sed -i 's/exec "${NODE}"/NODE_ENV=production exec "${NODE}" ${NODE_OPTIONS} /g' cp ./etc/custom_welcome/template.js.hbs ./src/legacy/ui/ui_render/bootstrap/template.js.hbs cp ./etc/custom_welcome/light_theme.style.css ./src/core/server/core_app/assets/legacy_light_theme.css # SVG -cp ./etc/custom_welcome/*svg ./src/core/server/core_app/assets/logos/ +cp ./etc/custom_welcome/Assets/default_branding/*svg ./src/core/server/core_app/assets/logos/ # Copy Home button -cp ./etc/custom_welcome/Assets/default_branding/home.svg ./src/core/server/core_app/assets/logos/ -cp ./etc/custom_welcome/Assets/default_branding/home_dark_mode.svg ./src/core/server/core_app/assets/logos/ # Copy favicons 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 @@ -116,11 +114,6 @@ cp ./etc/styles.js ./src/core/server/rendering/views/styles.js 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 -## Remove OpenSearch from the upper bar with empty svg -cp ./etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg ./src/core/server/core_app/assets/logos/opensearch_dashboards.svg -cp ./etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg ./src/core/server/core_app/assets/logos/opensearch_dashboards_on_light.svg -cp ./etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg ./src/core/server/core_app/assets/logos/opensearch_dashboards_on_darke.svg - # Remove the `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 @@ -158,24 +151,8 @@ sed -i 's|https://survey.opensearch.org|https://wazuh.com/community/join-us-on-s 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 # Custom logos -## Custom logos - Home button logo -sed -i 's|MARK_THEMED="ui/logos/opensearch_mark.svg"|MARK_THEMED="ui/logos/home.svg"|g' ./src/core/target/public/core.entry.js -sed -i 's|MARK_ON_LIGHT="ui/logos/opensearch_mark_on_light.svg"|MARK_ON_LIGHT="ui/logos/home.svg"|g' ./src/core/target/public/core.entry.js -sed -i 's|MARK_ON_DARK="ui/logos/opensearch_mark_on_dark.svg"|MARK_ON_DARK="ui/logos/home_dark_mode.svg"|g' ./src/core/target/public/core.entry.js -sed -i 's|MARK_THEMED="ui/logos/opensearch_mark.svg"|MARK_THEMED="ui/logos/home.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js -sed -i 's|MARK_ON_LIGHT="ui/logos/opensearch_mark_on_light.svg"|MARK_ON_LIGHT="ui/logos/home.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js -sed -i 's|MARK_ON_DARK="ui/logos/opensearch_mark_on_dark.svg"|MARK_ON_DARK="ui/logos/home_dark_mode.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js ## Custom logos - Login logo -sed -i 's|OPENSEARCH_ON_LIGHT="ui/logos/opensearch_on_light.svg"|OPENSEARCH_ON_LIGHT="ui/logos/Wazuh-Logo.svg"|g' ./plugins/alertingDashboards/target/public/alertingDashboards.plugin.js -sed -i 's|OPENSEARCH_ON_DARK="ui/logos/opensearch_on_dark.svg"|OPENSEARCH_ON_DARK="ui/logos/Wazuh-Logo.svg"|g' ./plugins/alertingDashboards/target/public/alertingDashboards.plugin.js -sed -i 's|OPENSEARCH_ON_LIGHT="ui/logos/opensearch_on_light.svg"|OPENSEARCH_ON_LIGHT="ui/logos/Wazuh-Logo.svg"|g' ./plugins/indexManagementDashboards/target/public/indexManagementDashboards.plugin.js -sed -i 's|OPENSEARCH_ON_DARK="ui/logos/opensearch_on_dark.svg"|OPENSEARCH_ON_DARK="ui/logos/Wazuh-Logo.svg"|g' ./plugins/indexManagementDashboards/target/public/indexManagementDashboards.plugin.js -sed -i 's|OPENSEARCH_ON_LIGHT="ui/logos/opensearch_on_light.svg"|OPENSEARCH_ON_LIGHT="ui/logos/Wazuh-Logo.svg"|g' ./plugins/notificationsDashboards/target/public/notificationsDashboards.plugin.js -sed -i 's|OPENSEARCH_ON_DARK="ui/logos/opensearch_on_dark.svg"|OPENSEARCH_ON_DARK="ui/logos/Wazuh-Logo.svg"|g' ./plugins/notificationsDashboards/target/public/notificationsDashboards.plugin.js -sed -i 's|OPENSEARCH_ON_LIGHT="ui/logos/opensearch_on_light.svg"|OPENSEARCH_ON_LIGHT="ui/logos/Wazuh-Logo.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js -sed -i 's|OPENSEARCH_ON_DARK="ui/logos/opensearch_on_dark.svg"|OPENSEARCH_ON_DARK="ui/logos/Wazuh-Logo.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js -sed -i 's|OPENSEARCH_ON_LIGHT="ui/logos/opensearch_on_light.svg"|OPENSEARCH_ON_LIGHT="ui/logos/Wazuh-Logo.svg"|g' ./src/core/target/public/core.entry.js -sed -i 's|OPENSEARCH_ON_DARK="ui/logos/opensearch_on_dark.svg"|OPENSEARCH_ON_DARK="ui/logos/Wazuh-Logo.svg"|g' ./src/core/target/public/core.entry.js +sed -i 's|props.chrome.logos.OpenSearch.url|props.http.basePath.prepend("/ui/logos/wazuh_dashboard_login_mark.svg")|g' ./plugins/securityDashboards/target/public/securityDashboards.chunk.5.js # Redirections ## Redirections - Replace the redirections to the home app 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 deleted file mode 100644 index a62df5484a..0000000000 --- a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/home.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - 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 deleted file mode 100644 index 8258f69eff..0000000000 --- a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/home_dark_mode.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - Wazuh home - - diff --git a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg deleted file mode 100644 index 035a60b514..0000000000 --- a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/wazuh_mark_default_mode.svg b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch.svg similarity index 100% rename from stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/wazuh_mark_default_mode.svg rename to stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch.svg diff --git a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_center_mark.svg b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_center_mark.svg new file mode 100644 index 0000000000..7445c31da2 --- /dev/null +++ b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_center_mark.svg @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/wazuh_mark_dark_mode.svg b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_center_mark_dark.svg similarity index 100% rename from stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/wazuh_mark_dark_mode.svg rename to stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_center_mark_dark.svg diff --git a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_dashboards_on_dark.svg b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_dashboards_on_dark.svg new file mode 100644 index 0000000000..ea25e5d2f9 --- /dev/null +++ b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_dashboards_on_dark.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + diff --git a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_dashboards_on_light.svg b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_dashboards_on_light.svg new file mode 100644 index 0000000000..a931095bb7 --- /dev/null +++ b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_dashboards_on_light.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + diff --git a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_mark.svg b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_mark.svg new file mode 100644 index 0000000000..7445c31da2 --- /dev/null +++ b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_mark.svg @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_mark_on_dark.svg b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_mark_on_dark.svg new file mode 100644 index 0000000000..902e504f75 --- /dev/null +++ b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_mark_on_dark.svg @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_mark_on_light.svg b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_mark_on_light.svg new file mode 100644 index 0000000000..7445c31da2 --- /dev/null +++ b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_mark_on_light.svg @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_on_dark.svg b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_on_dark.svg new file mode 100644 index 0000000000..902e504f75 --- /dev/null +++ b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_on_dark.svg @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_on_light.svg b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_on_light.svg new file mode 100644 index 0000000000..7445c31da2 --- /dev/null +++ b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_on_light.svg @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_spinner.svg b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_spinner.svg new file mode 100644 index 0000000000..a931095bb7 --- /dev/null +++ b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_spinner.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + diff --git a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_spinner_on_dark.svg b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_spinner_on_dark.svg new file mode 100644 index 0000000000..1912d28aca --- /dev/null +++ b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_spinner_on_dark.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + diff --git a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_spinner_on_light.svg b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_spinner_on_light.svg new file mode 100644 index 0000000000..67a94ba74e --- /dev/null +++ b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_spinner_on_light.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + diff --git a/stack/dashboard/base/files/etc/custom_welcome/wazuh_wazuh_bg.svg b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/wazuh_dashboard_login_background.svg similarity index 100% rename from stack/dashboard/base/files/etc/custom_welcome/wazuh_wazuh_bg.svg rename to stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/wazuh_dashboard_login_background.svg diff --git a/stack/dashboard/base/files/etc/custom_welcome/Wazuh-Logo.svg b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/wazuh_dashboard_login_mark.svg similarity index 100% rename from stack/dashboard/base/files/etc/custom_welcome/Wazuh-Logo.svg rename to stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/wazuh_dashboard_login_mark.svg diff --git a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/wazuh_logo_white.svg b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/wazuh_logo_white.svg deleted file mode 100644 index a7c056fadd..0000000000 --- a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/wazuh_logo_white.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - diff --git a/stack/dashboard/base/files/etc/custom_welcome/light_theme.style.css b/stack/dashboard/base/files/etc/custom_welcome/light_theme.style.css index e332ef08c8..f25261c6b8 100644 --- a/stack/dashboard/base/files/etc/custom_welcome/light_theme.style.css +++ b/stack/dashboard/base/files/etc/custom_welcome/light_theme.style.css @@ -4432,7 +4432,7 @@ input:focus { /*------------- WAZUH -------------*/ .wz-login { - background: url(./logos/wazuh_wazuh_bg.svg) !important; + background: url(./logos/wazuh_dashboard_login_background.svg) !important; width: 100% !important; height: 100% !important; background-size: cover !important; @@ -4473,25 +4473,9 @@ input:focus { margin-top: 32px; } -.loginWelcome__logo { - display: inline-block; - width: 80px; - height: 80px; - line-height: 80px; - text-align: center; - background-color: #FFF; - border-radius: 100%; - padding: 16px; - box-shadow: 0 6px 12px -1px rgba(152, 162, 179, 0.2), 0 4px 4px -1px rgba(152, 162, 179, 0.2), 0 2px 2px 0 rgba(152, 162, 179, 0.2); - margin-bottom: 32px; -} - div.euiFormRow > div.euiFormRow__fieldWrapper > button { background-color: #3595F9!important; border-color: #3595F9!important; color: #fff; } -.loginWelcome__logo { - background: url(./logos/Wazuh-Logo.svg) center center no-repeat !important; -} From ad42f01b30fd54225b229cfa30748bebf504ff38 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Mon, 20 Nov 2023 13:49:40 +0100 Subject: [PATCH 903/994] Improved parameters --- stack/dashboard/deb/build_package.sh | 70 ++++++++++++--------------- stack/dashboard/deb/builder.sh | 28 +++++------ stack/dashboard/rpm/build_package.sh | 71 +++++++++++++--------------- stack/dashboard/rpm/builder.sh | 27 +++++------ 4 files changed, 89 insertions(+), 107 deletions(-) diff --git a/stack/dashboard/deb/build_package.sh b/stack/dashboard/deb/build_package.sh index c6c16c67b0..0b1da825b4 100755 --- a/stack/dashboard/deb/build_package.sh +++ b/stack/dashboard/deb/build_package.sh @@ -17,11 +17,14 @@ deb_amd64_builder="deb_dashboard_builder_amd64" deb_builder_dockerfile="${current_path}/docker" future="no" base_cmd="" -app_url="" plugin_main="" plugin_updates="" plugin_core="" build_base="yes" +have_main=false +have_updates=false +have_core=false +version="" trap ctrl_c INT @@ -38,13 +41,18 @@ ctrl_c() { clean 1 } +set_version() { + if [ "${reference}" ];then + version=$(curl -sL https://raw.githubusercontent.com/wazuh/wazuh-packages/${reference}/VERSION | cat) + else + version=$(cat ${current_path}/../../../VERSION) + fi +} + build_deb() { container_name="$1" dockerfile_path="$2" - if [ "${app_url_reference}" ]; then - app_url="${app_url_reference}" - fi if [ "${plugin_main_reference}" ];then plugin_main="${plugin_main_reference}" fi @@ -66,16 +74,11 @@ build_deb() { if [ "${reference}" ];then base_cmd+="--reference ${reference}" fi - if [ "${app_url_reference}" ];then - base_cmd+="--app-url ${app_url}/${plugin_main}" + if [ "${plugin_main_reference}" ];then + base_cmd+="--app-url ${plugin_main_reference}" fi ../base/generate_base.sh -s ${outdir} -r ${revision} ${base_cmd} else - if [ "${reference}" ];then - version=$(curl -sL https://raw.githubusercontent.com/wazuh/wazuh-packages/${reference}/VERSION | cat) - else - version=$(cat ${current_path}/../../../VERSION) - fi basefile="${outdir}/wazuh-dashboard-base-${version}-${revision}-linux-x64.tar.xz" if ! test -f "${basefile}"; then echo "Did not find expected Wazuh dashboard base file: ${basefile} in output path. Exiting..." @@ -93,12 +96,12 @@ build_deb() { if [ "${reference}" ];then docker run -t --rm ${volumes} \ ${container_name} ${architecture} ${revision} \ - ${future} ${app_url} ${plugin_main} ${plugin_updates} ${plugin_core} ${reference} || return 1 + ${future} ${plugin_main} ${plugin_updates} ${plugin_core} ${reference} || return 1 else docker run -t --rm ${volumes} \ -v ${current_path}/../../..:/root:Z \ ${container_name} ${architecture} ${revision} \ - ${future} ${app_url} ${plugin_main} ${plugin_updates} ${plugin_core} || return 1 + ${future} ${plugin_main} ${plugin_updates} ${plugin_core} || return 1 fi echo "Package $(ls -Art ${outdir} | tail -n 1) added to ${outdir}." @@ -134,17 +137,14 @@ help() { echo -e " -a, --architecture " echo -e " [Optional] Target architecture of the package [amd64]." echo -e "" - echo -e " -ar, --app-repo " - echo -e " [Optional] URL where Wazuh plugins are located." - echo -e "" - echo -e " -m, --main-app " - echo -e " [Required by '-ar, --app-repo'] Wazuh main plugin filename located at the URL provided, must include ZIP extension." + echo -e " -m, --main-app " + echo -e " [Optional] Wazuh main plugin URL." echo -e "" - echo -e " -u, --updates-app " - echo -e " [Required by '-ar, --app-repo'] Wazuh Check Updates plugin filename located at the URL provided, must include ZIP extension." + echo -e " -u, --updates-app " + echo -e " [Optional] Wazuh Check Updates plugin URL." echo -e "" - echo -e " -c, --core-app " - echo -e " [Required by '-ar, --app-repo'] Wazuh Core plugin filename located at the URL provided, must include ZIP extension." + echo -e " -c, --core-app " + echo -e " [Optional] Wazuh Core plugin URL." echo -e "" echo -e " -b, --build-base " echo -e " [Optional] Build a new base or use a existing one. By default, yes." @@ -186,17 +186,10 @@ main() { help 1 fi ;; - "-ar"|"--app-repo") - if [ -n "$2" ]; then - app_url_reference="$2" - shift 2 - else - help 1 - fi - ;; "-m"|"--main-app-url") if [ -n "$2" ]; then plugin_main_reference="$2" + have_main=true shift 2 else help 1 @@ -205,6 +198,7 @@ main() { "-u"|"--updates-app-url") if [ -n "$2" ]; then plugin_updates_reference="$2" + have_updates=true shift 2 else help 1 @@ -213,6 +207,7 @@ main() { "-c"|"--core-app-url") if [ -n "$2" ]; then plugin_core_reference="$2" + have_core=true shift 2 else help 1 @@ -263,15 +258,12 @@ main() { esac done - if [ ${app_url_reference} ] && [ ${plugin_main_reference} ] && [ ${plugin_updates_reference} ] && [ ${plugin_core_reference} ]; then - echo "The Wazuh dashboard package will be created using the following plugins URLs:" - echo "Wazuh main plugin: ${app_url_reference}/${plugin_main_reference}" - echo "Wazuh Check Updates plugin: ${app_url_reference}/${plugin_updates_reference}" - echo "Wazuh Core plugin: ${app_url_reference}/${plugin_core_reference}" - elif [ ! ${app_url_reference} ] && [ ! ${plugin_main_reference} ] && [ ! ${plugin_updates_reference} ] && [ ! ${plugin_core_reference} ]; then - echo "No Wazuh plugins have been defined, will use pre-release." - else - echo "The -ar, -m, -u, and -c options must be used together." + set_version + + if [ ! "${plugin_main_reference}" ] && [ ! "${plugin_updates_reference}" ] && [ ! "${plugin_core_reference}" ]; then + echo "No Wazuh plugins have been defined, ${version} pre-release development packages with revision ${revision} will be used." + elif [[ ${have_main} != ${have_updates} ]] || [[ ${have_updates} != ${have_core} ]]; then + echo "The -m, -u, and -c options must be used together." exit 1 fi diff --git a/stack/dashboard/deb/builder.sh b/stack/dashboard/deb/builder.sh index 9a5d8ac420..fafd97ada0 100755 --- a/stack/dashboard/deb/builder.sh +++ b/stack/dashboard/deb/builder.sh @@ -14,11 +14,10 @@ target="wazuh-dashboard" architecture=$1 revision=$2 future=$3 -app_url=$4 -plugin_main=$5 -plugin_updates=$6 -plugin_core=$7 -reference=$8 +plugin_main=$4 +plugin_updates=$5 +plugin_core=$6 +reference=$7 directory_base="/usr/share/wazuh-dashboard" if [ -z "${revision}" ]; then @@ -35,19 +34,19 @@ else fi fi -if [ "${app_url}" ] && [ "${plugin_main}" ] && [ "${plugin_updates}" ] && [ "${plugin_core}" ] ;then +if [ "${plugin_main}" ] && [ "${plugin_updates}" ] && [ "${plugin_core}" ] ;then valid_url='(https?|ftp|file)://[-[:alnum:]\+&@#/%?=~_|!:,.;]*[-[:alnum:]\+&@#/%=~_|]' - if [[ "${app_url}/${plugin_main}" =~ $valid_url ]];then - url_main="${app_url}/${plugin_main}" - if ! curl --output /dev/null --silent --head --fail "${app_url}/${plugin_main}"; then - echo "The given URL to download the Wazuh main plugin ZIP does not exist: ${app_url}/${plugin_main}" + if [[ "${plugin_main}" =~ $valid_url ]];then + url_main="${plugin_main}" + if ! curl --output /dev/null --silent --head --fail "${url_main}"; then + echo "The given URL to download the Wazuh main plugin ZIP does not exist: ${url_main}" exit 1 fi else url_main="https://packages-dev.wazuh.com/${app_url}/ui/dashboard/wazuh-${version}-${revision}.zip" fi - if [[ "${app_url}/${plugin_updates}" =~ $valid_url ]];then - url_updates="${app_url}/${plugin_updates}" + if [[ "${plugin_updates}" =~ $valid_url ]];then + url_updates="${plugin_updates}" if ! curl --output /dev/null --silent --head --fail "${url_updates}"; then echo "The given URL to download the Wazuh Check Updates plugin ZIP does not exist: ${url_updates}" exit 1 @@ -55,8 +54,8 @@ if [ "${app_url}" ] && [ "${plugin_main}" ] && [ "${plugin_updates}" ] && [ "${p else url_updates="https://packages-dev.wazuh.com/${app_url}/ui/dashboard/wazuhCheckUpdates-${version}-${revision}.zip" fi - if [[ "${app_url}/${plugin_core}" =~ $valid_url ]];then - url_core="${app_url}/${plugin_core}" + if [[ "${plugin_core}" =~ $valid_url ]];then + url_core="${plugin_core}" if ! curl --output /dev/null --silent --head --fail "${url_core}"; then echo "The given URL to download the Wazuh Core plugin ZIP does not exist: ${url_core}" exit 1 @@ -75,7 +74,6 @@ build_dir=/build pkg_name="${target}-${version}" pkg_path="${build_dir}/${target}" source_dir="${pkg_path}/${pkg_name}" - mkdir -p ${source_dir}/debian # Including spec file diff --git a/stack/dashboard/rpm/build_package.sh b/stack/dashboard/rpm/build_package.sh index 0c43e4dd2a..a4d1b55046 100755 --- a/stack/dashboard/rpm/build_package.sh +++ b/stack/dashboard/rpm/build_package.sh @@ -17,11 +17,14 @@ rpm_x86_builder="rpm_dashboard_builder_x86" rpm_builder_dockerfile="${current_path}/docker" future="no" base_cmd="" -app_url="" plugin_main="" plugin_updates="" plugin_core="" build_base="yes" +have_main=false +have_updates=false +have_core=false +version="" trap ctrl_c INT @@ -38,13 +41,18 @@ ctrl_c() { clean 1 } +set_version() { + if [ "${reference}" ];then + version=$(curl -sL https://raw.githubusercontent.com/wazuh/wazuh-packages/${reference}/VERSION | cat) + else + version=$(cat ${current_path}/../../../VERSION) + fi +} + build_rpm() { container_name="$1" dockerfile_path="$2" - if [ "${app_url_reference}" ]; then - app_url="${app_url_reference}" - fi if [ "${plugin_main_reference}" ];then plugin_main="${plugin_main_reference}" fi @@ -66,16 +74,11 @@ build_rpm() { if [ "${reference}" ];then base_cmd+="--reference ${reference}" fi - if [ "${app_url_reference}" ];then - base_cmd+="--app-url ${app_url}/${plugin_main}" + if [ "${plugin_main_reference}" ];then + base_cmd+="--app-url ${plugin_main_reference}" fi ../base/generate_base.sh -s ${outdir} -r ${revision} ${base_cmd} else - if [ "${reference}" ];then - version=$(curl -sL https://raw.githubusercontent.com/wazuh/wazuh-packages/${reference}/VERSION | cat) - else - version=$(cat ${current_path}/../../../VERSION) - fi basefile="${outdir}/wazuh-dashboard-base-${version}-${revision}-linux-x64.tar.xz" if ! test -f "${basefile}"; then echo "Did not find expected Wazuh dashboard base file: ${basefile} in output path. Exiting..." @@ -93,12 +96,12 @@ build_rpm() { if [ "${reference}" ];then docker run -t --rm ${volumes} \ ${container_name} ${architecture} ${revision} \ - ${future} ${app_url} ${plugin_main} ${plugin_updates} ${plugin_core} ${reference} || return 1 + ${future} ${plugin_main} ${plugin_updates} ${plugin_core} ${reference} || return 1 else docker run -t --rm ${volumes} \ -v ${current_path}/../../..:/root:Z \ ${container_name} ${architecture} \ - ${revision} ${future} ${app_url} ${plugin_main} ${plugin_updates} ${plugin_core} || return 1 + ${revision} ${future} ${plugin_main} ${plugin_updates} ${plugin_core} || return 1 fi echo "Package $(ls -Art ${outdir} | tail -n 1) added to ${outdir}." @@ -134,17 +137,14 @@ help() { echo -e " -a, --architecture " echo -e " [Optional] Target architecture of the package [x86_64]." echo -e "" - echo -e " -ar, --app-repo " - echo -e " [Optional] URL where Wazuh plugins are located." - echo -e "" - echo -e " -m, --main-app " - echo -e " [Required by '-ar, --app-repo'] Wazuh main plugin filename located at the URL provided, must include ZIP extension." + echo -e " -m, --main-app " + echo -e " [Optional] Wazuh main plugin URL." echo -e "" - echo -e " -u, --updates-app " - echo -e " [Required by '-ar, --app-repo'] Wazuh Check Updates plugin filename located at the URL provided, must include ZIP extension." + echo -e " -u, --updates-app " + echo -e " [Optional] Wazuh Check Updates plugin URL." echo -e "" - echo -e " -c, --core-app " - echo -e " [Required by '-ar, --app-repo'] Wazuh Core plugin filename located at the URL provided, must include ZIP extension." + echo -e " -c, --core-app " + echo -e " [Optional] Wazuh Core plugin URL." echo -e "" echo -e " -b, --build-base " echo -e " [Optional] Build a new base or use a existing one. By default, yes." @@ -186,17 +186,10 @@ main() { help 1 fi ;; - "-ar"|"--app-repo") - if [ -n "$2" ]; then - app_url_reference="$2" - shift 2 - else - help 1 - fi - ;; "-m"|"--main-app-url") if [ -n "$2" ]; then plugin_main_reference="$2" + have_main=true shift 2 else help 1 @@ -205,6 +198,7 @@ main() { "-u"|"--updates-app-url") if [ -n "$2" ]; then plugin_updates_reference="$2" + have_updates=true shift 2 else help 1 @@ -213,6 +207,7 @@ main() { "-c"|"--core-app-url") if [ -n "$2" ]; then plugin_core_reference="$2" + have_core=true shift 2 else help 1 @@ -263,15 +258,13 @@ main() { esac done - if [ ${app_url_reference} ] && [ ${plugin_main_reference} ] && [ ${plugin_updates_reference} ] && [ ${plugin_core_reference} ]; then - echo "The Wazuh dashboard package will be created using the following plugins URLs:" - echo "Wazuh main plugin: ${app_url_reference}/${plugin_main_reference}" - echo "Wazuh Check Updates plugin: ${app_url_reference}/${plugin_updates_reference}" - echo "Wazuh Core plugin: ${app_url_reference}/${plugin_core_reference}" - elif [ ! ${app_url_reference} ] && [ ! ${plugin_main_reference} ] && [ ! ${plugin_updates_reference} ] && [ ! ${plugin_core_reference} ]; then - echo "No Wazuh plugins have been defined, will use pre-release." - else - echo "The -ar, -m, -u, and -c options must be used together." + + set_version + + if [ ! "${plugin_main_reference}" ] && [ ! "${plugin_updates_reference}" ] && [ ! "${plugin_core_reference}" ]; then + echo "No Wazuh plugins have been defined, ${version} pre-release development packages with revision ${revision} will be used." + elif [[ ${have_main} != ${have_updates} ]] || [[ ${have_updates} != ${have_core} ]]; then + echo "The -m, -u, and -c options must be used together." exit 1 fi diff --git a/stack/dashboard/rpm/builder.sh b/stack/dashboard/rpm/builder.sh index bf10ac2fbe..0f19d1e3fb 100755 --- a/stack/dashboard/rpm/builder.sh +++ b/stack/dashboard/rpm/builder.sh @@ -14,11 +14,10 @@ target="wazuh-dashboard" architecture=$1 revision=$2 future=$3 -app_url=$4 -plugin_main=$5 -plugin_updates=$6 -plugin_core=$7 -reference=$8 +plugin_main=$4 +plugin_updates=$5 +plugin_core=$6 +reference=$7 directory_base="/usr/share/wazuh-dashboard" if [ -z "${revision}" ]; then @@ -35,19 +34,19 @@ else fi fi -if [ "${app_url}" ] && [ "${plugin_main}" ] && [ "${plugin_updates}" ] && [ "${plugin_core}" ] ;then +if [ "${plugin_main}" ] && [ "${plugin_updates}" ] && [ "${plugin_core}" ] ;then valid_url='(https?|ftp|file)://[-[:alnum:]\+&@#/%?=~_|!:,.;]*[-[:alnum:]\+&@#/%=~_|]' - if [[ "${app_url}/${plugin_main}" =~ $valid_url ]];then - url_main="${app_url}/${plugin_main}" - if ! curl --output /dev/null --silent --head --fail "${app_url}/${plugin_main}"; then - echo "The given URL to download the Wazuh main plugin ZIP does not exist: ${app_url}/${plugin_main}" + if [[ "${plugin_main}" =~ $valid_url ]];then + url_main="${plugin_main}" + if ! curl --output /dev/null --silent --head --fail "${url_main}"; then + echo "The given URL to download the Wazuh main plugin ZIP does not exist: ${url_main}" exit 1 fi else url_main="https://packages-dev.wazuh.com/${app_url}/ui/dashboard/wazuh-${version}-${revision}.zip" fi - if [[ "${app_url}/${plugin_updates}" =~ $valid_url ]];then - url_updates="${app_url}/${plugin_updates}" + if [[ "${plugin_updates}" =~ $valid_url ]];then + url_updates="${plugin_updates}" if ! curl --output /dev/null --silent --head --fail "${url_updates}"; then echo "The given URL to download the Wazuh Check Updates plugin ZIP does not exist: ${url_updates}" exit 1 @@ -55,8 +54,8 @@ if [ "${app_url}" ] && [ "${plugin_main}" ] && [ "${plugin_updates}" ] && [ "${p else url_updates="https://packages-dev.wazuh.com/${app_url}/ui/dashboard/wazuhCheckUpdates-${version}-${revision}.zip" fi - if [[ "${app_url}/${plugin_core}" =~ $valid_url ]];then - url_core="${app_url}/${plugin_core}" + if [[ "${plugin_core}" =~ $valid_url ]];then + url_core="${plugin_core}" if ! curl --output /dev/null --silent --head --fail "${url_core}"; then echo "The given URL to download the Wazuh Core plugin ZIP does not exist: ${url_core}" exit 1 From 13d1b77c6b0f54425fb17af1b14864bbf828fdd7 Mon Sep 17 00:00:00 2001 From: Manuel Date: Mon, 20 Nov 2023 16:52:28 +0100 Subject: [PATCH 904/994] Updated action-wait-for-workflow version --- .github/workflows/test-install-deb.yml | 2 +- .github/workflows/test-install-rpm.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-install-deb.yml b/.github/workflows/test-install-deb.yml index bd1fadc7fa..11ff5a6576 100644 --- a/.github/workflows/test-install-deb.yml +++ b/.github/workflows/test-install-deb.yml @@ -22,7 +22,7 @@ jobs: skip_after_successful_duplicate: 'false' - name: Wait for the package to be built - uses: ArcticLampyrid/action-wait-for-workflow@v1.0.3 + uses: ArcticLampyrid/action-wait-for-workflow@v1.0.4 id: wait-for-build with: github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/test-install-rpm.yml b/.github/workflows/test-install-rpm.yml index a44498a53a..3504067ba4 100644 --- a/.github/workflows/test-install-rpm.yml +++ b/.github/workflows/test-install-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.0.3 + uses: ArcticLampyrid/action-wait-for-workflow@v1.0.4 id: wait-for-build with: github_token: ${{ secrets.GITHUB_TOKEN }} From f1b381396b1eec3d5d2cca8d544c04fa36f60042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 21 Nov 2023 15:47:29 +0100 Subject: [PATCH 905/994] Removed PDF report dependencies --- .../install_functions/dashboard.sh | 28 ------- .../install_functions/installCommon.sh | 76 +------------------ .../install_functions/installMain.sh | 2 - 3 files changed, 4 insertions(+), 102 deletions(-) diff --git a/unattended_installer/install_functions/dashboard.sh b/unattended_installer/install_functions/dashboard.sh index 2e22db640a..cf25db1b53 100644 --- a/unattended_installer/install_functions/dashboard.sh +++ b/unattended_installer/install_functions/dashboard.sh @@ -217,31 +217,3 @@ function dashboard_install() { } -function dashboard_installReportDependencies() { - - # Flags that indicates that is an optional installation. - optional_installation=1 - report_dependencies=1 - - installCommon_checkChromium - - if [ "${sys_type}" == "yum" ]; then - dashboard_dependencies+=( nss xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-utils xorg-x11-fonts-cyrillic xorg-x11-fonts-Type1 xorg-x11-fonts-misc fontconfig freetype ) - installCommon_yumInstallList "${dashboard_dependencies[@]}" - - # In RHEL cases, remove the CentOS repositories configuration - if [ "${centos_repos_configured}" == 1 ]; then - installCommon_removeCentOSrepositories - fi - - elif [ "${sys_type}" == "apt-get" ]; then - dashboard_dependencies+=( libnss3-dev fonts-liberation libfontconfig1 ) - installCommon_aptInstallList "${dashboard_dependencies[@]}" - fi - - if [ "${pdf_warning}" == 1 ]; then - common_logger -w "Wazuh dashboard dependencies skipped. PDF report generation may not work." - fi - optional_installation=0 - -} diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index b5873bfc51..43d607a7e1 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -134,7 +134,8 @@ function installCommon_aptInstallList(){ common_logger "Installing $dep." installCommon_aptInstall "${dep}" if [ "${install_result}" != 0 ]; then - installCommon_checkOptionalInstallation + common_logger -e "Cannot install dependency: ${dep}." + exit 1 fi done fi @@ -173,20 +174,6 @@ function installCommon_changePasswordApi() { } -function installCommon_checkOptionalInstallation() { - - if [ "${optional_installation}" != 1 ]; then - common_logger -e "Cannot install dependency: ${dep}." - exit 1 - else - common_logger -w "Cannot install optional dependency: ${dep}." - if [ "${report_dependencies}" == 1 ]; then - pdf_warning=1 - fi - fi - -} - function installCommon_createCertificates() { if [ -n "${AIO}" ]; then @@ -292,36 +279,6 @@ function installCommon_changePasswords() { } -function installCommon_checkChromium() { - - if [ "${sys_type}" == "yum" ]; then - if (! yum list installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\\.) && (! yum list installed 2>/dev/null | grep -q -E ^"chromium"\\.); then - if [ "${DIST_NAME}" == "amzn" ]; then - installCommon_installChrome - elif [[ "${DIST_NAME}" == "centos" ]] && [[ "${DIST_VER}" == "7" ]]; then - installCommon_installChrome - elif [[ "${DIST_NAME}" == "rhel" ]] && [[ "${DIST_VER}" == "8" || "${DIST_VER}" == "9" ]]; then - installCommon_configureCentOSRepositories - dashboard_dependencies=(chromium) - else - dashboard_dependencies=(chromium) - fi - fi - - elif [ "${sys_type}" == "apt-get" ]; then - if (! apt list --installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\/) && (! apt list --installed 2>/dev/null | grep -q -E ^"chromium-browser"\/); then - - # Report generation doesn't work with Chromium in Ubuntu 22 and Ubuntu 20 - if [[ "${DIST_NAME}" == "ubuntu" ]] && [[ "${DIST_VER}" == "22" || "${DIST_VER}" == "20" || "${DIST_VER}" == "18" ]]; then - installCommon_installChrome - else - dashboard_dependencies=(chromium-browser) - fi - fi - fi - -} - # Adds the CentOS repository to install the dashboard dependencies. function installCommon_configureCentOSRepositories() { @@ -400,32 +357,6 @@ function installCommon_installCheckDependencies() { } -function installCommon_installChrome() { - - dep="chrome" - common_logger "Installing ${dep}." - - if [ "${sys_type}" == "yum" ]; then - chrome_package="/tmp/wazuh-install-files/chrome.rpm" - common_curl -so "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm --max-time 100 --retry 5 --retry-delay 5 --fail - eval "yum install ${chrome_package} -y ${debug}" - - if [ "${PIPESTATUS[0]}" != 0 ]; then - installCommon_checkOptionalInstallation - fi - - elif [ "${sys_type}" == "apt-get" ]; then - chrome_package="/tmp/wazuh-install-files/chrome.deb" - common_curl -so "${chrome_package}" https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb --max-time 100 --retry 5 --retry-delay 5 --fail - installCommon_aptInstall "${chrome_package}" - - if [ "${install_result}" != 0 ]; then - installCommon_checkOptionalInstallation - fi - fi - -} - function installCommon_installPrerequisites() { if [ "${sys_type}" == "yum" ]; then @@ -765,7 +696,8 @@ function installCommon_yumInstallList(){ eval "echo \${yum_output} ${debug}" if [ "${yum_code}" != 0 ]; then - installCommon_checkOptionalInstallation + common_logger -e "Cannot install dependency: ${dep}." + exit 1 fi done fi diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index 9cd6f4a213..bc68d38d41 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -321,7 +321,6 @@ function main() { if [ -n "${dashboard}" ]; then common_logger "--- Wazuh dashboard ----" - dashboard_installReportDependencies dashboard_install dashboard_configure installCommon_startService "wazuh-dashboard" @@ -361,7 +360,6 @@ function main() { filebeat_configure installCommon_startService "filebeat" common_logger "--- Wazuh dashboard ---" - dashboard_installReportDependencies dashboard_install dashboard_configure installCommon_startService "wazuh-dashboard" From 4f3d5e0a9bcb815e8ad5403b59bb8c5d197d034e Mon Sep 17 00:00:00 2001 From: Edgardo Monsalve <146019357+ed108206@users.noreply.github.com> Date: Tue, 21 Nov 2023 17:22:52 -0300 Subject: [PATCH 906/994] Update build.sh new SCA file --- macos/package_files/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/macos/package_files/build.sh b/macos/package_files/build.sh index f94537efbd..a332d67a14 100755 --- a/macos/package_files/build.sh +++ b/macos/package_files/build.sh @@ -60,7 +60,7 @@ function build() { find ${SOURCES_PATH}/src/init/ -name *.sh -type f -exec install -m 0640 {} ${INSTALLATION_SCRIPTS_DIR}/src/init \; mkdir -p ${INSTALLATION_SCRIPTS_DIR}/sca/generic - mkdir -p ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/{15,16,17,18,20,21,22} + mkdir -p ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/{15,16,17,18,20,21,22,23} cp -r ${SOURCES_PATH}/ruleset/sca/darwin ${INSTALLATION_SCRIPTS_DIR}/sca cp -r ${SOURCES_PATH}/ruleset/sca/generic ${INSTALLATION_SCRIPTS_DIR}/sca @@ -73,6 +73,7 @@ function build() { cp ${SOURCES_PATH}/etc/templates/config/darwin/20/sca.files ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/20/ cp ${SOURCES_PATH}/etc/templates/config/darwin/21/sca.files ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/21/ cp ${SOURCES_PATH}/etc/templates/config/darwin/22/sca.files ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/22/ + cp ${SOURCES_PATH}/etc/templates/config/darwin/22/sca.files ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/23/ cp ${SOURCES_PATH}/src/VERSION ${INSTALLATION_SCRIPTS_DIR}/src/ cp ${SOURCES_PATH}/src/REVISION ${INSTALLATION_SCRIPTS_DIR}/src/ From daf392921adcf952d9e47e359eb0bb2e42f2eede Mon Sep 17 00:00:00 2001 From: Edgardo Monsalve <146019357+ed108206@users.noreply.github.com> Date: Tue, 21 Nov 2023 17:26:38 -0300 Subject: [PATCH 907/994] Update wazuh-manager.spec new SCA file --- 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 173e40b65f..7c5eec863f 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -115,7 +115,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/packages_files/manager_installation_ mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/{applications,generic} mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amzn/{1,2} mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/centos/{8,7,6,5} -mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/darwin/{15,16,17,18,19,20,21,22} +mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/darwin/{15,16,17,18,19,20,21,22,23} mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/debian/{7,8,9,10,11} mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/ubuntu/{12,14,16,18,20,22}/04 mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/rhel/{9,8,7,6,5} @@ -766,6 +766,8 @@ rm -fr %{buildroot} %attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/darwin/21/* %dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/darwin/22 %attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/darwin/22/* +%dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/darwin/23 +%attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/darwin/23/* %dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/debian %attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/debian/* %dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/rhel From 6ca7f4b10335bea57e152cfe22936fe9df370e4e Mon Sep 17 00:00:00 2001 From: Edgardo Monsalve <146019357+ed108206@users.noreply.github.com> Date: Tue, 21 Nov 2023 17:29:43 -0300 Subject: [PATCH 908/994] Update rules new SCA file --- debs/SPECS/wazuh-manager/debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debs/SPECS/wazuh-manager/debian/rules b/debs/SPECS/wazuh-manager/debian/rules index e0dddd9ec4..616fccdcb3 100644 --- a/debs/SPECS/wazuh-manager/debian/rules +++ b/debs/SPECS/wazuh-manager/debian/rules @@ -129,6 +129,7 @@ override_dh_install: mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/20 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/21 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/22 + mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/23 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/7 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/8 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/9 @@ -170,6 +171,7 @@ override_dh_install: cp etc/templates/config/darwin/20/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/20 cp etc/templates/config/darwin/21/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/21 cp etc/templates/config/darwin/22/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/22 + cp etc/templates/config/darwin/22/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/23 cp etc/templates/config/debian/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian cp etc/templates/config/debian/7/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/7 From bcb2ed0f5e05a2669d002cef2efd6acdd68a0765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20David=20Guti=C3=A9rrez?= Date: Wed, 22 Nov 2023 10:23:07 +0100 Subject: [PATCH 909/994] fix(dashboard): loading logos --- .../default_branding/opensearch_spinner.svg | 26 +++------ .../opensearch_spinner_on_dark.svg | 12 ++--- .../opensearch_spinner_on_light.svg | 3 +- stack/dashboard/base/files/etc/styles.js | 2 +- stack/dashboard/base/files/etc/template.js | 53 ++++++------------- 5 files changed, 30 insertions(+), 66 deletions(-) diff --git a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_spinner.svg b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_spinner.svg index a931095bb7..605f05e17f 100644 --- a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_spinner.svg +++ b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_spinner.svg @@ -1,23 +1,13 @@ - - + - - - - - - + + + + + + diff --git a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_spinner_on_dark.svg b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_spinner_on_dark.svg index 1912d28aca..528236b80c 100644 --- a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_spinner_on_dark.svg +++ b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_spinner_on_dark.svg @@ -4,13 +4,11 @@ width="1024px" height="200px" viewBox="0 0 1024 200" fill="none" > - - - - - - - + + + + + diff --git a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_spinner_on_light.svg b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_spinner_on_light.svg index 67a94ba74e..605f05e17f 100644 --- a/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_spinner_on_light.svg +++ b/stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/opensearch_spinner_on_light.svg @@ -6,9 +6,8 @@ - + diff --git a/stack/dashboard/base/files/etc/styles.js b/stack/dashboard/base/files/etc/styles.js index 1637d9905d..0d179fb933 100644 --- a/stack/dashboard/base/files/etc/styles.js +++ b/stack/dashboard/base/files/etc/styles.js @@ -128,7 +128,7 @@ const Styles = ({ font-weight: 400; } - .osdLoaderWrap svg { + .osdLoaderWrap svg, .osdLoaderWrap img { width: 384px; height: 112px; margin: auto; diff --git a/stack/dashboard/base/files/etc/template.js b/stack/dashboard/base/files/etc/template.js index 983ce71bc1..d8b53e813d 100644 --- a/stack/dashboard/base/files/etc/template.js +++ b/stack/dashboard/base/files/etc/template.js @@ -57,46 +57,23 @@ const Template = ({ }) => { var _injectedMetadata$bra, _injectedMetadata$bra2, _injectedMetadata$bra3, _injectedMetadata$bra4; - const openSearchLogo = /*#__PURE__*/_react.default.createElement("svg", { - width: "64", - height: "64", - viewBox: "0 0 64 64", - fill: "none", - xmlns: "http://www.w3.org/2000/svg" - }, /*#__PURE__*/_react.default.createElement("path", { - d: "M61.7374 23.5C60.4878 23.5 59.4748 24.513 59.4748 25.7626C59.4748 44.3813 44.3813 59.4748 25.7626 59.4748C24.513 59.4748 23.5 60.4878 23.5 61.7374C23.5 62.987 24.513 64 25.7626 64C46.8805 64 64 46.8805 64 25.7626C64 24.513 62.987 23.5 61.7374 23.5Z", - fill: "#005EB8" - }), /*#__PURE__*/_react.default.createElement("path", { - d: "M48.0814 38C50.2572 34.4505 52.3615 29.7178 51.9475 23.0921C51.0899 9.36725 38.6589 -1.04463 26.9206 0.0837327C22.3253 0.525465 17.6068 4.2712 18.026 10.9805C18.2082 13.8961 19.6352 15.6169 21.9544 16.9399C24.1618 18.1992 26.9978 18.9969 30.2128 19.9011C34.0962 20.9934 38.6009 22.2203 42.063 24.7717C46.2125 27.8295 49.0491 31.3743 48.0814 38Z", - fill: "#003B5C" - }), /*#__PURE__*/_react.default.createElement("path", { - d: "M3.91861 14C1.74276 17.5495 -0.361506 22.2822 0.0524931 28.9079C0.910072 42.6327 13.3411 53.0446 25.0794 51.9163C29.6747 51.4745 34.3932 47.7288 33.974 41.0195C33.7918 38.1039 32.3647 36.3831 30.0456 35.0601C27.8382 33.8008 25.0022 33.0031 21.7872 32.0989C17.9038 31.0066 13.3991 29.7797 9.93694 27.2283C5.78746 24.1704 2.95092 20.6257 3.91861 14Z", - fill: "#005EB8" - })); + const openSearchLogo = _react.default.createElement("img", { + alt: 'Loading logo', + className: 'loadingLogo', + src: `${uiPublicUrl}/logos/opensearch.svg` + }); - const openSearchLogoSpinner = _react.default.createElement("svg", { - viewBox:"0 0 1024 200", - fill: "none", - xmlns: "http://www.w3.org/2000/svg" - }, - _react.default.createElement("polygon",{points:"204.11 142.81 174.37 46.12 150.88 46.12 121.13 142.81 91.65 46.06 64.64 46.06 107.69 187.04 129.61 187.04 162.63 85 195.5 187.04 217.42 187.04 260.48 46.12 233.6 46.12 204.11 142.81", fill:"black"}), - _react.default.createElement("polygon",{points:"451.67 70.52 524.33 70.52 444.36 182.73 444.36 187.04 563.74 187.04 563.74 162.64 487.81 162.64 567.65 50.56 567.65 46.12 451.67 46.12 451.67 70.52", fill:"black"}), - _react.default.createElement("path",{d:"M390,61c-12.09-12.61-28.57-19.24-48-19.24-41,0-72,32.22-72,75s30.95,75,72,75c19.35,0,35.84-6.6,48-19.12v16.16h27.58V44.7H390Zm-45.15,104.7c-27.1,0-46.77-20.6-46.77-49s19.67-48.84,46.77-48.84S391.5,88.4,391.5,116.7,371.89,165.68,344.88,165.68Z", fill:"black"}), - _react.default.createElement("path",{d:"M696.14,125.88c0,25.29-13.92,39.8-38.18,39.8s-38.32-14.51-38.32-39.8V44.7H592v83.39c0,46.91,35.51,63.56,65.92,63.56s65.77-16.65,65.77-63.56V44.7H696.14Z", fill:"black"}), - _react.default.createElement("path",{d:"M883.3,93.62A85.09,85.09,0,0,0,878.86,76a56.88,56.88,0,0,0-9.46-16.64A45.46,45.46,0,0,0,853.3,47q-9.93-4.71-24.54-4.7-19.05,0-32.48,8.22A53,53,0,0,0,782.19,63V8.35h-24.4V187h27.66V113.71q0-12.52,2.8-21.27A37.82,37.82,0,0,1,796,78.35a28.86,28.86,0,0,1,11.42-7.76,39.44,39.44,0,0,1,13.83-2.42c7.47,0,13.55,1.53,18.2,4.57a31.27,31.27,0,0,1,10.82,12,52.22,52.22,0,0,1,5.22,16.12,107.39,107.39,0,0,1,1.38,16.89V187h27.66V108.75A114.2,114.2,0,0,0,883.3,93.62Z", fill:"black"}), - _react.default.createElement("circle",{fill:"#3585F9",cx:"937.12",cy:"167.6",r:"22.24"})); + const openSearchLogoSpinner = _react.default.createElement("img", { + alt: 'Loading logo', + className: 'loadingLogo', + src: `${uiPublicUrl}/logos/opensearch_spinner_on_light.svg` + }); - const openSearchLogoSpinnerDark = _react.default.createElement("svg", { - viewBox:"0 0 1024 200", - fill: "none", - xmlns: "http://www.w3.org/2000/svg" - }, - _react.default.createElement("polygon",{points:"204.11 142.81 174.37 46.12 150.88 46.12 121.13 142.81 91.65 46.06 64.64 46.06 107.69 187.04 129.61 187.04 162.63 85 195.5 187.04 217.42 187.04 260.48 46.12 233.6 46.12 204.11 142.81", fill:"white"}), - _react.default.createElement("polygon",{points:"451.67 70.52 524.33 70.52 444.36 182.73 444.36 187.04 563.74 187.04 563.74 162.64 487.81 162.64 567.65 50.56 567.65 46.12 451.67 46.12 451.67 70.52", fill:"white"}), - _react.default.createElement("path",{d:"M390,61c-12.09-12.61-28.57-19.24-48-19.24-41,0-72,32.22-72,75s30.95,75,72,75c19.35,0,35.84-6.6,48-19.12v16.16h27.58V44.7H390Zm-45.15,104.7c-27.1,0-46.77-20.6-46.77-49s19.67-48.84,46.77-48.84S391.5,88.4,391.5,116.7,371.89,165.68,344.88,165.68Z", fill:"white"}), - _react.default.createElement("path",{d:"M696.14,125.88c0,25.29-13.92,39.8-38.18,39.8s-38.32-14.51-38.32-39.8V44.7H592v83.39c0,46.91,35.51,63.56,65.92,63.56s65.77-16.65,65.77-63.56V44.7H696.14Z", fill:"white"}), - _react.default.createElement("path",{d:"M883.3,93.62A85.09,85.09,0,0,0,878.86,76a56.88,56.88,0,0,0-9.46-16.64A45.46,45.46,0,0,0,853.3,47q-9.93-4.71-24.54-4.7-19.05,0-32.48,8.22A53,53,0,0,0,782.19,63V8.35h-24.4V187h27.66V113.71q0-12.52,2.8-21.27A37.82,37.82,0,0,1,796,78.35a28.86,28.86,0,0,1,11.42-7.76,39.44,39.44,0,0,1,13.83-2.42c7.47,0,13.55,1.53,18.2,4.57a31.27,31.27,0,0,1,10.82,12,52.22,52.22,0,0,1,5.22,16.12,107.39,107.39,0,0,1,1.38,16.89V187h27.66V108.75A114.2,114.2,0,0,0,883.3,93.62Z", fill:"white"}), - _react.default.createElement("circle",{fill:"#3585F9",cx:"937.12",cy:"167.6",r:"22.24"})); + const openSearchLogoSpinnerDark = _react.default.createElement("img", { + alt: 'Loading logo', + className: 'loadingLogo', + src: `${uiPublicUrl}/logos/opensearch_spinner_on_dark.svg` + }); const loadingLogoDefault = (_injectedMetadata$bra = injectedMetadata.branding.loadingLogo) === null || _injectedMetadata$bra === void 0 ? void 0 : _injectedMetadata$bra.defaultUrl; From c27ace0a22867ec1f572312b7f3ab4b5ab10fad7 Mon Sep 17 00:00:00 2001 From: Vikman Fernandez-Castro Date: Wed, 22 Nov 2023 10:46:40 +0100 Subject: [PATCH 910/994] Bump version to 4.8.1 --- CHANGELOG.md | 4 ++++ VERSION | 2 +- aix/SPECS/wazuh-agent-aix.spec | 4 +++- debs/SPECS/wazuh-agent/debian/changelog | 6 ++++++ debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 6 ++++++ debs/SPECS/wazuh-manager/debian/copyright | 2 +- macos/specs/wazuh-agent-arm64.pkgproj | 4 ++-- macos/specs/wazuh-agent-intel64.pkgproj | 4 ++-- rpms/SPECS/wazuh-agent.spec | 4 +++- rpms/SPECS/wazuh-manager.spec | 4 +++- solaris/solaris10/pkginfo | 4 ++-- stack/dashboard/deb/debian/changelog | 6 ++++++ stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 ++ stack/indexer/deb/debian/changelog | 6 ++++++ stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 ++ tests/unattended/unit/suites/test-common.sh | 4 ++-- tests/unattended/unit/suites/test-dashboard.sh | 10 +++++----- tests/unattended/unit/suites/test-indexer.sh | 8 ++++---- .../install_functions/installVariables.sh | 2 +- 22 files changed, 64 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15611dc1bb..565cac37d6 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. +## [4.8.1] + +- https://github.com/wazuh/wazuh-packages/releases/tag/v4.8.1 + ## [4.8.0] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.8.0 diff --git a/VERSION b/VERSION index 88f181192c..697e993915 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.8.0 +4.8.1 diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index c2d94988e7..e45ccaef03 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.8.0 +Version: 4.8.1 Release: 1 License: GPL URL: https://www.wazuh.com/ @@ -290,6 +290,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog +* Tue Jan 30 2024 support - 4.8.1 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html * Fri Dec 15 2023 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Thu Dec 07 2023 support - 4.7.1 diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 1d79fa4432..30c3b9764d 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -1,3 +1,9 @@ +wazuh-agent (4.8.1-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html + + -- Wazuh, Inc Tue, 30 Jan 2024 00:00:00 +0000 + wazuh-agent (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 69851d429f..c30f285cd2 100644 --- a/debs/SPECS/wazuh-agent/debian/copyright +++ b/debs/SPECS/wazuh-agent/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 21 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 30 Jan 2024 00:00:00 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index 5f2aab6155..3aef6efb85 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -1,3 +1,9 @@ +wazuh-manager (4.8.1-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html + + -- Wazuh, Inc Tue, 30 Jan 2024 00:00:00 +0000 + wazuh-manager (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 69851d429f..c30f285cd2 100644 --- a/debs/SPECS/wazuh-manager/debian/copyright +++ b/debs/SPECS/wazuh-manager/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 21 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 30 Jan 2024 00:00:00 +0000 It was downloaded from: diff --git a/macos/specs/wazuh-agent-arm64.pkgproj b/macos/specs/wazuh-agent-arm64.pkgproj index 2f8ecdbe8d..bc1fe8d2b8 100644 --- a/macos/specs/wazuh-agent-arm64.pkgproj +++ b/macos/specs/wazuh-agent-arm64.pkgproj @@ -812,7 +812,7 @@ USE_HFS+_COMPRESSION VERSION - 4.8.0-1 + 4.8.1-1 TYPE 0 @@ -1240,7 +1240,7 @@ NAME - wazuh-agent-4.8.0-1.arm64 + wazuh-agent-4.8.1-1.arm64 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/macos/specs/wazuh-agent-intel64.pkgproj b/macos/specs/wazuh-agent-intel64.pkgproj index 8f319c52c3..d6fc49771c 100644 --- a/macos/specs/wazuh-agent-intel64.pkgproj +++ b/macos/specs/wazuh-agent-intel64.pkgproj @@ -812,7 +812,7 @@ USE_HFS+_COMPRESSION VERSION - 4.8.0-1 + 4.8.1-1 TYPE 0 @@ -1239,7 +1239,7 @@ NAME - wazuh-agent-4.8.0-1.intel64 + wazuh-agent-4.8.1-1.intel64 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index ab0bbbc273..529908837b 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -7,7 +7,7 @@ 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.8.0 +Version: 4.8.1 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -625,6 +625,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* Tue Jan 30 2024 support - 4.8.1 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html * Fri Dec 15 2023 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Thu Dec 07 2023 support - 4.7.1 diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 7c303922ad..d4cfe18cfa 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -7,7 +7,7 @@ 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.8.0 +Version: 4.8.1 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -848,6 +848,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* Tue Jan 30 2024 support - 4.8.1 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html * Fri Dec 15 2023 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Thu Dec 07 2023 support - 4.7.1 diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index d167f45048..e6a3502b8c 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -1,11 +1,11 @@ NAME=Wazuh - Wazuh unifies historically separate functions into a single agent and platform architecture. Providing protection for public clouds, private clouds, and on-premise data centers. PKG="wazuh-agent" -VERSION="4.8.0" +VERSION="4.8.1" ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="15Dec2023" +PSTAMP="30Jan2024" EMAIL="info@wazuh.com" ISTATES="S s 1 2 3" RSTATES="S s 1 2 3" diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 7378658f16..c827611ee1 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -1,3 +1,9 @@ +wazuh-dashboard (4.8.1-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html + + -- Wazuh, Inc Tue, 30 Jan 2024 00:00:00 +0000 + wazuh-dashboard (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index e1363f5649..7712d24437 100644 --- a/stack/dashboard/deb/debian/copyright +++ b/stack/dashboard/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 21 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 30 Jan 2024 00:00:00 +0000 It was downloaded from: diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 9cfe0603c9..fb842e77f6 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -331,6 +331,8 @@ rm -fr %{buildroot} %config(noreplace) %attr(640, %{USER}, %{GROUP}) "%{CONFIG_DIR}/opensearch_dashboards.yml" %changelog +* Tue Jan 30 2024 support - 4.8.1 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html * Fri Dec 15 2023 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Thu Dec 07 2023 support - 4.7.1 diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 3086ff911f..5ae97742a1 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -1,3 +1,9 @@ +wazuh-indexer (4.8.1-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html + + -- Wazuh, Inc Tue, 30 Jan 2024 00:00:00 +0000 + wazuh-indexer (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index e1363f5649..7712d24437 100644 --- a/stack/indexer/deb/debian/copyright +++ b/stack/indexer/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 21 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 30 Jan 2024 00:00:00 +0000 It was downloaded from: diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index fd4c14afb8..3efa856b94 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -697,6 +697,8 @@ rm -fr %{buildroot} %changelog +* Tue Jan 30 2024 support - 4.8.1 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html * Fri Dec 15 2023 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Thu Dec 07 2023 support - 4.7.1 diff --git a/tests/unattended/unit/suites/test-common.sh b/tests/unattended/unit/suites/test-common.sh index c4b22ee938..fc8b89ba06 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.8.0-1 @wazuh + @mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.8.1-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-05-common_checkInstalled-all-installed-yum-assert() { - @echo "wazuh-manager.x86_64 4.8.0-1 @wazuh" + @echo "wazuh-manager.x86_64 4.8.1-1 @wazuh" @echo 1 @echo "wazuh-indexer.x86_64 4.6.0-1 @wazuh" diff --git a/tests/unattended/unit/suites/test-dashboard.sh b/tests/unattended/unit/suites/test-dashboard.sh index 79324f4fbe..862c061218 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.8.0" + wazuh_version="4.8.1" elasticsearch_oss_version="7.10.2" wazuh_kibana_plugin_revision="1" repobaseurl="https://packages.wazuh.com/4.x" @@ -55,7 +55,7 @@ test-03-dashboard_install-yum() { load-dashboard_install sys_type="yum" sep="-" - wazuh_version="4.8.0" + wazuh_version="4.8.1" wazuh_revision="1" dashboard_install } @@ -68,7 +68,7 @@ test-ASSERT-FAIL-04-dashboard_install-yum-error() { load-dashboard_install sys_type="yum" sep="-" - wazuh_version="4.8.0" + wazuh_version="4.8.1" wazuh_revision="1" @mockfalse yum install wazuh-dashboard-1.13.2-1 -y dashboard_install @@ -78,7 +78,7 @@ test-05-dashboard_install-apt() { load-dashboard_install sys_type="apt-get" sep="=" - wazuh_version="4.8.0" + wazuh_version="4.8.1" wazuh_revision="1" dashboard_install } @@ -91,7 +91,7 @@ test-ASSERT-FAIL-06-dashboard_install-apt-error() { load-dashboard_install sys_type="apt-get" sep="=" - wazuh_version="4.8.0" + wazuh_version="4.8.1" wazuh_revision="1" @mockfalse apt install wazuh-dashboard=1.13.2-1 -y dashboard_install diff --git a/tests/unattended/unit/suites/test-indexer.sh b/tests/unattended/unit/suites/test-indexer.sh index db0f3a382f..4e7434ae9f 100644 --- a/tests/unattended/unit/suites/test-indexer.sh +++ b/tests/unattended/unit/suites/test-indexer.sh @@ -49,7 +49,7 @@ test-03-indexer_install-yum() { load-indexer_install sys_type="yum" sep="-" - wazuh_version="4.8.0" + wazuh_version="4.8.1" wazuh_revision="1" indexer_install } @@ -63,7 +63,7 @@ test-ASSERT-FAIL-04-indexer_install-yum-error() { load-indexer_install sys_type="yum" sep="-" - wazuh_version="4.8.0" + wazuh_version="4.8.1" wazuh_revision="1" @mockfalse yum install wazuh-indexer-1.13.2-1 -y indexer_install @@ -73,7 +73,7 @@ test-05-indexer_install-apt() { load-indexer_install sys_type="apt-get" sep="=" - wazuh_version="4.8.0" + wazuh_version="4.8.1" wazuh_revision="1" indexer_install } @@ -87,7 +87,7 @@ test-ASSERT-FAIL-06-indexer_install-apt-error() { load-indexer_install sys_type="apt-get" sep="=" - wazuh_version="4.8.0" + wazuh_version="4.8.1" wazuh_revision="1" @mockfalse apt install wazuh-indexer=1.13.2-1 -y indexer_install diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index f7aa93ae57..f7a2e077a2 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.8" -readonly wazuh_version="4.8.0" +readonly wazuh_version="4.8.1" readonly filebeat_version="7.10.2" readonly wazuh_install_vesion="0.1" readonly source_branch="v${wazuh_version}" From 67ac826d2108b60b96e6b1c367f96ab825811aed Mon Sep 17 00:00:00 2001 From: Manuel Date: Wed, 22 Nov 2023 12:46:04 +0100 Subject: [PATCH 911/994] Changed REVISION debs name --- .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 72b892111a..9dafa6ddfd 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -64,7 +64,7 @@ jobs: 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 }}" + REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g; s/\//./g' ) 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 diff --git a/.github/workflows/test-install-deb.yml b/.github/workflows/test-install-deb.yml index bd1fadc7fa..928f1eb50b 100644 --- a/.github/workflows/test-install-deb.yml +++ b/.github/workflows/test-install-deb.yml @@ -69,7 +69,7 @@ jobs: 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 }}) + REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g; s/\//./g' ) echo "PACKAGE_NAME=wazuh-${{ matrix.type }}_${VERSION}-${REVISION}_${{ matrix.arch }}.deb" >> $GITHUB_ENV - name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }} From 080973895e0c1839d57e2b531e9793cf4e648797 Mon Sep 17 00:00:00 2001 From: Manuel Date: Wed, 22 Nov 2023 12:46:47 +0100 Subject: [PATCH 912/994] Changed REVISION rpms name --- .github/workflows/build-rpm-packages.yml | 2 +- .github/workflows/test-install-rpm.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 8e180534a3..50f21b7ca8 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -65,7 +65,7 @@ jobs: 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' ) + REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g; s/\//./g' ) 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 diff --git a/.github/workflows/test-install-rpm.yml b/.github/workflows/test-install-rpm.yml index a44498a53a..90f05d9f33 100644 --- a/.github/workflows/test-install-rpm.yml +++ b/.github/workflows/test-install-rpm.yml @@ -78,7 +78,7 @@ jobs: 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' ) + REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g; 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 }} From b688b64fe13aeae3aea1773b52cb814319ad4ebb Mon Sep 17 00:00:00 2001 From: c-bordon Date: Wed, 22 Nov 2023 08:55:08 -0300 Subject: [PATCH 913/994] Added validation for CentOS Repos --- .../install_functions/installCommon.sh | 12 ++++++++++-- .../install_functions/installMain.sh | 4 ---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 43d607a7e1..b49e13e7b6 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -279,7 +279,7 @@ function installCommon_changePasswords() { } -# Adds the CentOS repository to install the dashboard dependencies. +# Adds the CentOS repository to install lsof. function installCommon_configureCentOSRepositories() { centos_repos_configured=1 @@ -347,8 +347,16 @@ function installCommon_installCheckDependencies() { if [ "${sys_type}" == "yum" ]; then dependencies=( systemd grep tar coreutils sed procps-ng gawk lsof curl openssl ) + if [[ "${DIST_NAME}" == "rhel" ]] && [[ "${DIST_VER}" == "8" || "${DIST_VER}" == "9" ]]; then + installCommon_configureCentOSRepositories + fi installCommon_yumInstallList "${dependencies[@]}" + # In RHEL cases, remove the CentOS repositories configuration + if [ "${centos_repos_configured}" == 1 ]; then + installCommon_removeCentOSrepositories + fi + elif [ "${sys_type}" == "apt-get" ]; then eval "apt-get update -q ${debug}" dependencies=( systemd grep tar coreutils sed procps gawk lsof curl openssl ) @@ -507,7 +515,7 @@ function installCommon_restoreWazuhrepo() { } function installCommon_removeCentOSrepositories() { - + eval "rm -f ${centos_repo} ${debug}" eval "rm -f ${centos_key} ${debug}" eval "yum clean all ${debug}" diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index bc68d38d41..1539bfc648 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -217,10 +217,6 @@ function main() { common_checkSystem - if [ -z "${uninstall}" ]; then - installCommon_installCheckDependencies - fi - if [ -z "${download}" ]; then check_dist fi From dff2d829013f3dff510d5eafc85b7a81acd9616c Mon Sep 17 00:00:00 2001 From: Jose Luis Carreras Marin Date: Wed, 22 Nov 2023 13:03:51 +0100 Subject: [PATCH 914/994] Fix some SPECS versions in the new SCA file from macOS 14 --- debs/SPECS/wazuh-manager/debian/rules | 4 ++-- macos/package_files/build.sh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debs/SPECS/wazuh-manager/debian/rules b/debs/SPECS/wazuh-manager/debian/rules index 616fccdcb3..f650758d62 100644 --- a/debs/SPECS/wazuh-manager/debian/rules +++ b/debs/SPECS/wazuh-manager/debian/rules @@ -129,7 +129,7 @@ override_dh_install: mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/20 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/21 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/22 - mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/23 + mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/23 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/7 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/8 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/9 @@ -171,7 +171,7 @@ override_dh_install: cp etc/templates/config/darwin/20/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/20 cp etc/templates/config/darwin/21/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/21 cp etc/templates/config/darwin/22/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/22 - cp etc/templates/config/darwin/22/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/23 + cp etc/templates/config/darwin/23/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/23 cp etc/templates/config/debian/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian cp etc/templates/config/debian/7/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/7 diff --git a/macos/package_files/build.sh b/macos/package_files/build.sh index a332d67a14..522513b789 100755 --- a/macos/package_files/build.sh +++ b/macos/package_files/build.sh @@ -35,10 +35,10 @@ function build() { configure if [ -z "${USER_BINARYINSTALL}" ]; then - make -C ${SOURCES_PATH}/src deps TARGET=agent + make -C ${SOURCES_PATH}/src deps TARGET=agent - echo "Generating Wazuh executables" - make -j$JOBS -C ${SOURCES_PATH}/src DYLD_FORCE_FLAT_NAMESPACE=1 TARGET=agent build + echo "Generating Wazuh executables" + make -j$JOBS -C ${SOURCES_PATH}/src DYLD_FORCE_FLAT_NAMESPACE=1 TARGET=agent build fi echo "Running install script" @@ -73,7 +73,7 @@ function build() { cp ${SOURCES_PATH}/etc/templates/config/darwin/20/sca.files ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/20/ cp ${SOURCES_PATH}/etc/templates/config/darwin/21/sca.files ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/21/ cp ${SOURCES_PATH}/etc/templates/config/darwin/22/sca.files ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/22/ - cp ${SOURCES_PATH}/etc/templates/config/darwin/22/sca.files ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/23/ + cp ${SOURCES_PATH}/etc/templates/config/darwin/23/sca.files ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/23/ cp ${SOURCES_PATH}/src/VERSION ${INSTALLATION_SCRIPTS_DIR}/src/ cp ${SOURCES_PATH}/src/REVISION ${INSTALLATION_SCRIPTS_DIR}/src/ From e20815edada880d9e9ab97914fe8239de8fc1bb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Wed, 22 Nov 2023 18:35:11 +0100 Subject: [PATCH 915/994] Improved message of CentOS key import failure --- unattended_installer/install_functions/installCommon.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index b49e13e7b6..2a2930466b 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -287,8 +287,7 @@ function installCommon_configureCentOSRepositories() { eval "common_curl -sLo ${centos_key} 'https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official' --max-time 300 --retry 5 --retry-delay 5 --fail" if [ ! -f "${centos_key}" ]; then - common_logger -w "The CentOS key could not be added. Chromium package skipped." - pdf_warning=1 + common_logger -w "The CentOS key could not be added. Some dependencies may not be installed." else centos_repo="/etc/yum.repos.d/centos.repo" eval "touch ${centos_repo} ${debug}" From af4fb8e8c1ee364c1b6e7ee3d1ed523b5dc2e0fe Mon Sep 17 00:00:00 2001 From: Vikman Fernandez-Castro Date: Thu, 23 Nov 2023 13:23:44 +0100 Subject: [PATCH 916/994] Update the release ETA for 4.7.0 --- aix/SPECS/wazuh-agent-aix.spec | 2 +- debs/SPECS/wazuh-agent/debian/changelog | 2 +- debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 2 +- debs/SPECS/wazuh-manager/debian/copyright | 2 +- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- stack/dashboard/deb/debian/changelog | 2 +- stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- stack/indexer/deb/debian/changelog | 2 +- stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 46a0d98d84..bf17f08839 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 -* Tue Nov 21 2023 support - 4.7.0 +* Mon Nov 27 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 05485a304a..dce656471d 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,7 +2,7 @@ wazuh-agent (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Tue, 21 Nov 2023 00:00:00 +0000 + -- Wazuh, Inc Mon, 27 Nov 2023 00:00:00 +0000 wazuh-agent (4.6.0-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 69851d429f..58a2b27935 100644 --- a/debs/SPECS/wazuh-agent/debian/copyright +++ b/debs/SPECS/wazuh-agent/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 21 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Mon, 27 Nov 2023 00:00:00 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index 77b04053ac..4892b2b400 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,7 +2,7 @@ wazuh-manager (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Tue, 21 Nov 2023 00:00:00 +0000 + -- Wazuh, Inc Mon, 27 Nov 2023 00:00:00 +0000 wazuh-manager (4.6.0-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 69851d429f..58a2b27935 100644 --- a/debs/SPECS/wazuh-manager/debian/copyright +++ b/debs/SPECS/wazuh-manager/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 21 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Mon, 27 Nov 2023 00:00:00 +0000 It was downloaded from: diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 799390018d..84fbdf1661 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -599,7 +599,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Tue Nov 21 2023 support - 4.7.0 +* Mon Nov 27 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 3e8b9f2603..6a7189f414 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -822,7 +822,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Tue Nov 21 2023 support - 4.7.0 +* Mon Nov 27 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 3ff3b3d95b..be55507866 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-dashboard (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Tue, 21 Nov 2023 00:00:00 +0000 + -- Wazuh, Inc Mon, 27 Nov 2023 00:00:00 +0000 wazuh-dashboard (4.6.0-RELEASE) stable; urgency=low diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index e1363f5649..d8ef3b22a4 100644 --- a/stack/dashboard/deb/debian/copyright +++ b/stack/dashboard/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 21 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Mon, 27 Nov 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 95c7be89a7..450be32275 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -408,7 +408,7 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog -* Tue Nov 21 2023 support - 4.7.0 +* Mon Nov 27 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 0538fd0cd8..8cd93a9e2f 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-indexer (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Tue, 21 Nov 2023 00:00:00 +0000 + -- Wazuh, Inc Mon, 27 Nov 2023 00:00:00 +0000 wazuh-indexer (4.6.0-RELEASE) stable; urgency=low diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index e1363f5649..d8ef3b22a4 100644 --- a/stack/indexer/deb/debian/copyright +++ b/stack/indexer/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 21 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Mon, 27 Nov 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index ccd96707d7..f5bd7e3e2d 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1444,7 +1444,7 @@ rm -fr %{buildroot} %changelog -* Tue Nov 21 2023 support - 4.7.0 +* Mon Nov 27 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html * Tue Oct 24 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html From e757b5624f668f21a160a26047e1a786f5c53c01 Mon Sep 17 00:00:00 2001 From: Vikman Fernandez-Castro Date: Thu, 23 Nov 2023 13:38:34 +0100 Subject: [PATCH 917/994] Fix 4.6.0 release date --- aix/SPECS/wazuh-agent-aix.spec | 2 +- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- stack/dashboard/deb/debian/changelog | 2 ++ stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index bf17f08839..974a4e615e 100644 --- a/aix/SPECS/wazuh-agent-aix.spec +++ b/aix/SPECS/wazuh-agent-aix.spec @@ -292,7 +292,7 @@ rm -fr %{buildroot} %changelog * Mon Nov 27 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html -* Tue Oct 24 2023 support - 4.6.0 +* Tue Oct 31 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html * Tue Oct 24 2023 support - 4.5.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 84fbdf1661..af9ec7b440 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -601,7 +601,7 @@ rm -fr %{buildroot} %changelog * Mon Nov 27 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html -* Tue Oct 24 2023 support - 4.6.0 +* Tue Oct 31 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html * Tue Oct 24 2023 support - 4.5.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 6a7189f414..6b2bc0b093 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -824,7 +824,7 @@ rm -fr %{buildroot} %changelog * Mon Nov 27 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html -* Tue Oct 24 2023 support - 4.6.0 +* Tue Oct 31 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html * Tue Oct 24 2023 support - 4.5.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index be55507866..79e0a7df1f 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -8,6 +8,8 @@ wazuh-dashboard (4.6.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html + -- Wazuh, Inc Tue, 31 Oct 2023 00:00:00 +0000 + wazuh-dashboard (4.5.4-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 450be32275..eb8df3ecb8 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -410,7 +410,7 @@ rm -fr %{buildroot} %changelog * Mon Nov 27 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html -* Tue Oct 24 2023 support - 4.6.0 +* Tue Oct 31 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html * Tue Oct 24 2023 support - 4.5.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index f5bd7e3e2d..bfec731d41 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1446,7 +1446,7 @@ rm -fr %{buildroot} %changelog * Mon Nov 27 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html -* Tue Oct 24 2023 support - 4.6.0 +* Tue Oct 31 2023 support - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html * Tue Oct 24 2023 support - 4.5.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html From b8555748122b5a32add17ac71f33580892249186 Mon Sep 17 00:00:00 2001 From: Dwordcito Date: Wed, 2 Aug 2023 00:03:52 -0300 Subject: [PATCH 918/994] Add new libraries to the manager spec file. --- rpms/SPECS/wazuh-manager.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 7c303922ad..271dbd5f77 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -682,6 +682,11 @@ rm -fr %{buildroot} %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 +%attr(750, root, wazuh) %{_localstatedir}/lib/libcontent_manager.so +%attr(750, root, wazuh) %{_localstatedir}/lib/libindexer_connector.so +%attr(750, root, wazuh) %{_localstatedir}/lib/librocksdb.so.8 +%attr(750, root, wazuh) %{_localstatedir}/lib/librouter.so +%attr(750, root, wazuh) %{_localstatedir}/lib/libvulnerability_scanner.so %{_localstatedir}/lib/libpython3.10.so.1.0 %dir %attr(770, wazuh, wazuh) %{_localstatedir}/logs %attr(660, wazuh, wazuh) %ghost %{_localstatedir}/logs/active-responses.log From aa9a9e48c63ef192d94fc0cab5d14f3aab98be09 Mon Sep 17 00:00:00 2001 From: MiguelazoDS Cazajous-Miguel Date: Mon, 9 Oct 2023 16:54:45 -0300 Subject: [PATCH 919/994] Adding flatccrt library to rpm SPECS --- 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 271dbd5f77..6cecf606e5 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -685,6 +685,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/lib/libcontent_manager.so %attr(750, root, wazuh) %{_localstatedir}/lib/libindexer_connector.so %attr(750, root, wazuh) %{_localstatedir}/lib/librocksdb.so.8 +%attr(750, root, wazuh) %{_localstatedir}/lib/libflatccrt.so %attr(750, root, wazuh) %{_localstatedir}/lib/librouter.so %attr(750, root, wazuh) %{_localstatedir}/lib/libvulnerability_scanner.so %{_localstatedir}/lib/libpython3.10.so.1.0 From ef656127a366146fae7b9ba99c90e56692556467 Mon Sep 17 00:00:00 2001 From: Dwordcito Date: Thu, 23 Nov 2023 13:55:21 -0300 Subject: [PATCH 920/994] Remove cpe helper installation --- rpms/SPECS/wazuh-manager.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 6cecf606e5..6943a0f33f 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -95,9 +95,6 @@ install -m 0644 src/init/templates/wazuh-manager.service ${RPM_BUILD_ROOT}/usr/l # Clean the preinstalled configuration assesment files rm -f ${RPM_BUILD_ROOT}%{_localstatedir}/ruleset/sca/* -# Install Vulnerability Detector files -install -m 0440 src/wazuh_modules/vulnerability_detector/*.json ${RPM_BUILD_ROOT}%{_localstatedir}/queue/vulnerabilities/dictionaries - # Add configuration scripts mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/packages_files/manager_installation_scripts/ cp gen_ossec.sh ${RPM_BUILD_ROOT}%{_localstatedir}/packages_files/manager_installation_scripts/ @@ -695,6 +692,7 @@ rm -fr %{buildroot} %attr(640, wazuh, wazuh) %ghost %{_localstatedir}/logs/integrations.log %attr(660, wazuh, wazuh) %ghost %{_localstatedir}/logs/ossec.log %attr(660, wazuh, wazuh) %ghost %{_localstatedir}/logs/ossec.json +%attr(0440, root, wazuh) %{_localstatedir}/queue/indexer/vd_states_template.json %dir %attr(750, wazuh, wazuh) %{_localstatedir}/logs/api %dir %attr(750, wazuh, wazuh) %{_localstatedir}/logs/archives %dir %attr(750, wazuh, wazuh) %{_localstatedir}/logs/alerts @@ -734,11 +732,10 @@ rm -fr %{buildroot} %dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/rids %dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/tasks %dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/sockets -%dir %attr(660, root, wazuh) %{_localstatedir}/queue/vulnerabilities -%dir %attr(440, root, wazuh) %{_localstatedir}/queue/vulnerabilities/dictionaries +%dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/vd +%dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/indexer +%dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/router %dir %attr(750, wazuh, wazuh) %{_localstatedir}/queue/logcollector -%attr(0440, root, wazuh) %{_localstatedir}/queue/vulnerabilities/dictionaries/cpe_helper.json -%attr(0440, root, wazuh) %ghost %{_localstatedir}/queue/vulnerabilities/dictionaries/msu.json.gz %dir %attr(750, root, wazuh) %{_localstatedir}/ruleset %dir %attr(750, root, wazuh) %{_localstatedir}/ruleset/sca %dir %attr(750, root, wazuh) %{_localstatedir}/ruleset/decoders From 69c99982994c1ecca03d26a0c08578cdea7b66d8 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Fri, 24 Nov 2023 15:11:18 -0300 Subject: [PATCH 921/994] Changed check yum lock function --- .../common_functions/common.sh | 22 ++++++++-- .../install_functions/installCommon.sh | 42 +++++++------------ 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/unattended_installer/common_functions/common.sh b/unattended_installer/common_functions/common.sh index fe0c7e8d9b..00651292e3 100644 --- a/unattended_installer/common_functions/common.sh +++ b/unattended_installer/common_functions/common.sh @@ -70,7 +70,7 @@ function common_checkInstalled() { dashboard_installed="" if [ "${sys_type}" == "yum" ]; then - installCommon_checkYumLock + common_checkYumLock wazuh_installed=$(yum list installed 2>/dev/null | grep wazuh-manager) elif [ "${sys_type}" == "apt-get" ]; then wazuh_installed=$(apt list --installed 2>/dev/null | grep wazuh-manager) @@ -82,7 +82,7 @@ function common_checkInstalled() { fi if [ "${sys_type}" == "yum" ]; then - installCommon_checkYumLock + common_checkYumLock indexer_installed=$(yum list installed 2>/dev/null | grep wazuh-indexer) elif [ "${sys_type}" == "apt-get" ]; then indexer_installed=$(apt list --installed 2>/dev/null | grep wazuh-indexer) @@ -94,7 +94,7 @@ function common_checkInstalled() { fi if [ "${sys_type}" == "yum" ]; then - installCommon_checkYumLock + common_checkYumLock filebeat_installed=$(yum list installed 2>/dev/null | grep filebeat) elif [ "${sys_type}" == "apt-get" ]; then filebeat_installed=$(apt list --installed 2>/dev/null | grep filebeat) @@ -106,7 +106,7 @@ function common_checkInstalled() { fi if [ "${sys_type}" == "yum" ]; then - installCommon_checkYumLock + common_checkYumLock dashboard_installed=$(yum list installed 2>/dev/null | grep wazuh-dashboard) elif [ "${sys_type}" == "apt-get" ]; then dashboard_installed=$(apt list --installed 2>/dev/null | grep wazuh-dashboard) @@ -189,3 +189,17 @@ function common_remove_gpg_key() { fi } + +function common_checkYumLock() { + + attempt=0 + seconds=30 + max_attempts=10 + + while [ -f "${yum_lockfile}" ] && [ "${attempt}" -lt "${max_attempts}" ]; do + attempt=$((attempt+1)) + common_logger "Another process is using YUM. Waiting for it to release the lock. Next retry in ${seconds} seconds (${attempt}/${max_attempts})" + sleep "${seconds}" + done + +} diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 07bd4bf3a9..081f9d814c 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -173,7 +173,7 @@ function installCommon_checkOptionalInstallation() { exit 1 else common_logger -w "Cannot install optional dependency: ${dep}." - if [ "${report_dependencies}" == 1 ]; then + if [ "${report_dependencies}" == 1 ]; then pdf_warning=1 fi fi @@ -194,20 +194,6 @@ function installCommon_checkAptLock() { } -function installCommon_checkYumLock() { - - attempt=0 - seconds=30 - max_attempts=10 - - while [ -f "${yum_lockfile}" ] && [ "${attempt}" -lt "${max_attempts}" ]; do - attempt=$((attempt+1)) - common_logger "Another process is using YUM. Waiting for it to release the lock. Next retry in ${seconds} seconds (${attempt}/${max_attempts})" - sleep "${seconds}" - done - -} - function installCommon_createCertificates() { common_logger -d "Creating Wazuh certificates." @@ -317,7 +303,7 @@ function installCommon_changePasswords() { function installCommon_checkChromium() { if [ "${sys_type}" == "yum" ]; then - installCommon_checkYumLock + common_checkYumLock if (! yum list installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\\.) && (! yum list installed 2>/dev/null | grep -q -E ^"chromium"\\.); then if [ "${DIST_NAME}" == "amzn" ]; then installCommon_installChrome @@ -330,7 +316,7 @@ function installCommon_checkChromium() { dashboard_dependencies=(chromium) fi fi - + elif [ "${sys_type}" == "apt-get" ]; then if (! apt list --installed 2>/dev/null | grep -q -E ^"google-chrome-stable"\/) && (! apt list --installed 2>/dev/null | grep -q -E ^"chromium-browser"\/); then @@ -345,7 +331,7 @@ function installCommon_checkChromium() { } -# Adds the CentOS repository to install the dashboard dependencies. +# Adds the CentOS repository to install the dashboard dependencies. function installCommon_configureCentOSRepositories() { centos_repos_configured=1 @@ -603,7 +589,7 @@ function installCommon_restoreWazuhrepo() { } function installCommon_removeCentOSrepositories() { - + eval "rm -f ${centos_repo} ${debug}" eval "rm -f ${centos_key} ${debug}" eval "yum clean all ${debug}" @@ -629,7 +615,7 @@ function installCommon_rollBack() { if [[ -n "${wazuh_installed}" && ( -n "${wazuh}" || -n "${AIO}" || -n "${uninstall}" ) ]];then common_logger "Removing Wazuh manager." if [ "${sys_type}" == "yum" ]; then - installCommon_checkYumLock + common_checkYumLock if [ "${attempt}" -ne "${max_attempts}" ]; then eval "yum remove wazuh-manager -y ${debug}" manager_installed=$(yum list installed 2>/dev/null | grep wazuh-manager) @@ -645,7 +631,7 @@ function installCommon_rollBack() { else common_logger "Wazuh manager removed." fi - + fi if [[ ( -n "${wazuh_remaining_files}" || -n "${wazuh_installed}" ) && ( -n "${wazuh}" || -n "${AIO}" || -n "${uninstall}" ) ]]; then @@ -655,7 +641,7 @@ function installCommon_rollBack() { if [[ -n "${indexer_installed}" && ( -n "${indexer}" || -n "${AIO}" || -n "${uninstall}" ) ]]; then common_logger "Removing Wazuh indexer." if [ "${sys_type}" == "yum" ]; then - installCommon_checkYumLock + common_checkYumLock if [ "${attempt}" -ne "${max_attempts}" ]; then eval "yum remove wazuh-indexer -y ${debug}" indexer_installed=$(yum list installed 2>/dev/null | grep wazuh-indexer) @@ -682,7 +668,7 @@ function installCommon_rollBack() { if [[ -n "${filebeat_installed}" && ( -n "${wazuh}" || -n "${AIO}" || -n "${uninstall}" ) ]]; then common_logger "Removing Filebeat." if [ "${sys_type}" == "yum" ]; then - installCommon_checkYumLock + common_checkYumLock if [ "${attempt}" -ne "${max_attempts}" ]; then eval "yum remove filebeat -y ${debug}" filebeat_installed=$(yum list installed 2>/dev/null | grep filebeat) @@ -709,7 +695,7 @@ function installCommon_rollBack() { if [[ -n "${dashboard_installed}" && ( -n "${dashboard}" || -n "${AIO}" || -n "${uninstall}" ) ]]; then common_logger "Removing Wazuh dashboard." if [ "${sys_type}" == "yum" ]; then - installCommon_checkYumLock + common_checkYumLock if [ "${attempt}" -ne "${max_attempts}" ]; then eval "yum remove wazuh-dashboard -y ${debug}" dashboard_installed=$(yum list installed 2>/dev/null | grep wazuh-dashboard) @@ -823,7 +809,7 @@ function installCommon_yumInstallList(){ dependencies=("$@") not_installed=() for dep in "${dependencies[@]}"; do - installCommon_checkYumLock + common_checkYumLock if ! yum list installed 2>/dev/null | grep -q -E ^"${dep}"\\.;then not_installed+=("${dep}") fi @@ -854,12 +840,12 @@ function installCommon_yumInstall() { else installer="${package}" fi - + command="yum install ${installer} -y" - installCommon_checkYumLock + common_checkYumLock if [ "${attempt}" -ne "${max_attempts}" ]; then - yum_output=$(eval "${command} 2>&1") + yum_output=$(eval "${command} 2>&1") install_result="${PIPESTATUS[0]}" eval "echo \${yum_output} ${debug}" fi From fd72f2c9f96e296b97aba58a2b0c84fdce39ba48 Mon Sep 17 00:00:00 2001 From: Vikman Fernandez-Castro Date: Mon, 27 Nov 2023 13:51:37 +0100 Subject: [PATCH 922/994] Update ETA date for 4.7.1 --- aix/SPECS/wazuh-agent-aix.spec | 2 +- debs/SPECS/wazuh-agent/debian/changelog | 4 ++-- debs/SPECS/wazuh-manager/debian/changelog | 4 ++-- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- stack/dashboard/deb/debian/changelog | 4 ++-- stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- stack/indexer/deb/debian/changelog | 4 ++-- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index fbcd046d95..2c7f0c4ce7 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 Dec 07 2023 support - 4.7.1 +* Tue Dec 05 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html * Tue Nov 21 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index d573f5d0b1..d58ff8282f 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,13 +2,13 @@ wazuh-agent (4.7.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html - -- Wazuh, Inc Thu, 07 Dec 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 05 Dec 2023 00:00:00 +0000 wazuh-agent (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Mon, 27 Nov 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 05 Nov 2023 00:00:00 +0000 wazuh-agent (4.6.0-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index 7df1bae968..66f78cc741 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,13 +2,13 @@ wazuh-manager (4.7.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html - -- Wazuh, Inc Thu, 07 Dec 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 05 Dec 2023 00:00:00 +0000 wazuh-manager (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Mon, 27 Nov 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 05 Nov 2023 00:00:00 +0000 wazuh-manager (4.6.0-RELEASE) stable; urgency=low diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index d421285e86..5ebdd98b36 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -599,7 +599,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Thu Dec 07 2023 support - 4.7.1 +* Tue Dec 05 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html * Tue Nov 21 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index f6043ad692..033a51afcc 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -827,7 +827,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Thu Dec 07 2023 support - 4.7.1 +* Tue Dec 05 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html * Tue Nov 21 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index fe95ffdcff..b764e4979b 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,13 +2,13 @@ wazuh-dashboard (4.7.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html - -- Wazuh, Inc Thu, 07 Dec 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 05 Dec 2023 00:00:00 +0000 wazuh-dashboard (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Mon, 27 Nov 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 05 Nov 2023 00:00:00 +0000 wazuh-dashboard (4.6.0-RELEASE) stable; urgency=low diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 7c9c053ecf..e99246e422 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -408,7 +408,7 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog -* Thu Dec 07 2023 support - 4.7.1 +* Tue Dec 05 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html * Tue Nov 21 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 7ff68b2fa9..ab916943c6 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,13 +2,13 @@ wazuh-indexer (4.7.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html - -- Wazuh, Inc Thu, 07 Dec 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 05 Dec 2023 00:00:00 +0000 wazuh-indexer (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Mon, 27 Nov 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 05 Nov 2023 00:00:00 +0000 wazuh-indexer (4.6.0-RELEASE) stable; urgency=low diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 10ae1db25f..cc76492203 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1444,7 +1444,7 @@ rm -fr %{buildroot} %changelog -* Thu Dec 07 2023 support - 4.7.1 +* Tue Dec 05 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html * Tue Nov 21 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html From f2c23f9be640c96a16f88540d72d0c981f1f30f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20David=20Guti=C3=A9rrez?= Date: Mon, 27 Nov 2023 14:46:04 +0100 Subject: [PATCH 923/994] fix: remove dot in customization file of Wazuh dashboard --- stack/dashboard/CUSTOM_BRANDING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/dashboard/CUSTOM_BRANDING.md b/stack/dashboard/CUSTOM_BRANDING.md index aa56a16c4a..6ba8c6efe8 100644 --- a/stack/dashboard/CUSTOM_BRANDING.md +++ b/stack/dashboard/CUSTOM_BRANDING.md @@ -4,7 +4,7 @@ Wazuh dashboard allows to apply a custom branding. ## Customize through OpenSearch Dashboards settings -This uses the built-in settings of OpenSearch Dashboards, for more information, see: https://opensearch.org/docs/2.10/dashboards/branding/. +This uses the built-in settings of OpenSearch Dashboards, for more information, see: https://opensearch.org/docs/2.10/dashboards/branding/ ## Replace the default assets of Wazuh dashboard From e6da6580d2a3f99461b289e073ca16e3fb903930 Mon Sep 17 00:00:00 2001 From: Antonio Date: Mon, 27 Nov 2023 15:47:34 +0100 Subject: [PATCH 924/994] fix(#2654): duplicated script delete --- stack/indexer/rpm/wazuh-indexer.spec | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index fd4c14afb8..ece2ce5096 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -181,18 +181,6 @@ if [ ${1} = 2 ]; 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 From 73781fcc67334f75850e7dc20d7ece8c2ae93873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20David=20Guti=C3=A9rrez?= Date: Mon, 27 Nov 2023 17:40:07 +0100 Subject: [PATCH 925/994] fix: remove .md file --- stack/dashboard/CUSTOM_BRANDING.md | 37 ------------------------------ 1 file changed, 37 deletions(-) delete mode 100644 stack/dashboard/CUSTOM_BRANDING.md diff --git a/stack/dashboard/CUSTOM_BRANDING.md b/stack/dashboard/CUSTOM_BRANDING.md deleted file mode 100644 index 6ba8c6efe8..0000000000 --- a/stack/dashboard/CUSTOM_BRANDING.md +++ /dev/null @@ -1,37 +0,0 @@ -# Custom branding - -Wazuh dashboard allows to apply a custom branding. - -## Customize through OpenSearch Dashboards settings - -This uses the built-in settings of OpenSearch Dashboards, for more information, see: https://opensearch.org/docs/2.10/dashboards/branding/ - -## Replace the default assets of Wazuh dashboard - -This approach is useful for users that want to replace the default assets of the Wazuh dashboard as fallback instead of using the custom branding settings of OpenSearch Dashboards. Use case: revendors, IT security companies, custom package, etc... - -The Wazuh dashboard package replaces the original files of OpenSearch Dashboards distribuible and rename it placing the files at `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/` directory. The customization can be done by replacing the assets. - -| File | Theme | Description | -| --- | --- | --- | -| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch.svg` | - | Unused* | -| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_center_mark.svg` | - | Unused* | -| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_center_mark_on_dark.svg` | Dark | Unused* | -| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_center_mark_on_light.svg` | Dark | Unused* | -| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_dashboards.svg` | - | Unused* | -| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_dashboards_on_dark.svg` | Dark | Branding logo on expanded header | -| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_dashboards_on_light.svg` | Light | Branding logo on expanded header | -| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/wazuh_dashboard_login_background.svg` | Dark | Background of login page | -| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/wazuh_dashboard_login_mark.svg` | Dark | Branding logo on the login page | -| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_dashboards_spinner.svg` | - | Unused* | -| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_dashboards_spinner_on_dark.svg` | Dark | Loading logo | -| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_dashboards_spinner_on_light.svg` | Light | Loading logo | -| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_mark.svg` | - | Unused* | -| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_mark_on_light.svg` | Light | ISO Branding logo when the expanded header is disabled | -| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_mark_on_dark.svg` | Dark | ISO Branding logo when the expanded header is disabled | -| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_on_light.svg` | Light | Unused* | -| `WAZUH_DASHBOARD_PATH/src/core/server/core_app/assets/logos/opensearch_on_dark.svg` | Dark | Unused* | - -*The file was replaced. - -> Note: The name of images includes the reference to `wazuh`, to customize this, it is needed to do changes in the production code of the Wazuh dashboard package, see `base/builder.sh`. This is not recommended if you don't know what should be done. From 4b4f6b9c1d87ad9a455f9319432b820e076c3133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20David=20Guti=C3=A9rrez?= Date: Wed, 29 Nov 2023 10:08:56 +0100 Subject: [PATCH 926/994] feat(dashboard): collapse initially the application categories in the side menu --- 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 ad465f8665..5e29c96135 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -177,6 +177,9 @@ sed -i 's|OPENSEARCH_ON_DARK="ui/logos/opensearch_on_dark.svg"|OPENSEARCH_ON_DAR sed -i 's|OPENSEARCH_ON_LIGHT="ui/logos/opensearch_on_light.svg"|OPENSEARCH_ON_LIGHT="ui/logos/Wazuh-Logo.svg"|g' ./src/core/target/public/core.entry.js sed -i 's|OPENSEARCH_ON_DARK="ui/logos/opensearch_on_dark.svg"|OPENSEARCH_ON_DARK="ui/logos/Wazuh-Logo.svg"|g' ./src/core/target/public/core.entry.js +# Collapse initially the application categories in the side menu +sed -i 's|_storage\$getItem!==void 0?_storage\$getItem:"true"|_storage\$getItem!==void 0?_storage\$getItem:"false"|' ./src/core/target/public/core.entry.js + # Redirections ## Redirections - Replace the redirections to the home app app_home='wz-home' From 18304b57791a673dbc0d1287e113cf684b422711 Mon Sep 17 00:00:00 2001 From: Vikman Fernandez-Castro Date: Thu, 30 Nov 2023 09:31:06 +0100 Subject: [PATCH 927/994] Bump version to 4.7.2 --- CHANGELOG.md | 4 ++++ VERSION | 2 +- aix/SPECS/wazuh-agent-aix.spec | 4 +++- debs/SPECS/wazuh-agent/debian/changelog | 6 ++++++ debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 6 ++++++ debs/SPECS/wazuh-manager/debian/copyright | 2 +- macos/specs/wazuh-agent-arm64.pkgproj | 4 ++-- macos/specs/wazuh-agent-intel64.pkgproj | 4 ++-- rpms/SPECS/wazuh-agent.spec | 4 +++- rpms/SPECS/wazuh-manager.spec | 4 +++- solaris/solaris10/pkginfo | 4 ++-- stack/dashboard/deb/debian/changelog | 6 ++++++ stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 ++ stack/indexer/deb/debian/changelog | 6 ++++++ stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 ++ tests/unattended/unit/suites/test-common.sh | 4 ++-- tests/unattended/unit/suites/test-dashboard.sh | 10 +++++----- tests/unattended/unit/suites/test-indexer.sh | 8 ++++---- .../install_functions/installVariables.sh | 2 +- 22 files changed, 64 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index acc6b1da08..e1f86028dd 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. +## [4.7.2] + +- https://github.com/wazuh/wazuh-packages/releases/tag/v4.7.2 + ## [4.7.1] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.7.1 diff --git a/VERSION b/VERSION index 7c66fca579..af9764a59e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.7.1 +4.7.2 diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 2c7f0c4ce7..da7f45b1e6 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.7.1 +Version: 4.7.2 Release: 1 License: GPL URL: https://www.wazuh.com/ @@ -290,6 +290,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog +* Sun Dec 17 2023 support - 4.7.2 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html * Tue Dec 05 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html * Tue Nov 21 2023 support - 4.7.0 diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index d58ff8282f..0f8b70282b 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -1,3 +1,9 @@ +wazuh-agent (4.7.2-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html + + -- Wazuh, Inc Sun, 17 Dec 2023 00:00:00 +0000 + wazuh-agent (4.7.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 58a2b27935..6730c39e96 100644 --- a/debs/SPECS/wazuh-agent/debian/copyright +++ b/debs/SPECS/wazuh-agent/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 27 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Sun, 17 Dec 2023 00:00:00 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index 66f78cc741..e0c74d11b1 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -1,3 +1,9 @@ +wazuh-manager (4.7.2-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html + + -- Wazuh, Inc Sun, 17 Dec 2023 00:00:00 +0000 + wazuh-manager (4.7.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 58a2b27935..6730c39e96 100644 --- a/debs/SPECS/wazuh-manager/debian/copyright +++ b/debs/SPECS/wazuh-manager/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 27 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Sun, 17 Dec 2023 00:00:00 +0000 It was downloaded from: diff --git a/macos/specs/wazuh-agent-arm64.pkgproj b/macos/specs/wazuh-agent-arm64.pkgproj index 5f71ee5336..444635d1ef 100644 --- a/macos/specs/wazuh-agent-arm64.pkgproj +++ b/macos/specs/wazuh-agent-arm64.pkgproj @@ -812,7 +812,7 @@ USE_HFS+_COMPRESSION VERSION - 4.7.1-1 + 4.7.2-1 TYPE 0 @@ -1240,7 +1240,7 @@ NAME - wazuh-agent-4.7.1-1.arm64 + wazuh-agent-4.7.2-1.arm64 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/macos/specs/wazuh-agent-intel64.pkgproj b/macos/specs/wazuh-agent-intel64.pkgproj index 864b7c66da..71aa74e9eb 100644 --- a/macos/specs/wazuh-agent-intel64.pkgproj +++ b/macos/specs/wazuh-agent-intel64.pkgproj @@ -812,7 +812,7 @@ USE_HFS+_COMPRESSION VERSION - 4.7.1-1 + 4.7.2-1 TYPE 0 @@ -1239,7 +1239,7 @@ NAME - wazuh-agent-4.7.1-1.intel64 + wazuh-agent-4.7.2-1.intel64 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 5ebdd98b36..64e4f269b9 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -7,7 +7,7 @@ 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.7.1 +Version: 4.7.2 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -599,6 +599,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* Sun Dec 17 2023 support - 4.7.2 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html * Tue Dec 05 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html * Tue Nov 21 2023 support - 4.7.0 diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 033a51afcc..5b7a886810 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -7,7 +7,7 @@ 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.7.1 +Version: 4.7.2 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -827,6 +827,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* Sun Dec 17 2023 support - 4.7.2 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html * Tue Dec 05 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html * Tue Nov 21 2023 support - 4.7.0 diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index c66315df3e..34522af26c 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -1,11 +1,11 @@ NAME=Wazuh - Wazuh unifies historically separate functions into a single agent and platform architecture. Providing protection for public clouds, private clouds, and on-premise data centers. PKG="wazuh-agent" -VERSION="4.7.1" +VERSION="4.7.2" ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="07Dec2023" +PSTAMP="17Dec2023" EMAIL="info@wazuh.com" ISTATES="S s 1 2 3" RSTATES="S s 1 2 3" diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index b764e4979b..4e5cff7f72 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -1,3 +1,9 @@ +wazuh-dashboard (4.7.2-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html + + -- Wazuh, Inc Sun, 17 Dec 2023 00:00:00 +0000 + wazuh-dashboard (4.7.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index d8ef3b22a4..256242d968 100644 --- a/stack/dashboard/deb/debian/copyright +++ b/stack/dashboard/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 27 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Sun, 17 Dec 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index e99246e422..36cf55ca43 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 +* Sun Dec 17 2023 support - 4.7.2 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html * Tue Dec 05 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html * Tue Nov 21 2023 support - 4.7.0 diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index ab916943c6..0f1b57c07d 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -1,3 +1,9 @@ +wazuh-indexer (4.7.2-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html + + -- Wazuh, Inc Sun, 17 Dec 2023 00:00:00 +0000 + wazuh-indexer (4.7.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index d8ef3b22a4..256242d968 100644 --- a/stack/indexer/deb/debian/copyright +++ b/stack/indexer/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 27 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Sun, 17 Dec 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index cc76492203..2203ee0104 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1444,6 +1444,8 @@ rm -fr %{buildroot} %changelog +* Sun Dec 17 2023 support - 4.7.2 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html * Tue Dec 05 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html * Tue Nov 21 2023 support - 4.7.0 diff --git a/tests/unattended/unit/suites/test-common.sh b/tests/unattended/unit/suites/test-common.sh index 787d974232..8ee2d7a0ba 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.7.1-1 @wazuh + @mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.7.2-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-05-common_checkInstalled-all-installed-yum-assert() { - @echo "wazuh-manager.x86_64 4.7.1-1 @wazuh" + @echo "wazuh-manager.x86_64 4.7.2-1 @wazuh" @echo 1 @echo "wazuh-indexer.x86_64 4.6.0-1 @wazuh" diff --git a/tests/unattended/unit/suites/test-dashboard.sh b/tests/unattended/unit/suites/test-dashboard.sh index 3a7a716ae7..d3f53edc98 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.7.1" + wazuh_version="4.7.2" elasticsearch_oss_version="7.10.2" wazuh_kibana_plugin_revision="1" repobaseurl="https://packages.wazuh.com/4.x" @@ -55,7 +55,7 @@ test-03-dashboard_install-yum() { load-dashboard_install sys_type="yum" sep="-" - wazuh_version="4.7.1" + wazuh_version="4.7.2" wazuh_revision="1" dashboard_install } @@ -68,7 +68,7 @@ test-ASSERT-FAIL-04-dashboard_install-yum-error() { load-dashboard_install sys_type="yum" sep="-" - wazuh_version="4.7.1" + wazuh_version="4.7.2" wazuh_revision="1" @mockfalse yum install wazuh-dashboard-1.13.2-1 -y dashboard_install @@ -78,7 +78,7 @@ test-05-dashboard_install-apt() { load-dashboard_install sys_type="apt-get" sep="=" - wazuh_version="4.7.1" + wazuh_version="4.7.2" wazuh_revision="1" dashboard_install } @@ -91,7 +91,7 @@ test-ASSERT-FAIL-06-dashboard_install-apt-error() { load-dashboard_install sys_type="apt-get" sep="=" - wazuh_version="4.7.1" + wazuh_version="4.7.2" wazuh_revision="1" @mockfalse apt install wazuh-dashboard=1.13.2-1 -y dashboard_install diff --git a/tests/unattended/unit/suites/test-indexer.sh b/tests/unattended/unit/suites/test-indexer.sh index 281027be57..264bc797aa 100644 --- a/tests/unattended/unit/suites/test-indexer.sh +++ b/tests/unattended/unit/suites/test-indexer.sh @@ -49,7 +49,7 @@ test-03-indexer_install-yum() { load-indexer_install sys_type="yum" sep="-" - wazuh_version="4.7.1" + wazuh_version="4.7.2" wazuh_revision="1" indexer_install } @@ -63,7 +63,7 @@ test-ASSERT-FAIL-04-indexer_install-yum-error() { load-indexer_install sys_type="yum" sep="-" - wazuh_version="4.7.1" + wazuh_version="4.7.2" wazuh_revision="1" @mockfalse yum install wazuh-indexer-1.13.2-1 -y indexer_install @@ -73,7 +73,7 @@ test-05-indexer_install-apt() { load-indexer_install sys_type="apt-get" sep="=" - wazuh_version="4.7.1" + wazuh_version="4.7.2" wazuh_revision="1" indexer_install } @@ -87,7 +87,7 @@ test-ASSERT-FAIL-06-indexer_install-apt-error() { load-indexer_install sys_type="apt-get" sep="=" - wazuh_version="4.7.1" + wazuh_version="4.7.2" wazuh_revision="1" @mockfalse apt install wazuh-indexer=1.13.2-1 -y indexer_install diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index 5f45d3f454..09b951a44f 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.7" -readonly wazuh_version="4.7.1" +readonly wazuh_version="4.7.2" readonly filebeat_version="7.10.2" readonly wazuh_install_vesion="0.1" readonly source_branch="v${wazuh_version}" From 1a0ab5a961ac93d035a83ae29ee29ad4f7b2585c Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 5 Dec 2023 15:12:29 -0300 Subject: [PATCH 928/994] WIA dependencies fix --- unattended_installer/builder.sh | 2 +- .../install_functions/installCommon.sh | 61 ++++++++++++++++--- .../install_functions/installMain.sh | 4 ++ .../install_functions/installVariables.sh | 1 + 4 files changed, 57 insertions(+), 11 deletions(-) diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index 09fd9b8a96..3ac3fc8677 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -16,7 +16,7 @@ readonly resources_certs="${base_path_builder}/cert_tool" readonly resources_passwords="${base_path_builder}/passwords_tool" readonly resources_common="${base_path_builder}/common_functions" readonly resources_download="${base_path_builder}/downloader" -readonly source_branch="4.7.0" +readonly source_branch="4.7.2" function getHelp() { diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 2a2930466b..0e65f6c9fe 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -120,8 +120,6 @@ function installCommon_aptInstall() { function installCommon_aptInstallList(){ dependencies=("$@") - not_installed=() - for dep in "${dependencies[@]}"; do if ! apt list --installed 2>/dev/null | grep -q -E ^"${dep}"\/; then not_installed+=("${dep}") @@ -368,6 +366,11 @@ function installCommon_installPrerequisites() { if [ "${sys_type}" == "yum" ]; then dependencies=( libcap gnupg2 ) + for dep in "${dependencies[@]}"; do + if ! yum list installed 2>/dev/null | grep -q -E ^"${dep}"\\.;then + not_installed+=("${dep}") + fi + done installCommon_yumInstallList "${dependencies[@]}" elif [ "${sys_type}" == "apt-get" ]; then @@ -686,27 +689,65 @@ function installCommon_startService() { function installCommon_yumInstallList(){ - dependencies=("$@") - not_installed=() - for dep in "${dependencies[@]}"; do - if ! yum list installed 2>/dev/null | grep -q -E ^"${dep}"\\.;then - not_installed+=("${dep}") + common_logger "--- Dependencies ---" + for dep in "${not_installed[@]}"; do + common_logger "Installing $dep." + yum_output=$(yum install ${dep} -y 2>&1) + yum_code="${PIPESTATUS[0]}" + + eval "echo \${yum_output} ${debug}" + if [ "${yum_code}" != 0 ]; then + common_logger -e "Cannot install dependency: ${dep}." + exit 1 fi done +} + +function installCommon_removeWIADependencies() { + + if [ "${sys_type}" == "yum" ]; then + installCommon_yumRemoveWIADependencies + elif [ "${sys_type}" == "apt-get" ]; then + installCommon_aptRemoveWIADependencies + fi + +} + +function installCommon_yumRemoveWIADependencies(){ + if [ "${#not_installed[@]}" -gt 0 ]; then common_logger "--- Dependencies ---" for dep in "${not_installed[@]}"; do - common_logger "Installing $dep." - yum_output=$(yum install ${dep} -y 2>&1) + common_logger "Removing $dep." + yum_output=$(yum remove ${dep} -y 2>&1) yum_code="${PIPESTATUS[0]}" eval "echo \${yum_output} ${debug}" if [ "${yum_code}" != 0 ]; then - common_logger -e "Cannot install dependency: ${dep}." + common_logger -e "Cannot remove dependency: ${dep}." exit 1 fi done fi } + +function installCommon_aptRemoveWIADependencies(){ + + if [ "${#not_installed[@]}" -gt 0 ]; then + common_logger "--- Dependencies ----" + for dep in "${not_installed[@]}"; do + common_logger "Removing $dep." + apt_output=$(apt-get remove --purge ${dep} -y 2>&1) + apt_code="${PIPESTATUS[0]}" + + eval "echo \${apt_output} ${debug}" + if [ "${apt_code}" != 0 ]; then + common_logger -e "Cannot remove dependency: ${dep}." + exit 1 + fi + done + fi + +} \ No newline at end of file diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index c96735cc1d..75cb01a85c 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -304,6 +304,7 @@ function main() { indexer_configure installCommon_startService "wazuh-indexer" indexer_initialize + installCommon_removeWIADependencies fi # -------------- Start Wazuh indexer cluster case ------------------ @@ -322,6 +323,7 @@ function main() { installCommon_startService "wazuh-dashboard" installCommon_changePasswords dashboard_initialize + installCommon_removeWIADependencies fi @@ -338,6 +340,7 @@ function main() { filebeat_configure installCommon_changePasswords installCommon_startService "filebeat" + installCommon_removeWIADependencies fi # -------------- AIO case ------------------------------------------ @@ -361,6 +364,7 @@ function main() { installCommon_startService "wazuh-dashboard" installCommon_changePasswords dashboard_initializeAIO + installCommon_removeWIADependencies fi diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index 09b951a44f..14f9be263e 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -54,3 +54,4 @@ wazuh_aio_ports=( 9200 9300 1514 1515 1516 55000 "${http_port}") readonly wazuh_indexer_ports=( 9200 9300 ) readonly wazuh_manager_ports=( 1514 1515 1516 55000 ) wazuh_dashboard_port="${http_port}" +not_installed=() From 8b126ba36781e30d5df4c9d6c9bb3fa392d12c9e Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 5 Dec 2023 15:51:54 -0300 Subject: [PATCH 929/994] Added new variable to contemplate product dependencies --- .../install_functions/installCommon.sh | 47 +++++++++++++++---- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 0e65f6c9fe..1a47c5fb9d 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -120,6 +120,12 @@ function installCommon_aptInstall() { function installCommon_aptInstallList(){ dependencies=("$@") + installed_in_WIA=() + if [ "${#not_installed[@]}" -gt 0 ]; then + installed_in_WIA=("${not_installed[@]}") + not_installed=() + fi + for dep in "${dependencies[@]}"; do if ! apt list --installed 2>/dev/null | grep -q -E ^"${dep}"\/; then not_installed+=("${dep}") @@ -138,6 +144,10 @@ function installCommon_aptInstallList(){ done fi + if [ "${#installed_in_WIA[@]}" -gt 0 ]; then + not_installed=("${installed_in_WIA[@]}") + fi + } function installCommon_changePasswordApi() { @@ -689,19 +699,38 @@ function installCommon_startService() { function installCommon_yumInstallList(){ - common_logger "--- Dependencies ---" - for dep in "${not_installed[@]}"; do - common_logger "Installing $dep." - yum_output=$(yum install ${dep} -y 2>&1) - yum_code="${PIPESTATUS[0]}" + dependencies=("$@") + installed_in_WIA=() + if [ "${#not_installed[@]}" -gt 0 ]; then + installed_in_WIA=("${not_installed[@]}") + not_installed=() + fi - eval "echo \${yum_output} ${debug}" - if [ "${yum_code}" != 0 ]; then - common_logger -e "Cannot install dependency: ${dep}." - exit 1 + for dep in "${dependencies[@]}"; do + if ! yum list installed 2>/dev/null | grep -q -E ^"${dep}"\\.;then + not_installed+=("${dep}") fi done + if [ "${#not_installed[@]}" -gt 0 ]; then + common_logger "--- Dependencies ---" + for dep in "${not_installed[@]}"; do + common_logger "Installing $dep." + yum_output=$(yum install ${dep} -y 2>&1) + yum_code="${PIPESTATUS[0]}" + + eval "echo \${yum_output} ${debug}" + if [ "${yum_code}" != 0 ]; then + common_logger -e "Cannot install dependency: ${dep}." + exit 1 + fi + done + fi + + if [ "${#installed_in_WIA[@]}" -gt 0 ]; then + not_installed=("${installed_in_WIA[@]}") + fi + } function installCommon_removeWIADependencies() { From eabfdc0aa7513d450088aa508e77916fa7cf1b22 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 5 Dec 2023 16:25:05 -0300 Subject: [PATCH 930/994] Fixed validation for dependencies packages --- .../install_functions/installCommon.sh | 50 +++++++------------ .../install_functions/installVariables.sh | 6 ++- 2 files changed, 22 insertions(+), 34 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 1a47c5fb9d..f13af8cd3b 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -120,15 +120,16 @@ function installCommon_aptInstall() { function installCommon_aptInstallList(){ dependencies=("$@") - installed_in_WIA=() - if [ "${#not_installed[@]}" -gt 0 ]; then - installed_in_WIA=("${not_installed[@]}") - not_installed=() - fi + not_installed=() for dep in "${dependencies[@]}"; do if ! apt list --installed 2>/dev/null | grep -q -E ^"${dep}"\/; then not_installed+=("${dep}") + for wia_dep in "${wia_apt_dependencies[@]}"; do + if [ "${wia_dep}" == "${dep}" ]; then + wia_dependencies_installed+=("${dep}") + fi + done fi done @@ -144,10 +145,6 @@ function installCommon_aptInstallList(){ done fi - if [ "${#installed_in_WIA[@]}" -gt 0 ]; then - not_installed=("${installed_in_WIA[@]}") - fi - } function installCommon_changePasswordApi() { @@ -353,11 +350,10 @@ function installCommon_getPass() { function installCommon_installCheckDependencies() { if [ "${sys_type}" == "yum" ]; then - dependencies=( systemd grep tar coreutils sed procps-ng gawk lsof curl openssl ) if [[ "${DIST_NAME}" == "rhel" ]] && [[ "${DIST_VER}" == "8" || "${DIST_VER}" == "9" ]]; then installCommon_configureCentOSRepositories fi - installCommon_yumInstallList "${dependencies[@]}" + installCommon_yumInstallList "${wia_yum_dependencies[@]}" # In RHEL cases, remove the CentOS repositories configuration if [ "${centos_repos_configured}" == 1 ]; then @@ -366,8 +362,7 @@ function installCommon_installCheckDependencies() { elif [ "${sys_type}" == "apt-get" ]; then eval "apt-get update -q ${debug}" - dependencies=( systemd grep tar coreutils sed procps gawk lsof curl openssl ) - installCommon_aptInstallList "${dependencies[@]}" + installCommon_aptInstallList "${wia_apt_dependencies[@]}" fi } @@ -375,18 +370,11 @@ function installCommon_installCheckDependencies() { function installCommon_installPrerequisites() { if [ "${sys_type}" == "yum" ]; then - dependencies=( libcap gnupg2 ) - for dep in "${dependencies[@]}"; do - if ! yum list installed 2>/dev/null | grep -q -E ^"${dep}"\\.;then - not_installed+=("${dep}") - fi - done - installCommon_yumInstallList "${dependencies[@]}" - + installCommon_yumInstallList "${wazuh_yum_dependencies[@]}" elif [ "${sys_type}" == "apt-get" ]; then eval "apt-get update -q ${debug}" - dependencies=( apt-transport-https libcap2-bin software-properties-common gnupg ) - installCommon_aptInstallList "${dependencies[@]}" + dependencies= + installCommon_aptInstallList "${wazuh_apt_dependencies[@]}" fi } @@ -700,15 +688,15 @@ function installCommon_startService() { function installCommon_yumInstallList(){ dependencies=("$@") - installed_in_WIA=() - if [ "${#not_installed[@]}" -gt 0 ]; then - installed_in_WIA=("${not_installed[@]}") - not_installed=() - fi - + not_installed=() for dep in "${dependencies[@]}"; do if ! yum list installed 2>/dev/null | grep -q -E ^"${dep}"\\.;then not_installed+=("${dep}") + for wia_dep in "${wia_yum_dependencies[@]}"; do + if [ "${wia_dep}" == "${dep}" ]; then + wia_dependencies_installed+=("${dep}") + fi + done fi done @@ -727,10 +715,6 @@ function installCommon_yumInstallList(){ done fi - if [ "${#installed_in_WIA[@]}" -gt 0 ]; then - not_installed=("${installed_in_WIA[@]}") - fi - } function installCommon_removeWIADependencies() { diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index 14f9be263e..65cf50630f 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -54,4 +54,8 @@ wazuh_aio_ports=( 9200 9300 1514 1515 1516 55000 "${http_port}") readonly wazuh_indexer_ports=( 9200 9300 ) readonly wazuh_manager_ports=( 1514 1515 1516 55000 ) wazuh_dashboard_port="${http_port}" -not_installed=() +wia_yum_dependencies=( systemd grep tar coreutils sed procps-ng gawk lsof curl openssl ) +wia_apt_dependencies=( systemd grep tar coreutils sed procps gawk lsof curl openssl ) +wazuh_yum_dependencies=( libcap gnupg2 ) +wazuh_apt_dependencies=( apt-transport-https libcap2-bin software-properties-common gnupg ) +wia_dependencies_installed=() From ba6b5a859a378ee0ddc97c84fa13f1a708b408d5 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 5 Dec 2023 16:31:35 -0300 Subject: [PATCH 931/994] Fixed wia dependencies variable --- unattended_installer/install_functions/installCommon.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index f13af8cd3b..ad34467a6f 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -729,9 +729,9 @@ function installCommon_removeWIADependencies() { function installCommon_yumRemoveWIADependencies(){ - if [ "${#not_installed[@]}" -gt 0 ]; then + if [ "${#wia_dependencies_installed[@]}" -gt 0 ]; then common_logger "--- Dependencies ---" - for dep in "${not_installed[@]}"; do + for dep in "${wia_dependencies_installed[@]}"; do common_logger "Removing $dep." yum_output=$(yum remove ${dep} -y 2>&1) yum_code="${PIPESTATUS[0]}" @@ -748,9 +748,9 @@ function installCommon_yumRemoveWIADependencies(){ function installCommon_aptRemoveWIADependencies(){ - if [ "${#not_installed[@]}" -gt 0 ]; then + if [ "${#wia_dependencies_installed[@]}" -gt 0 ]; then common_logger "--- Dependencies ----" - for dep in "${not_installed[@]}"; do + for dep in "${wia_dependencies_installed[@]}"; do common_logger "Removing $dep." apt_output=$(apt-get remove --purge ${dep} -y 2>&1) apt_code="${PIPESTATUS[0]}" From b656ffe9512a72bb8fecec282debe93707a8783e Mon Sep 17 00:00:00 2001 From: Dwordcito Date: Wed, 6 Dec 2023 02:34:23 -0300 Subject: [PATCH 932/994] Update release ETA for 4.8.0 --- aix/SPECS/wazuh-agent-aix.spec | 2 +- debs/SPECS/wazuh-agent/debian/changelog | 2 +- debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 2 +- debs/SPECS/wazuh-manager/debian/copyright | 2 +- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- solaris/solaris10/pkginfo | 2 +- stack/dashboard/deb/debian/changelog | 2 +- stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- stack/indexer/deb/debian/changelog | 2 +- stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index a7be7d5294..97e5d9f031 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 -* Fri Dec 15 2023 support - 4.8.0 +* Wed Jan 31 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Tue Dec 05 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 999f266617..695a6d9951 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,7 +2,7 @@ wazuh-agent (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html - -- Wazuh, Inc Fri, 15 Dec 2023 00:00:00 +0000 + -- Wazuh, Inc Wed, 31 Jan 2024 00:00:00 +0000 wazuh-agent (4.7.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 58a2b27935..7e98828b81 100644 --- a/debs/SPECS/wazuh-agent/debian/copyright +++ b/debs/SPECS/wazuh-agent/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 27 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Wed, 31 Jan 2024 00:00:00 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index bc7ae6f0eb..fc122c629a 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,7 +2,7 @@ wazuh-manager (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html - -- Wazuh, Inc Fri, 15 Dec 2023 00:00:00 +0000 + -- Wazuh, Inc Wed, 31 Jan 2024 00:00:00 +0000 wazuh-manager (4.7.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 58a2b27935..7e98828b81 100644 --- a/debs/SPECS/wazuh-manager/debian/copyright +++ b/debs/SPECS/wazuh-manager/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 27 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Wed, 31 Jan 2024 00:00:00 +0000 It was downloaded from: diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index e3e99dc9f4..b19829c430 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -625,7 +625,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Fri Dec 15 2023 support - 4.8.0 +* Wed Jan 31 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Tue Dec 05 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 3f77d77e86..c360902fbc 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -853,7 +853,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Fri Dec 15 2023 support - 4.8.0 +* Wed Jan 31 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Tue Dec 05 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index d167f45048..6ecf2e19e5 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -5,7 +5,7 @@ ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="15Dec2023" +PSTAMP="31Jan2024" EMAIL="info@wazuh.com" ISTATES="S s 1 2 3" RSTATES="S s 1 2 3" diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 6c2f5620be..b6f06ed552 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-dashboard (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html - -- Wazuh, Inc Fri, 15 Dec 2023 00:00:00 +0000 + -- Wazuh, Inc Wed, 31 Jan 2024 00:00:00 +0000 wazuh-dashboard (4.7.1-RELEASE) stable; urgency=low diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index d8ef3b22a4..551c75ab1e 100644 --- a/stack/dashboard/deb/debian/copyright +++ b/stack/dashboard/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 27 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Wed, 31 Jan 2024 00:00:00 +0000 It was downloaded from: diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 5f9a9095b4..8473a747a8 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -335,7 +335,7 @@ rm -fr %{buildroot} %config(noreplace) %attr(640, %{USER}, %{GROUP}) "%{CONFIG_DIR}/opensearch_dashboards.yml" %changelog -* Fri Dec 15 2023 support - 4.8.0 +* Wed Jan 31 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Tue Dec 05 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 22fd0ab2aa..48a707b6dd 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-indexer (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html - -- Wazuh, Inc Fri, 15 Dec 2023 00:00:00 +0000 + -- Wazuh, Inc Wed, 31 Jan 2024 00:00:00 +0000 wazuh-indexer (4.7.1-RELEASE) stable; urgency=low diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index d8ef3b22a4..551c75ab1e 100644 --- a/stack/indexer/deb/debian/copyright +++ b/stack/indexer/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 27 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Wed, 31 Jan 2024 00:00:00 +0000 It was downloaded from: diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 097b43c5fd..7ba3d9f8f7 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -685,7 +685,7 @@ rm -fr %{buildroot} %changelog -* Fri Dec 15 2023 support - 4.8.0 +* Wed Jan 31 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Tue Dec 05 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html From bd6b4510c4f75f649bed33e323e7760d89dcc5bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 7 Dec 2023 12:59:01 +0100 Subject: [PATCH 933/994] Fixed warning message when generating certificates --- unattended_installer/cert_tool/certFunctions.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/unattended_installer/cert_tool/certFunctions.sh b/unattended_installer/cert_tool/certFunctions.sh index 2bf889999c..b7ef25c9c4 100644 --- a/unattended_installer/cert_tool/certFunctions.sh +++ b/unattended_installer/cert_tool/certFunctions.sh @@ -125,7 +125,7 @@ function cert_generateIndexercertificates() { for i in "${!indexer_node_names[@]}"; do indexer_node_name=${indexer_node_names[$i]} cert_generateCertificateconfiguration "${indexer_node_name}" "${indexer_node_ips[i]}" - eval "openssl req -new -nodes -newkey rsa:2048 -keyout ${cert_tmp_path}/${indexer_node_name}-key.pem -out ${cert_tmp_path}/${indexer_node_name}.csr -config ${cert_tmp_path}/${indexer_node_name}.conf -days 3650 ${debug}" + eval "openssl req -new -nodes -newkey rsa:2048 -keyout ${cert_tmp_path}/${indexer_node_name}-key.pem -out ${cert_tmp_path}/${indexer_node_name}.csr -config ${cert_tmp_path}/${indexer_node_name}.conf ${debug}" eval "openssl x509 -req -in ${cert_tmp_path}/${indexer_node_name}.csr -CA ${cert_tmp_path}/root-ca.pem -CAkey ${cert_tmp_path}/root-ca.key -CAcreateserial -out ${cert_tmp_path}/${indexer_node_name}.pem -extfile ${cert_tmp_path}/${indexer_node_name}.conf -extensions v3_req -days 3650 ${debug}" done else @@ -144,7 +144,7 @@ function cert_generateFilebeatcertificates() { j=$((i+1)) declare -a server_ips=(server_node_ip_"$j"[@]) cert_generateCertificateconfiguration "${server_name}" "${!server_ips}" - eval "openssl req -new -nodes -newkey rsa:2048 -keyout ${cert_tmp_path}/${server_name}-key.pem -out ${cert_tmp_path}/${server_name}.csr -config ${cert_tmp_path}/${server_name}.conf -days 3650 ${debug}" + eval "openssl req -new -nodes -newkey rsa:2048 -keyout ${cert_tmp_path}/${server_name}-key.pem -out ${cert_tmp_path}/${server_name}.csr -config ${cert_tmp_path}/${server_name}.conf ${debug}" eval "openssl x509 -req -in ${cert_tmp_path}/${server_name}.csr -CA ${cert_tmp_path}/root-ca.pem -CAkey ${cert_tmp_path}/root-ca.key -CAcreateserial -out ${cert_tmp_path}/${server_name}.pem -extfile ${cert_tmp_path}/${server_name}.conf -extensions v3_req -days 3650 ${debug}" done else @@ -161,7 +161,7 @@ function cert_generateDashboardcertificates() { for i in "${!dashboard_node_names[@]}"; do dashboard_node_name="${dashboard_node_names[i]}" cert_generateCertificateconfiguration "${dashboard_node_name}" "${dashboard_node_ips[i]}" - eval "openssl req -new -nodes -newkey rsa:2048 -keyout ${cert_tmp_path}/${dashboard_node_name}-key.pem -out ${cert_tmp_path}/${dashboard_node_name}.csr -config ${cert_tmp_path}/${dashboard_node_name}.conf -days 3650 ${debug}" + eval "openssl req -new -nodes -newkey rsa:2048 -keyout ${cert_tmp_path}/${dashboard_node_name}-key.pem -out ${cert_tmp_path}/${dashboard_node_name}.csr -config ${cert_tmp_path}/${dashboard_node_name}.conf ${debug}" eval "openssl x509 -req -in ${cert_tmp_path}/${dashboard_node_name}.csr -CA ${cert_tmp_path}/root-ca.pem -CAkey ${cert_tmp_path}/root-ca.key -CAcreateserial -out ${cert_tmp_path}/${dashboard_node_name}.pem -extfile ${cert_tmp_path}/${dashboard_node_name}.conf -extensions v3_req -days 3650 ${debug}" done else From bb5f6f722ab6933b9493178a20260c29c8d0c739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Rebollo=20P=C3=A9rez?= Date: Thu, 7 Dec 2023 12:42:32 +0000 Subject: [PATCH 934/994] fix: upgrade botocore dependency --- wpk/linux/x86_64/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wpk/linux/x86_64/Dockerfile b/wpk/linux/x86_64/Dockerfile index 7d0c375a57..c6bc909271 100644 --- a/wpk/linux/x86_64/Dockerfile +++ b/wpk/linux/x86_64/Dockerfile @@ -40,7 +40,7 @@ RUN curl -OL http://packages.wazuh.com/utils/openssl/openssl-1.1.1a.tar.gz && \ tar xf openssl-1.1.1a.tar.gz && cd openssl-1.1.1a && \ ./config --prefix=/usr/ --openssldir=/usr/ shared zlib && \ make -j$(nproc) && make install && echo "/usr/lib" > /etc/ld.so.conf.d/openssl-1.1.1a.conf && \ - ldconfig -v && cd / && rm -rf openssl-1.1.1a* + ldconfig -v && cd / && rm -rf openssl-1.1.1a* RUN yum install zlib-devel libffi-devel -y @@ -54,7 +54,7 @@ RUN cd Python-3.7.16 && \ make install RUN pip3 install cryptography==2.9.2 typing awscli -RUN pip3 install --upgrade botocore==1.20.54 +RUN pip3 install --upgrade botocore==1.33.9 ADD wpkpack.py /usr/local/bin/wpkpack ADD run.sh /usr/local/bin/run From f6c093bf0e589947b7de76029ba13979b97aa709 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Thu, 7 Dec 2023 10:14:25 -0300 Subject: [PATCH 935/994] Added remove for generate config and start cluster functions --- unattended_installer/install_functions/installCommon.sh | 4 +++- unattended_installer/install_functions/installMain.sh | 5 +++++ .../install_functions/installVariables.sh | 8 ++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index ad34467a6f..e6e38cd981 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -617,6 +617,8 @@ function installCommon_rollBack() { common_remove_gpg_key + installCommon_removeWIADependencies + eval "systemctl daemon-reload ${debug}" if [ -z "${uninstall}" ]; then @@ -763,4 +765,4 @@ function installCommon_aptRemoveWIADependencies(){ done fi -} \ No newline at end of file +} diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index 75cb01a85c..be850243d5 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -296,6 +296,10 @@ function main() { checks_names fi + if [ -n "${configurations}" ]; then + installCommon_removeWIADependencies + fi + # -------------- Wazuh indexer case ------------------------------- if [ -n "${indexer}" ]; then @@ -312,6 +316,7 @@ function main() { if [ -n "${start_indexer_cluster}" ]; then indexer_startCluster installCommon_changePasswords + installCommon_removeWIADependencies fi # -------------- Wazuh dashboard case ------------------------------ diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index 65cf50630f..b5dc51229b 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -54,8 +54,8 @@ wazuh_aio_ports=( 9200 9300 1514 1515 1516 55000 "${http_port}") readonly wazuh_indexer_ports=( 9200 9300 ) readonly wazuh_manager_ports=( 1514 1515 1516 55000 ) wazuh_dashboard_port="${http_port}" -wia_yum_dependencies=( systemd grep tar coreutils sed procps-ng gawk lsof curl openssl ) -wia_apt_dependencies=( systemd grep tar coreutils sed procps gawk lsof curl openssl ) -wazuh_yum_dependencies=( libcap gnupg2 ) -wazuh_apt_dependencies=( apt-transport-https libcap2-bin software-properties-common gnupg ) +readonly wia_yum_dependencies=( systemd grep tar coreutils sed procps-ng gawk lsof curl openssl ) +readonly wia_apt_dependencies=( systemd grep tar coreutils sed procps gawk lsof curl openssl ) +readonly wazuh_yum_dependencies=( libcap gnupg2 ) +readonly wazuh_apt_dependencies=( apt-transport-https libcap2-bin software-properties-common gnupg ) wia_dependencies_installed=() From 6c8bd2bbcc129c9f5963c8edb97437379d17a404 Mon Sep 17 00:00:00 2001 From: Dwordcito Date: Thu, 7 Dec 2023 14:17:18 -0300 Subject: [PATCH 936/994] Remove libflatcc from specs files. --- rpms/SPECS/wazuh-manager.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 6943a0f33f..c87cbde26e 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -682,7 +682,6 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/lib/libcontent_manager.so %attr(750, root, wazuh) %{_localstatedir}/lib/libindexer_connector.so %attr(750, root, wazuh) %{_localstatedir}/lib/librocksdb.so.8 -%attr(750, root, wazuh) %{_localstatedir}/lib/libflatccrt.so %attr(750, root, wazuh) %{_localstatedir}/lib/librouter.so %attr(750, root, wazuh) %{_localstatedir}/lib/libvulnerability_scanner.so %{_localstatedir}/lib/libpython3.10.so.1.0 From a634bd60021849548486407a40a14be1ca6f2e7c Mon Sep 17 00:00:00 2001 From: Dwordcito Date: Thu, 7 Dec 2023 15:59:14 -0300 Subject: [PATCH 937/994] Update release ETA for 4.7.1 --- aix/SPECS/wazuh-agent-aix.spec | 2 +- debs/SPECS/wazuh-agent/debian/changelog | 2 +- debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 2 +- debs/SPECS/wazuh-manager/debian/copyright | 2 +- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- solaris/solaris10/pkginfo | 2 +- stack/dashboard/deb/debian/changelog | 2 +- stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- stack/indexer/deb/debian/changelog | 2 +- stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 2c7f0c4ce7..e37e3a3f53 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 -* Tue Dec 05 2023 support - 4.7.1 +* Wed Dec 13 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html * Tue Nov 21 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index d58ff8282f..17337d768f 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,7 +2,7 @@ wazuh-agent (4.7.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html - -- Wazuh, Inc Tue, 05 Dec 2023 00:00:00 +0000 + -- Wazuh, Inc Wed, 13 Dec 2023 00:00:00 +0000 wazuh-agent (4.7.0-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 58a2b27935..1f1747ccfa 100644 --- a/debs/SPECS/wazuh-agent/debian/copyright +++ b/debs/SPECS/wazuh-agent/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 27 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Wed, 13 Dec 2023 00:00:00 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index 66f78cc741..b89a2149fa 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,7 +2,7 @@ wazuh-manager (4.7.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html - -- Wazuh, Inc Tue, 05 Dec 2023 00:00:00 +0000 + -- Wazuh, Inc Wed, 13 Dec 2023 00:00:00 +0000 wazuh-manager (4.7.0-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 58a2b27935..1f1747ccfa 100644 --- a/debs/SPECS/wazuh-manager/debian/copyright +++ b/debs/SPECS/wazuh-manager/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 27 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Wed, 13 Dec 2023 00:00:00 +0000 It was downloaded from: diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 5ebdd98b36..b09d84e4d5 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -599,7 +599,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Tue Dec 05 2023 support - 4.7.1 +* Wed Dec 13 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html * Tue Nov 21 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 033a51afcc..6b43c98228 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -827,7 +827,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Tue Dec 05 2023 support - 4.7.1 +* Wed Dec 13 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html * Tue Nov 21 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index c66315df3e..fef1a6473c 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -5,7 +5,7 @@ ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="07Dec2023" +PSTAMP="13Dec2023" EMAIL="info@wazuh.com" ISTATES="S s 1 2 3" RSTATES="S s 1 2 3" diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index b764e4979b..a06934766d 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-dashboard (4.7.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html - -- Wazuh, Inc Tue, 05 Dec 2023 00:00:00 +0000 + -- Wazuh, Inc Wed, 13 Dec 2023 00:00:00 +0000 wazuh-dashboard (4.7.0-RELEASE) stable; urgency=low diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index d8ef3b22a4..3175239d93 100644 --- a/stack/dashboard/deb/debian/copyright +++ b/stack/dashboard/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 27 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Wed, 13 Dec 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index e99246e422..e69af76922 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -408,7 +408,7 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog -* Tue Dec 05 2023 support - 4.7.1 +* Wed Dec 13 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html * Tue Nov 21 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index ab916943c6..5d05ec3110 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-indexer (4.7.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html - -- Wazuh, Inc Tue, 05 Dec 2023 00:00:00 +0000 + -- Wazuh, Inc Wed, 13 Dec 2023 00:00:00 +0000 wazuh-indexer (4.7.0-RELEASE) stable; urgency=low diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index d8ef3b22a4..3175239d93 100644 --- a/stack/indexer/deb/debian/copyright +++ b/stack/indexer/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Mon, 27 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Wed, 13 Dec 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index cc76492203..d87052c4f6 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1444,7 +1444,7 @@ rm -fr %{buildroot} %changelog -* Tue Dec 05 2023 support - 4.7.1 +* Wed Dec 13 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html * Tue Nov 21 2023 support - 4.7.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html From ac5ed67010f5bd6ebffcd1b32d1364803623097e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Mon, 11 Dec 2023 13:16:15 +0100 Subject: [PATCH 938/994] Fixed source branch value --- 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 09fd9b8a96..50b8b3312b 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -16,7 +16,7 @@ readonly resources_certs="${base_path_builder}/cert_tool" readonly resources_passwords="${base_path_builder}/passwords_tool" readonly resources_common="${base_path_builder}/common_functions" readonly resources_download="${base_path_builder}/downloader" -readonly source_branch="4.7.0" +readonly source_branch="4.7.1" function getHelp() { From c45d90eef262bafb8d6633866fa9e7a2c456142a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Mon, 11 Dec 2023 13:36:29 +0100 Subject: [PATCH 939/994] The source_branch variable is set dinamically --- unattended_installer/builder.sh | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index 3ac3fc8677..fe2d03ca4d 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -16,7 +16,8 @@ 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.7.2" +readonly source_directory="$(git rev-parse --show-toplevel)" +source_branch=`cat ${source_directory}/VERSION` function getHelp() { @@ -48,6 +49,8 @@ function getHelp() { function buildInstaller() { + checkDistDetectURL + output_script_path="${base_path_builder}/wazuh-install.sh" ## Create installer script @@ -131,7 +134,6 @@ function buildInstaller() { echo >> "${output_script_path}" echo "main \"\$@\"" >> "${output_script_path}" - checkDistDetectURL checkFilebeatURL } @@ -284,17 +286,21 @@ function builder_main() { function checkDistDetectURL() { - retries=0 - eval "curl -s -o /dev/null 'https://raw.githubusercontent.com/wazuh/wazuh/${source_branch}/src/init/dist-detect.sh' --retry 5 --retry-delay 5 --max-time 300 --fail" - e_code="${PIPESTATUS[0]}" - while [ "${e_code}" -eq 7 ] && [ "${retries}" -ne 12 ]; do - retries=$((retries+1)) - sleep 5 - eval "curl -s -o /dev/null 'https://raw.githubusercontent.com/wazuh/wazuh/${source_branch}/src/init/dist-detect.sh' --fail" + urls=("https://raw.githubusercontent.com/wazuh/wazuh/${source_branch}/src/init/dist-detect.sh" + "https://raw.githubusercontent.com/wazuh/wazuh/v${source_branch}/src/init/dist-detect.sh" + "https://raw.githubusercontent.com/wazuh/wazuh/master/src/init/dist-detect.sh") + + for url in "${urls[@]}"; do + eval "curl -s -o /dev/null '${url}' --retry 5 --retry-delay 5 --max-time 300 --fail" e_code="${PIPESTATUS[0]}" + + if [ "${e_code}" -eq 0 ]; then + source_branch=$(echo "${url}" | awk -F'/' '{print $(NF-3)}') + break + fi done - if [[ "${retries}" -eq 12 ]] || [[ "${e_code}" -ne 0 ]]; then + if [ "${e_code}" -ne 0 ]; then echo -e "Error: Could not get the dist-detect file." exit 1 fi From 721cabfe8e57396cfaf9b46162e208708b574731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Mon, 11 Dec 2023 19:22:29 +0100 Subject: [PATCH 940/994] Removed `gnupg` from RPM dependency list --- unattended_installer/install_functions/installVariables.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index b5dc51229b..46b4e80e78 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -56,6 +56,6 @@ readonly wazuh_manager_ports=( 1514 1515 1516 55000 ) wazuh_dashboard_port="${http_port}" readonly wia_yum_dependencies=( systemd grep tar coreutils sed procps-ng gawk lsof curl openssl ) readonly wia_apt_dependencies=( systemd grep tar coreutils sed procps gawk lsof curl openssl ) -readonly wazuh_yum_dependencies=( libcap gnupg2 ) +readonly wazuh_yum_dependencies=( libcap ) readonly wazuh_apt_dependencies=( apt-transport-https libcap2-bin software-properties-common gnupg ) wia_dependencies_installed=() From 25d0043bcaaee7f7fad6fd9272d442fa6703b383 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 11 Dec 2023 16:34:06 -0300 Subject: [PATCH 941/994] Some conflicts were resolved --- aix/SPECS/wazuh-agent-aix.spec | 4 ---- debs/SPECS/wazuh-agent/debian/changelog | 1 + macos/specs/wazuh-agent-arm64.pkgproj | 4 ---- macos/specs/wazuh-agent-intel64.pkgproj | 4 ---- rpms/SPECS/wazuh-agent.spec | 4 ---- rpms/SPECS/wazuh-manager.spec | 4 ---- tests/unattended/unit/suites/test-common.sh | 4 ---- 7 files changed, 1 insertion(+), 24 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index cb4925a13a..67f2fd3097 100644 --- a/aix/SPECS/wazuh-agent-aix.spec +++ b/aix/SPECS/wazuh-agent-aix.spec @@ -1,10 +1,6 @@ # Spec file for AIX systems Name: wazuh-agent -<<<<<<< HEAD -Version: 4.7.2 -======= Version: 4.8.0 ->>>>>>> eaf77a84bb66dbf01ef63f47982019c9d23798b4 Release: 1 License: GPL URL: https://www.wazuh.com/ diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index c22b8cf8f0..c790c48349 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -3,6 +3,7 @@ wazuh-agent (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html -- Wazuh, Inc Wed, 31 Jan 2024 00:00:00 +0000 + wazuh-agent (4.7.2-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html diff --git a/macos/specs/wazuh-agent-arm64.pkgproj b/macos/specs/wazuh-agent-arm64.pkgproj index 1843871734..2f8ecdbe8d 100644 --- a/macos/specs/wazuh-agent-arm64.pkgproj +++ b/macos/specs/wazuh-agent-arm64.pkgproj @@ -812,11 +812,7 @@ USE_HFS+_COMPRESSION VERSION -<<<<<<< HEAD - 4.7.2-1 -======= 4.8.0-1 ->>>>>>> eaf77a84bb66dbf01ef63f47982019c9d23798b4 TYPE 0 diff --git a/macos/specs/wazuh-agent-intel64.pkgproj b/macos/specs/wazuh-agent-intel64.pkgproj index 2cdb91b85f..8f319c52c3 100644 --- a/macos/specs/wazuh-agent-intel64.pkgproj +++ b/macos/specs/wazuh-agent-intel64.pkgproj @@ -812,11 +812,7 @@ USE_HFS+_COMPRESSION VERSION -<<<<<<< HEAD - 4.7.2-1 -======= 4.8.0-1 ->>>>>>> eaf77a84bb66dbf01ef63f47982019c9d23798b4 TYPE 0 diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 7bba5495a4..1880c9c7d1 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -7,11 +7,7 @@ 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 -<<<<<<< HEAD -Version: 4.7.2 -======= Version: 4.8.0 ->>>>>>> eaf77a84bb66dbf01ef63f47982019c9d23798b4 Release: %{_release} License: GPL Group: System Environment/Daemons diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 29fd41c5b6..62d411c051 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -7,11 +7,7 @@ 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 -<<<<<<< HEAD -Version: 4.7.2 -======= Version: 4.8.0 ->>>>>>> eaf77a84bb66dbf01ef63f47982019c9d23798b4 Release: %{_release} License: GPL Group: System Environment/Daemons diff --git a/tests/unattended/unit/suites/test-common.sh b/tests/unattended/unit/suites/test-common.sh index e05e7cbc91..c4b22ee938 100644 --- a/tests/unattended/unit/suites/test-common.sh +++ b/tests/unattended/unit/suites/test-common.sh @@ -61,11 +61,7 @@ test-04-common_checkInstalled-all-installed-yum() { @mocktrue yum list installed -<<<<<<< HEAD - @mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.7.2-1 @wazuh -======= @mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.8.0-1 @wazuh ->>>>>>> eaf77a84bb66dbf01ef63f47982019c9d23798b4 @mkdir /var/ossec @mock grep wazuh-indexer === @echo wazuh-indexer.x86_64 1.13.2-1 @wazuh From ee7952c9ce0ea284f7ae62852bdb32753108a449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Mon, 11 Dec 2023 19:22:29 +0100 Subject: [PATCH 942/994] Removed `gnupg` from RPM dependency list --- unattended_installer/install_functions/installVariables.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index 86ab671791..fdcc4f9257 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -58,6 +58,6 @@ readonly wazuh_manager_ports=( 1514 1515 1516 55000 ) wazuh_dashboard_port="${http_port}" readonly wia_yum_dependencies=( systemd grep tar coreutils sed procps-ng gawk lsof curl openssl ) readonly wia_apt_dependencies=( systemd grep tar coreutils sed procps gawk lsof curl openssl ) -readonly wazuh_yum_dependencies=( libcap gnupg2 ) +readonly wazuh_yum_dependencies=( libcap ) readonly wazuh_apt_dependencies=( apt-transport-https libcap2-bin software-properties-common gnupg ) wia_dependencies_installed=() From e9756663508f623d1f0d7a9798b3adacd8da43c5 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 12 Dec 2023 13:06:04 -0300 Subject: [PATCH 943/994] Updated release date --- aix/SPECS/wazuh-agent-aix.spec | 4 ++-- debs/SPECS/wazuh-agent/debian/changelog | 2 +- debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 2 +- debs/SPECS/wazuh-manager/debian/copyright | 2 +- rpms/SPECS/wazuh-agent.spec | 4 ++-- rpms/SPECS/wazuh-manager.spec | 4 ++-- solaris/solaris10/pkginfo | 2 +- stack/dashboard/deb/debian/changelog | 2 +- stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 4 ++-- stack/indexer/deb/debian/changelog | 2 +- stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 4 ++-- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index c8e0c245a4..46440fed5e 100644 --- a/aix/SPECS/wazuh-agent-aix.spec +++ b/aix/SPECS/wazuh-agent-aix.spec @@ -290,9 +290,9 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog -* Tue Jan 30 2024 support - 4.8.1 +* Tue Feb 13 2024 support - 4.8.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html -* Fri Dec 15 2023 support - 4.8.0 +* Wed Jan 31 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Sun Dec 17 2023 support - 4.7.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 842040bc98..176e88520c 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,7 +2,7 @@ wazuh-agent (4.8.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html - -- Wazuh, Inc Tue, 30 Jan 2024 00:00:00 +0000 + -- Wazuh, Inc Tue, 13 Feb 2024 00:00:00 +0000 wazuh-agent (4.8.0-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index c30f285cd2..0f0c2ebfcb 100644 --- a/debs/SPECS/wazuh-agent/debian/copyright +++ b/debs/SPECS/wazuh-agent/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 30 Jan 2024 00:00:00 +0000 + Wazuh, Inc on Tue, 13 Feb 2024 00:00:00 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index 8d1a9d27c9..d66272573f 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,7 +2,7 @@ wazuh-manager (4.8.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html - -- Wazuh, Inc Tue, 30 Jan 2024 00:00:00 +0000 + -- Wazuh, Inc Tue, 13 Feb 2024 00:00:00 +0000 wazuh-manager (4.8.0-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index c30f285cd2..0f0c2ebfcb 100644 --- a/debs/SPECS/wazuh-manager/debian/copyright +++ b/debs/SPECS/wazuh-manager/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 30 Jan 2024 00:00:00 +0000 + Wazuh, Inc on Tue, 13 Feb 2024 00:00:00 +0000 It was downloaded from: diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 295175f17a..25b39d7f6a 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -625,9 +625,9 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Tue Jan 30 2024 support - 4.8.1 +* Tue Feb 13 2024 support - 4.8.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html -* Fri Dec 15 2023 support - 4.8.0 +* Wed Jan 31 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Sun Dec 17 2023 support - 4.7.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 1796925f6b..fd541bb168 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -853,9 +853,9 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Tue Jan 30 2024 support - 4.8.1 +* Tue Feb 13 2024 support - 4.8.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html -* Fri Dec 15 2023 support - 4.8.0 +* Wed Jan 31 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Sun Dec 17 2023 support - 4.7.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index e6a3502b8c..892d78f907 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -5,7 +5,7 @@ ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="30Jan2024" +PSTAMP="13Feb2024" EMAIL="info@wazuh.com" ISTATES="S s 1 2 3" RSTATES="S s 1 2 3" diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 1dc07821f1..42e904ee03 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-dashboard (4.8.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html - -- Wazuh, Inc Tue, 30 Jan 2024 00:00:00 +0000 + -- Wazuh, Inc Tue, 13 Feb 2024 00:00:00 +0000 wazuh-dashboard (4.8.0-RELEASE) stable; urgency=low diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index 7712d24437..fc3c98c5ca 100644 --- a/stack/dashboard/deb/debian/copyright +++ b/stack/dashboard/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 30 Jan 2024 00:00:00 +0000 + Wazuh, Inc on Tue, 13 Feb 2024 00:00:00 +0000 It was downloaded from: diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index e49a4fe7e1..848af97473 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -335,9 +335,9 @@ rm -fr %{buildroot} %config(noreplace) %attr(640, %{USER}, %{GROUP}) "%{CONFIG_DIR}/opensearch_dashboards.yml" %changelog -* Tue Jan 30 2024 support - 4.8.1 +* Tue Feb 13 2024 support - 4.8.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html -* Fri Dec 15 2023 support - 4.8.0 +* Wed Jan 31 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Sun Dec 17 2023 support - 4.7.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index ecb91d0ae8..3a11b7288d 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-indexer (4.8.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html - -- Wazuh, Inc Tue, 30 Jan 2024 00:00:00 +0000 + -- Wazuh, Inc Tue, 13 Feb 2024 00:00:00 +0000 wazuh-indexer (4.8.0-RELEASE) stable; urgency=low diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index 7712d24437..fc3c98c5ca 100644 --- a/stack/indexer/deb/debian/copyright +++ b/stack/indexer/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Tue, 30 Jan 2024 00:00:00 +0000 + Wazuh, Inc on Tue, 13 Feb 2024 00:00:00 +0000 It was downloaded from: diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index ad8bf22c58..5e25088d80 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -685,9 +685,9 @@ rm -fr %{buildroot} %changelog -* Tue Jan 30 2024 support - 4.8.1 +* Tue Feb 13 2024 support - 4.8.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html -* Fri Dec 15 2023 support - 4.8.0 +* Wed Jan 31 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Sun Dec 17 2023 support - 4.7.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html From 70fd2d08b7043a7958807ce020d57fcc1708b3cd Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 12 Dec 2023 16:16:22 -0300 Subject: [PATCH 944/994] Fixed dependencies installation --- .../install_functions/installCommon.sh | 36 ++++++++++++++++--- .../install_functions/installMain.sh | 8 +++-- .../install_functions/installVariables.sh | 7 ++-- 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 7879edd6b7..c5638559a5 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -365,13 +365,41 @@ function installCommon_installCheckDependencies() { function installCommon_installPrerequisites() { - common_logger -d "Installing prerequisites dependencies." + message="Installing prerequisites dependencies." if [ "${sys_type}" == "yum" ]; then - installCommon_yumInstallList "${wazuh_yum_dependencies[@]}" + if [ "${1}" == "AIO" ]; then + common_logger -d "${message}" + installCommon_yumInstallList "${indexer_yum_dependencies[@]}" + installCommon_yumInstallList "${dashboard_yum_dependencies[@]}" + fi + if [ "${1}" == "indexer" ]; then + common_logger -d "${message}" + installCommon_yumInstallList "${indexer_yum_dependencies[@]}" + fi + if [ "${1}" == "dashboard" ]; then + common_logger -d "${message}" + installCommon_yumInstallList "${dashboard_yum_dependencies[@]}" + fi elif [ "${sys_type}" == "apt-get" ]; then eval "apt-get update -q ${debug}" - dependencies= - installCommon_aptInstallList "${wazuh_apt_dependencies[@]}" + if [ "${1}" == "AIO" ]; then + common_logger -d "${message}" + installCommon_yumInstallList "${indexer_apt_dependencies[@]}" + installCommon_yumInstallList "${dashboard_apt_dependencies[@]}" + installCommon_yumInstallList "${wazuh_apt_dependencies[@]}" + fi + if [ "${1}" == "indexer" ]; then + common_logger -d "${message}" + installCommon_yumInstallList "${indexer_apt_dependencies[@]}" + fi + if [ "${1}" == "dashboard" ]; then + common_logger -d "${message}" + installCommon_yumInstallList "${dashboard_apt_dependencies[@]}" + fi + if [ "${1}" == "wazuh" ]; then + common_logger -d "${message}" + installCommon_yumInstallList "${wazuh_apt_dependencies[@]}" + fi fi } diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index be850243d5..292debd018 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -228,7 +228,7 @@ function main() { exit 0 fi -# -------------- Preliminary checks -------------------------------- +# -------------- Preliminary checks and Prerequisites -------------------------------- if [ -z "${uninstall}" ]; then installCommon_installCheckDependencies @@ -254,22 +254,26 @@ function main() { if [ -n "${AIO}" ]; then rm -f "${tar_file}" checks_ports "${wazuh_aio_ports[@]}" + installCommon_installPrerequisites "AIO" fi if [ -n "${indexer}" ]; then checks_ports "${wazuh_indexer_ports[@]}" + installCommon_installPrerequisites "indexer" fi if [ -n "${wazuh}" ]; then checks_ports "${wazuh_manager_ports[@]}" + installCommon_installPrerequisites "wazuh" fi if [ -n "${dashboard}" ]; then checks_ports "${wazuh_dashboard_port}" + installCommon_installPrerequisites "dashboard" fi -# -------------- Prerequisites and Wazuh repo ---------------------- +# -------------- Wazuh repo ---------------------- if [ -n "${AIO}" ] || [ -n "${indexer}" ] || [ -n "${dashboard}" ] || [ -n "${wazuh}" ]; then installCommon_installPrerequisites diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index fdcc4f9257..6de0d15381 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -58,6 +58,9 @@ readonly wazuh_manager_ports=( 1514 1515 1516 55000 ) wazuh_dashboard_port="${http_port}" readonly wia_yum_dependencies=( systemd grep tar coreutils sed procps-ng gawk lsof curl openssl ) readonly wia_apt_dependencies=( systemd grep tar coreutils sed procps gawk lsof curl openssl ) -readonly wazuh_yum_dependencies=( libcap ) -readonly wazuh_apt_dependencies=( apt-transport-https libcap2-bin software-properties-common gnupg ) +readonly wazuh_apt_dependencies=( gnupg apt-transport-https ) +readonly indexer_yum_dependencies=( coreutils ) +readonly indexer_apt_dependencies=( debconf adduser procps gnupg apt-transport-https ) +readonly dashboard_yum_dependencies=( libcap ) +readonly dashboard_apt_dependencies=( debhelper tar curl libcap2-bin gnupg apt-transport-https ) wia_dependencies_installed=() From bd36383f402a512c24108399963aae31d7589251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Wed, 13 Dec 2023 11:39:03 +0100 Subject: [PATCH 945/994] Added `common_checkAptLock` function --- unattended_installer/common_functions/common.sh | 14 ++++++++++++++ .../install_functions/installCommon.sh | 10 +++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/unattended_installer/common_functions/common.sh b/unattended_installer/common_functions/common.sh index 00651292e3..04ac7f8131 100644 --- a/unattended_installer/common_functions/common.sh +++ b/unattended_installer/common_functions/common.sh @@ -7,6 +7,20 @@ # License (version 2) as published by the FSF - Free Software # Foundation. +function common_checkAptLock() { + + attempt=0 + seconds=30 + max_attempts=10 + + while fuser "${apt_lockfile}" >/dev/null 2>&1 && [ "${attempt}" -lt "${max_attempts}" ]; do + attempt=$((attempt+1)) + common_logger "Another process is using APT. Waiting for it to release the lock. Next retry in ${seconds} seconds (${attempt}/${max_attempts})" + sleep "${seconds}" + done + +} + function common_logger() { now=$(date +'%d/%m/%Y %H:%M:%S') diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 7879edd6b7..40a7819a58 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -98,7 +98,7 @@ function installCommon_aptInstall() { installer=${package} fi command="DEBIAN_FRONTEND=noninteractive apt-get install ${installer} -y -q" - installCommon_checkAptLock + common_checkAptLock if [ "${attempt}" -ne "${max_attempts}" ]; then apt_output=$(eval "${command} 2>&1") @@ -545,7 +545,7 @@ function installCommon_rollBack() { manager_installed=$(yum list installed 2>/dev/null | grep wazuh-manager) fi elif [ "${sys_type}" == "apt-get" ]; then - installCommon_checkAptLock + common_checkAptLock eval "apt-get remove --purge wazuh-manager -y ${debug}" manager_installed=$(apt list --installed 2>/dev/null | grep wazuh-manager) fi @@ -571,7 +571,7 @@ function installCommon_rollBack() { indexer_installed=$(yum list installed 2>/dev/null | grep wazuh-indexer) fi elif [ "${sys_type}" == "apt-get" ]; then - installCommon_checkAptLock + common_checkAptLock eval "apt-get remove --purge wazuh-indexer -y ${debug}" indexer_installed=$(apt list --installed 2>/dev/null | grep wazuh-indexer) fi @@ -598,7 +598,7 @@ function installCommon_rollBack() { filebeat_installed=$(yum list installed 2>/dev/null | grep filebeat) fi elif [ "${sys_type}" == "apt-get" ]; then - installCommon_checkAptLock + common_checkAptLock eval "apt-get remove --purge filebeat -y ${debug}" filebeat_installed=$(apt list --installed 2>/dev/null | grep filebeat) fi @@ -625,7 +625,7 @@ function installCommon_rollBack() { dashboard_installed=$(yum list installed 2>/dev/null | grep wazuh-dashboard) fi elif [ "${sys_type}" == "apt-get" ]; then - installCommon_checkAptLock + common_checkAptLock eval "apt-get remove --purge wazuh-dashboard -y ${debug}" dashboard_installed=$(apt list --installed 2>/dev/null | grep wazuh-dashboard) fi From 2adb9ca0a24b71a943c18beb8e0bae56cf49b973 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Thu, 14 Dec 2023 09:23:03 -0300 Subject: [PATCH 946/994] Improve aio dependencies --- .../install_functions/installCommon.sh | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index c5638559a5..227559ee2a 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -368,9 +368,9 @@ function installCommon_installPrerequisites() { message="Installing prerequisites dependencies." if [ "${sys_type}" == "yum" ]; then if [ "${1}" == "AIO" ]; then + deps=($(echo "${indexer_yum_dependencies[@]}" "${dashboard_yum_dependencies[@]}" | tr ' ' '\n' | sort -u)) common_logger -d "${message}" - installCommon_yumInstallList "${indexer_yum_dependencies[@]}" - installCommon_yumInstallList "${dashboard_yum_dependencies[@]}" + installCommon_yumInstallList "${deps[@]}" fi if [ "${1}" == "indexer" ]; then common_logger -d "${message}" @@ -383,22 +383,21 @@ function installCommon_installPrerequisites() { elif [ "${sys_type}" == "apt-get" ]; then eval "apt-get update -q ${debug}" if [ "${1}" == "AIO" ]; then + deps=($(echo "${wazuh_apt_dependencies[@]}" "${indexer_apt_dependencies[@]}" "${dashboard_apt_dependencies[@]}" | tr ' ' '\n' | sort -u)) common_logger -d "${message}" - installCommon_yumInstallList "${indexer_apt_dependencies[@]}" - installCommon_yumInstallList "${dashboard_apt_dependencies[@]}" - installCommon_yumInstallList "${wazuh_apt_dependencies[@]}" + installCommon_aptInstallList "${deps[@]}" fi if [ "${1}" == "indexer" ]; then common_logger -d "${message}" - installCommon_yumInstallList "${indexer_apt_dependencies[@]}" + installCommon_aptInstallList "${indexer_apt_dependencies[@]}" fi if [ "${1}" == "dashboard" ]; then common_logger -d "${message}" - installCommon_yumInstallList "${dashboard_apt_dependencies[@]}" + installCommon_aptInstallList "${dashboard_apt_dependencies[@]}" fi if [ "${1}" == "wazuh" ]; then common_logger -d "${message}" - installCommon_yumInstallList "${wazuh_apt_dependencies[@]}" + installCommon_aptInstallList "${wazuh_apt_dependencies[@]}" fi fi @@ -859,3 +858,18 @@ function installCommon_yumInstall() { fi } + + +function installCommon_checkAptLock() { + + attempt=0 + seconds=30 + max_attempts=10 + + while fuser "${apt_lockfile}" >/dev/null 2>&1 && [ "${attempt}" -lt "${max_attempts}" ]; do + attempt=$((attempt+1)) + common_logger "Another process is using APT. Waiting for it to release the lock. Next retry in ${seconds} seconds (${attempt}/${max_attempts})" + sleep "${seconds}" + done + +} From ec50d63c4fc2819a3e8620837d4a659da36ad295 Mon Sep 17 00:00:00 2001 From: Manuel Date: Fri, 15 Dec 2023 11:11:22 +0100 Subject: [PATCH 947/994] Added Debian12 SCA to SPECS --- debs/SPECS/wazuh-agent/debian/rules | 2 ++ debs/SPECS/wazuh-manager/debian/rules | 2 ++ rpms/SPECS/wazuh-manager.spec | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debs/SPECS/wazuh-agent/debian/rules b/debs/SPECS/wazuh-agent/debian/rules index 41fd65fabe..b79b4ce99f 100644 --- a/debs/SPECS/wazuh-agent/debian/rules +++ b/debs/SPECS/wazuh-agent/debian/rules @@ -105,6 +105,7 @@ override_dh_install: mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/9 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/10 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/11 + mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/12 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/ubuntu/12/04 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/ubuntu/14/04 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/ubuntu/16/04 @@ -123,6 +124,7 @@ override_dh_install: cp etc/templates/config/debian/9/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/9 cp etc/templates/config/debian/10/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/10 cp etc/templates/config/debian/11/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/11 + cp etc/templates/config/debian/12/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/12 cp etc/templates/config/ubuntu/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/ubuntu cp etc/templates/config/ubuntu/12/04/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/ubuntu/12/04 diff --git a/debs/SPECS/wazuh-manager/debian/rules b/debs/SPECS/wazuh-manager/debian/rules index f650758d62..f8efb7d961 100644 --- a/debs/SPECS/wazuh-manager/debian/rules +++ b/debs/SPECS/wazuh-manager/debian/rules @@ -135,6 +135,7 @@ override_dh_install: mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/9 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/10 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/11 + mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/12 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/rhel/5 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/rhel/6 mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/rhel/7 @@ -179,6 +180,7 @@ override_dh_install: cp etc/templates/config/debian/9/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/9 cp etc/templates/config/debian/10/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/10 cp etc/templates/config/debian/11/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/11 + cp etc/templates/config/debian/12/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/12 cp etc/templates/config/centos/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/centos cp etc/templates/config/centos/5/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/centos/5 diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 5b7a886810..8615855d37 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -116,7 +116,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/{a mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amzn/{1,2} mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/centos/{8,7,6,5} mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/darwin/{15,16,17,18,19,20,21,22,23} -mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/debian/{7,8,9,10,11} +mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/debian/{7,8,9,10,11,12} mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/ubuntu/{12,14,16,18,20,22}/04 mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/rhel/{9,8,7,6,5} mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/sles/{11,12,15} From 9366d1abe66fe791e105b2015cc92ff303e56a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Mon, 18 Dec 2023 16:04:15 +0100 Subject: [PATCH 948/994] Updated Filebeat module version to 0.4 --- 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 fe2d03ca4d..b4c0b3ee1e 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -74,7 +74,7 @@ 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.3.tar.gz"' >> "${output_script_path}" + echo 'readonly filebeat_wazuh_module="${repobaseurl}/filebeat/wazuh-filebeat-0.4.tar.gz"' >> "${output_script_path}" echo 'readonly bucket="packages-dev.wazuh.com"' >> "${output_script_path}" echo 'readonly repository="'"${devrepo}"'"' >> "${output_script_path}" sed -i 's|v${wazuh_version}|${wazuh_version}|g' "${resources_installer}/installVariables.sh" @@ -82,7 +82,7 @@ function buildInstaller() { echo 'readonly repogpg="https://packages.wazuh.com/key/GPG-KEY-WAZUH"' >> "${output_script_path}" echo 'readonly repobaseurl="https://packages.wazuh.com/4.x"' >> "${output_script_path}" echo 'readonly reporelease="stable"' >> "${output_script_path}" - echo 'readonly filebeat_wazuh_module="${repobaseurl}/filebeat/wazuh-filebeat-0.3.tar.gz"' >> "${output_script_path}" + echo 'readonly filebeat_wazuh_module="${repobaseurl}/filebeat/wazuh-filebeat-0.4.tar.gz"' >> "${output_script_path}" echo 'readonly bucket="packages.wazuh.com"' >> "${output_script_path}" echo 'readonly repository="4.x"' >> "${output_script_path}" fi From 20e32d89c3980c9ca442525c0df4e2c58bfb7e67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Mon, 18 Dec 2023 16:05:04 +0100 Subject: [PATCH 949/994] Updated Filebeat module version to 0.4 in Offline GHA --- .github/actions/offline-installation/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/offline-installation/common.sh b/.github/actions/offline-installation/common.sh index 4fc3514481..d9b73447c1 100644 --- a/.github/actions/offline-installation/common.sh +++ b/.github/actions/offline-installation/common.sh @@ -150,7 +150,7 @@ function filebeat_installation() { 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 + tar -xzf ./wazuh-offline/wazuh-files/wazuh-filebeat-0.4.tar.gz -C /usr/share/filebeat/module echo "INFO: Generating certificates of Filebeat..." NODE_NAME=wazuh-1 From 2c8724fc3dfa3724b47b75f35648477574c7b760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 19 Dec 2023 17:41:17 +0100 Subject: [PATCH 950/994] Fixed `source_branch` variable definition --- 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 fe2d03ca4d..dab949f633 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -16,8 +16,8 @@ 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_directory="$(git rev-parse --show-toplevel)" -source_branch=`cat ${source_directory}/VERSION` +readonly source_directory="$( cd $(dirname $0) ; pwd -P )" +source_branch=$(cat ${source_directory}/../VERSION) function getHelp() { From fa1a5510990ec53379dab34864be22a71311acdd Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Tue, 19 Dec 2023 23:44:58 +0100 Subject: [PATCH 951/994] Added wazuh-filebeat template to Wazuh indexer --- stack/indexer/base/builder.sh | 10 +++++--- stack/indexer/base/generate_base.sh | 29 ++++++++++++++++++------ stack/indexer/deb/build_package.sh | 34 ++++++++++++++++++++-------- stack/indexer/deb/debian/rules | 1 + stack/indexer/rpm/build_package.sh | 32 ++++++++++++++++++-------- stack/indexer/rpm/wazuh-indexer.spec | 1 + 6 files changed, 77 insertions(+), 30 deletions(-) diff --git a/stack/indexer/base/builder.sh b/stack/indexer/base/builder.sh index f89cfb79be..eed3af3cfc 100644 --- a/stack/indexer/base/builder.sh +++ b/stack/indexer/base/builder.sh @@ -10,12 +10,13 @@ set -x # License (version 2) as published by the FSF - Free Software # Foundation. -set -e +set -ex architecture="$1" revision="$2" -future="$3" -reference="$4" +filebeat_module_reference="$3" +future="$4" +reference="$5" opensearch_version="2.10.0" base_dir=/opt/wazuh-indexer-base @@ -64,6 +65,7 @@ mkdir -p ./etc/wazuh-indexer/ cp -r ./config/* ./etc/wazuh-indexer/ rm -rf ./config cp -r /root/stack/indexer/base/files/etc/wazuh-indexer/* ./etc/wazuh-indexer/ +curl -so ./etc/wazuh-indexer/wazuh-template.json "https://github.com/wazuh/wazuh/blob/${filebeat_module_reference}/extensions/elasticsearch/7.x/wazuh-template.json" cp -r /root/stack/indexer/base/files/etc/sysconfig ./etc/ cp -r /root/stack/indexer/base/files/etc/init.d ./etc/ cp -r /root/stack/indexer/base/files/usr ./ @@ -72,6 +74,8 @@ cp -r /root/stack/indexer/indexer-init.sh bin/ rm -rf ./plugins/opensearch-security/tools/install_demo_configuration.sh cp /root/VERSION . + + # ----------------------------------------------------------------------------- # Compile systemD module diff --git a/stack/indexer/base/generate_base.sh b/stack/indexer/base/generate_base.sh index 20a224e92c..78fcf47e51 100755 --- a/stack/indexer/base/generate_base.sh +++ b/stack/indexer/base/generate_base.sh @@ -18,6 +18,7 @@ container_name="indexer_base_builder" architecture="x64" future="no" revision="1" +filebeat_module_reference="" # ----------------------------------------------------------------------------- @@ -48,11 +49,11 @@ build_base() { # Build the RPM package with a Docker container if [ "${reference}" ];then docker run -t --rm -v ${outdir}/:/tmp/output:Z \ - ${container_name} ${architecture} ${revision} ${future} ${reference} || return 1 + ${container_name} ${architecture} ${revision} ${filebeat_module_reference} ${future} ${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} ${filebeat_module_reference} ${future} || return 1 fi echo "Base file $(ls -Art ${outdir} | tail -n 1) added to ${outdir}." @@ -66,11 +67,12 @@ help() { echo echo "Usage: $0 [OPTIONS]" echo - 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." - echo " -r, --revision [Optional] Package revision. By default ${revision}" - echo " -h, --help Show this help." + 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 " -f, --filebeat-module-reference [Optional] wazuh/wazuh Filebeat template branch or tag." + echo " --future [Optional] Build test future package 99.99.0 Used for development purposes." + echo " -r, --revision [Optional] Package revision. By default ${revision}" + echo " -h, --help Show this help." echo exit "${1}" } @@ -100,6 +102,14 @@ main() { help 1 fi ;; + "-f"|"--filebeat-module-reference") + if [ -n "${2}" ]; then + filebeat_module_reference="${2}" + shift 2 + else + help 1 + fi + ;; "--future") future="yes" shift 1 @@ -112,11 +122,16 @@ main() { help 1 fi ;; + *) help 1 esac done + if [ -z "${filebeat_module_reference}" ]; then + filebeat_module_reference=$(cat ${current_path}/../../../VERSION) + fi + build_base || clean 1 clean 0 diff --git a/stack/indexer/deb/build_package.sh b/stack/indexer/deb/build_package.sh index d67dac9f7b..cb08a00680 100755 --- a/stack/indexer/deb/build_package.sh +++ b/stack/indexer/deb/build_package.sh @@ -18,6 +18,7 @@ deb_builder_dockerfile="${current_path}/docker" future="no" base_cmd="" build_base="yes" +filebeat_module_reference="" trap ctrl_c INT @@ -40,7 +41,7 @@ build_deb() { # Copy the necessary files cp ${current_path}/builder.sh ${dockerfile_path} - + if [ "${build_base}" == "yes" ];then # Base generation if [ "${future}" == "yes" ];then @@ -49,7 +50,7 @@ build_deb() { if [ "${reference}" ];then base_cmd+="--reference ${reference}" fi - ../base/generate_base.sh -s ${outdir} -r ${revision} ${base_cmd} + ../base/generate_base.sh -s ${outdir} -r ${revision} -f ${filebeat_module_reference} ${base_cmd} else if [ "${reference}" ];then version=$(curl -sL https://raw.githubusercontent.com/wazuh/wazuh-packages/${reference}/VERSION | cat) @@ -107,14 +108,15 @@ help() { echo echo "Usage: $0 [OPTIONS]" echo - echo " -a, --architecture [Optional] Target architecture of the package [amd64]." - 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." - echo " --dont-build-docker [Optional] Locally built docker image will be used instead of generating a new one." - echo " --future [Optional] Build test future package 99.99.0 Used for development purposes." - echo " -h, --help Show this help." + echo " -a, --architecture [Optional] Target architecture of the package [amd64]." + 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." + echo " -f, --filebeat-module-reference [Optional] wazuh/wazuh Filebeat template branch or tag." + echo " --dont-build-docker [Optional] Locally built docker image will be used instead of generating a new one." + echo " --future [Optional] Build test future package 99.99.0 Used for development purposes." + echo " -h, --help Show this help." echo exit $1 } @@ -159,6 +161,14 @@ main() { help 1 fi ;; + "-f"|"--filebeat-module-reference") + if [ -n "${2}" ]; then + filebeat_module_reference="${2}" + shift 2 + else + help 1 + fi + ;; "--dont-build-docker") build_docker="no" shift 1 @@ -180,6 +190,10 @@ main() { esac done + if [ -z "${filebeat_module_reference}" ]; then + filebeat_module_reference=$(cat ${current_path}/../../../VERSION) + fi + build || clean 1 clean 0 diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index d538c46dc1..d53495b003 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -153,6 +153,7 @@ override_dh_fixperms: chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/jvm.options chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/modules/aggs-matrix-stats chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/opensearch.yml + chmod 660 $(TARGET_DIR)$(CONFIG_DIR)/wazuh-template.json chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/roles_mapping.yml chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/internal_users.yml chmod 640 $(TARGET_DIR)$(CONFIG_DIR)/opensearch-security/roles.yml diff --git a/stack/indexer/rpm/build_package.sh b/stack/indexer/rpm/build_package.sh index 41abeee729..d0614c1406 100755 --- a/stack/indexer/rpm/build_package.sh +++ b/stack/indexer/rpm/build_package.sh @@ -18,6 +18,7 @@ rpm_builder_dockerfile="${current_path}/docker" future="no" base_cmd="" build_base="yes" +filebeat_module_reference="" trap ctrl_c INT @@ -49,7 +50,7 @@ build_rpm() { if [ "${reference}" ];then base_cmd+="--reference ${reference}" fi - ../base/generate_base.sh -s ${outdir} -r ${revision} ${base_cmd} + ../base/generate_base.sh -s ${outdir} -r ${revision} -f ${filebeat_module_reference} ${base_cmd} else if [ "${reference}" ];then version=$(curl -sL https://raw.githubusercontent.com/wazuh/wazuh-packages/${reference}/VERSION | cat) @@ -106,14 +107,15 @@ help() { echo echo "Usage: $0 [OPTIONS]" echo - echo " -a, --architecture [Optional] Target architecture of the package [x86_64]." - 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." - echo " --dont-build-docker [Optional] Locally built docker image will be used instead of generating a new one." - echo " --future [Optional] Build test future package 99.99.0 Used for development purposes." - echo " -h, --help Show this help." + echo " -a, --architecture [Optional] Target architecture of the package [x86_64]." + 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." + echo " -f, --filebeat-module-reference [Optional] wazuh/wazuh Filebeat template branch or tag." + echo " --dont-build-docker [Optional] Locally built docker image will be used instead of generating a new one." + echo " --future [Optional] Build test future package 99.99.0 Used for development purposes." + echo " -h, --help Show this help." echo exit $1 } @@ -158,6 +160,14 @@ main() { help 1 fi ;; + "-f"|"--filebeat-module-reference") + if [ -n "${2}" ]; then + filebeat_module_reference="${2}" + shift 2 + else + help 1 + fi + ;; "--dont-build-docker") build_docker="no" shift 1 @@ -179,7 +189,9 @@ main() { esac done - set -ex + if [ -z "${filebeat_module_reference}" ]; then + filebeat_module_reference=$(cat ${current_path}/../../../VERSION) + fi build || clean 1 diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 1b68da074f..645a1daf0b 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -647,6 +647,7 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/*.properties %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/plugin-stats-metadata %attr(640, %{USER}, %{GROUP}) %{CONFIG_DIR}/opensearch-performance-analyzer/*.policy +%attr(660, %{USER}, %{GROUP}) %{CONFIG_DIR}/wazuh-template.json %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/ %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/ %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/performance-analyzer-rca/config/agent-stats-metadata From bf82f5da46415b13cc5da0c9a893e2821ec34e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Ruiz?= Date: Wed, 20 Dec 2023 12:11:40 +0100 Subject: [PATCH 952/994] Update `indexer-ism-init.sh` (#2700) * Update `indexer-ism-init.sh` Updates the script to upload the wazuh-template.json to the indexer. * Revert log file path --- stack/indexer/indexer-ism-init.sh | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/stack/indexer/indexer-ism-init.sh b/stack/indexer/indexer-ism-init.sh index 3f2edc541a..4217979624 100644 --- a/stack/indexer/indexer-ism-init.sh +++ b/stack/indexer/indexer-ism-init.sh @@ -84,7 +84,24 @@ function generate_rollover_template() { # Loads the index templates for the rollover policy to the indexer. ######################################################################### function load_templates() { - # Note: the wazuh-template.json could also be loaded here. + # Load wazuh-template.json, needed for initial indices creation. + local wazuh_template_path="/etc/wazuh-indexer/wazuh-template.json" + echo "Will create 'wazuh' index template" + if [ -f $wazuh_template_path ]; then + cat $wazuh_template_path | + if ! curl -s -k ${C_AUTH} \ + -X PUT "${INDEXER_URL}/_template/wazuh" \ + -o "${LOG_FILE}" --create-dirs \ + -H 'Content-Type: application/json' -d @-; then + echo " ERROR: 'wazuh' template creation failed" + exit 1 + else + echo " SUCC: 'wazuh' template created or updated" + fi + else + echo " ERROR: $wazuh_template_path not found" + fi + echo "Will create index templates to configure the alias" for alias in "${aliases[@]}"; do generate_rollover_template "${alias}" | From be4f235bf792db849e79d17edafdc9e19676b43d Mon Sep 17 00:00:00 2001 From: Francisco Tuduri Date: Wed, 20 Dec 2023 12:13:35 -0300 Subject: [PATCH 953/994] Add indexer config to ossec.conf if missing --- rpms/SPECS/wazuh-manager.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index c87cbde26e..0ce7bec4d3 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -296,6 +296,10 @@ if [ $1 = 2 ]; then rm -rf %{_localstatedir}/queue/sockets cp -rp %{_localstatedir}/queue/ossec %{_localstatedir}/queue/sockets fi + + CONFIG_INDEXER_TEMPLATE="%{_localstatedir}/packages_files/manager_installation_scripts/etc/templates/config/generic/wodle-indexer.manager.template" + . %{_localstatedir}/packages_files/manager_installation_scripts/src/init/update-indexer.sh + updateIndexerTemplate "%{_localstatedir}/etc/ossec.conf" $CONFIG_INDEXER_TEMPLATE fi # Fresh install code block From 7f9a95ce440bccea47271208c76a3e7e89a126a2 Mon Sep 17 00:00:00 2001 From: Francisco Tuduri Date: Wed, 20 Dec 2023 12:20:40 -0300 Subject: [PATCH 954/994] Revert "Add indexer config to ossec.conf if missing" This reverts commit be4f235bf792db849e79d17edafdc9e19676b43d. --- rpms/SPECS/wazuh-manager.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 0ce7bec4d3..c87cbde26e 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -296,10 +296,6 @@ if [ $1 = 2 ]; then rm -rf %{_localstatedir}/queue/sockets cp -rp %{_localstatedir}/queue/ossec %{_localstatedir}/queue/sockets fi - - CONFIG_INDEXER_TEMPLATE="%{_localstatedir}/packages_files/manager_installation_scripts/etc/templates/config/generic/wodle-indexer.manager.template" - . %{_localstatedir}/packages_files/manager_installation_scripts/src/init/update-indexer.sh - updateIndexerTemplate "%{_localstatedir}/etc/ossec.conf" $CONFIG_INDEXER_TEMPLATE fi # Fresh install code block From 8d1ca4df7e41aaf22321c70ffaa50d556ba396a7 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Wed, 20 Dec 2023 16:11:14 -0300 Subject: [PATCH 955/994] Removed wazuh-template json --- unattended_installer/install_functions/indexer.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/unattended_installer/install_functions/indexer.sh b/unattended_installer/install_functions/indexer.sh index 00196dc9d6..61e35b2e2f 100644 --- a/unattended_installer/install_functions/indexer.sh +++ b/unattended_installer/install_functions/indexer.sh @@ -190,12 +190,5 @@ function indexer_startCluster() { common_logger "The Wazuh indexer cluster ISM initialized." fi fi - eval "common_curl --silent ${filebeat_wazuh_template} --max-time 300 --retry 5 --retry-delay 5 ${debug}" | 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 - else - common_logger -d "Inserted wazuh-alerts template into the Wazuh indexer cluster." - fi } \ No newline at end of file From 62afa4096cb302a75dbe5d85ef6a35534c7fed54 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Wed, 20 Dec 2023 16:12:10 -0300 Subject: [PATCH 956/994] Added end space --- unattended_installer/install_functions/indexer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/indexer.sh b/unattended_installer/install_functions/indexer.sh index 61e35b2e2f..1eeb485a0b 100644 --- a/unattended_installer/install_functions/indexer.sh +++ b/unattended_installer/install_functions/indexer.sh @@ -191,4 +191,4 @@ function indexer_startCluster() { fi fi -} \ No newline at end of file +} From 9e70e66894e92df0f1f5c00ac7c28cd0ab8f9d7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 21 Dec 2023 17:26:34 +0100 Subject: [PATCH 957/994] Double quotes removed in indexer IP --- unattended_installer/passwords_tool/passwordsFunctions.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/unattended_installer/passwords_tool/passwordsFunctions.sh b/unattended_installer/passwords_tool/passwordsFunctions.sh index be1798a802..b705e40a39 100644 --- a/unattended_installer/passwords_tool/passwordsFunctions.sh +++ b/unattended_installer/passwords_tool/passwordsFunctions.sh @@ -366,6 +366,9 @@ function passwords_getNetworkHost() { IP=$(grep -hr "^network.host:" /etc/wazuh-indexer/opensearch.yml) NH="network.host: " IP="${IP//$NH}" + + # Remove surrounding double quotes if present + IP="${IP//\"}" #allow to find ip with an interface if [[ ${IP} =~ _.*_ ]]; then From 9ceb882bd361d5c85a5f5032e8b9f3d3ba677c29 Mon Sep 17 00:00:00 2001 From: Francisco Tuduri Date: Wed, 20 Dec 2023 12:22:30 -0300 Subject: [PATCH 958/994] Add indexer config to ossec.conf if missing, on upgrade --- rpms/SPECS/wazuh-manager.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 183cd103c8..dd7b65fb6c 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -286,6 +286,8 @@ fi %post echo "VERSION=\"$(%{_localstatedir}/bin/wazuh-control info -v)\"" > /etc/ossec-init.conf + +# Upgrade install code block if [ $1 = 2 ]; then if [ -d %{_localstatedir}/logs/ossec ]; then rm -rf %{_localstatedir}/logs/wazuh @@ -296,6 +298,11 @@ if [ $1 = 2 ]; then rm -rf %{_localstatedir}/queue/sockets cp -rp %{_localstatedir}/queue/ossec %{_localstatedir}/queue/sockets fi + + # Ensure that the 'Indexer' is configured + CONFIG_INDEXER_TEMPLATE="%{_localstatedir}/packages_files/manager_installation_scripts/etc/templates/config/generic/wodle-indexer.manager.template" + . %{_localstatedir}/packages_files/manager_installation_scripts/src/init/update-indexer.sh + updateIndexerTemplate "%{_localstatedir}/etc/ossec.conf" $CONFIG_INDEXER_TEMPLATE fi # Fresh install code block From dded7ee98c5b94a220f6c5e869f78aa9dcaf3324 Mon Sep 17 00:00:00 2001 From: Tomas Sarquis Date: Tue, 12 Dec 2023 15:35:53 -0300 Subject: [PATCH 959/994] Update old VD config when installing Wazuh manager Co-authored-by: Kevin Cardenas --- debs/SPECS/wazuh-manager/debian/postinst | 48 +++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/debs/SPECS/wazuh-manager/debian/postinst b/debs/SPECS/wazuh-manager/debian/postinst index ece01e5b0f..2ab5c9d2a6 100644 --- a/debs/SPECS/wazuh-manager/debian/postinst +++ b/debs/SPECS/wazuh-manager/debian/postinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # postinst script for Wazuh # Wazuh, Inc 2015 set -e @@ -266,6 +266,52 @@ case "$1" in fi fi + # Function that checks if the old (< v4.8) VD configuration is present. + is_old_vulndet_config_present() + { + local OSSEC_CONFIGURATION_FILE="$1" + local VULNERABILITY_DETECTOR_PATTERN="" + + if ( grep -q "$VULNERABILITY_DETECTOR_PATTERN" "$OSSEC_CONFIGURATION_FILE" ); then + return 0 + fi + return 1 + } + + # Function that updates the old (< v4.8) VD configuration with the latest one. + update_vulndet_config() + { + local OSSEC_CONFIGURATION_FILE="$1" + local OSSEC_CONFIGURATION_FILE_TMP="$1.tmp" + + touch $OSSEC_CONFIGURATION_FILE_TMP + local OSSEC_CONFIGURATION_FILE_BEFORE_VD="$(sed -ne '//q;p' $OSSEC_CONFIGURATION_FILE)" + local OSSEC_CONFIGURATION_FILE_AFTER_VD="$(sed -e '1,/<\/vulnerability-detector>/d' $OSSEC_CONFIGURATION_FILE)" + + # Append current config preceding the old VD config. + echo "${OSSEC_CONFIGURATION_FILE_BEFORE_VD}" >> $OSSEC_CONFIGURATION_FILE_TMP + echo "" >> $OSSEC_CONFIGURATION_FILE_TMP + + # Append new VD config. + local VULNDET_TEMPLATE_FILE="${SCRIPTS_DIR}/etc/templates/config/generic/wodle-vulnerability-detection.manager.template" + cat ${VULNDET_TEMPLATE_FILE} >> $OSSEC_CONFIGURATION_FILE_TMP + echo "" >> $OSSEC_CONFIGURATION_FILE_TMP + + # Append new Indexer config. + local INDEXER_TEMPLATE_FILE="${SCRIPTS_DIR}/etc/templates/config/generic/wodle-indexer.manager.template" + cat ${INDEXER_TEMPLATE_FILE} >> $OSSEC_CONFIGURATION_FILE_TMP + + # Append current config succeeding the old VD config. + echo "$OSSEC_CONFIGURATION_FILE_AFTER_VD" >> $OSSEC_CONFIGURATION_FILE_TMP + + mv $OSSEC_CONFIGURATION_FILE_TMP $OSSEC_CONFIGURATION_FILE + } + + # Update VD configuration if necessary. + if is_old_vulndet_config_present "${DIR}/etc/ossec.conf"; then + update_vulndet_config "${DIR}/etc/ossec.conf" + fi + if [ ! -z "$2" ]; then if [ -f ${WAZUH_TMP_DIR}/wazuh.restart ] ; then if command -v systemctl > /dev/null 2>&1 && systemctl > /dev/null 2>&1; then From d370b7beb7f93ab9bb8fad1c3e6c44e00beb6135 Mon Sep 17 00:00:00 2001 From: Tomas Sarquis Date: Tue, 12 Dec 2023 17:45:25 -0300 Subject: [PATCH 960/994] Improve script by doing it more general --- debs/SPECS/wazuh-manager/debian/postinst | 84 ++++++++++++++++-------- 1 file changed, 57 insertions(+), 27 deletions(-) diff --git a/debs/SPECS/wazuh-manager/debian/postinst b/debs/SPECS/wazuh-manager/debian/postinst index 2ab5c9d2a6..3d3dc59200 100644 --- a/debs/SPECS/wazuh-manager/debian/postinst +++ b/debs/SPECS/wazuh-manager/debian/postinst @@ -266,50 +266,80 @@ case "$1" in fi fi - # Function that checks if the old (< v4.8) VD configuration is present. - is_old_vulndet_config_present() + # Function that checks if a config if present. + is_config_present() { - local OSSEC_CONFIGURATION_FILE="$1" - local VULNERABILITY_DETECTOR_PATTERN="" + local CONFIG_FILE="${DIR}/etc/ossec.conf" + local CONFIG_PATTERN="$1" - if ( grep -q "$VULNERABILITY_DETECTOR_PATTERN" "$OSSEC_CONFIGURATION_FILE" ); then + if ( grep -q "$CONFIG_PATTERN" "$CONFIG_FILE" ); then return 0 fi return 1 } - # Function that updates the old (< v4.8) VD configuration with the latest one. - update_vulndet_config() + # Function that adds a wodle config from a template file. + add_wodle_config() { - local OSSEC_CONFIGURATION_FILE="$1" - local OSSEC_CONFIGURATION_FILE_TMP="$1.tmp" + local CONFIG_FILE="${DIR}/etc/ossec.conf" + local CONFIG_FILE_TMP="${DIR}/etc/ossec.conf.tmp" + local WODLE_NAME="$1" - touch $OSSEC_CONFIGURATION_FILE_TMP - local OSSEC_CONFIGURATION_FILE_BEFORE_VD="$(sed -ne '//q;p' $OSSEC_CONFIGURATION_FILE)" - local OSSEC_CONFIGURATION_FILE_AFTER_VD="$(sed -e '1,/<\/vulnerability-detector>/d' $OSSEC_CONFIGURATION_FILE)" + touch $CONFIG_FILE_TMP + cat ${CONFIG_FILE} >> $CONFIG_FILE_TMP - # Append current config preceding the old VD config. - echo "${OSSEC_CONFIGURATION_FILE_BEFORE_VD}" >> $OSSEC_CONFIGURATION_FILE_TMP - echo "" >> $OSSEC_CONFIGURATION_FILE_TMP + # Remove trailing newlines and config closure ("") + printf "%s" "$(< ${CONFIG_FILE_TMP})" > $CONFIG_FILE_TMP + sed -i '$ d' $CONFIG_FILE_TMP + + # Append wodle config. + local WODLE_TEMPLATE_FILE="${SCRIPTS_DIR}/etc/templates/config/generic/wodle-${WODLE_NAME}.manager.template" + cat ${WODLE_TEMPLATE_FILE} >> $CONFIG_FILE_TMP + echo "" >> $CONFIG_FILE_TMP + + # Close config. + echo "" >> $CONFIG_FILE_TMP + + mv $CONFIG_FILE_TMP $CONFIG_FILE + } + + # Function that removes a piece of config given two patterns. + remove_config() + { + local CONFIG_FILE="${DIR}/etc/ossec.conf" + local CONFIG_FILE_TMP="${DIR}/etc/ossec.conf.tmp" + local PATTERN_BEFORE="$1" + local PATTERN_AFTER="$2" - # Append new VD config. - local VULNDET_TEMPLATE_FILE="${SCRIPTS_DIR}/etc/templates/config/generic/wodle-vulnerability-detection.manager.template" - cat ${VULNDET_TEMPLATE_FILE} >> $OSSEC_CONFIGURATION_FILE_TMP - echo "" >> $OSSEC_CONFIGURATION_FILE_TMP + touch $CONFIG_FILE_TMP + local CONFIG_BEFORE="$(sed -ne "$PATTERN_BEFORE" $CONFIG_FILE)" + local CONFIG_AFTER="$(sed -e "$PATTERN_AFTER" $CONFIG_FILE)" - # Append new Indexer config. - local INDEXER_TEMPLATE_FILE="${SCRIPTS_DIR}/etc/templates/config/generic/wodle-indexer.manager.template" - cat ${INDEXER_TEMPLATE_FILE} >> $OSSEC_CONFIGURATION_FILE_TMP + # Append current config preceding the old VD config. + echo "${CONFIG_BEFORE}" >> $CONFIG_FILE_TMP # Append current config succeeding the old VD config. - echo "$OSSEC_CONFIGURATION_FILE_AFTER_VD" >> $OSSEC_CONFIGURATION_FILE_TMP + echo "$CONFIG_AFTER" >> $CONFIG_FILE_TMP - mv $OSSEC_CONFIGURATION_FILE_TMP $OSSEC_CONFIGURATION_FILE + mv $CONFIG_FILE_TMP $CONFIG_FILE } - # Update VD configuration if necessary. - if is_old_vulndet_config_present "${DIR}/etc/ossec.conf"; then - update_vulndet_config "${DIR}/etc/ossec.conf" + # Remove old VD config if present. + is_config_present "" + if [[ $? -eq 0 ]]; then + remove_config "//q;p" "1,/<\/vulnerability-detector>/d" + fi + + # Append new VD config if not present. + is_config_present "" + if [[ $? -eq 1 ]]; then + add_wodle_config "vulnerability-detection" + fi + + # Append new indexer config if not present. + is_config_present "" + if [[ $? -eq 1 ]]; then + add_wodle_config "indexer" fi if [ ! -z "$2" ]; then From 220b931402e70cc51d4bce333dd5e85a30788c19 Mon Sep 17 00:00:00 2001 From: Tomas Sarquis Date: Wed, 13 Dec 2023 09:11:37 -0300 Subject: [PATCH 961/994] Revert "Improve script by doing it more general" This reverts commit d0e09055a79651d60bb69d37738a9665f2f1ba6e. --- debs/SPECS/wazuh-manager/debian/postinst | 84 ++++++++---------------- 1 file changed, 27 insertions(+), 57 deletions(-) diff --git a/debs/SPECS/wazuh-manager/debian/postinst b/debs/SPECS/wazuh-manager/debian/postinst index 3d3dc59200..2ab5c9d2a6 100644 --- a/debs/SPECS/wazuh-manager/debian/postinst +++ b/debs/SPECS/wazuh-manager/debian/postinst @@ -266,80 +266,50 @@ case "$1" in fi fi - # Function that checks if a config if present. - is_config_present() + # Function that checks if the old (< v4.8) VD configuration is present. + is_old_vulndet_config_present() { - local CONFIG_FILE="${DIR}/etc/ossec.conf" - local CONFIG_PATTERN="$1" + local OSSEC_CONFIGURATION_FILE="$1" + local VULNERABILITY_DETECTOR_PATTERN="" - if ( grep -q "$CONFIG_PATTERN" "$CONFIG_FILE" ); then + if ( grep -q "$VULNERABILITY_DETECTOR_PATTERN" "$OSSEC_CONFIGURATION_FILE" ); then return 0 fi return 1 } - # Function that adds a wodle config from a template file. - add_wodle_config() + # Function that updates the old (< v4.8) VD configuration with the latest one. + update_vulndet_config() { - local CONFIG_FILE="${DIR}/etc/ossec.conf" - local CONFIG_FILE_TMP="${DIR}/etc/ossec.conf.tmp" - local WODLE_NAME="$1" + local OSSEC_CONFIGURATION_FILE="$1" + local OSSEC_CONFIGURATION_FILE_TMP="$1.tmp" - touch $CONFIG_FILE_TMP - cat ${CONFIG_FILE} >> $CONFIG_FILE_TMP + touch $OSSEC_CONFIGURATION_FILE_TMP + local OSSEC_CONFIGURATION_FILE_BEFORE_VD="$(sed -ne '//q;p' $OSSEC_CONFIGURATION_FILE)" + local OSSEC_CONFIGURATION_FILE_AFTER_VD="$(sed -e '1,/<\/vulnerability-detector>/d' $OSSEC_CONFIGURATION_FILE)" - # Remove trailing newlines and config closure ("") - printf "%s" "$(< ${CONFIG_FILE_TMP})" > $CONFIG_FILE_TMP - sed -i '$ d' $CONFIG_FILE_TMP - - # Append wodle config. - local WODLE_TEMPLATE_FILE="${SCRIPTS_DIR}/etc/templates/config/generic/wodle-${WODLE_NAME}.manager.template" - cat ${WODLE_TEMPLATE_FILE} >> $CONFIG_FILE_TMP - echo "" >> $CONFIG_FILE_TMP - - # Close config. - echo "" >> $CONFIG_FILE_TMP - - mv $CONFIG_FILE_TMP $CONFIG_FILE - } - - # Function that removes a piece of config given two patterns. - remove_config() - { - local CONFIG_FILE="${DIR}/etc/ossec.conf" - local CONFIG_FILE_TMP="${DIR}/etc/ossec.conf.tmp" - local PATTERN_BEFORE="$1" - local PATTERN_AFTER="$2" + # Append current config preceding the old VD config. + echo "${OSSEC_CONFIGURATION_FILE_BEFORE_VD}" >> $OSSEC_CONFIGURATION_FILE_TMP + echo "" >> $OSSEC_CONFIGURATION_FILE_TMP - touch $CONFIG_FILE_TMP - local CONFIG_BEFORE="$(sed -ne "$PATTERN_BEFORE" $CONFIG_FILE)" - local CONFIG_AFTER="$(sed -e "$PATTERN_AFTER" $CONFIG_FILE)" + # Append new VD config. + local VULNDET_TEMPLATE_FILE="${SCRIPTS_DIR}/etc/templates/config/generic/wodle-vulnerability-detection.manager.template" + cat ${VULNDET_TEMPLATE_FILE} >> $OSSEC_CONFIGURATION_FILE_TMP + echo "" >> $OSSEC_CONFIGURATION_FILE_TMP - # Append current config preceding the old VD config. - echo "${CONFIG_BEFORE}" >> $CONFIG_FILE_TMP + # Append new Indexer config. + local INDEXER_TEMPLATE_FILE="${SCRIPTS_DIR}/etc/templates/config/generic/wodle-indexer.manager.template" + cat ${INDEXER_TEMPLATE_FILE} >> $OSSEC_CONFIGURATION_FILE_TMP # Append current config succeeding the old VD config. - echo "$CONFIG_AFTER" >> $CONFIG_FILE_TMP + echo "$OSSEC_CONFIGURATION_FILE_AFTER_VD" >> $OSSEC_CONFIGURATION_FILE_TMP - mv $CONFIG_FILE_TMP $CONFIG_FILE + mv $OSSEC_CONFIGURATION_FILE_TMP $OSSEC_CONFIGURATION_FILE } - # Remove old VD config if present. - is_config_present "" - if [[ $? -eq 0 ]]; then - remove_config "//q;p" "1,/<\/vulnerability-detector>/d" - fi - - # Append new VD config if not present. - is_config_present "" - if [[ $? -eq 1 ]]; then - add_wodle_config "vulnerability-detection" - fi - - # Append new indexer config if not present. - is_config_present "" - if [[ $? -eq 1 ]]; then - add_wodle_config "indexer" + # Update VD configuration if necessary. + if is_old_vulndet_config_present "${DIR}/etc/ossec.conf"; then + update_vulndet_config "${DIR}/etc/ossec.conf" fi if [ ! -z "$2" ]; then From a35d4152e9f320baae311c1f416729e3bccf7c89 Mon Sep 17 00:00:00 2001 From: Tomas Sarquis Date: Wed, 13 Dec 2023 10:32:35 -0300 Subject: [PATCH 962/994] Rename variables to shorter names --- debs/SPECS/wazuh-manager/debian/postinst | 28 ++++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/debs/SPECS/wazuh-manager/debian/postinst b/debs/SPECS/wazuh-manager/debian/postinst index 2ab5c9d2a6..af0447860e 100644 --- a/debs/SPECS/wazuh-manager/debian/postinst +++ b/debs/SPECS/wazuh-manager/debian/postinst @@ -269,10 +269,10 @@ case "$1" in # Function that checks if the old (< v4.8) VD configuration is present. is_old_vulndet_config_present() { - local OSSEC_CONFIGURATION_FILE="$1" + local CONFIG_FILE="$1" local VULNERABILITY_DETECTOR_PATTERN="" - if ( grep -q "$VULNERABILITY_DETECTOR_PATTERN" "$OSSEC_CONFIGURATION_FILE" ); then + if ( grep -q "$VULNERABILITY_DETECTOR_PATTERN" "$CONFIG_FILE" ); then return 0 fi return 1 @@ -281,30 +281,30 @@ case "$1" in # Function that updates the old (< v4.8) VD configuration with the latest one. update_vulndet_config() { - local OSSEC_CONFIGURATION_FILE="$1" - local OSSEC_CONFIGURATION_FILE_TMP="$1.tmp" + local CONFIG_FILE="$1" + local CONFIG_FILE_TMP="$1.tmp" - touch $OSSEC_CONFIGURATION_FILE_TMP - local OSSEC_CONFIGURATION_FILE_BEFORE_VD="$(sed -ne '//q;p' $OSSEC_CONFIGURATION_FILE)" - local OSSEC_CONFIGURATION_FILE_AFTER_VD="$(sed -e '1,/<\/vulnerability-detector>/d' $OSSEC_CONFIGURATION_FILE)" + touch $CONFIG_FILE_TMP + local CONFIG_BEFORE_VD="$(sed -ne '//q;p' $CONFIG_FILE)" + local CONFIG_AFTER_VD="$(sed -e '1,/<\/vulnerability-detector>/d' $CONFIG_FILE)" # Append current config preceding the old VD config. - echo "${OSSEC_CONFIGURATION_FILE_BEFORE_VD}" >> $OSSEC_CONFIGURATION_FILE_TMP - echo "" >> $OSSEC_CONFIGURATION_FILE_TMP + echo "${CONFIG_BEFORE_VD}" >> $CONFIG_FILE_TMP + echo "" >> $CONFIG_FILE_TMP # Append new VD config. local VULNDET_TEMPLATE_FILE="${SCRIPTS_DIR}/etc/templates/config/generic/wodle-vulnerability-detection.manager.template" - cat ${VULNDET_TEMPLATE_FILE} >> $OSSEC_CONFIGURATION_FILE_TMP - echo "" >> $OSSEC_CONFIGURATION_FILE_TMP + cat ${VULNDET_TEMPLATE_FILE} >> $CONFIG_FILE_TMP + echo "" >> $CONFIG_FILE_TMP # Append new Indexer config. local INDEXER_TEMPLATE_FILE="${SCRIPTS_DIR}/etc/templates/config/generic/wodle-indexer.manager.template" - cat ${INDEXER_TEMPLATE_FILE} >> $OSSEC_CONFIGURATION_FILE_TMP + cat ${INDEXER_TEMPLATE_FILE} >> $CONFIG_FILE_TMP # Append current config succeeding the old VD config. - echo "$OSSEC_CONFIGURATION_FILE_AFTER_VD" >> $OSSEC_CONFIGURATION_FILE_TMP + echo "$CONFIG_AFTER_VD" >> $CONFIG_FILE_TMP - mv $OSSEC_CONFIGURATION_FILE_TMP $OSSEC_CONFIGURATION_FILE + mv $CONFIG_FILE_TMP $CONFIG_FILE } # Update VD configuration if necessary. From 9b5dc85c474238529bd93509c355e66365bb1006 Mon Sep 17 00:00:00 2001 From: Tomas Sarquis Date: Mon, 18 Dec 2023 14:25:05 -0300 Subject: [PATCH 963/994] Reuse script --- debs/SPECS/wazuh-manager/debian/postinst | 54 +++--------------------- 1 file changed, 7 insertions(+), 47 deletions(-) diff --git a/debs/SPECS/wazuh-manager/debian/postinst b/debs/SPECS/wazuh-manager/debian/postinst index af0447860e..1bee2d6889 100644 --- a/debs/SPECS/wazuh-manager/debian/postinst +++ b/debs/SPECS/wazuh-manager/debian/postinst @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # postinst script for Wazuh # Wazuh, Inc 2015 set -e @@ -234,6 +234,12 @@ case "$1" in fi + # Upgrade old (< v4.8) VD configuration if present. + CONFIG_VD_TEMPLATE="${SCRIPTS_DIR}/etc/templates/config/generic/wodle-vulnerability-detection.manager.template" + CONFIG_INDEXER_TEMPLATE="${SCRIPTS_DIR}/etc/templates/config/generic/wodle-indexer.manager.template" + . ./src/init/replace_vulnerability_detector.sh + updateVulnerabilityDetector "${DIR}/etc/ossec.conf" $CONFIG_VD_TEMPLATE $CONFIG_INDEXER_TEMPLATE + # Restoring file permissions ${SCRIPTS_DIR}/restore-permissions.sh > /dev/null 2>&1 || true @@ -266,52 +272,6 @@ case "$1" in fi fi - # Function that checks if the old (< v4.8) VD configuration is present. - is_old_vulndet_config_present() - { - local CONFIG_FILE="$1" - local VULNERABILITY_DETECTOR_PATTERN="" - - if ( grep -q "$VULNERABILITY_DETECTOR_PATTERN" "$CONFIG_FILE" ); then - return 0 - fi - return 1 - } - - # Function that updates the old (< v4.8) VD configuration with the latest one. - update_vulndet_config() - { - local CONFIG_FILE="$1" - local CONFIG_FILE_TMP="$1.tmp" - - touch $CONFIG_FILE_TMP - local CONFIG_BEFORE_VD="$(sed -ne '//q;p' $CONFIG_FILE)" - local CONFIG_AFTER_VD="$(sed -e '1,/<\/vulnerability-detector>/d' $CONFIG_FILE)" - - # Append current config preceding the old VD config. - echo "${CONFIG_BEFORE_VD}" >> $CONFIG_FILE_TMP - echo "" >> $CONFIG_FILE_TMP - - # Append new VD config. - local VULNDET_TEMPLATE_FILE="${SCRIPTS_DIR}/etc/templates/config/generic/wodle-vulnerability-detection.manager.template" - cat ${VULNDET_TEMPLATE_FILE} >> $CONFIG_FILE_TMP - echo "" >> $CONFIG_FILE_TMP - - # Append new Indexer config. - local INDEXER_TEMPLATE_FILE="${SCRIPTS_DIR}/etc/templates/config/generic/wodle-indexer.manager.template" - cat ${INDEXER_TEMPLATE_FILE} >> $CONFIG_FILE_TMP - - # Append current config succeeding the old VD config. - echo "$CONFIG_AFTER_VD" >> $CONFIG_FILE_TMP - - mv $CONFIG_FILE_TMP $CONFIG_FILE - } - - # Update VD configuration if necessary. - if is_old_vulndet_config_present "${DIR}/etc/ossec.conf"; then - update_vulndet_config "${DIR}/etc/ossec.conf" - fi - if [ ! -z "$2" ]; then if [ -f ${WAZUH_TMP_DIR}/wazuh.restart ] ; then if command -v systemctl > /dev/null 2>&1 && systemctl > /dev/null 2>&1; then From e01f47d067b5673ddafa9b8650a580ab3be00543 Mon Sep 17 00:00:00 2001 From: Tomas Sarquis Date: Mon, 18 Dec 2023 15:18:15 -0300 Subject: [PATCH 964/994] Fix path --- debs/SPECS/wazuh-manager/debian/postinst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debs/SPECS/wazuh-manager/debian/postinst b/debs/SPECS/wazuh-manager/debian/postinst index 1bee2d6889..2eedbc68cd 100644 --- a/debs/SPECS/wazuh-manager/debian/postinst +++ b/debs/SPECS/wazuh-manager/debian/postinst @@ -237,7 +237,7 @@ case "$1" in # Upgrade old (< v4.8) VD configuration if present. CONFIG_VD_TEMPLATE="${SCRIPTS_DIR}/etc/templates/config/generic/wodle-vulnerability-detection.manager.template" CONFIG_INDEXER_TEMPLATE="${SCRIPTS_DIR}/etc/templates/config/generic/wodle-indexer.manager.template" - . ./src/init/replace_vulnerability_detector.sh + . ${SCRIPTS_DIR}/src/init/replace_vulnerability_detector.sh updateVulnerabilityDetector "${DIR}/etc/ossec.conf" $CONFIG_VD_TEMPLATE $CONFIG_INDEXER_TEMPLATE # Restoring file permissions From 40548b19b461794f8e9d2835e26e18c771cb6a17 Mon Sep 17 00:00:00 2001 From: Francisco Tuduri Date: Wed, 20 Dec 2023 17:14:19 -0300 Subject: [PATCH 965/994] Add indexer config to ossec.conf if missing, on upgrade Co-authored-by: Tomas --- debs/SPECS/wazuh-manager/debian/postinst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/debs/SPECS/wazuh-manager/debian/postinst b/debs/SPECS/wazuh-manager/debian/postinst index 2eedbc68cd..b983b5e81f 100644 --- a/debs/SPECS/wazuh-manager/debian/postinst +++ b/debs/SPECS/wazuh-manager/debian/postinst @@ -234,11 +234,10 @@ case "$1" in fi - # Upgrade old (< v4.8) VD configuration if present. - CONFIG_VD_TEMPLATE="${SCRIPTS_DIR}/etc/templates/config/generic/wodle-vulnerability-detection.manager.template" + # Ensure that the 'Indexer' is configured CONFIG_INDEXER_TEMPLATE="${SCRIPTS_DIR}/etc/templates/config/generic/wodle-indexer.manager.template" - . ${SCRIPTS_DIR}/src/init/replace_vulnerability_detector.sh - updateVulnerabilityDetector "${DIR}/etc/ossec.conf" $CONFIG_VD_TEMPLATE $CONFIG_INDEXER_TEMPLATE + . ${SCRIPTS_DIR}/src/init/update-indexer.sh + updateIndexerTemplate "${DIR}/etc/ossec.conf" $CONFIG_INDEXER_TEMPLATE # Restoring file permissions ${SCRIPTS_DIR}/restore-permissions.sh > /dev/null 2>&1 || true From ce878c4f003b7931f6736dc249fa2b61a3702768 Mon Sep 17 00:00:00 2001 From: Vikman Fernandez-Castro Date: Fri, 22 Dec 2023 10:28:07 +0100 Subject: [PATCH 966/994] Update release date for 4.7.2 --- aix/SPECS/wazuh-agent-aix.spec | 2 +- debs/SPECS/wazuh-agent/debian/changelog | 2 +- debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 2 +- debs/SPECS/wazuh-manager/debian/copyright | 2 +- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- stack/dashboard/deb/debian/changelog | 2 +- stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- stack/indexer/deb/debian/changelog | 2 +- stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 51c8f87245..8ba310dd13 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 -* Sun Dec 17 2023 support - 4.7.2 +* Tue Jan 09 2024 support - 4.7.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html * Wed Dec 13 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 06be8fd365..90d49039ab 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,7 +2,7 @@ wazuh-agent (4.7.2-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html - -- Wazuh, Inc Sun, 17 Dec 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 09 Jan 2024 00:00:00 +0000 wazuh-agent (4.7.1-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 6730c39e96..35a04448c8 100644 --- a/debs/SPECS/wazuh-agent/debian/copyright +++ b/debs/SPECS/wazuh-agent/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Sun, 17 Dec 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 09 Jan 2024 00:00:00 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index 609308ceb8..d5cbb3c422 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,7 +2,7 @@ wazuh-manager (4.7.2-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html - -- Wazuh, Inc Sun, 17 Dec 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 09 Jan 2024 00:00:00 +0000 wazuh-manager (4.7.1-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 6730c39e96..35a04448c8 100644 --- a/debs/SPECS/wazuh-manager/debian/copyright +++ b/debs/SPECS/wazuh-manager/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Sun, 17 Dec 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 09 Jan 2024 00:00:00 +0000 It was downloaded from: diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 1f676556b6..6f464ae967 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -599,7 +599,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Sun Dec 17 2023 support - 4.7.2 +* Tue Jan 09 2024 support - 4.7.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html * Wed Dec 13 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index cb6fb97d24..9064a94672 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -827,7 +827,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Sun Dec 17 2023 support - 4.7.2 +* Tue Jan 09 2024 support - 4.7.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html * Wed Dec 13 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index f973461a36..429d89fdc4 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-dashboard (4.7.2-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html - -- Wazuh, Inc Sun, 17 Dec 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 09 Jan 2024 00:00:00 +0000 wazuh-dashboard (4.7.1-RELEASE) stable; urgency=low diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index 256242d968..0d4c3b6b72 100644 --- a/stack/dashboard/deb/debian/copyright +++ b/stack/dashboard/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Sun, 17 Dec 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 09 Jan 2024 00:00:00 +0000 It was downloaded from: diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 544c58aa82..6c808e10c6 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -408,7 +408,7 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog -* Sun Dec 17 2023 support - 4.7.2 +* Tue Jan 09 2024 support - 4.7.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html * Wed Dec 13 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 691eba0ad9..77863584b8 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-indexer (4.7.2-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html - -- Wazuh, Inc Sun, 17 Dec 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 09 Jan 2024 00:00:00 +0000 wazuh-indexer (4.7.1-RELEASE) stable; urgency=low diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index 256242d968..0d4c3b6b72 100644 --- a/stack/indexer/deb/debian/copyright +++ b/stack/indexer/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Sun, 17 Dec 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 09 Jan 2024 00:00:00 +0000 It was downloaded from: diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index f609c6dfc4..6451397765 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1444,7 +1444,7 @@ rm -fr %{buildroot} %changelog -* Sun Dec 17 2023 support - 4.7.2 +* Tue Jan 09 2024 support - 4.7.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html * Wed Dec 13 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html From b1300d9e0e1a55aa2864b75e89eda191c227dab5 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Tue, 26 Dec 2023 17:39:45 +0100 Subject: [PATCH 967/994] Fixed Filebeat template URL in Wazuh indexer base --- stack/indexer/base/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/indexer/base/builder.sh b/stack/indexer/base/builder.sh index eed3af3cfc..4186c79ba7 100644 --- a/stack/indexer/base/builder.sh +++ b/stack/indexer/base/builder.sh @@ -65,7 +65,7 @@ mkdir -p ./etc/wazuh-indexer/ cp -r ./config/* ./etc/wazuh-indexer/ rm -rf ./config cp -r /root/stack/indexer/base/files/etc/wazuh-indexer/* ./etc/wazuh-indexer/ -curl -so ./etc/wazuh-indexer/wazuh-template.json "https://github.com/wazuh/wazuh/blob/${filebeat_module_reference}/extensions/elasticsearch/7.x/wazuh-template.json" +curl -so ./etc/wazuh-indexer/wazuh-template.json "https://raw.githubusercontent.com/wazuh/wazuh/${filebeat_module_reference}/extensions/elasticsearch/7.x/wazuh-template.json" cp -r /root/stack/indexer/base/files/etc/sysconfig ./etc/ cp -r /root/stack/indexer/base/files/etc/init.d ./etc/ cp -r /root/stack/indexer/base/files/usr ./ From dc6e1cbc0a98a6bea8d4347d20701abd371589db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Ruiz?= Date: Wed, 27 Dec 2023 16:09:49 +0100 Subject: [PATCH 968/994] Update indexer-ism-init.sh (#2726) Fixes yellow cluster status on single node deployment caused by ISM plugin's configuration indices having 1 replica index. --- stack/indexer/indexer-ism-init.sh | 88 +++++++++++++++++++++++++++---- 1 file changed, 78 insertions(+), 10 deletions(-) diff --git a/stack/indexer/indexer-ism-init.sh b/stack/indexer/indexer-ism-init.sh index 4217979624..b30531cb0a 100644 --- a/stack/indexer/indexer-ism-init.sh +++ b/stack/indexer/indexer-ism-init.sh @@ -80,6 +80,48 @@ function generate_rollover_template() { EOF } +######################################################################### +# Creates an index template to disable replicas on ISM configurastion indices. +# Returns: +# The index template as a JSON string. +######################################################################### +function generate_ism_config_template() { + cat <<-EOF + { + "order": 1, + "index_patterns": [ + ".opendistro-ism-managed-index-history-*", + ".opendistro-ism-config", + ".opendistro-job-scheduler-lock" + ], + "settings": { + "number_of_replicas": 0 + } + } + EOF +} + +######################################################################### +# Creates persistent cluster's settings to disable replicas for ISM history. +# Returns: +# The setting as a JSON string. +######################################################################### +function generate_ism_config() { + cat <<-EOF + { + "persistent": { + "plugins": { + "index_state_management": { + "history": { + "number_of_replicas": "0" + } + } + } + } + } + EOF +} + ######################################################################### # Loads the index templates for the rollover policy to the indexer. ######################################################################### @@ -89,18 +131,44 @@ function load_templates() { echo "Will create 'wazuh' index template" if [ -f $wazuh_template_path ]; then cat $wazuh_template_path | + if ! curl -s -k ${C_AUTH} \ + -X PUT "${INDEXER_URL}/_template/wazuh" \ + -o "${LOG_FILE}" --create-dirs \ + -H 'Content-Type: application/json' -d @-; then + echo " ERROR: 'wazuh' template creation failed" + return 1 + else + echo " SUCC: 'wazuh' template created or updated" + fi + else + echo " ERROR: $wazuh_template_path not found" + fi + + # Load template for ISM configuration indices + echo "Will create 'ism_history_indices' index template" + generate_ism_config_template | if ! curl -s -k ${C_AUTH} \ - -X PUT "${INDEXER_URL}/_template/wazuh" \ + -X PUT "${INDEXER_URL}/_template/ism_history_indices" \ -o "${LOG_FILE}" --create-dirs \ -H 'Content-Type: application/json' -d @-; then - echo " ERROR: 'wazuh' template creation failed" - exit 1 + echo " ERROR: 'ism_history_indices' template creation failed" + return 1 else - echo " SUCC: 'wazuh' template created or updated" + echo " SUCC: 'ism_history_indices' template created or updated" + fi + + # Make settings persistent + echo "Will disable replicas for 'plugins.index_state_management.history' indices" + generate_ism_config | + if ! curl -s -k ${C_AUTH} \ + -X PUT "${INDEXER_URL}/_cluster/settings" \ + -o "${LOG_FILE}" --create-dirs \ + -H 'Content-Type: application/json' -d @-; then + echo " ERROR: cluster's settings update failed" + return 1 + else + echo " SUCC: cluster's settings saved" fi - else - echo " ERROR: $wazuh_template_path not found" - fi echo "Will create index templates to configure the alias" for alias in "${aliases[@]}"; do @@ -201,7 +269,7 @@ function create_write_index() { -H 'Content-Type: application/json' \ -d "$(generate_write_index_alias "${1}")"; then echo " ERROR: creating '${1}' write index" - exit 1 + return 1 else echo " SUCC: '${1}' write index created" fi @@ -263,7 +331,7 @@ function show_help() { echo -e " -v, --verbose" echo -e " Set verbose mode. Prints more information." echo -e "" - exit 1 + return 1 } ######################################################################### @@ -353,7 +421,7 @@ function main() { echo "SUCC: Indexer ISM initialization finished successfully." else echo "ERROR: Indexer ISM initialization failed. Check ${LOG_FILE} for more information." - exit 1 + return 1 fi } From 19cafa22a1b33c06a29af333ced0960ff327284f Mon Sep 17 00:00:00 2001 From: c-bordon Date: Wed, 27 Dec 2023 14:55:29 -0300 Subject: [PATCH 969/994] The change was reverted to obtain the Wazuh version of the VERSION file --- unattended_installer/builder.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index dab949f633..061c77166d 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -16,8 +16,7 @@ readonly resources_certs="${base_path_builder}/cert_tool" readonly resources_passwords="${base_path_builder}/passwords_tool" readonly resources_common="${base_path_builder}/common_functions" readonly resources_download="${base_path_builder}/downloader" -readonly source_directory="$( cd $(dirname $0) ; pwd -P )" -source_branch=$(cat ${source_directory}/../VERSION) +source_branch="4.7.2" function getHelp() { From 1622614cd8bcdf18dc6f0b82eec9426109d2f352 Mon Sep 17 00:00:00 2001 From: Diego Fernando Rodriguez Date: Mon, 18 Dec 2023 03:16:20 -0500 Subject: [PATCH 970/994] Add flag --download-content to generate_debian_package.sh --- debs/generate_debian_package.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/debs/generate_debian_package.sh b/debs/generate_debian_package.sh index 4f14917329..3524481c7a 100755 --- a/debs/generate_debian_package.sh +++ b/debs/generate_debian_package.sh @@ -15,6 +15,7 @@ REVISION="1" TARGET="" JOBS="2" DEBUG="no" +DOWNLOAD_CONTENT="no" BUILD_DOCKER="yes" DOCKER_TAG="latest" INSTALLATION_PATH="/var/ossec" @@ -84,7 +85,7 @@ build_deb() { ${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 + ${USE_LOCAL_SOURCE_CODE} ${FUTURE} {DOWNLOAD_CONTENT}|| return 1 echo "Package $(ls -Art ${OUTDIR} | tail -n 1) added to ${OUTDIR}." @@ -162,6 +163,7 @@ help() { echo " -p, --path [Optional] Installation path for the package. By default: /var/ossec." 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 " --download-content [Optional] Download content and add it to 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." @@ -245,6 +247,10 @@ main() { shift 1 fi ;; + "--download-content") + DOWNLOAD_CONTENT="yes" + shift 1 + ;; "--dont-build-docker") BUILD_DOCKER="no" shift 1 From 838881e68367164d83b83615543d166e2d68e6b2 Mon Sep 17 00:00:00 2001 From: Diego Fernando Rodriguez Date: Mon, 18 Dec 2023 03:16:49 -0500 Subject: [PATCH 971/994] Add var download_content to build.sh --- debs/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debs/build.sh b/debs/build.sh index 7896c49081..8a0524befe 100755 --- a/debs/build.sh +++ b/debs/build.sh @@ -23,6 +23,7 @@ wazuh_packages_branch=$9 use_local_specs=${10} local_source_code=${11} future=${12} +download_content=${13} if [ -z "${package_release}" ]; then package_release="1" @@ -87,6 +88,7 @@ cd ${build_dir}/${build_target} && tar -czf ${package_full_name}.orig.tar.gz "${ sed -i "s:RELEASE:${package_release}:g" ${sources_dir}/debian/changelog sed -i "s:export JOBS=.*:export JOBS=${jobs}:g" ${sources_dir}/debian/rules sed -i "s:export DEBUG_ENABLED=.*:export DEBUG_ENABLED=${debug}:g" ${sources_dir}/debian/rules +sed -i "s:export DOWNLOAD_CONTENT_ENABLED=.*:export DOWNLOAD_CONTENT_ENABLED=${download_content}:g" ${sources_dir}/debian/rules sed -i "s#export PATH=.*#export PATH=/usr/local/gcc-5.5.0/bin:${PATH}#g" ${sources_dir}/debian/rules sed -i "s#export LD_LIBRARY_PATH=.*#export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}#g" ${sources_dir}/debian/rules sed -i "s:export INSTALLATION_DIR=.*:export INSTALLATION_DIR=${dir_path}:g" ${sources_dir}/debian/rules From c55ec47e797943895d5b3d215e2eb197358ba6f0 Mon Sep 17 00:00:00 2001 From: Diego Fernando Rodriguez Date: Mon, 18 Dec 2023 03:17:06 -0500 Subject: [PATCH 972/994] Add var DOWNLOAD_CONTENT_ENABLED to rules --- debs/SPECS/wazuh-manager/debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debs/SPECS/wazuh-manager/debian/rules b/debs/SPECS/wazuh-manager/debian/rules index 6c4e7da8af..e7fb3dbae8 100644 --- a/debs/SPECS/wazuh-manager/debian/rules +++ b/debs/SPECS/wazuh-manager/debian/rules @@ -26,6 +26,7 @@ export JOBS="5" export DEBUG_ENABLED="no" export PATH="${PATH}" export LD_LIBRARY_PATH="" +export DOWNLOAD_CONTENT_ENABLED="no" %: dh $@ @@ -64,6 +65,7 @@ override_dh_install: USER_GENERATE_AUTHD_CERT="y" \ USER_AUTO_START="n" \ USER_CREATE_SSL_CERT="n" \ + DOWNLOAD_CONTENT="$(DOWNLOAD_CONTENT_ENABLED)" \ ./install.sh # Copying init.d script From 34c902d489241304e2bbd80e8c35f20ab33b2999 Mon Sep 17 00:00:00 2001 From: Diego Fernando Rodriguez Date: Mon, 18 Dec 2023 03:17:48 -0500 Subject: [PATCH 973/994] Add decompress to postinst --- debs/SPECS/wazuh-manager/debian/postinst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debs/SPECS/wazuh-manager/debian/postinst b/debs/SPECS/wazuh-manager/debian/postinst index b983b5e81f..bc41db4a0f 100644 --- a/debs/SPECS/wazuh-manager/debian/postinst +++ b/debs/SPECS/wazuh-manager/debian/postinst @@ -71,6 +71,10 @@ case "$1" in chown ${USER}:${GROUP} ${DIR}/queue/db/global.db* fi + if [ -f "${DIR}/vd.tar.xz" ]; then + tar -xf ${DIR}/vd.tar.xz -C ${DIR} + fi + # Delete uncompatible DBs versions if [ ! -z $2 ]; then From 6339a603831e6b9731c072870cc2303f97d00db0 Mon Sep 17 00:00:00 2001 From: Diego Fernando Rodriguez Date: Mon, 18 Dec 2023 16:56:38 -0500 Subject: [PATCH 974/994] Fix var DOWNLOAD_CONTENT --- debs/generate_debian_package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debs/generate_debian_package.sh b/debs/generate_debian_package.sh index 3524481c7a..ddccc84138 100755 --- a/debs/generate_debian_package.sh +++ b/debs/generate_debian_package.sh @@ -85,7 +85,7 @@ build_deb() { ${CONTAINER_NAME}:${DOCKER_TAG} ${TARGET} ${BRANCH} ${ARCHITECTURE} \ ${REVISION} ${JOBS} ${INSTALLATION_PATH} ${DEBUG} \ ${CHECKSUM} ${PACKAGES_BRANCH} ${USE_LOCAL_SPECS} \ - ${USE_LOCAL_SOURCE_CODE} ${FUTURE} {DOWNLOAD_CONTENT}|| return 1 + ${USE_LOCAL_SOURCE_CODE} ${FUTURE} ${DOWNLOAD_CONTENT}|| return 1 echo "Package $(ls -Art ${OUTDIR} | tail -n 1) added to ${OUTDIR}." From 63993b4c9014ee8e1d1f0583befa2b708164d86e Mon Sep 17 00:00:00 2001 From: Diego Fernando Rodriguez Date: Mon, 18 Dec 2023 16:57:08 -0500 Subject: [PATCH 975/994] Change owner queue/vd --- debs/SPECS/wazuh-manager/debian/postinst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debs/SPECS/wazuh-manager/debian/postinst b/debs/SPECS/wazuh-manager/debian/postinst index bc41db4a0f..93e2379d6d 100644 --- a/debs/SPECS/wazuh-manager/debian/postinst +++ b/debs/SPECS/wazuh-manager/debian/postinst @@ -73,6 +73,9 @@ case "$1" in if [ -f "${DIR}/vd.tar.xz" ]; then tar -xf ${DIR}/vd.tar.xz -C ${DIR} + chown ${USER}:${GROUP} ${DIR}/queue/vd + chown ${USER}:${GROUP} ${DIR}/queue/vd-updater + rm -rf ${DIR}/vd.tar.xz fi # Delete uncompatible DBs versions From 586ce0756e05319ac1f8f6d0ce98f12fb66fd188 Mon Sep 17 00:00:00 2001 From: Diego Fernando Rodriguez Date: Tue, 19 Dec 2023 13:56:33 -0500 Subject: [PATCH 976/994] Add --download-content option to generate_rpm_package.sh --- rpms/generate_rpm_package.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/rpms/generate_rpm_package.sh b/rpms/generate_rpm_package.sh index b2c3ee8f36..70afe2f5b5 100755 --- a/rpms/generate_rpm_package.sh +++ b/rpms/generate_rpm_package.sh @@ -18,6 +18,7 @@ REVISION="1" TARGET="" JOBS="2" DEBUG="no" +DOWNLOAD_CONTENT="no" BUILD_DOCKER="yes" DOCKER_TAG="latest" USER_PATH="no" @@ -110,7 +111,7 @@ build_rpm() { ${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 + ${LEGACY} ${USE_LOCAL_SOURCE_CODE} ${FUTURE} ${DOWNLOAD_CONTENT}|| return 1 echo "Package $(ls -Art ${OUTDIR} | tail -n 1) added to ${OUTDIR}." @@ -209,6 +210,7 @@ help() { echo " -p, --path [Optional] Installation path for the package. By default: /var/ossec." 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 " --download-content [Optional] Download content and add it to 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." @@ -287,6 +289,10 @@ main() { DEBUG="yes" shift 1 ;; + "--download-content") + DOWNLOAD_CONTENT="yes" + shift 1 + ;; "--dont-build-docker") BUILD_DOCKER="no" shift 1 From 5ac62972a767c032ad332e202c704edc3bf16697 Mon Sep 17 00:00:00 2001 From: Diego Fernando Rodriguez Date: Tue, 19 Dec 2023 13:56:50 -0500 Subject: [PATCH 977/994] Add --define _download_content_enabled in build.sh --- rpms/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rpms/build.sh b/rpms/build.sh index 05d1224fda..da4ddbc126 100755 --- a/rpms/build.sh +++ b/rpms/build.sh @@ -24,6 +24,7 @@ src=${11} legacy=${12} local_source_code=${13} future=${14} +download_content=${15} wazuh_version="" rpmbuild="rpmbuild" @@ -125,6 +126,7 @@ fi $linux $rpmbuild --define "_sysconfdir /etc" --define "_topdir ${rpm_build_dir}" \ --define "_threads ${threads}" --define "_release ${package_release}" \ --define "_localstatedir ${directory_base}" --define "_debugenabled ${debug}" \ + --define "_download_content_enabled ${download_content}" \ --target ${architecture_target} -ba ${rpm_build_dir}/SPECS/${package_name}.spec if [[ "${checksum}" == "yes" ]]; then From f27da257ad5401d1bca3ce9b3c825ecdc7bad880 Mon Sep 17 00:00:00 2001 From: Diego Fernando Rodriguez Date: Tue, 19 Dec 2023 13:57:27 -0500 Subject: [PATCH 978/994] Add download content in install.sh call --- rpms/SPECS/wazuh-manager.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index dd7b65fb6c..9a8d1844a1 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -78,6 +78,7 @@ echo 'USER_CA_STORE="/path/to/my_cert.pem"' >> ./etc/preloaded-vars.conf echo 'USER_GENERATE_AUTHD_CERT="y"' >> ./etc/preloaded-vars.conf echo 'USER_AUTO_START="n"' >> ./etc/preloaded-vars.conf echo 'USER_CREATE_SSL_CERT="n"' >> ./etc/preloaded-vars.conf +echo 'DOWNLOAD_CONTENT="%{_download_content_enabled}"' >> ./etc/preloaded-vars.conf ./install.sh # Create directories @@ -305,6 +306,13 @@ if [ $1 = 2 ]; then updateIndexerTemplate "%{_localstatedir}/etc/ossec.conf" $CONFIG_INDEXER_TEMPLATE fi +if [ -f "%{_localstatedir}/vd.tar.xz" ]; then + tar -xf %{_localstatedir}/vd.tar.xz -C %{_localstatedir} + chown wazuh:wazuh %{_localstatedir}/queue/vd + chown wazuh:wazuh %{_localstatedir}/queue/vd-updater + rm -rf tar -xf %{_localstatedir}/vd.tar.xz +fi + # Fresh install code block if [ $1 = 1 ]; then @@ -725,6 +733,7 @@ rm -fr %{buildroot} %attr(750, root, root) %config(missingok) %{_localstatedir}/packages_files/manager_installation_scripts/etc/templates/config/centos/* %dir %attr(750, root, root) %config(missingok) %{_localstatedir}/packages_files/manager_installation_scripts/etc/templates/config/rhel %attr(750, root, root) %config(missingok) %{_localstatedir}/packages_files/manager_installation_scripts/etc/templates/config/rhel/* +%attr(750, wazuh, wazuh) %{_localstatedir}/vd.tar.xz %dir %attr(750, root, wazuh) %{_localstatedir}/queue %attr(600, root, wazuh) %ghost %{_localstatedir}/queue/agents-timestamp %dir %attr(750, wazuh, wazuh) %{_localstatedir}/queue/agentless From 1adb3618c7073f675a659b1d5cdc617c0fe02949 Mon Sep 17 00:00:00 2001 From: Diego Fernando Rodriguez Date: Thu, 21 Dec 2023 09:05:05 -0500 Subject: [PATCH 979/994] Rename vd.tar.xz to vd_1.0.0_vd_4.8.0.tar.xz --- debs/SPECS/wazuh-manager/debian/postinst | 7 ++++--- rpms/SPECS/wazuh-manager.spec | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/debs/SPECS/wazuh-manager/debian/postinst b/debs/SPECS/wazuh-manager/debian/postinst index 93e2379d6d..0863da1afb 100644 --- a/debs/SPECS/wazuh-manager/debian/postinst +++ b/debs/SPECS/wazuh-manager/debian/postinst @@ -15,6 +15,7 @@ case "$1" in OSMYSHELL="/sbin/nologin" SCRIPTS_DIR="${WAZUH_GLOBAL_TMP_DIR}/manager_installation_scripts" SCA_BASE_DIR="${SCRIPTS_DIR}/sca" + VD_FILENAME='vd_1.0.0_vd_4.8.0.tar.xz' if [ -d /run/systemd/system ]; then rm -f /etc/init.d/wazuh-manager @@ -71,11 +72,11 @@ case "$1" in chown ${USER}:${GROUP} ${DIR}/queue/db/global.db* fi - if [ -f "${DIR}/vd.tar.xz" ]; then - tar -xf ${DIR}/vd.tar.xz -C ${DIR} + if [ -f "${DIR}/${VD_FILENAME}" ]; then + tar -xf ${DIR}/${VD_FILENAME} -C ${DIR} chown ${USER}:${GROUP} ${DIR}/queue/vd chown ${USER}:${GROUP} ${DIR}/queue/vd-updater - rm -rf ${DIR}/vd.tar.xz + rm -rf ${DIR}/${VD_FILENAME} fi # Delete uncompatible DBs versions diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 9a8d1844a1..ec85c0b032 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -306,11 +306,12 @@ if [ $1 = 2 ]; then updateIndexerTemplate "%{_localstatedir}/etc/ossec.conf" $CONFIG_INDEXER_TEMPLATE fi -if [ -f "%{_localstatedir}/vd.tar.xz" ]; then - tar -xf %{_localstatedir}/vd.tar.xz -C %{_localstatedir} +VD_FILENAME='vd_1.0.0_vd_4.8.0.tar.xz' +if [ -f "%{_localstatedir}/${VD_FILENAME}" ]; then + tar -xf %{_localstatedir}/${VD_FILENAME} -C %{_localstatedir} chown wazuh:wazuh %{_localstatedir}/queue/vd chown wazuh:wazuh %{_localstatedir}/queue/vd-updater - rm -rf tar -xf %{_localstatedir}/vd.tar.xz + rm -rf tar -xf %{_localstatedir}/${VD_FILENAME} fi # Fresh install code block From e152a5e9f921f618d68976b6b1799455c430305e Mon Sep 17 00:00:00 2001 From: Diego Fernando Rodriguez Date: Wed, 27 Dec 2023 15:19:28 -0500 Subject: [PATCH 980/994] Update folder name vd_updater --- debs/SPECS/wazuh-manager/debian/postinst | 2 +- rpms/SPECS/wazuh-manager.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debs/SPECS/wazuh-manager/debian/postinst b/debs/SPECS/wazuh-manager/debian/postinst index 0863da1afb..fcb507b51a 100644 --- a/debs/SPECS/wazuh-manager/debian/postinst +++ b/debs/SPECS/wazuh-manager/debian/postinst @@ -75,7 +75,7 @@ case "$1" in if [ -f "${DIR}/${VD_FILENAME}" ]; then tar -xf ${DIR}/${VD_FILENAME} -C ${DIR} chown ${USER}:${GROUP} ${DIR}/queue/vd - chown ${USER}:${GROUP} ${DIR}/queue/vd-updater + chown ${USER}:${GROUP} ${DIR}/queue/vd_updater rm -rf ${DIR}/${VD_FILENAME} fi diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index ec85c0b032..e53bcf47a9 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -310,7 +310,7 @@ VD_FILENAME='vd_1.0.0_vd_4.8.0.tar.xz' if [ -f "%{_localstatedir}/${VD_FILENAME}" ]; then tar -xf %{_localstatedir}/${VD_FILENAME} -C %{_localstatedir} chown wazuh:wazuh %{_localstatedir}/queue/vd - chown wazuh:wazuh %{_localstatedir}/queue/vd-updater + chown wazuh:wazuh %{_localstatedir}/queue/vd_updater rm -rf tar -xf %{_localstatedir}/${VD_FILENAME} fi @@ -734,7 +734,7 @@ rm -fr %{buildroot} %attr(750, root, root) %config(missingok) %{_localstatedir}/packages_files/manager_installation_scripts/etc/templates/config/centos/* %dir %attr(750, root, root) %config(missingok) %{_localstatedir}/packages_files/manager_installation_scripts/etc/templates/config/rhel %attr(750, root, root) %config(missingok) %{_localstatedir}/packages_files/manager_installation_scripts/etc/templates/config/rhel/* -%attr(750, wazuh, wazuh) %{_localstatedir}/vd.tar.xz +%attr(750, wazuh, wazuh) %{_localstatedir}/${VD_FILENAME} %dir %attr(750, root, wazuh) %{_localstatedir}/queue %attr(600, root, wazuh) %ghost %{_localstatedir}/queue/agents-timestamp %dir %attr(750, wazuh, wazuh) %{_localstatedir}/queue/agentless From b05c2a4da7ce20ea5d09ae88ed4fae2e9d044c0f Mon Sep 17 00:00:00 2001 From: Diego Fernando Rodriguez Date: Thu, 28 Dec 2023 12:44:07 -0500 Subject: [PATCH 981/994] Update _vdfilename --- rpms/SPECS/wazuh-manager.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index e53bcf47a9..e387fd4a3f 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -306,12 +306,12 @@ if [ $1 = 2 ]; then updateIndexerTemplate "%{_localstatedir}/etc/ossec.conf" $CONFIG_INDEXER_TEMPLATE fi -VD_FILENAME='vd_1.0.0_vd_4.8.0.tar.xz' -if [ -f "%{_localstatedir}/${VD_FILENAME}" ]; then - tar -xf %{_localstatedir}/${VD_FILENAME} -C %{_localstatedir} +%define _vdfilename vd_1.0.0_vd_4.8.0.tar.xz +if [ -f "%{_localstatedir}/%{_vdfilename}" ]; then + tar -xf %{_localstatedir}/%{_vdfilename} -C %{_localstatedir} chown wazuh:wazuh %{_localstatedir}/queue/vd chown wazuh:wazuh %{_localstatedir}/queue/vd_updater - rm -rf tar -xf %{_localstatedir}/${VD_FILENAME} + rm -rf tar -xf %{_localstatedir}/%{_vdfilename} fi # Fresh install code block @@ -734,7 +734,7 @@ rm -fr %{buildroot} %attr(750, root, root) %config(missingok) %{_localstatedir}/packages_files/manager_installation_scripts/etc/templates/config/centos/* %dir %attr(750, root, root) %config(missingok) %{_localstatedir}/packages_files/manager_installation_scripts/etc/templates/config/rhel %attr(750, root, root) %config(missingok) %{_localstatedir}/packages_files/manager_installation_scripts/etc/templates/config/rhel/* -%attr(750, wazuh, wazuh) %{_localstatedir}/${VD_FILENAME} +%attr(750, wazuh, wazuh) %{_localstatedir}/%{_vdfilename} %dir %attr(750, root, wazuh) %{_localstatedir}/queue %attr(600, root, wazuh) %ghost %{_localstatedir}/queue/agents-timestamp %dir %attr(750, wazuh, wazuh) %{_localstatedir}/queue/agentless From b4069cf45f98cd403e03454602ebb42497407a48 Mon Sep 17 00:00:00 2001 From: Diego Fernando Rodriguez Date: Thu, 28 Dec 2023 12:55:24 -0500 Subject: [PATCH 982/994] Fix rm command --- 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 e387fd4a3f..90dc27919a 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -311,7 +311,7 @@ if [ -f "%{_localstatedir}/%{_vdfilename}" ]; then tar -xf %{_localstatedir}/%{_vdfilename} -C %{_localstatedir} chown wazuh:wazuh %{_localstatedir}/queue/vd chown wazuh:wazuh %{_localstatedir}/queue/vd_updater - rm -rf tar -xf %{_localstatedir}/%{_vdfilename} + rm -rf %{_localstatedir}/%{_vdfilename} fi # Fresh install code block From b85854a6438055121146110a4f60d5f318880a96 Mon Sep 17 00:00:00 2001 From: Andres Carmelo Micalizzi Casali Date: Wed, 3 Jan 2024 10:41:12 +0100 Subject: [PATCH 983/994] fix: update indexer ism log path --- stack/indexer/indexer-ism-init.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/indexer/indexer-ism-init.sh b/stack/indexer/indexer-ism-init.sh index 4217979624..797a6e31c7 100644 --- a/stack/indexer/indexer-ism-init.sh +++ b/stack/indexer/indexer-ism-init.sh @@ -12,7 +12,7 @@ INDEXER_PASSWORD="admin" INDEXER_HOSTNAME="localhost" POLICY_NAME="rollover_policy" -LOG_FILE="/tmp/wazuh-indexer/ism-init.log" +LOG_FILE="/var/log/wazuh-indexer/ism-init.log" INDEXER_URL="https://${INDEXER_HOSTNAME}:9200" From 98a63db216f0eb1f33e8785412a006f5e0c5aa7a Mon Sep 17 00:00:00 2001 From: Andres Carmelo Micalizzi Date: Tue, 19 Dec 2023 22:49:13 +0100 Subject: [PATCH 984/994] fix: performance-analizer service exceution path Signed-off-by: Andres Carmelo Micalizzi Casali --- .../systemd/system/wazuh-indexer-performance-analyzer.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/indexer/base/files/usr/lib/systemd/system/wazuh-indexer-performance-analyzer.service b/stack/indexer/base/files/usr/lib/systemd/system/wazuh-indexer-performance-analyzer.service index b19fba0d09..b815c53dd2 100644 --- a/stack/indexer/base/files/usr/lib/systemd/system/wazuh-indexer-performance-analyzer.service +++ b/stack/indexer/base/files/usr/lib/systemd/system/wazuh-indexer-performance-analyzer.service @@ -4,7 +4,7 @@ PartOf=wazuh-indexer.service After=wazuh-indexer.service [Service] -ExecStart=/usr/share/wazuh-indexer/bin/performance-analyzer-agent-cli +ExecStart=/usr/share/wazuh-indexer/bin/opensearch-performance-analyzer/performance-analyzer-agent-cli Restart=on-failure User=wazuh-indexer Group=wazuh-indexer From 69e3ec793604c2a13508395565b0562b33fd78d9 Mon Sep 17 00:00:00 2001 From: Andres Carmelo Micalizzi Date: Tue, 19 Dec 2023 22:49:45 +0100 Subject: [PATCH 985/994] fix deb performance-analyzer files rules Signed-off-by: Andres Carmelo Micalizzi Casali --- stack/indexer/deb/debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index d538c46dc1..f979f5c864 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -167,6 +167,8 @@ override_dh_fixperms: chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/securityadmin.sh chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/wazuh-certs-tool.sh chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/wazuh-passwords-tool.sh + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-performance-analyzer/performance-analyzer-agent-cli + chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/bin/opensearch-performance-analyzer/performance-analyzer-agent find "$(TARGET_DIR)$(INSTALLATION_DIR)" -type d -exec chmod 750 {} \; find "$(TARGET_DIR)$(INSTALLATION_DIR)" -type f -perm 644 -exec chmod 640 {} \; From 36d938fd44fed154b57a8c9d6bd7b315e232ee0e Mon Sep 17 00:00:00 2001 From: Andres Carmelo Micalizzi Date: Wed, 20 Dec 2023 11:16:35 +0100 Subject: [PATCH 986/994] fix: add OPENSEARCH_PATH_CONF enviroment variable Signed-off-by: Andres Carmelo Micalizzi Casali --- .../systemd/system/wazuh-indexer-performance-analyzer.service | 1 + 1 file changed, 1 insertion(+) diff --git a/stack/indexer/base/files/usr/lib/systemd/system/wazuh-indexer-performance-analyzer.service b/stack/indexer/base/files/usr/lib/systemd/system/wazuh-indexer-performance-analyzer.service index b815c53dd2..d759f92022 100644 --- a/stack/indexer/base/files/usr/lib/systemd/system/wazuh-indexer-performance-analyzer.service +++ b/stack/indexer/base/files/usr/lib/systemd/system/wazuh-indexer-performance-analyzer.service @@ -9,6 +9,7 @@ Restart=on-failure User=wazuh-indexer Group=wazuh-indexer Environment=OPENSEARCH_HOME=/usr/share/wazuh-indexer +Environment=OPENSEARCH_PATH_CONF=/etc/wazuh-indexer/ WorkingDirectory=/usr/share/wazuh-indexer [Install] From e4b1e9bf40cb63f5d8d35fbe13fa3f9345f00813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Ruiz?= Date: Wed, 3 Jan 2024 17:55:21 +0100 Subject: [PATCH 987/994] Update `indexer-ism-init.sh` (#2733) * Update indexer-ism-init.sh Update ism-init script to parametrize the path of the wazuh-template * Update indexer-ism-init.sh --- stack/indexer/indexer-ism-init.sh | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/stack/indexer/indexer-ism-init.sh b/stack/indexer/indexer-ism-init.sh index b30531cb0a..3e9e4a3f27 100644 --- a/stack/indexer/indexer-ism-init.sh +++ b/stack/indexer/indexer-ism-init.sh @@ -19,6 +19,8 @@ INDEXER_URL="https://${INDEXER_HOSTNAME}:9200" # curl settings shortcuts C_AUTH="-u admin:${INDEXER_PASSWORD}" +ALERTS_TEMPLATE="/etc/wazuh-indexer/wazuh-template.json" + ######################################################################### # Creates the rollover_policy ISM policy. # Globals: @@ -127,10 +129,9 @@ function generate_ism_config() { ######################################################################### function load_templates() { # Load wazuh-template.json, needed for initial indices creation. - local wazuh_template_path="/etc/wazuh-indexer/wazuh-template.json" echo "Will create 'wazuh' index template" - if [ -f $wazuh_template_path ]; then - cat $wazuh_template_path | + if [ -f "${ALERTS_TEMPLATE}" ]; then + cat "${ALERTS_TEMPLATE}" | if ! curl -s -k ${C_AUTH} \ -X PUT "${INDEXER_URL}/_template/wazuh" \ -o "${LOG_FILE}" --create-dirs \ @@ -141,7 +142,7 @@ function load_templates() { echo " SUCC: 'wazuh' template created or updated" fi else - echo " ERROR: $wazuh_template_path not found" + echo " ERROR: ${ALERTS_TEMPLATE} not found" fi # Load template for ISM configuration indices @@ -403,6 +404,15 @@ function main() { shift 2 fi ;; + "-t" | "--template") + if [ -z "${2}" ]; then + echo "Error on arguments. Probably missing