Merge pull request #8210 from wazuh/merge-4.11.1-into-4.12.0

Merge 4.11.1 into 4.12.0
wazuh · Feb 21, 2025 · 2d53fc4 · 2d53fc4
2 parents 1d19003 + 8ab70f5
commit 2d53fc4
Show file tree

Hide file tree

Showing 19 changed files with 117 additions and 81 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,16 +13,22 @@ All notable changes to this project will be documented in this file.
 - Updated Wazuh dashboard package generation guide. ([#7961](https://github.com/wazuh/wazuh-documentation/pull/7961))
 - Updated images in FIM PoC. [#7979](https://github.com/wazuh/wazuh-documentation/pull/7979)
 
+# [v4.11.1]
+
+- Support for Wazuh 4.11.1
+
 ## [v4.11.0]
 
 ### Added
 
 - Added architecture information to assistant pages. ([#7830](https://github.com/wazuh/wazuh-documentation/pull/7830))
+- Added CISA to the vulnerability source enumerations and compatibility matrix. ([#8201](https://github.com/wazuh/wazuh-documentation/pull/8201))
 
 ### Changed
 
 - Updated note about uninstalling Wazuh agents in Solaris. ([#7925](https://github.com/wazuh/wazuh-documentation/pull/7925))
 - Updated screenshots from System Inventory.  ([#8044](https://github.com/wazuh/wazuh-documentation/pull/8044))
+- Updated the Virtual Machine (OVA) and Amazon Machine Images (AMI) sections. Updated the operating system component to AL2023. ([#8201](https://github.com/wazuh/wazuh-documentation/pull/8201))
 
 ### Removed
 

diff --git a/source/_static/js/redirects.js b/source/_static/js/redirects.js
@@ -80,6 +80,7 @@ newUrls['4.12'] = [
 
 newUrls['4.11'] = [
   '/release-notes/release-4-11-0.html',
+  '/release-notes/release-4-11-1.html',
 ]
 
 /* *** RELEASE 4.10 ****/

diff --git a/source/compliance/hipaa/vulnerability-detection.rst b/source/compliance/hipaa/vulnerability-detection.rst
@@ -2,11 +2,11 @@
 
 .. meta::
   :description: The Vulnerability Detection module helps in meeting HIPAA compliance. Learn more about it in this section of the Wazuh documentation.
-  
+
 Vulnerability detection
 =======================
 
-Wazuh detects vulnerabilities in the applications installed on monitored endpoints using the Vulnerability Detection module. It performs a software audit by querying our Cyber Threat Intelligence (CTI) API for vulnerability content documents. We aggregate vulnerability information into the CTI repository from external vulnerability sources indexed by Canonical, Debian, Red Hat, Arch Linux, Amazon Linux Advisories Security (ALAS), Microsoft, and the National Vulnerability Database (NVD). We also maintain the integrity of our vulnerability data and the vulnerabilities repository updated, ensuring the solution checks for the latest CVEs. The Vulnerability detection module correlates this information with data from the endpoint application inventory.
+Wazuh detects vulnerabilities in the applications installed on monitored endpoints using the Vulnerability Detection module. It performs a software audit by querying our Cyber Threat Intelligence (CTI) API for vulnerability content documents. We aggregate vulnerability information into the CTI repository from external vulnerability sources indexed by Canonical, Debian, Red Hat, Arch Linux, Amazon Linux Advisories Security (ALAS), Microsoft, CISA, and the National Vulnerability Database (NVD). We also maintain the integrity of our vulnerability data and the vulnerabilities repository updated, ensuring the solution checks for the latest CVEs. The Vulnerability detection module correlates this information with data from the endpoint application inventory.
 
 The Vulnerability Detection module helps to implement the following HIPAA section:
 

diff --git a/source/compliance/nist/vulnerability-detection.rst b/source/compliance/nist/vulnerability-detection.rst
@@ -6,7 +6,7 @@
 Vulnerability detection
 =======================
 
-The Wazuh Vulnerability Detection module performs a software audit. It identifies vulnerabilities in the operating system and installed applications in monitored endpoints. The module queries our Cyber Threat Intelligence (CTI) API for vulnerability content documents. We aggregate vulnerability information into the CTI repository from external vulnerability sources indexed by Canonical, Debian, Red Hat, Arch Linux, Amazon Linux Advisories Security (ALAS), Microsoft, and the National Vulnerability Database (NVD). We also maintain the integrity of our vulnerability data and the vulnerabilities repository updated, ensuring the solution checks for the latest CVEs. The Vulnerability detection module correlates this information with data from the endpoint application inventory.
+The Wazuh Vulnerability Detection module performs a software audit. It identifies vulnerabilities in the operating system and installed applications in monitored endpoints. The module queries our Cyber Threat Intelligence (CTI) API for vulnerability content documents. We aggregate vulnerability information into the CTI repository from external vulnerability sources indexed by Canonical, Debian, Red Hat, Arch Linux, Amazon Linux Advisories Security (ALAS), Microsoft, CISA, and the National Vulnerability Database (NVD). We also maintain the integrity of our vulnerability data and the vulnerabilities repository updated, ensuring the solution checks for the latest CVEs. The Vulnerability detection module correlates this information with data from the endpoint application inventory.
 
 The :doc:`Vulnerability Detection </user-manual/capabilities/vulnerability-detection/index>` module helps to implement the following NIST 800-53 controls:
 

diff --git a/source/compliance/pci-dss/vulnerability-detection.rst b/source/compliance/pci-dss/vulnerability-detection.rst
@@ -6,7 +6,7 @@
 Vulnerability detection
 =======================
 
-Wazuh is able to detect vulnerabilities in the applications installed on agents using the Vulnerability Detection module. This software audit is performed by querying our Cyber Threat Intelligence (CTI) API for vulnerability content documents. We aggregate vulnerability information into the CTI repository from external vulnerability sources indexed by Canonical, Debian, Red Hat, Arch Linux, Amazon Linux Advisories Security (ALAS), Microsoft, and the National Vulnerability Database (NVD). We also maintain the integrity of our vulnerability data and the vulnerabilities repository updated, ensuring the solution checks for the latest CVEs. The Vulnerability detection module correlates this information with data from the endpoint application inventory.
+Wazuh is able to detect vulnerabilities in the applications installed on agents using the Vulnerability Detection module. This software audit is performed by querying our Cyber Threat Intelligence (CTI) API for vulnerability content documents. We aggregate vulnerability information into the CTI repository from external vulnerability sources indexed by Canonical, Debian, Red Hat, Arch Linux, Amazon Linux Advisories Security (ALAS), Microsoft, CISA, and the National Vulnerability Database (NVD). We also maintain the integrity of our vulnerability data and the vulnerabilities repository updated, ensuring the solution checks for the latest CVEs. The Vulnerability detection module correlates this information with data from the endpoint application inventory.
 
 The vulnerability detection module helps to meet the following PCI DSS requirements:
 

diff --git a/source/compliance/tsc/common-criteria/cc7.1.rst b/source/compliance/tsc/common-criteria/cc7.1.rst
@@ -15,7 +15,7 @@ The use case below shows how Wazuh assists in meeting this requirement.
 Use case: Monitoring a CentOS endpoint for vulnerabilities
 ----------------------------------------------------------
 
-Wazuh helps meet the *common criteria CC7.1* by providing the Vulnerability Detection module. This module can uncover vulnerabilities in operating systems and installed applications. It performs a software audit by querying our Cyber Threat Intelligence (CTI) API for vulnerability content documents. We aggregate vulnerability information into the CTI repository from external vulnerability sources indexed by Canonical, Debian, Red Hat, Arch Linux, Amazon Linux Advisories Security (ALAS), Microsoft, and the National Vulnerability Database (NVD). We also maintain the integrity of our vulnerability data and the vulnerabilities repository updated, ensuring the solution checks for the latest CVEs. The Vulnerability detection module correlates this information with data from the endpoint application inventory.
+Wazuh helps meet the *common criteria CC7.1* by providing the Vulnerability Detection module. This module can uncover vulnerabilities in operating systems and installed applications. It performs a software audit by querying our Cyber Threat Intelligence (CTI) API for vulnerability content documents. We aggregate vulnerability information into the CTI repository from external vulnerability sources indexed by Canonical, Debian, Red Hat, Arch Linux, Amazon Linux Advisories Security (ALAS), Microsoft, CISA, and the National Vulnerability Database (NVD). We also maintain the integrity of our vulnerability data and the vulnerabilities repository updated, ensuring the solution checks for the latest CVEs. The Vulnerability detection module correlates this information with data from the endpoint application inventory.
 
 In this use case, you can see how the Wazuh Vulnerability Detection module detects vulnerabilities on a CentOS 8 endpoint.
 

diff --git a/source/deployment-options/amazon-machine-images/amazon-machine-images.rst b/source/deployment-options/amazon-machine-images/amazon-machine-images.rst
@@ -6,7 +6,7 @@
 Amazon Machine Images (AMI)
 ===========================
 
-Wazuh provides a pre-built Amazon Machine Image (AMI). An AMI is a pre-configured template that is ready to use for creating a virtual computing environment within the Amazon Elastic Compute Cloud (Amazon EC2). The latest Wazuh AMI packages together Amazon Linux 2 with the following central components for your Wazuh server:
+Wazuh provides a pre-built Amazon Machine Image (AMI). An AMI is a ready-to-use template for creating virtual computing environments in Amazon Elastic Compute Cloud (Amazon EC2). The latest Wazuh AMI includes Amazon Linux 2023 and the Wazuh central components.
 
 - Wazuh manager |WAZUH_CURRENT_AMI|
 - Filebeat-OSS |FILEBEAT_LATEST_AMI|
@@ -20,11 +20,11 @@ Packages list
 
 .. |var_WAZUH_CURRENT_AMI| replace:: |WAZUH_CURRENT_AMI|
 
-+------------------+--------------+-------------+-------------------------+---------------------+
-| Distribution     | Architecture | VM Format   | Latest version          | Product page        |
-+==================+==============+=============+=========================+=====================+
-| Amazon Linux 2   | 64-bit       | AWS AMI     | |var_WAZUH_CURRENT_AMI| | |AMI_PRODUCT_PAGE|  |
-+------------------+--------------+-------------+-------------------------+---------------------+
++---------------------+--------------+-------------+-------------------------+---------------------+
+| Distribution        | Architecture | VM Format   | Latest version          | Product page        |
++=====================+==============+=============+=========================+=====================+
+| Amazon Linux 2023   | 64-bit       | AWS AMI     | |var_WAZUH_CURRENT_AMI| | |AMI_PRODUCT_PAGE|  |
++---------------------+--------------+-------------+-------------------------+---------------------+
 
 Deployment alternatives
 -----------------------

diff --git a/source/deployment-options/deploying-with-puppet/wazuh-puppet-module/index.rst b/source/deployment-options/deploying-with-puppet/wazuh-puppet-module/index.rst
@@ -293,8 +293,8 @@ Indexer users
    .. code-block:: puppet
 
       node "puppet-agent.com" {
-        class { 'wazuh::dashboard':
-          dashboard_password => '<NEW_PASSWORD>'
+        class { 'wazuh::filebeat_oss':
+          filebeat_oss_elastic_password  => '<NEW_PASSWORD>'
         }
       }
 
@@ -303,8 +303,8 @@ Indexer users
    .. code-block:: puppet
 
       node "puppet-agent.com" {
-        class { 'wazuh::filebeat_oss':
-          filebeat_oss_elastic_password  => '<NEW_PASSWORD>'
+        class { 'wazuh::dashboard':
+          dashboard_password => '<NEW_PASSWORD>'
         }
       }
 

diff --git a/source/deployment-options/virtual-machine/virtual-machine.rst b/source/deployment-options/virtual-machine/virtual-machine.rst
@@ -11,25 +11,24 @@ Virtual Machine (OVA)
 Wazuh provides a pre-built virtual machine image in Open Virtual Appliance (OVA) format. This can be directly imported to VirtualBox or other OVA compatible virtualization systems. Take into account that this VM only runs on 64-bit systems with x86_64/AMD64 architecture. It does not provide high availability and scalability out of the box. However, these can be implemented by using :doc:`distributed deployment </installation-guide/index>`.
 
 
-Download the `virtual appliance (OVA) <https://packages.wazuh.com/|WAZUH_CURRENT_MAJOR_OVA|/vm/wazuh-|WAZUH_CURRENT_OVA|.ova>`_, which contains the following components:
+Download the `virtual appliance (OVA) <https://packages.wazuh.com/|WAZUH_CURRENT_MAJOR_OVA|/vm/wazuh-|WAZUH_CURRENT_OVA|.ova>`_, which includes Amazon Linux 2023 and the Wazuh central components.
 
-    - Amazon Linux 2
-    - Wazuh manager |WAZUH_CURRENT_OVA|
-    - Wazuh indexer |WAZUH_CURRENT_OVA|
-    - Filebeat-OSS |FILEBEAT_LATEST_OVA|
-    - Wazuh dashboard |WAZUH_CURRENT_OVA|
+-  Wazuh manager |WAZUH_CURRENT_OVA|
+-  Filebeat-OSS |FILEBEAT_LATEST_OVA|
+-  Wazuh indexer |WAZUH_CURRENT_OVA|
+-  Wazuh dashboard |WAZUH_CURRENT_OVA|
 
 Packages list
 -------------
 
-.. |VM_AL2_64_OVA| replace:: `wazuh-|WAZUH_CURRENT_OVA|.ova <https://packages.wazuh.com/|WAZUH_CURRENT_MAJOR_OVA|/vm/wazuh-|WAZUH_CURRENT_OVA|.ova>`__ (`sha512 <https://packages.wazuh.com/|WAZUH_CURRENT_MAJOR_OVA|/checksums/wazuh/|WAZUH_CURRENT_OVA|/wazuh-|WAZUH_CURRENT_OVA|.ova.sha512>`__)
+.. |VM_AL_64_OVA| replace:: `wazuh-|WAZUH_CURRENT_OVA|.ova <https://packages.wazuh.com/|WAZUH_CURRENT_MAJOR_OVA|/vm/wazuh-|WAZUH_CURRENT_OVA|.ova>`__ (`sha512 <https://packages.wazuh.com/|WAZUH_CURRENT_MAJOR_OVA|/checksums/wazuh/|WAZUH_CURRENT_OVA|/wazuh-|WAZUH_CURRENT_OVA|.ova.sha512>`__)
 .. |WAZUH_OVA_VERSION| replace:: |WAZUH_CURRENT_OVA|
 
-+----------------+-----------------------------------+--------------+----------------------+------------------+
-|  Distribution  | Architecture                      | VM Format    | Version              | Package          |
-+================+===================================+==============+======================+==================+
-| Amazon Linux 2 | 64-bit x86_64/AMD64 architecture  |      OVA     | |WAZUH_OVA_VERSION|  | |VM_AL2_64_OVA|  |
-+----------------+-----------------------------------+--------------+----------------------+------------------+
++-------------------+-----------------------------------+--------------+----------------------+-----------------+
+|  Distribution     | Architecture                      | VM Format    | Version              | Package         |
++===================+===================================+==============+======================+=================+
+| Amazon Linux 2023 | 64-bit x86_64/AMD64 architecture  |      OVA     | |WAZUH_OVA_VERSION|  | |VM_AL_64_OVA|  |
++-------------------+-----------------------------------+--------------+----------------------+-----------------+
 
 Hardware requirements
 ---------------------

diff --git a/source/release-notes/index-4x.rst b/source/release-notes/index-4x.rst
@@ -12,8 +12,8 @@ This section summarizes the most important features of each Wazuh 4.x release.
 Wazuh version                                  Release date
 =============================================  ====================
 :doc:`4.12.0 </release-notes/release-4-12-0>`  TBD
-:doc:`4.11.0 </release-notes/release-4-11-0>`  TBD
-:doc:`4.10.2 </release-notes/release-4-10-2>`  TBD
+:doc:`4.11.1 </release-notes/release-4-11-1>`  TBD
+:doc:`4.11.0 </release-notes/release-4-11-0>`  20 February 2025
 :doc:`4.10.1 </release-notes/release-4-10-1>`  16 January 2025
 :doc:`4.10.0 </release-notes/release-4-10-0>`  9 January 2025
 :doc:`4.9.2 </release-notes/release-4-9-2>`    4 November 2024
@@ -78,8 +78,8 @@ Wazuh version                                  Release date
    .. toctree::
 
       4.12.0 Release notes <release-4-12-0>
+      4.11.1 Release notes <release-4-11-1>
       4.11.0 Release notes <release-4-11-0>
-      4.10.2 Release notes <release-4-10-2>
       4.10.1 Release notes <release-4-10-1>
       4.10.0 Release notes <release-4-10-0>
       4.9.2 Release notes <release-4-9-2>

diff --git a/source/release-notes/index.rst b/source/release-notes/index.rst
@@ -12,8 +12,8 @@ This section summarizes the most important features of each Wazuh release.
 Wazuh version                                    Release date
 ==============================================   ====================
 :doc:`4.12.0 </release-notes/release-4-12-0>`    TBD
-:doc:`4.11.0 </release-notes/release-4-11-0>`    TBD
-:doc:`4.10.2 </release-notes/release-4-10-2>`    TBD
+:doc:`4.11.1 </release-notes/release-4-11-1>`    TBD
+:doc:`4.11.0 </release-notes/release-4-11-0>`    20 February 2025
 :doc:`4.10.1 </release-notes/release-4-10-1>`    16 January 2025
 :doc:`4.10.0 </release-notes/release-4-10-0>`    9 January 2025
 :doc:`4.9.2 </release-notes/release-4-9-2>`      4 November 2024