Skip to content

Commit 104e9bc

Browse files
authored
Merge pull request #295765 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents 2030c96 + 2b40db7 commit 104e9bc

22 files changed

+316
-647
lines changed

.openpublishing.redirection.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3240,6 +3240,21 @@
32403240
"redirect_url": "/azure/databox/index",
32413241
"redirect_document_id": false
32423242
},
3243+
{
3244+
"source_path_from_root": "/articles/databox/data-box-next-gen-overview.md",
3245+
"redirect_url": "/azure/databox/data-box-overview?pivots=dbx-ng",
3246+
"redirect_document_id": false
3247+
},
3248+
{
3249+
"source_path_from_root": "/articles/databox/data-box-next-gen-quickstart-portal.md",
3250+
"redirect_url": "/azure/databox/data-box-quickstart-portal?pivots=dbx-ng",
3251+
"redirect_document_id": false
3252+
},
3253+
{
3254+
"source_path_from_root": "/articles/databox/data-box-next-gen-quickstart-export.md",
3255+
"redirect_url": "/azure/databox/data-box-quickstart-export?pivots=dbx-ng",
3256+
"redirect_document_id": false
3257+
},
32433258
{
32443259
"source_path_from_root": "/articles/ddos-protection/ddos-disaster-recovery-guidance.md",
32453260
"redirect_url": "../reliability/reliability-ddos.md",

articles/application-gateway/multiple-site-overview.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: This article provides an overview of the Azure Application Gateway
44
services: application-gateway
55
author: greg-lindsay
66
ms.service: azure-application-gateway
7-
ms.date: 02/28/2024
7+
ms.date: 03/05/2025
88
ms.author: greglin
99
ms.topic: concept-article
1010
---
@@ -75,6 +75,7 @@ In the Azure portal, under the multi-site listener, you must choose the **Multip
7575
* There can only be up to two asterisks `*` in a host name. For example, `*.contoso.*` is valid and `*.contoso.*.*.com` is invalid.
7676
* There can only be a maximum of 4 wildcard characters in a host name. For example, `????.contoso.com`, `w??.contoso*.edu.*` are valid, but `????.contoso.*` is invalid.
7777
* Using asterisk `*` and question mark `?` together in a component of a host name (`*?` or `?*` or `**`) is invalid. For example, `*?.contoso.com` and `**.contoso.com` are invalid.
78+
* An entry of `*.contoso.com` does not match `contoso.com` because `*.contoso.com` specifies that a dot is present before contoso.
7879

7980
<!-- docutune:enable -->
8081

articles/backup/backup-azure-vm-migrate-enhanced-policy.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Move VM backup - standard to enhanced policy in Azure Backup
33
description: Learn how to trigger Azure VM backups migration from standard policy to enhanced policy, and then monitor the configuration backup migration job.
44
ms.topic: reference
5-
ms.date: 01/10/2025
5+
ms.date: 03/05/2025
66
ms.service: azure-backup
77
author: jyothisuri
88
ms.author: jsuri
@@ -15,9 +15,6 @@ This article describes how to migrate Azure VM backups from standard to enhanced
1515

1616
Azure Backup now supports migration to the enhanced policy for Azure VM backups using standard policy. The migration of VM backups to enhanced policy enables you to schedule multiple backups per day (up to every 4 hours), retain snapshots for longer duration, and use multi-disk crash consistency for VM backups. Snapshot-tier recovery points (created using enhanced policy) are zonally resilient. The migration of VM backups to enhanced policy also allows you to migrate your VMs to Trusted Launch and use Premium SSD v2 and Ultra-disks for the VMs without disrupting the existing backups.
1717

18-
>[!Note]
19-
>Backup of unprotected trusted launch VM using standard policy is available in preview in [selected regions](backup-support-matrix-iaas.md#tvm-backup). To enable Trusted Launch for existing VMs protected by Standard Policy, you must first migrate to Enhanced Policy.
20-
2118
## Considerations
2219

2320
- Before you start the migration, ensure that there are no ongoing backup jobs for the VM that you plan to migrate.

articles/backup/backup-azure-vms-enhanced-policy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Back up Azure VMs with Enhanced policy
33
description: Learn how to configure Enhanced policy to back up VMs.
44
ms.topic: how-to
5-
ms.date: 01/10/2025
5+
ms.date: 03/05/2025
66
ms.reviewer: sharrai
77
ms.service: azure-backup
88
ms.custom: devx-track-azurecli, devx-track-azurepowershell
@@ -19,7 +19,7 @@ Azure Backup now supports Enhanced policy for Azure VM backup that offers:
1919
- Longer retention in snapshot (operational) tier up to 30 days.
2020

2121
>[!Note]
22-
>- Standard policy doesn't support protecting newer Azure offerings, such as Ultra SSD and Premium SSD v2. Backup of trusted launch VM using standard policy is available in preview in [selected regions](backup-support-matrix-iaas.md#tvm-backup). Configuring backup of trusted launch VM using standard policy is supported only using Recovery Services – Backup APIs using API version *2024-09-30-preview*.
22+
>- Standard policy doesn't support protecting newer Azure offerings, such as Ultra SSD and Premium SSD v2. Backup of trusted launch VM using standard policy is available in preview in [selected regions](backup-support-matrix-iaas.md#tvm-backup).
2323
>- Backups for VMs with data access authentication enabled disks fails.
2424
>- Protection of a VM with an enhanced policy incurs additional snapshot costs. [Learn more](backup-instant-restore-capability.md#cost-impact).
2525
>- Once you enable a VM backup with Enhanced policy, Azure Backup doesn't allow to change the policy type to Standard.

articles/backup/backup-instant-restore-capability.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Azure Instant Restore Capability
33
description: Azure Instant Restore Capability and FAQs for VM backup stack, Resource Manager deployment model
44
ms.topic: overview
5-
ms.date: 01/10/2025
5+
ms.date: 03/05/2025
66
author: jyothisuri
77
ms.author: jsuri
88
---
@@ -57,8 +57,7 @@ Enhanced policy uses Managed disk snapshots for Instant Restore functionality. T
5757
For example, a VM with 100GB in size has a change rate of 2% and retention of 5 days for Instant Restore. In this case, the snapshot storage billed will be 108GB (100 + 100 X 0.02 X 4).
5858

5959
>[!NOTE]
60-
>- Snapshot retention is fixed to 5 days for weekly policies for Standard policy and can vary between 5 to 20 days for enhanced policy.
61-
>- Trusted Launch virtual machines protected using standard policy uses managed disk snapshots for Instant Restore functionality. In this scenario, the snapshot storage billed is same as that of enhanced policy.
60+
>Snapshot retention is fixed to 5 days for weekly policies for Standard policy and can vary between 5 to 20 days for enhanced policy.
6261
6362
## Configure snapshot retention
6463

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: reference
5-
ms.date: 03/03/2025
5+
ms.date: 03/05/2025
66
ms.custom: references_regions, linux-related-content
77
ms.reviewer: nikhilsarode
88
ms.service: azure-backup
@@ -180,7 +180,7 @@ Back up Azure VMs with locks | Supported for managed VMs. <br><br> Not supported
180180
Configure standalone Azure VMs in Windows Storage Spaces | Not supported.
181181
[Restore Virtual Machine Scale Sets](/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-orchestration-modes#scale-sets-with-flexible-orchestration) | Supported for the flexible orchestration model to back up and restore a single Azure VM.
182182
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).
183-
<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](/azure/virtual-machines/generation-2) (protected with Azure Backup) to a trusted launch VM is currently not supported. [Learn how to create a trusted launch VM](/azure/virtual-machines/trusted-launch-portal?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. <br><br> Backup of trusted launch VM using standard policy is available in preview. Review the following supported scenarios: <br> - Supported regions: South Africa, North, Norway, East, Sweden, Central, Korea, Central, Japan, East, Qatar, Central, Mexico, Central, Jio India, West, Israel, Central, Brazil, Southeast, Germany, West Central, UK, West, UAE, Central, Switzerland, West, South Africa, West, Norway, West, West India, South India, France, South, Australia, East, Australia, Central 2, North Europe, Southeast Asia, North Central US, West Central US. <br> - Configuring backup of trusted launch VM using standard policy is supported only using Recovery Services – Backup APIs using API version *2024-09-30-preview*.
183+
<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](/azure/virtual-machines/generation-2) (protected with Azure Backup) to a trusted launch VM is currently not supported. [Learn how to create a trusted launch VM](/azure/virtual-machines/trusted-launch-portal?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.
184184
[Back up confidential VMs](../confidential-computing/confidential-vm-overview.md) | Unsupported. <br><br> Note that the following limited preview support scenarios are discontinued and currently not available: <br><br> - Backup of Confidential VMs with no confidential disk encryption. <br> - Backup of Confidential VMs with confidential OS disk encryption through a platform-managed key (PMK).
185185
Backup of VMs with SSE and CMK encryption using HSM | Supported. <br><br> You must assign the permissions get, wrap, and unwrap key to the Key Vault to User-assigned managed identity.
186186

articles/databox/TOC.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@
66
- name: Overview
77
items:
88
- name: What is Data Box?
9-
href: data-box-overview.md
9+
href: data-box-overview.md?pivots=dbx
1010
- name: What is next-gen Data Box?
11-
href: data-box-next-gen-overview.md
11+
href: data-box-overview.md?pivots=dbx-ng
1212
- name: Quickstarts
1313
expanded: true
1414
items:
1515
- name: Set up - Azure portal
1616
items:
1717
- name: For import
18-
href: data-box-quickstart-portal.md
18+
href: data-box-quickstart-portal.md?pivots=dbx
1919
- name: For import - Next Gen
20-
href: data-box-next-gen-quickstart-portal.md
20+
href: data-box-quickstart-portal.md?pivots=dbx-ng
2121
- name: For export
22-
href: data-box-quickstart-export.md
22+
href: data-box-quickstart-export.md?pivots=dbx
2323
- name: For export - Next Gen
24-
href: data-box-next-gen-quickstart-export.md
24+
href: data-box-quickstart-export.md?pivots=dbx-ng
2525
- name: Tutorials
2626
items:
2727
- name: Import data to Azure

0 commit comments

Comments
 (0)