Merge pull request #8172 from wazuh/merge-4.11.0-into-4.12.0

Merge 4.11.0 into 4.12.0

Author: javimed

CHANGELOG.md

@@ -28,6 +28,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

requirements.txt

@@ -2,6 +2,6 @@ Sphinx==7.2.6
 sphinx-tabs==3.4.5
 docutils==0.18.1
 jsmin==3.0.1
-Jinja2==3.1.4
+Jinja2==3.1.5
 Pygments==2.15.1
 sphinx-reredirects==0.1.5

resources/dashboards/MS-graph Intune events.ndjson

@@ -122,13 +122,94 @@ redirections.push(
     '4.9': '/user-manual/wazuh-indexer/wazuh-indexer-tuning.html#set-node-attributes-for-each-node-in-a-cluster',
     '4.10': '/user-manual/wazuh-indexer-cluster/wazuh-indexer-cluster-tuning.html#set-node-attributes-for-each-node-in-a-cluster',
   },
+  {
+    'target': ['4.9=>4.10', '4.10=>4.9'],
+    '4.9': '/user-manual/wazuh-server-cluster.html',
+    '4.10': '/user-manual/wazuh-server-cluster/index.html',
+  },
+  {
+    'target': ['4.9=>4.10', '4.10=>4.9'],
+    '4.9': '/user-manual/wazuh-server-cluster.html#architecture-overview',
+    '4.10': '/user-manual/wazuh-server-cluster/architecture-overview.html',
+  },
+  {
+    'target': ['4.9=>4.10', '4.10=>4.9'],
+    '4.9': '/user-manual/wazuh-server-cluster.html#types-of-nodes-in-a-wazuh-server-cluster',
+    '4.10': '/user-manual/wazuh-server-cluster/types-of-nodes.html',
+  },
+  {
+    'target': ['4.9=>4.10', '4.10=>4.9'],
+    '4.9': '/user-manual/wazuh-server-cluster.html#how-the-wazuh-server-cluster-works',
+    '4.10': '/user-manual/wazuh-server-cluster/how-server-cluster-works.html',
+  },
+  {
+    'target': ['4.9=>4.10', '4.10=>4.9'],
+    '4.9': '/user-manual/wazuh-server-cluster.html#wazuh-cluster-nodes-configuration',
+    '4.10': '/user-manual/wazuh-server-cluster/cluster-nodes-configuration.html',
+  },
+  {
+    'target': ['4.9=>4.10', '4.10=>4.9'],
+    '4.9': '/user-manual/wazuh-server-cluster.html#data-synchronization',
+    '4.10': '/user-manual/wazuh-server-cluster/data-synchronization.html',
+  },
+  {
+    'target': ['4.9=>4.10', '4.10=>4.9'],
+    '4.9': '/user-manual/wazuh-server-cluster.html#certificates-deployment',
+    '4.10': '/user-manual/wazuh-server-cluster/certificates-deployment.html',
+  },
+  {
+    'target': ['4.9=>4.10', '4.10=>4.9'],
+    '4.9': '/user-manual/wazuh-server-cluster.html#adding-new-wazuh-server-nodes',
+    '4.10': '/user-manual/wazuh-server-cluster/adding-new-server-nodes/index.html',
+  },
+  {
+    'target': ['4.9=>4.10', '4.10=>4.9'],
+    '4.9': '/user-manual/wazuh-server-cluster.html#certificates-creation',
+    '4.10': '/user-manual/wazuh-server-cluster/adding-new-server-nodes/certificates-creation.html',
+  },
+  {
+    'target': ['4.9=>4.10', '4.10=>4.9'],
+    '4.9': '/user-manual/wazuh-server-cluster.html#configuring-existing-components-to-connect-with-the-new-node',
+    '4.10': '/user-manual/wazuh-server-cluster/adding-new-server-nodes/configuration-to-connect-with-new-node.html',
+  },
+  {
+    'target': ['4.9=>4.10', '4.10=>4.9'],
+    '4.9': '/user-manual/wazuh-server-cluster.html#wazuh-server-node-s-installation',
+    '4.10': '/user-manual/wazuh-server-cluster/adding-new-server-nodes/server-nodes-installation.html',
+  },
+  {
+    'target': ['4.9=>4.10', '4.10=>4.9'],
+    '4.9': '/user-manual/wazuh-server-cluster.html#testing-the-cluster',
+    '4.10': '/user-manual/wazuh-server-cluster/adding-new-server-nodes/testing-the-cluster.html',
+  },
+  {
+    'target': ['4.9=>4.10', '4.10=>4.9'],
+    '4.9': '/user-manual/wazuh-server-cluster.html#agent-connections',
+    '4.10': '/user-manual/wazuh-server-cluster/agent-connections.html',
+  },
+  {
+    'target': ['4.9=>4.10', '4.10=>4.9'],
+    '4.9': '/user-manual/wazuh-server-cluster.html#load-balancers',
+    '4.10': '/user-manual/wazuh-server-cluster/load-balancers.html',
+  },
+  {
+    'target': ['4.9=>4.10', '4.10=>4.9'],
+    '4.9': '/upgrade-guide/compatibility-matrix/index.html',
+    '4.10': '/upgrade-guide/index.html#wazuh-components-compatibility',
+  },
+  {
+    'target': ['4.9=>4.10', '4.10=>4.9'],
+    '4.9': '/upgrade-guide/manual-backup-restore.html',
+    '4.10': '/upgrade-guide/troubleshooting.html#wazuh-db-backup-restoration',
+  }
 );
 
 /* Pages added in 4.10 */
 
 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',
