Merge pull request #8905 from wazuh/merge-4.12-into-4.13.0

Merge 4.12 into 4.13.0

Author: javimed

CHANGELOG.md

@@ -51,6 +51,7 @@ All notable changes to this project will be documented in this file.
 - **Post-release**: Added a Q&A to the Cloud service FAQ section. ([#8832](https://github.com/wazuh/wazuh-documentation/pull/8832))
 - **Post-release**: Added agent restart commands to Agent enrollment methods section. ([#8836](https://github.com/wazuh/wazuh-documentation/pull/8836))
 - **Post-release**: Added Wazuh Docker support for Windows. ([#8852](https://github.com/wazuh/wazuh-documentation/pull/8852))
+- **Post-release**: Added new steps and images to the API Permission section of the *Wazuh Microsoft Graph API* setup documentation. ([#8898](https://github.com/wazuh/wazuh-documentation/pull/8898))
 
 ### Changed
 
@@ -85,6 +86,7 @@ All notable changes to this project will be documented in this file.
 - **Post-release**: Changed Suricata ruleset file permission in POC guide. ([#8821](https://github.com/wazuh/wazuh-documentation/pull/8821))
 - **Post-release**: Adjusted the Data analysis documentation. ([#8850](https://github.com/wazuh/wazuh-documentation/pull/8850))
 - **Post-release**: Updated images and powershell command in **Leveraging LLMs for alert enrichment** PoC. [#8888](https://github.com/wazuh/wazuh-documentation/pull/8888)
+- **Post-release**: Updated RBAC reference to show actual policy names with wildcards. ([#8904](https://github.com/wazuh/wazuh-documentation/pull/8904))
 
 ### Fixed
 
@@ -96,6 +98,7 @@ All notable changes to this project will be documented in this file.
 - **Post-release**: Fixed incorrect reference from **Ubuntu** to **Windows** endpoint in the SCA use case documentation. ([#8629](https://github.com/wazuh/wazuh-documentation/pull/8629))
 - **Post-release**: Fixed incorrect URL and filepaths in the YARA download steps of the *Leveraging LLMs for Alert Enrichment* PoC. ([#8686](https://github.com/wazuh/wazuh-documentation/pull/8686))
 - **Post-release**: Corrected inaccurate references to the Wazuh Syscollector module. ([#8713](https://github.com/wazuh/wazuh-documentation/pull/8713))
+- **Post-release**: Corrected git command syntax in the Wazuh dashboard package generation guide. ([#8903](https://github.com/wazuh/wazuh-documentation/pull/8903))
 
 ### Removed
 

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

@@ -57,7 +57,12 @@ Your application needs specific API permissions to retrieve logs and events from
 
 To configure the application permissions, go to the **API permissions** page and choose **Add a permission**.
 
-#. Select **Microsoft Graph API** and click on **Application permissions**.
+#. Select **Microsoft Graph API** and click on **Application permissions**:
+
+   .. thumbnail:: /images/cloud-security/ms-graph/select-api-permissions.png
+      :align: center
+      :width: 80%
+
 #. Add the following relationships' permissions under the **SecurityAlert** and **SecurityIncident** sections:
 
    -  ``SecurityAlert.Read.All``: This permission is required to read security alerts from the ``/security/alerts_v2`` API on your tenant.
@@ -78,10 +83,18 @@ To configure the application permissions, go to the **API permissions** page and
       :alt: API permissions Intune
       :align: center
       :width: 100%
+      
+#. Use an admin user to **Grant admin consent** for the tenant:
 
-.. note::
+   .. thumbnail:: /images/cloud-security/ms-graph/grant-admin-consent.png
+      :title: API permissions Intune
+      :alt: API permissions Intune
+      :align: center
+      :width: 100%
 
-   Admin consent is required for API permission changes.
+   .. note::
+   
+      Admin consent is required for API permission changes.
 
 Wazuh server or agent
 ---------------------
@@ -133,6 +146,22 @@ Next, we will see the necessary configuration to allow the integration to succes
    -  ``<name>`` specifies the resource's name (i.e., specific API endpoint) to query for logs.
    -  ``<relationship>`` specifies the types of content (relationships) to obtain logs for.
 
+#. Restart your Wazuh server or agent, depending on where you configured the Wazuh module for Microsoft Graph.
+
+   .. tabs::
+   
+      .. tab:: Wazuh agent
+   
+         .. code-block:: console
+   
+            # systemctl restart wazuh-agent
+   
+      .. tab:: Wazuh manager
+   
+         .. code-block:: console
+   
+            # systemctl restart wazuh-manager
+       
    .. note::
 
       Multi-tenant is not supported. You can only configure one block of ``api_auth``. To learn more about the Wazuh module for Microsoft Graph options, see the :doc:`ms-graph </user-manual/reference/ossec-conf/ms-graph-module>` reference.

source/development/packaging/generate-dashboard-package.rst

@@ -53,7 +53,7 @@ Follow the steps below to build the packages:
 
    .. code:: console
 
-      $ git clone -b v|WAZUH_CURRENT| https://github.com/wazuh/wazuh-dashboard.git && && cd wazuh-dashboard/ && git checkout v|WAZUH_CURRENT|
+      $ git clone -b v|WAZUH_CURRENT| https://github.com/wazuh/wazuh-dashboard.git && cd wazuh-dashboard/
       $ nvm install $(cat .nvmrc)
       $ nvm use $(cat .nvmrc)
       $ yarn osd bootstrap