Merge pull request #301237 from MicrosoftDocs/main

v-ccolin · web-flow · commit d6c135c892bf · 2025-06-12T12:15:40.000+01:00
Merge main to live, 4 AM
diff --git a/articles/application-gateway/monitor-application-gateway-reference.md b/articles/application-gateway/monitor-application-gateway-reference.md
@@ -1,7 +1,7 @@
 ---
 title: Monitoring data reference for Azure Application Gateway
 description: This article contains important reference material you need when you monitor Azure Application Gateway.
-ms.date: 05/12/2025
+ms.date: 06/04/2025
 ms.custom: horz-monitor
 ms.topic: reference
 author: mbender-ms
@@ -494,6 +494,7 @@ Application Gateway's Layer 4 proxy provides log data through access logs. These
 | sslProtocol | SSL/TLS protocol being used (for TLS protocol listeners). |
 | serverRouted | The backend server IP and port number to which the traffic was routed. |
 | serverStatus | 200 - session completed successfully. 400 - client data couldn't be parsed. 500 - internal server error. 502 - bad gateway. For example, when an upstream server couldn't be reached. 503 - service unavailable. For example, if access is limited by the number of connections. |
+| error_info | The reason for the error as per serverStatus code. |
 | ResourceId | Application Gateway resource URI. |
 
 [!INCLUDE [horz-monitor-ref-activity-log](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-activity-log.md)]
diff --git a/articles/backup/backup-azure-vm-backup-faq.yml b/articles/backup/backup-azure-vm-backup-faq.yml
@@ -4,7 +4,7 @@ metadata:
   description: In this article, discover answers to common questions about backing up Azure VMs with the Azure Backup service.
   ms.topic: faq
   ms.service: azure-backup
-  ms.date: 05/12/2025
+  ms.date: 06/12/2025
   author: jyothisuri
   ms.author: jsuri
   ms.custom: build-2025
@@ -149,6 +149,10 @@ sections:
         answer: |
           No, you can't retain one single restore point. When you delete the previous restore points, the chain gets deleted. Therefore, you can't selectively retain or delete a recovery point.
 
+      - question: In Azure VM Backup, what is the Snapshot Tier and Storage Redundancy for snapshot taken as part of backup?
+        answer: |
+          In Azure VM Backup, snapshots are taken using the Standard HDD tier type, regardless of the source VM disk tier. By default, the storage redundancy for these snapshots is Locally Redundant Storage (LRS). However, if the VM backups are managed by an Enhanced Policy and the underlying source disk storage supports Zone Redundant Storage (ZRS), the snapshots will be of the ZRS type.
+
       - question: How long can I retain backup points of Azure VMs using the backup policy?
         answer: |
           The maximum retentions of the backup points are:
diff --git a/articles/backup/disk-backup-faq.yml b/articles/backup/disk-backup-faq.yml
@@ -4,7 +4,7 @@ metadata:
   description: Get answers to frequently asked questions about Azure Disk Backup
   ms.topic: faq
   ms.service: azure-backup
-  ms.date: 06/03/2024
+  ms.date: 06/12/2025
   author: jyothisuri
   ms.author: jsuri
 title: Frequently asked questions about Azure Disk Backup
@@ -153,4 +153,7 @@ additionalContent: |
 
   ## Next steps
   
-  - [Azure Disk Backup support matrix](disk-backup-support-matrix.md)
+  - [Azure Disk Backup support matrix](disk-backup-support-matrix.md).
+  - Back up Azure Managed Disks using [Azure portal](backup-managed-disks.md), [Azure PowerShell](backup-managed-disks-ps.md), [Azure CLI](backup-managed-disks-cli.md), [REST API](backup-azure-dataprotection-use-rest-api-backup-disks.md).
+  - Restore Azure Managed Disks using [Azure portal](restore-managed-disks.md), [Azure PowerShell](restore-managed-disks-ps.md), [Azure CLI](restore-managed-disks-cli.md), [REST API](backup-azure-dataprotection-use-rest-api-restore-disks.md).
+  - [Manage Azure Managed Disks backups using Azure portal](manage-azure-managed-disks.md).
diff --git a/articles/backup/manage-telemetry.md b/articles/backup/manage-telemetry.md
@@ -1,43 +1,45 @@
 ---
 title: Manage telemetry settings in Microsoft Azure Backup Server (MABS)
 description: This article provides information about how to manage the telemetry settings in MABS.
