Skip to content

Commit 4d43b4e

Browse files
authored
Merge pull request #264071 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents ace155d + e832b05 commit 4d43b4e

25 files changed

+1701
-1636
lines changed

.openpublishing.publish.config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1214,7 +1214,6 @@
12141214
".openpublishing.redirection.defender-for-cloud.json",
12151215
".openpublishing.redirection.defender-for-iot.json",
12161216
".openpublishing.redirection.iot-hub-device-update.json",
1217-
"articles/site-recovery/.openpublishing.redirection.site-recovery.json",
12181217
".openpublishing.redirection.json",
12191218
".openpublishing.redirection.key-vault.json",
12201219
".openpublishing.redirection.machine-configuration.json",
@@ -1279,7 +1278,9 @@
12791278
"articles/purview/.openpublishing.redirection.purview.json",
12801279
"articles/route-server/.openpublishing.redirection.route-server.json",
12811280
"articles/sap/.openpublishing.redirection.sap.json",
1281+
"articles/security/.openpublishing.redirection.security.json",
12821282
"articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
1283+
"articles/site-recovery/.openpublishing.redirection.site-recovery.json",
12831284
"articles/spatial-anchors/.openpublishing.redirection.spatial-anchors.json",
12841285
"articles/spring-apps/.openpublishing.redirection.spring-apps.json",
12851286
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",

.openpublishing.redirection.json

Lines changed: 189 additions & 1429 deletions
Large diffs are not rendered by default.
88.1 KB
Loading

articles/active-directory-b2c/partner-bindid.md

Lines changed: 193 additions & 146 deletions
Large diffs are not rendered by default.

