Merge pull request #2751 from wazuh/merge-4.8.2-into-master

Merge 4.8.2 into master
wazuh · Jan 8, 2024 · 1b7947f · 1b7947f
2 parents 9766d74 + 1916ea1
commit 1b7947f
Show file tree

Hide file tree

Showing 21 changed files with 230 additions and 58 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.9.0
 
+## [4.8.2]
+
+- https://github.com/wazuh/wazuh-packages/releases/tag/v4.8.2
+
+## [4.8.1]
+
+- https://github.com/wazuh/wazuh-packages/releases/tag/v4.8.1
+
 ## [4.8.0]
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.8.0

diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec
@@ -292,11 +292,13 @@ rm -fr %{buildroot}
 %changelog
 * Thu May 14 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
+* Wed Mar 26 2024 support <[email protected]> - 4.8.2
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html
 * Tue Feb 13 2024 support <[email protected]> - 4.8.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
 * Wed Jan 31 2024 support <[email protected]> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
-* Sun Dec 17 2023 support <[email protected]> - 4.7.2
+* Tue Jan 09 2024 support <[email protected]> - 4.7.2
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
 * Wed Dec 13 2023 support <[email protected]> - 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
@@ -4,6 +4,12 @@ wazuh-agent (4.9.0-RELEASE) stable; urgency=low
 
  -- Wazuh, Inc <[email protected]>  Thu, 14 May 2024 00:00:00 +0000
 