-ms.date:  06/28/2024
+ms.date:  06/12/2025
 ms.topic: how-to
 author: jyothisuri
 ms.author: jsuri
 ---
 
-# Manage telemetry settings
+# Manage telemetry settings in Microsoft Azure Backup Server
 
 >[!NOTE]
 >This feature is applicable for MABS V3 UR2 and later.
 
-This article provides information about how to manage the telemetry (Diagnostics and utility data) settings in Microsoft Azure Backup Server (MABS).
+This article describes how to manage telemetry (Diagnostics and utility data) settings in Microsoft Azure Backup Server (MABS).
 
-By default, MABS sends diagnostic and connectivity data to Microsoft. Microsoft uses this data to provide and improve the quality, security, and integrity of Microsoft products and services.
+By default, MABS sends diagnostic and connectivity data to Microsoft. Microsoft uses this data to enhance the quality, security, and reliability of its products and services.
 
-Administrators can turn off this feature at any point of time. For more information on the data collected, see the [following section](#telemetry-data-collected).
+Administrators can turn off this feature at any point of time. Learn about the [data collected details](#telemetry-data-collected).
 
-## Turn on/off telemetry from console
+## Enable/disable telemetry from the MABS console
 
-1. In the Microsoft Azure Backup Server console, go to **Management** and click **Options** in the top pane.
-1. In the **Options** dialog box, select **Diagnostic and Usage Data Settings**.
+To enable/disable telemetry from the MABS console, follow these steps:
 
-    ![console telemetry options](./media/telemetry/telemetry-options.png)
+1. In the Microsoft Azure Backup Server console, go to **Management** and select **Options**.
+1. On the **Options** pane, select **Diagnostic and Usage Data Settings**.
 
-1. Select the diagnostic and usage data sharing preference from the options displayed and then click **OK**.
+    :::image type="content" source="./media/telemetry/telemetry-options.png" alt-text="Screenshot shows the console telemetry options.":::
+
+1. Select the diagnostic and usage data sharing preference, and then select **OK**.
 
     >[!NOTE]
     >We recommend you to read the [Privacy Statement](https://privacy.microsoft.com/privacystatement) before you select the option.
-    >- To turn on telemetry, select **Yes, I am willing to send data to Microsoft**.
-    >- To turn off telemetry, select **No, I prefer not to send data to Microsoft**.
+    >- To enable telemetry, select **Yes, I am willing to send data to Microsoft**.
+    >- To disable telemetry, select **No, I prefer not to send data to Microsoft**.
 
 ## Telemetry data collected
 
 | Data related To | Data collected* |
 | --- | --- |
-| **Setup** | Version of MABS installed. <br/><br/>Version of the MABS update rollup installed. <br/><br/> Unique machine identifier. <br/><br/> Operating system on which MABS is installed. <br/><br/> Unique cloud subscription identifier.<br/><br/> MARS agent version.<br/><br/> Whether tiered storage is enabled. <br/><br/> Size of the storage used. |
-| **Workload Protected** | Workload unique Identifier. <br/><br/>Size of the workload being backed up. <br/><br/>Workload type and its version number. <br/><br/>If the workload is currently being protected by MABS. <br/><br/>Unique Identifier of the Protection Group under which the workload is protected.<br/><br/> Location where the workload is getting backed up - to disk/tape or cloud.|
+| **Setup** | Version of MABS installed. <br/><br/>Version of the MABS update rollup installed. <br/><br/> Unique machine identifier. <br/><br/> Operating system on which MABS is installed. <br/><br/> Unique cloud subscription identifier.<br/><br/> MARS agent version.<br/><br/> Tiered storage is enabled/ disabled. <br/><br/> Size of the storage used. |
+| **Workload Protected** | Workload unique Identifier. <br/><br/>Size of the workload being backed up. <br/><br/>Workload type and its version number. <br/><br/>The workload is currently protected/ unprotected by MABS. <br/><br/>Unique Identifier of the Protection Group under which the workload is protected.<br/><br/> Location where the workload is getting backed up - to disk/tape or cloud.|
 | **Jobs** | Status of the backup/restore job. <br/><br/> Size of the data backed up/restored. <br/><br/>Failure message, in case backup/restore job fails.<br/><br/> Time taken for the restore job.<br/><br/>Details of the workload for which the backup/restore job was run. |
 | **Telemetry change status** | The status change details for the telemetry settings, if enabled or disabled, and when. |
 | **MABS Console Crash Error** | The details of the error when a MABS console crashes.|
diff --git a/articles/backup/quick-restore-hana-cli.md b/articles/backup/quick-restore-hana-cli.md
@@ -3,7 +3,7 @@ title: Quickstart - Restore an SAP HANA database with Azure CLI
 description: In this quickstart, learn how to restore SAP HANA System Replication database with Azure CLI.
 ms.devlang: azurecli
 ms.topic: quickstart
-ms.date: 06/17/2024
+ms.date: 06/12/2025
 ms.custom: mvc, devx-track-azurecli, mode-api, engagement-fy24
 ms.service: azure-backup
 author: jyothisuri
@@ -12,7 +12,7 @@ ms.author: jsuri
 
 # Quickstart: Restore SAP HANA System Replication on Azure VMs using Azure CLI
 
-This quickstart describes how to restore SAP HANA System Replication (HSR) using Azure CLI.
+This quickstart describes how to restore SAP HANA System Replication (HSR) using Azure CLI. You can also do the restore operation using [Azure portal](sap-hana-database-restore.md).
 
 SAP HANA databases are critical workloads that require a low recovery-point objective (RPO) and long-term retention. This article describes how you can back up SAP HANA databases that are running on Azure virtual machines (VMs) to an Azure Backup Recovery Services vault by using Azure Backup.
 
diff --git a/articles/sentinel/sap/deploy-sap-security-content.md b/articles/sentinel/sap/deploy-sap-security-content.md
@@ -51,14 +51,42 @@ To deploy a Microsoft Sentinel solution for SAP applications from the content hu
 
 Make sure that you also review the [prerequisites for deploying Microsoft Sentinel solution for SAP applications](prerequisites-for-deploying-sap-continuous-threat-monitoring.md), especially [Azure prerequisites](prerequisites-for-deploying-sap-continuous-threat-monitoring.md#azure-prerequisites).
 
-## Install the solution from the content hub
+:::zone pivot="connection-agentless"
+
+## Install the solution
 
 Installing the **Microsoft Sentinel Solution for SAP** makes both the data connector agent and the agentless data connector available to you from the Microsoft Sentinel **Configuration > Data connectors** page. The solution also deploys security content, such as the **SAP -Audit Controls** workbook and SAP-related analytics rules.
  
-1. Install the solution using one of these methods, based on your connector type: 
-- If you're using the SAP agentless data connector (Limited preview), [install the solution via the Azure marketplace](https://portal.azure.com/#create/sentinel4sap.sentinel4sap-previewsentinel4sap) after receiving a notification of onboarding. 
+1. [Install the solution via the Azure marketplace](https://portal.azure.com/#create/sentinel4sap.sentinel4sap-previewsentinel4sap) after receiving a notification of onboarding. 
+ 
+1. On the **Microsoft Sentinel solution for SAP applications** page, select **Create** to define deployment settings. For example:
+
+    :::image type="content" source="./media/deploy-sap-security-content/sap-solution.png" alt-text="Screenshot that shows the Microsoft Sentinel solution for SAP applications solution pane." lightbox="./media/deploy-sap-security-content/sap-solution.png":::
+
+1. On the default **Basics** tab, scroll down to select where to install the solution. If you're working with [the Microsoft Sentinel solution for SAP applications in multiple workspaces](cross-workspace.md), select **Some of the data is on a different workspace**, and then define your target workspace, your SOC workspace, and SAP workspace. For example:
+
+    For example:
+
+    :::image type="content" source="./media/deploy-sap-security-content/sap-multi-workspace.png" alt-text="Screenshot that shows how to configure the Microsoft Sentinel solution for SAP applications to work across multiple workspaces.":::
+
+1. Select **Review + create** or **Next** to browse through the solution components. When you're ready, select **Create**
+
+    The deployment process can take a few minutes. After the deployment is finished, you can view the deployed content in Microsoft Sentinel.
+
+> [!TIP]
+> If you want the SAP and SOC data to be kept on the same workspace with no additional access controls, do not select **Some of the data is on a different workspace**. In such cases, for more information, see [SAP and SOC data maintained in the same workspace](cross-workspace.md#sap-and-soc-data-maintained-in-the-same-workspace).
+
+For more information, see [Discover and manage Microsoft Sentinel out-of-the-box content](../sentinel-solutions-deploy.md).
+
+:::zone-end
 
-- If you're using the data connector agent, in the Microsoft Sentinel **Content hub**, search for **SAP** to install the **SAP applications** solution. 
+:::zone pivot="connection-agent"
+
+## Install the solution
+
+Installing the **Microsoft Sentinel Solution for SAP** makes both the data connector agent and the agentless data connector available to you from the Microsoft Sentinel **Configuration > Data connectors** page. The solution also deploys security content, such as the **SAP -Audit Controls** workbook and SAP-related analytics rules.
+ 
+1. In the Microsoft Sentinel **Content hub**, search for **SAP** to install the **SAP applications** solution. 
  
 1. On the **Microsoft Sentinel solution for SAP applications** page, select **Create** to define deployment settings. For example:
 
@@ -79,6 +107,8 @@ Installing the **Microsoft Sentinel Solution for SAP** makes both the data conne
 
 For more information, see [Discover and manage Microsoft Sentinel out-of-the-box content](../sentinel-solutions-deploy.md).
 
+:::zone-end
+
 ## View deployed content
 
 When the deployment is finished, display your new content by browsing again to the Microsoft Sentinel for SAP applications solution from the **Content hub**. Alternatively:
diff --git a/articles/sentinel/sap/prerequisites-for-deploying-sap-continuous-threat-monitoring.md b/articles/sentinel/sap/prerequisites-for-deploying-sap-continuous-threat-monitoring.md
@@ -100,7 +100,9 @@ Typically, Azure prerequisites are managed by your **security** teams.
 
 ## SAP prerequisites for the agentless data connector
 
-We recommend that your **SAP BASIS** team verify and ensure SAP system prerequisites. We strongly recommend that any management of your SAP system is carried out by an experienced SAP system administrator.
+We recommend that your **SAP BASIS** team verify and ensure SAP system prerequisites. The SAP BASIS admin should review SAP notes 3390051 and 382318 to ensure that NetWeaver is set up for integration.
+
+We strongly recommend that any management of your SAP system is carried out by an experienced SAP system administrator.
 
 | Prerequisite | Description |
 | ---- | ----------- |
diff --git a/articles/zone-pivot-groups.yml b/articles/zone-pivot-groups.yml
@@ -1914,7 +1914,7 @@ groups:
   prompt: Choose a connection type
   pivots:
   - id: connection-agentless
-    title: Agentless data connector (Preview)
+    title: Agentless data connector (Limited preview)
   - id: connection-agent
     title: Data connector agent
 # Owner: jodowns