articles/automation/runtime-environment-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Runtime environment in Azure Automation
33
description: This article provides an overview on Runtime environment in Azure Automation.
44
services: automation
55
ms.subservice: process-automation
6-
ms.date: 01/22/2024
6+
ms.date: 01/24/2024
77
ms.topic: conceptual
88
ms.custom: references_regions
99
---
@@ -83,7 +83,7 @@ You can't edit these Runtime environments. However, any changes that are made in
8383
- RBAC permissions cannot be assigned to Runtime environment.
8484
- Runtime environment can't be configured through Azure Automation extension for Visual Studio Code.
8585
- Deleted Runtime environments cannot be recovered.
86-
- The feature is only supported through Azure portal and REST API.
86+
- The feature is only supported through Azure portal and [REST API](https://learn.microsoft.com/rest/api/automation/runtime-environments?view=rest-automation-2023-05-15-preview).
8787

8888
## Switch between new and old experience
8989

articles/backup/backup-rbac-rs-vault.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Manage Backups with Azure role-based access control
33
description: Use Azure role-based access control to manage access to backup management operations in Recovery Services vault.
44
ms.reviewer: utraghuv
55
ms.topic: conceptual
6-
ms.date: 02/28/2022
6+
ms.date: 01/24/2024
77
ms.service: backup
88
author: AbhishekMallick-MS
99
ms.author: v-abhmallick
@@ -80,6 +80,7 @@ The following table captures the Backup management actions and corresponding min
8080
| Delete backup policy of Azure VM backup | Backup Contributor | Recovery Services vault |
8181
| Stop backup (with retain data or delete data) on VM backup | Backup Contributor | Recovery Services vault |
8282
| | Virtual Machine Contributor | Source VM that got backed-up | Alternatively, instead of a built-in-role, you can consider a custom role which has the following permissions: Microsoft.Compute/virtualMachines/write |
83+
| Cross region restore | Backup Operator | Subscription of the Recovery Services vault | This is in addition to the restore permissions mentioned above. In case of cross region restore, instead of a built-in role, you can use a custom role that has the following permissions: <br><br> - Microsoft.RecoveryServices/locations/backupAadProperties/read <br><br> - Microsoft.RecoveryServices/locations/backupCrrJobs/action <br><br> - Microsoft.RecoveryServices/locations/backupCrrJob/action <br><br> - Microsoft.RecoveryServices/locations/backupCrossRegionRestore/action <br><br> - Microsoft.RecoveryServices/locations/backupCrrOperationResults/read <br><br> - Microsoft.RecoveryServices/locations/backupCrrOperationsStatus/read |
8384

8485
### Minimum role requirements for the Azure File share backup
8586

articles/backup/backup-sql-server-database-azure-vms.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Back up multiple SQL Server VMs from the vault
33
description: In this article, learn how to back up SQL Server databases on Azure virtual machines with Azure Backup from the Recovery Services vault
44
ms.topic: conceptual
5-
ms.date: 05/24/2023
5+
ms.date: 01/24/2024
66
ms.service: backup
77
author: AbhishekMallick-MS
88
ms.author: v-abhmallick
@@ -116,6 +116,7 @@ When you back up a SQL Server database on an Azure VM, the backup extension on t
116116
- Semicolon (;)
117117
- Forward slash (/)
118118

119+
- SQL Backup configuration doesn't support the single quotation in the database name and causes deployment failure. If there is any database with single quote, we recommend that you rename the database or take the native backup approach.
119120
- Aliasing is available for unsupported characters, but we recommend avoiding them. For more information, see [Understanding the Table Service Data Model](/rest/api/storageservices/understanding-the-table-service-data-model).
120121

121122
- Multiple databases on the same SQL instance with casing difference aren't supported.

articles/backup/backup-support-matrix-iaas.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Support matrix for Azure VM backups
33
description: Get a summary of support settings and limitations for backing up Azure VMs by using the Azure Backup service.
44
ms.topic: conceptual
5-
ms.date: 01/22/2024
5+
ms.date: 01/24/2024
66
ms.custom: references_regions
77
ms.reviewer: sharrai
88
ms.service: backup
@@ -172,7 +172,7 @@ Back up Azure VMs with locks | Supported for managed VMs. <br><br> Not supported
172172
Configure standalone Azure VMs in Windows Storage Spaces | Not supported.
173173
[Restore Virtual Machine Scale Sets](../virtual-machine-scale-sets/virtual-machine-scale-sets-orchestration-modes.md#scale-sets-with-flexible-orchestration) | Supported for the flexible orchestration model to back up and restore a single Azure VM.
174174
Restore with managed identities | Supported for managed Azure VMs. <br><br> Not supported for classic and unmanaged Azure VMs. <br><br> Cross-region restore isn't supported with managed identities. <br><br> Currently, this is available in all Azure public and national cloud regions. <br><br> [Learn more](backup-azure-arm-restore-vms.md#restore-vms-with-managed-identities).
175-
<a name="tvm-backup">Back up trusted launch VMs</a> | Backup is supported. <br><br> Backup of trusted launch VMs is supported through [Enhanced policy](backup-azure-vms-enhanced-policy.md). You can enable backup through a [Recovery Services vault](./backup-azure-arm-vms-prepare.md), the [pane for managing a VM](./backup-during-vm-creation.md#start-a-backup-after-creating-the-vm), and the [pane for creating a VM](backup-during-vm-creation.md#create-a-vm-with-backup-configured). <br><br> **Feature details** <br><br> - Backup is supported in all regions where trusted launch VMs are available. <br><br> - Configuration of backups, alerts, and monitoring for trusted launch VMs is currently not supported through the backup center. <br><br> - Migration of an existing [Gen2 VM](../virtual-machines/generation-2.md) (protected with Azure Backup) to a trusted launch VM is currently not supported. [Learn how to create a trusted launch VM](../virtual-machines/trusted-launch-portal.md?tabs=portal#deploy-a-trusted-launch-vm). <br><br> - Item-level restore is supported for the scenarios mentioned [here](backup-support-matrix-iaas.md#support-for-file-level-restore). <br><br> Note that if the trusted launch VM was created by converting a Standard VM, ensure that you remove all the recovery points created using Standard policy before enabling the backup operation for the VM.
175+
<a name="tvm-backup">Back up trusted launch VMs</a> | Backup is supported. <br><br> Backup of trusted launch VMs is supported through [Enhanced policy](backup-azure-vms-enhanced-policy.md). You can enable backup through a [Recovery Services vault](./backup-azure-arm-vms-prepare.md), the [pane for managing a VM](./backup-during-vm-creation.md#start-a-backup-after-creating-the-vm), and the [pane for creating a VM](backup-during-vm-creation.md#create-a-vm-with-backup-configured). <br><br> **Feature details** <br><br> - Backup is supported in all regions where trusted launch VMs are available. <br><br> - Configuration of backups, alerts, and monitoring for trusted launch VMs is supported through the backup center. <br><br> - Migration of an existing [Gen2 VM](../virtual-machines/generation-2.md) (protected with Azure Backup) to a trusted launch VM is currently not supported. [Learn how to create a trusted launch VM](../virtual-machines/trusted-launch-portal.md?tabs=portal#deploy-a-trusted-launch-vm). <br><br> - Item-level restore is supported for the scenarios mentioned [here](backup-support-matrix-iaas.md#support-for-file-level-restore). <br><br> Note that if the trusted launch VM was created by converting a Standard VM, ensure that you remove all the recovery points created using Standard policy before enabling the backup operation for the VM.
176176
[Back up confidential VMs](../confidential-computing/confidential-vm-overview.md) | The backup support is in limited preview. <br><br> Backup is supported only for confidential VMs that have no confidential disk encryption and for confidential VMs that have confidential OS disk encryption through a platform-managed key (PMK). <br><br> Backup is currently not supported for confidential VMs that have confidential OS disk encryption through a customer-managed key (CMK). <br><br> **Feature details** <br><br> - Backup is supported in [all regions where confidential VMs are available](../confidential-computing/confidential-vm-overview.md#regions). <br><br> - Backup is supported only if you're using [Enhanced policy](backup-azure-vms-enhanced-policy.md). You can configure backup through the [pane for creating a VM](backup-azure-arm-vms-prepare.md), the [pane for managing a VM](backup-during-vm-creation.md#start-a-backup-after-creating-the-vm), and the [Recovery Services vault](backup-azure-arm-vms-prepare.md). <br><br> - [Cross-region restore](backup-azure-arm-restore-vms.md#cross-region-restore) and file recovery (item-level restore) for confidential VMs are currently not supported.
177177

178178
## VM storage support

articles/backup/restore-sql-database-azure-vm.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Restore SQL Server databases on an Azure VM
33
description: This article describes how to restore SQL Server databases that are running on an Azure VM and that are backed up with Azure Backup. You can also use Cross Region Restore to restore your databases to a secondary region.
44
ms.topic: conceptual
5-
ms.date: 08/03/2023
5+
ms.date: 01/24/2024
66
ms.service: backup
77
author: AbhishekMallick-MS
88
ms.author: v-abhmallick
@@ -260,6 +260,8 @@ The secondary region restore user experience will be similar to the primary regi
260260
>- The role/access level required to perform restore operation in cross-regions are _Backup Operator_ role in the subscription and _Contributor(write)_ access on the source and target virtual machines. To view backup jobs, _Backup reader_ is the minimum permission required in the subscription.
261261
>- The RPO for the backup data to be available in secondary region is 12 hours. Therefore, when you turn on CRR, the RPO for the secondary region is 12 hours + log frequency duration (that can be set to a minimum of 15 minutes).
262262
263+
Learn about the [minimum role requirements for cross-region restore](backup-rbac-rs-vault.md#minimum-role-requirements-for-azure-workload-backups-sql-and-hana-db-backups).
264+
263265
### Monitoring secondary region restore jobs
264266

265267
1. In the Azure portal, go to **Backup center** > **Backup Jobs**.

articles/backup/sap-hana-database-restore.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Restore SAP HANA databases on Azure VMs
33
description: In this article, you'll learn how to restore SAP HANA databases that are running on Azure virtual machines. You can also use Cross Region Restore to restore your databases to a secondary region.
44
ms.topic: how-to
5-
ms.date: 07/31/2023
5+
ms.date: 01/24/2024
66
ms.service: backup
77
ms.custom: ignite-2022
88
author: AbhishekMallick-MS
@@ -349,6 +349,8 @@ The secondary region restore user experience is similar to the primary region re
349349
>* The role and access level that are required to perform a restore operation in cross-regions are the Backup Operator role in the subscription and Contributor (write) access on the source and target virtual machines. To view backup jobs, Backup reader is the minimum permission that's required in the subscription.
350350
>* The recovery point objective (RPO) for the backup data to be available in secondary region is 12 hours. Therefore, when you turn on CRR, the RPO for the secondary region is *12 hours + log frequency duration* (which can be set to a minimum of 15 minutes).
351351

352+
Learn about the [minimum role requirements for cross-region restore](backup-rbac-rs-vault.md#minimum-role-requirements-for-azure-workload-backups-sql-and-hana-db-backups).
353+
352354
### Monitor secondary region restore jobs
353355

354356
1. In the Azure portal, go to **Backup center**, and then select **Backup Jobs**.

0 commit comments

Comments
 (0)