+wazuh-agent (4.8.2-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html
+
+ -- Wazuh, Inc <[email protected]>  Wed, 26 Mar 2024 00:00:00 +0000
+
 wazuh-agent (4.8.1-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
@@ -20,7 +26,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 <[email protected]>  Sun, 9 Jan 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Tue, 09 Jan 2024 00:00:00 +0000
 
 wazuh-agent (4.7.1-RELEASE) stable; urgency=low
 

diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog
@@ -4,6 +4,12 @@ wazuh-manager (4.9.0-RELEASE) stable; urgency=low
 
  -- Wazuh, Inc <[email protected]>  Thu, 14 May 2024 00:00:00 +0000
 
+wazuh-manager (4.8.2-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html
+
+ -- Wazuh, Inc <[email protected]>  Wed, 26 Mar 2024 00:00:00 +0000
+
 wazuh-manager (4.8.1-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
@@ -20,7 +26,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 <[email protected]>  Sun, 9 Jan 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Tue, 09 Jan 2024 00:00:00 +0000
 
 wazuh-manager (4.7.1-RELEASE) stable; urgency=low
 

diff --git a/ova/generate_ova.sh b/ova/generate_ova.sh
@@ -104,7 +104,7 @@ build_ova() {
     --product "Wazuh v${OVA_VERSION} OVA" \
     --producturl "https://packages.wazuh.com/vm/wazuh-${OVA_VERSION}.ova" \
     --vendor "Wazuh, inc <[email protected]>" --vendorurl "https://wazuh.com" \
-    --version "$OVA_VERSION" --description "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." \
+    --version "$OVA_VERSION" --description "Wazuh enhances security visibility in your infrastructure by monitoring endpoints at the operating system and application levels. Its capabilities include log analysis, file integrity monitoring, intrusion detection, and compliance monitoring." \
     || clean 1
 
     vagrant destroy -f

diff --git a/ova/wazuh_ovf_template b/ova/wazuh_ovf_template
@@ -26,7 +26,7 @@
     </ProductSection>
     <AnnotationSection>
       <Info>A human-readable annotation</Info>
-      <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.</Annotation>
+      <Annotation>Wazuh enhances security visibility in your infrastructure by monitoring endpoints at the operating system and application levels. Its capabilities include log analysis, file integrity monitoring, intrusion detection, and compliance monitoring.</Annotation>
     </AnnotationSection>
     <OperatingSystemSection ovf:id="101" vmw:osType="otherLinux64Guest">
       <Info>The kind of installed guest operating system</Info>

diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec
@@ -627,11 +627,13 @@ rm -fr %{buildroot}
 %changelog
 * Thu May 14 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
+* Wed Mar 26 2024 support <[email protected]> - 4.8.2
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html
 * Tue Feb 13 2024 support <[email protected]> - 4.8.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
 * Wed Jan 31 2024 support <[email protected]> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
-* Sun Dec 17 2023 support <[email protected]> - 4.7.2
+* Tue Jan 09 2024 support <[email protected]> - 4.7.2
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
 * Wed Dec 13 2023 support <[email protected]> - 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
@@ -855,11 +855,13 @@ rm -fr %{buildroot}
 %changelog
 * Thu May 14 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
+* Wed Mar 26 2024 support <[email protected]> - 4.8.2
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html
 * Tue Feb 13 2024 support <[email protected]> - 4.8.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
 * Wed Jan 31 2024 support <[email protected]> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
-* Sun Dec 17 2023 support <[email protected]> - 4.7.2
+* Tue Jan 09 2024 support <[email protected]> - 4.7.2
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
 * Wed Dec 13 2023 support <[email protected]> - 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
@@ -4,6 +4,12 @@ wazuh-dashboard (4.9.0-RELEASE) stable; urgency=low
 
  -- Wazuh, Inc <[email protected]>  Thu, 28 Mar 2024 00:00:00 +0000
 
+wazuh-dashboard (4.8.2-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html
+
+ -- Wazuh, Inc <[email protected]>  Wed, 26 Mar 2024 00:00:00 +0000
+
 wazuh-dashboard (4.8.1-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
@@ -20,7 +26,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 <[email protected]>  Sun, 17 Dec 2023 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Tue, 09 Jan 2024 00:00:00 +0000
 
 wazuh-dashboard (4.7.1-RELEASE) stable; urgency=low
 

diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec
@@ -337,11 +337,13 @@ rm -fr %{buildroot}
 %changelog
 * Thu May 14 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
+* Wed Mar 26 2024 support <[email protected]> - 4.8.2
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html
 * Tue Feb 13 2024 support <[email protected]> - 4.8.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
 * Wed Jan 31 2024 support <[email protected]> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
-* Sun Dec 17 2023 support <[email protected]> - 4.7.2
+* Tue Jan 09 2024 support <[email protected]> - 4.7.2
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
 * Wed Dec 13 2023 support <[email protected]> - 4.7.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html

diff --git 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://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 ./
@@ -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/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,11 +4,12 @@ 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
 Environment=OPENSEARCH_HOME=/usr/share/wazuh-indexer
+Environment=OPENSEARCH_PATH_CONF=/etc/wazuh-indexer/
 WorkingDirectory=/usr/share/wazuh-indexer
 
 [Install]

diff --git 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 <path>         [Optional] Set the destination path of package. By default, an output folder will be created."
-    echo "    --reference <ref>     [Optional] wazuh-packages branch or tag"
-    echo "    --future              [Optional] Build test future package 99.99.0 Used for development purposes."
-    echo "    -r, --revision <rev>  [Optional] Package revision. By default ${revision}"
-    echo "    -h, --help            Show this help."
+    echo "    -s, --store <path>                [Optional] Set the destination path of package. By default, an output folder will be created."
+    echo "    --reference <ref>                 [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 <rev>              [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
@@ -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 <arch>  [Optional] Target architecture of the package [amd64]."
-    echo "    -b, --build-base <yes/no>  [Optional] Build a new base or use a existing one. By default, yes."
-    echo "    -r, --revision <rev>       [Optional] Package revision. By default: 1."
-    echo "    -s, --store <path>         [Optional] Set the destination path of package. By default, an output folder will be created."
-    echo "    --reference <ref>          [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 <arch>         [Optional] Target architecture of the package [amd64]."
+    echo "    -b, --build-base <yes/no>         [Optional] Build a new base or use a existing one. By default, yes."
+    echo "    -r, --revision <rev>              [Optional] Package revision. By default: 1."
+    echo "    -s, --store <path>                [Optional] Set the destination path of package. By default, an output folder will be created."
+    echo "    --reference <ref>                 [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/changelog b/stack/indexer/deb/debian/changelog
@@ -4,6 +4,12 @@ wazuh-indexer (4.9.0-RELEASE) stable; urgency=low
 
  -- Wazuh, Inc <[email protected]>  Thu, 28 Mar 2024 00:00:00 +0000
 
+wazuh-indexer (4.8.2-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html
+
+ -- Wazuh, Inc <[email protected]>  Wed, 26 Mar 2024 00:00:00 +0000
+
 wazuh-indexer (4.8.1-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
@@ -20,7 +26,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 <[email protected]>  Sun, 17 Dec 2023 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Tue, 09 Jan 2024 00:00:00 +0000
 
 wazuh-indexer (4.7.1-RELEASE) stable; urgency=low
 

diff --git 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
@@ -167,6 +168,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 {} \;