Merge pull request #8132 from wazuh/merge-4.10.2-into-4.11.0

Merge 4.10.2 into 4.11.0
wazuh · Jan 24, 2025 · 6427795 · 6427795
2 parents 749bd05 + 2712165
commit 6427795
Show file tree

Hide file tree

Showing 16 changed files with 112 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,10 @@ All notable changes to this project will be documented in this file.
 
 - Removed note about plugins and upgrading Wazuh central components. ([#8020](https://github.com/wazuh/wazuh-documentation/pull/8020))
 
+# [v4.10.2]
+
+- Support for Wazuh 4.10.2
+
 # [v4.10.1]
 
 - Support for Wazuh 4.10.1

diff --git a/resources/dashboards/MS-graph Intune events.ndjson b/resources/dashboards/MS-graph Intune events.ndjson
diff --git a/resources/dashboards/MS-graph Intune managed devices and apps.ndjson b/resources/dashboards/MS-graph Intune managed devices and apps.ndjson
diff --git a/source/_static/js/redirects.js b/source/_static/js/redirects.js
@@ -120,6 +120,7 @@ redirections.push(
 newUrls['4.10'] = [
   '/release-notes/release-4-10-0.html',
   '/release-notes/release-4-10-1.html',
+  '/release-notes/release-4-10-2.html',
   '/user-manual/reference/ossec-conf/anti-tampering.html',
   '/user-manual/capabilities/vulnerability-detection/troubleshooting.html',
   '/user-manual/capabilities/vulnerability-detection/FAQ.html',

diff --git a/source/_templates/installations/disable-wazuh-updates.rst b/source/_templates/installations/disable-wazuh-updates.rst
@@ -0,0 +1,26 @@
+.. Copyright (C) 2015, Wazuh, Inc.
+
+.. note::
+
+   **Recommended Action**: Disable Wazuh Updates.
+
+   We recommend disabling the Wazuh package repositories after installation to prevent accidental upgrades that could break the environment.
+
+   Execute the following command to disable the Wazuh repository:
+
+   .. tabs::
+
+      .. group-tab:: YUM
+
+         .. code-block:: console
+
+            # sed -i "s/^enabled=1/enabled=0/" /etc/yum.repos.d/wazuh.repo
+
+      .. group-tab:: APT (Debian/Ubuntu)
+
+         .. code-block:: console
+
+            # sed -i "s/^deb /#deb /" /etc/apt/sources.list.d/wazuh.list
+            # apt update
+
+.. End of include file
diff --git a/source/installation-guide/wazuh-dashboard/installation-assistant.rst b/source/installation-guide/wazuh-dashboard/installation-assistant.rst
@@ -55,6 +55,7 @@ Wazuh dashboard installation
 
    When you access the Wazuh dashboard for the first time, the browser shows a warning message stating that the certificate was not issued by a trusted authority. An exception can be added in the advanced options of the web browser. For increased security, the ``root-ca.pem`` file previously generated can be imported to the certificate manager of the browser instead. Alternatively, a certificate from a trusted authority can be configured. 
 
+.. include:: /_templates/installations/disable-wazuh-updates.rst
 
 Next steps
 ----------

diff --git a/source/installation-guide/wazuh-dashboard/step-by-step.rst b/source/installation-guide/wazuh-dashboard/step-by-step.rst
@@ -120,6 +120,8 @@ Starting the Wazuh dashboard service
 
    When you access the Wazuh dashboard for the first time, the browser shows a warning message stating that the certificate was not issued by a trusted authority. An exception can be added in the advanced options of the web browser. For increased security, the ``root-ca.pem``  file previously generated can be imported to the certificate manager of the browser. Alternatively, a certificate from a trusted authority can be configured.
 
+.. include:: /_templates/installations/disable-wazuh-updates.rst
+
 Securing your Wazuh installation
 --------------------------------
 

diff --git a/source/installation-guide/wazuh-indexer/installation-assistant.rst b/source/installation-guide/wazuh-indexer/installation-assistant.rst
@@ -156,6 +156,8 @@ Testing the cluster installation
 
       # curl -k -u admin:<ADMIN_PASSWORD> https://<WAZUH_INDEXER_IP>:9200/_cat/nodes?v
 
+.. include:: /_templates/installations/disable-wazuh-updates.rst
+
 Next steps
 ----------
 

diff --git a/source/installation-guide/wazuh-indexer/step-by-step.rst b/source/installation-guide/wazuh-indexer/step-by-step.rst
@@ -164,6 +164,7 @@ Starting the service
 
 Repeat this stage of the installation process for every Wazuh indexer node in your cluster. Then proceed with initializing your single-node or multi-node cluster in the next stage.
 
+.. include:: /_templates/installations/disable-wazuh-updates.rst
 
 3. Cluster initialization
 -------------------------

diff --git a/source/installation-guide/wazuh-server/installation-assistant.rst b/source/installation-guide/wazuh-server/installation-assistant.rst
@@ -32,6 +32,8 @@ Your Wazuh server is now successfully installed.
 
 - If you want a Wazuh server multi-node cluster, repeat this process on every Wazuh server node.
 
+.. include:: /_templates/installations/disable-wazuh-updates.rst
+
 Next steps
 ----------
 

diff --git a/source/installation-guide/wazuh-server/step-by-step.rst b/source/installation-guide/wazuh-server/step-by-step.rst
@@ -212,6 +212,8 @@ Starting the Filebeat service
 
 Your Wazuh server node is now successfully installed. Repeat this stage of the installation process for every Wazuh server node in your Wazuh cluster, then proceed with configuring the Wazuh cluster. If you want a Wazuh server single-node cluster, everything is set and you can proceed directly with :doc:`../wazuh-dashboard/step-by-step`.
 
+.. include:: /_templates/installations/disable-wazuh-updates.rst
+
 2. Cluster configuration for multi-node deployment
 --------------------------------------------------
 .. raw:: html

diff --git a/source/quickstart.rst b/source/quickstart.rst
@@ -98,6 +98,8 @@ When you access the Wazuh dashboard for the first time, the browser shows a warn
 
 If you want to uninstall the Wazuh central components, run the Wazuh installation assistant using the option ``-u`` or ``–-uninstall``.
 
+.. include:: /_templates/installations/disable-wazuh-updates.rst
+
 Next steps
 ----------
 

diff --git a/source/release-notes/index-4x.rst b/source/release-notes/index-4x.rst
@@ -12,6 +12,7 @@ This section summarizes the most important features of each Wazuh 4.x release.
 Wazuh version                                  Release date
 =============================================  ====================
 :doc:`4.11.0 </release-notes/release-4-11-0>`  TBD
+:doc:`4.10.2 </release-notes/release-4-10-2>`  TBD
 :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
@@ -76,6 +77,7 @@ Wazuh version                                  Release date
    .. toctree::
 
       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,6 +12,7 @@ This section summarizes the most important features of each Wazuh release.
 Wazuh version                                    Release date
 ==============================================   ====================
 :doc:`4.11.0 </release-notes/release-4-11-0>`    TBD
+:doc:`4.10.2 </release-notes/release-4-10-2>`    TBD
 :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

diff --git a/source/release-notes/release-4-10-2.rst b/source/release-notes/release-4-10-2.rst
@@ -0,0 +1,42 @@
+.. Copyright (C) 2015, Wazuh, Inc.
+.. meta::
+   :description: Wazuh 4.10.2 has been released. Check out our release notes to discover the changes and additions of this release.
+
+4.10.2 Release notes - TBD
+==========================
+
+This section lists the changes in version 4.10.2. Every update of the Wazuh solution is cumulative and includes all enhancements and fixes from previous releases.
+
+What's new
+----------
+
+This release includes new features or enhancements as the following:
+
+Resolved issues
+---------------
+
+This release resolves known issues as the following:
+
+Changelogs
+----------
+
+The repository changelogs provide more details about the changes.
+
+Product repositories
+^^^^^^^^^^^^^^^^^^^^
+
+-  `wazuh/wazuh <https://github.com/wazuh/wazuh/blob/v4.10.2/CHANGELOG.md>`__
+-  `wazuh/wazuh-dashboard-plugins <https://github.com/wazuh/wazuh-dashboard-plugins/blob/v4.10.2/CHANGELOG.md>`__
+
+Auxiliary repositories
+^^^^^^^^^^^^^^^^^^^^^^^
+
+-  `wazuh/wazuh-ansible <https://github.com/wazuh/wazuh-ansible/blob/v4.10.2/CHANGELOG.md>`__
+-  `wazuh/wazuh-kubernetes <https://github.com/wazuh/wazuh-kubernetes/blob/v4.10.2/CHANGELOG.md>`__
+-  `wazuh/wazuh-puppet <https://github.com/wazuh/wazuh-puppet/blob/v4.10.2/CHANGELOG.md>`__
+-  `wazuh/wazuh-docker <https://github.com/wazuh/wazuh-docker/blob/v4.10.2/CHANGELOG.md>`__
+
+-  `wazuh/wazuh-qa <https://github.com/wazuh/wazuh-qa/blob/v4.10.2/CHANGELOG.md>`__
+-  `wazuh/qa-integration-framework <https://github.com/wazuh/qa-integration-framework/blob/v4.10.2/CHANGELOG.md>`__
+
+-  `wazuh/wazuh-documentation <https://github.com/wazuh/wazuh-documentation/blob/v4.10.2/CHANGELOG.md>`__
diff --git a/source/user-manual/capabilities/vulnerability-detection/offline-update.rst b/source/user-manual/capabilities/vulnerability-detection/offline-update.rst
@@ -22,8 +22,8 @@ We regularly publish a snapshot of the threat intelligence repository to the Cyb
 .. code-block:: none
    :class: output
 
-   https://s3.us-east-1.amazonaws.com/cti-snapshots-pro/store/contexts/vd_1.0.0/consumers/vd_4.8.0/cves.file.zip
-   2023-12-14T11:12:18.241777Z
+   https://cti.wazuh.com/store/contexts/vd_1.0.0/consumers/vd_4.8.0/1251692_1737570906.zip
+   2025-01-22T18:35:06.662375Z
 
 Configure offline vulnerability detection
 -----------------------------------------
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,6 +55,7 @@ Wazuh dashboard installation @@
        When you access the Wazuh dashboard for the first time, the browser shows a warning message stating that the certificate was not issued by a trusted authority. An exception can be added in the advanced options of the web browser. For increased security, the ``root-ca.pem`` file previously generated can be imported to the certificate manager of the browser instead. Alternatively, a certificate from a trusted authority can be configured.
+    .. include:: /_templates/installations/disable-wazuh-updates.rst
     Next steps
     ----------
@@ Expand Down @@