@@ -139,13 +220,31 @@ newUrls['4.10'] = [
   '/user-manual/wazuh-indexer-cluster/index-lifecycle-management.html',
   '/user-manual/wazuh-indexer-cluster/wazuh-indexer-cluster-tuning.html',
   '/user-manual/wazuh-indexer-cluster/cluster-management.html',
+  '/cloud-security/azure/ms-intune-integration.html',
+  '/user-manual/wazuh-server-cluster/index.html',
+  '/user-manual/wazuh-server-cluster/architecture-overview.html',
+  '/user-manual/wazuh-server-cluster/types-of-nodes.html',
+  '/user-manual/wazuh-server-cluster/how-server-cluster-works.html',
+  '/user-manual/wazuh-server-cluster/cluster-nodes-configuration.html',
+  '/user-manual/wazuh-server-cluster/data-synchronization.html',
+  '/user-manual/wazuh-server-cluster/certificates-deployment.html',
+  '/user-manual/wazuh-server-cluster/adding-new-server-nodes/index.html',
+  '/user-manual/wazuh-server-cluster/adding-new-server-nodes/certificates-creation.html',
+  '/user-manual/wazuh-server-cluster/adding-new-server-nodes/configuration-to-connect-with-new-node.html',
+  '/user-manual/wazuh-server-cluster/adding-new-server-nodes/server-nodes-installation.html',
+  '/user-manual/wazuh-server-cluster/adding-new-server-nodes/testing-the-cluster.html',
+  '/user-manual/wazuh-server-cluster/agent-connections.html',
+  '/user-manual/wazuh-server-cluster/load-balancers.html',
 ]
 
 /* Pages no longer available in 4.10 */
 
 removedUrls['4.10'] = [
   '/user-manual/wazuh-indexer-cluster.html',
   '/user-manual/wazuh-indexer/index-life-management.html',
+  '/user-manual/wazuh-server-cluster.html',
+  '/upgrade-guide/manual-backup-restore.html',
+  '/upgrade-guide/compatibility-matrix/index.html'
 ];
 
 /* *** RELEASE 4.9 ****/

resources/dashboards/MS-graph Intune managed devices and apps.ndjson

@@ -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

source/_static/js/redirects.js

@@ -41,14 +41,14 @@ if ( typeof(versions) === 'undefined' ) {
       if ($(this).closest('.dropdown').hasClass('show')
         && toElement !== $(this).siblings()[0]) {
         e.stopPropagation();
-        $(this).trigger('click');
+        $(this).trigger('click').trigger('blur');
       }
     });
     $('.navbar-nav .dropdown-menu').on('mouseleave', function(e) {
       let toElement = e.toElement || e.relatedTarget;
       if ($(this).closest('.dropdown').hasClass('show')
         && toElement !== $(this).siblings()[0]) {
-        $(this).siblings().trigger('click');
+        $(this).siblings().trigger('click').trigger('blur');
       }
     });
   }

source/_templates/installations/disable-wazuh-updates.rst

@@ -93,6 +93,7 @@ header {
     background-color: $light-color-base-space;
     .nav-link {
       color: $light-color-main-text;
+      &.active,
       &:hover,
       &:focus {
         color: $light-color-primary;
@@ -134,6 +135,7 @@ header {
     background-color: $dark-color-index-header-background;
     .nav-link {
       color: $dark-color-main-text;
+      &.active,
       &:hover,
       &:focus {
         color: $dark-color-primary;