Merge branch '4.10' into merge-4.10-into-4.10.2

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

source/_static/js/redirects.js

@@ -104,6 +104,86 @@ 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 */
@@ -122,13 +202,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 ****/

source/_themes/wazuh_doc_theme_v3/src/js-source/utils.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/_themes/wazuh_doc_theme_v3/src/scss/components/_navbar-menu.scss

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

source/_themes/wazuh_doc_theme_v3/template-parts/header.html

@@ -10,6 +10,7 @@
     <div class="container">
       <nav>
         <ul>
+          <li><a href="{{ theme_wazuh_web_url + '/blog/' }}" target="_blank" rel="noreferrer noopener">Blog</a></li>
           <li><a href="{{ theme_wazuh_web_url + '/community/' }}" target="_blank" rel="noreferrer noopener">Community</a></li>
           <li><a href="{{ theme_wazuh_web_url + '/contact-us/' }}" target="_blank" rel="noreferrer noopener">Contact us</a></li>
         </ul>
@@ -89,7 +90,10 @@
                 <a class="nav-link" href="{{ theme_wazuh_web_url + '/cloud/' }}" target="_blank" rel="noreferrer noopener">Cloud</a>
               </li>
               <li class="nav-item">
-                <a class="nav-link" href="{{ theme_wazuh_doc_url + '/current/index.html' }}">Documentation</a>
+                <a class="nav-link" href="https://cti.wazuh.com/" target="_blank" rel="noreferrer noopener">CTI</a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link active" href="{{ theme_wazuh_doc_url + '/current/index.html' }}">Documentation</a>
               </li>
               <li class="nav-item dropdown">
                 <a class="nav-link dropdown-toggle" href="#" id="dropdown-services" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Services<b class="caret d-inline d-sm-none"></b><svg class="d-none d-sm-inline"><use xlink:href="#menu-chevron" /></svg></a>
@@ -116,9 +120,6 @@
                   </li>
                 </ul>
               </li>
-              <li class="nav-item">
-                <a class="nav-link" href="{{ theme_wazuh_web_url + '/blog/' }}" target="_blank" rel="noreferrer noopener">Blog</a>
-              </li>
               <li class="nav-item dropdown">
                 <a class="nav-link dropdown-toggle" href="#" id="dropdown-company" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Company<b class="caret d-inline d-sm-none"></b><svg class="d-none d-sm-inline"><use xlink:href="#menu-chevron" /></svg></a>
                 <ul class="dropdown-menu" aria-labelledby="dropdown-company">

source/cloud-security/azure/index.rst

@@ -25,3 +25,4 @@ This section provides instructions for monitoring Microsoft Azure infrastructure
    storage
    graph
    monitoring-ms-graph
+   ms-intune-integration

source/cloud-security/azure/ms-graph-api-setup.rst

@@ -48,6 +48,8 @@ Certificates & secrets
 
       Ensure you write down the secret's value section because the UI won't let you copy it afterward.
 
+.. _permissions-ms-graph-api-setup:
+
 API permissions
 ---------------