Skip to content

Commit 16eae08

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into fxl---remove-reddison
2 parents 2e06e6e + 9dd1305 commit 16eae08

108 files changed

Lines changed: 420 additions & 859 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -990,6 +990,11 @@
990990
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-deploy-configure-compute",
991991
"redirect_document_id": false
992992
},
993+
{
994+
"source_path": "articles/databox-online/azure-stack-edge-deploy-aks-on-azure-stack-edge.md",
995+
"redirect_url": "/articles/databox-online/azure-stack-edge-gpu-kubernetes-workload-management",
996+
"redirect_document_id": false
997+
},
993998
{
994999
"source_path": "articles/databox-online/azure-stack-edge-system-requirements.md",
9951000
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-system-requirements",

articles/automation/automation-runbook-types.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ The Azure Automation Process Automation feature supports several types of runboo
2626
To learn about the process automation environment, see [Runbook execution in Azure Automation](automation-runbook-execution.md).
2727

2828
> [!NOTE]
29-
> Azure Automation will follow the support lifecycle of PowerShell and Python language versions in accordance with the timelines published by parent the products, [PowerShell](/powershell/scripting/install/powershell-support-lifecycle?view=powershell-7.3&preserve-view=true#powershell-end-of-support-dates) and [Python](https://devguide.python.org/versions/), respectively. We recommend that you use runbooks with supported language versions.
29+
> Azure Automation will follow the support lifecycle of PowerShell and Python language versions in accordance with the timelines published by the parent products, [PowerShell](/powershell/scripting/install/powershell-support-lifecycle?view=powershell-7.3&preserve-view=true#powershell-end-of-support-dates) and [Python](https://devguide.python.org/versions/), respectively. We recommend that you use runbooks with supported language versions.
3030
3131
Take into account the following considerations when determining which type to use for a particular runbook:
3232

@@ -43,7 +43,7 @@ The PowerShell version is determined by the **Runtime Version** specified.
4343
The same Azure sandbox and Hybrid Runbook Worker can execute multiple **PowerShell** runbooks targeting different runtime versions side by side.
4444

4545
> [!NOTE]
46-
> - Currently, PowerShell 7.4 runtime version is supported for both Cloud and Hybrid jobs in all Public regions except Brazil Southeast and Gov clouds.
46+
> - Currently, PowerShell 7.4 runtime version is supported for both Cloud and Hybrid jobs in all Public regions except Brazil Southeast and Gov clouds.
4747
> - At the time of runbook execution, if you select **Runtime Version** as **7.4**, PowerShell modules targeting 7.4 runtime version is used and if you select **Runtime Version** as **5.1**, PowerShell modules targeting 5.1 runtime version is used.
4848
4949
Ensure that you select the right Runtime Version for modules.

articles/azure-netapp-files/replication.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: azure-netapp-files
55
author: b-ahibbard
66
ms.service: azure-netapp-files
77
ms.topic: concept-article
8-
ms.date: 07/14/2025
8+
ms.date: 11/25/2025
99
ms.author: anfdocs
1010
ms.custom: references_regions
1111
---
@@ -33,7 +33,7 @@ Azure [availability zones](../reliability/availability-zones-overview.md) ar
3333
To learn more about availability zones in Azure NetApp Files, see [Reliability in Azure NetApp Files](../reliability/reliability-netapp-files.md).
3434

3535
> [!IMPORTANT]
36-
> We don't recommend that you use availability zones with Terraform-managed volumes. If you do, you must [add the zone property to your volume](manage-availability-zone-volume-placement.md#populate-availability-zone-for-terraform-managed-volumes).
36+
> If you manage volumes with Terraform, [add the zone property to your volume](manage-availability-zone-volume-placement.md#populate-availability-zone-for-terraform-managed-volumes).
3737
3838
#### Azure regions with availability zones
3939

articles/backup/azure-data-lake-storage-backup-support-matrix.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Vaulted backups of Azure Data Lake Storage are available in the following region
2626

2727
| Availability type | Region |
2828
| --- | --- |
29-
| **General availability** | East Asia, France South, Southeast US, Switzerland North, Switzerland West, UAE North, UK West, West India. |
29+
| **General availability** | Central US, East Asia, France South, Germany West Central, Southeast US, Switzerland North, Switzerland West, UAE North, UK West, West India. |
3030
| **Preview** | Australia East, Central India, Central US, East US, East US 2, Germany West Central, North Central US, North Europe, South India, Southeast Asia, West Central US, West US, West US 2, West US 3. |
3131

3232
## Supported storage accounts
@@ -70,7 +70,7 @@ Azure Data Lake Storage protection has the following supported and unsupported s
7070
- Soft Delete: Objects can still be soft-deleted as expected.
7171
- Undelete: Restore from soft-deleted state is not supported while Vaulted Backup is active. Undelete will only work if Vaulted Backup is disabled first. Re-enabling Vaulted Backup after disabling will trigger a full backup.
7272
- Storage accounts upgraded from FNS to HNS are not supported for backup.
73-
- SFTP-enabled & NFS accounts are not supported for backup. Backup jobs may stall if SFTP-uploaded blobs encountered.
73+
- SFTP- and NFS-enabled accounts aren’t supported for Vaulted Backup. Backup jobs on these accounts fail or hang when processing blobs uploaded via SFTP.
7474
- $web container cannot be restored as $web on the target. Use the renameTo option and restore it with a different container name.
7575
- $root container can be restored as $root on the target only if $root does not already exist there. If it already exists, use the renameTo option and restore it with a different container name.
7676

articles/backup/backup-azure-manage-windows-server.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ Use **Export jobs** to create a spreadsheet containing all Jobs menu information
195195

196196
To export the jobs information to a spreadsheet, select **Export jobs**. The service creates a spreadsheet using the name of the vault and date, but you can change the name.
197197

198-
>[!Note]
199-
>Azure Backup currently doesn't support exporting jobs with a filter applied, triggerring this operation fails for SQL and SAP HANA workload types. Alternatively, enable a Log Analytics workspace and [export workload-specific jobs](backup-azure-monitoring-use-azuremonitor.md#queries-specific-to-recovery-services-vault-workloads).
198+
> [!NOTE]
199+
> Azure Backup currently doesn't support exporting jobs with a filter applied. Triggering this operation fails for SQL and SAP HANA workload types. Alternatively, enable a Log Analytics workspace and [export workload-specific jobs](backup-azure-monitoring-use-azuremonitor.md#queries-specific-to-recovery-services-vault-workloads).
200200
201201
## Monitor Backup usage
202202

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,55 @@
11
---
22
title: Audit and enforce backup for Managed Disks using Azure Policy
3-
description: 'An article describing how to use Azure Policy to audit and enforce backup for all Disks created in a given scope'
3+
description: Learn how to use Azure Policy to audit and enforce backups for Azure Managed Disks to ensure compliance and protect business-critical data.
44
ms.topic: how-to
5-
ms.date: 12/03/2024
5+
ms.date: 11/25/2025
66
ms.service: azure-backup
77
author: AbhishekMallick-MS
88
ms.author: v-mallicka
99
# Customer intent: As a Backup Admin, I want to configure Azure Policies to enforce backup for Managed Disks, so that I can ensure compliance and protect business-critical data across my organization's resources.
1010
---
1111

12-
# Audit and enforce backup for Managed Disks using Azure Policy
12+
# Audit and enforce backup for Azure Managed Disks using Azure Policy
1313

14-
One of the key responsibilities of a Backup or Compliance Admin in an organization is to ensure that all business-critical machines are backed up with the appropriate retention.
14+
This article describes how Azure Backup uses built-in [Azure Policy](../governance/policy/overview.md) definitions to automate auditing and enforce backup configurations for Azure Managed Disks. These built-in policies ensure compliance with your organization’s retention requirements for business-critical machines.
1515

16-
Today, Azure Backup provides various built-in policies (using [Azure Policy](../governance/policy/overview.md)) to help you automatically ensure that your Azure Managed Disks are configured for backup. Depending on how your backup teams and resources are organized, you can use any one of the below policies:
16+
As a Backup and Compliance admin, choose the policy that best fits your team’s structure and resource organization to automatically configure backups for Azure Managed Disks.
17+
18+
## Azure Policy types for Azure Managed Disk backup
19+
20+
The following table lists the various policy types that allow you to manage Azure Managed Disk instances backups automatically:
21+
22+
| Policy type | Description |
23+
| --- | --- |
24+
| [Policy 1](#policy-1---azure-backup-should-be-enabled-for-managed-disks) | Identify Azure Managed Disks that don't have backup enabled. |
25+
| [Policy 2](#policy-2---configure-backup-for-azure-disks-managed-disks-with-a-given-tag-to-an-existing-backup-vault-in-the-same-region) | Configures backup for Azure Managed Disks with a given tag to an existing backup vault in the same region. |
26+
| [Policy 3](#policy-3---configure-backup-for-azure-disks-managed-disks-without-a-given-tag-to-an-existing-backup-vault-in-the-same-region) | Configures backup for Azure Managed Disks without a given tag to an existing backup vault in the same region. |
1727

1828
## Policy 1 - Azure Backup should be enabled for Managed Disks
1929

20-
Use an [audit-only](../governance/policy/concepts/effects.md#audit) policy to identify disks which don't have backup enabled. However, this policy doesn't automatically configure backups for these disks. It is useful when you're only looking to evaluate the overall compliance of the disks but not looking to take action immediately.
30+
Use an [audit-only](../governance/policy/concepts/effects.md#audit) policy to identify disks, which don't have backup enabled. However, this policy doesn't automatically configure backups for these disks. It's useful when you're only looking to evaluate the overall compliance of the disks but not looking to take action immediately.
2131

2232
## Policy 2 - Configure backup for Azure Disks (Managed Disks) with a given tag to an existing backup vault in the same region
2333

24-
A central backup team of an organization can use this policy to configure backup to an existing central Backup vault in the same subscription and location as the Managed Disks being governed. You can choose to **include** Disks that contain a certain tag, in the scope of this policy.
34+
A central backup team of an organization can use this policy to back up Azure Managed Disks to an existing central Backup vault in the same subscription and location. You can choose to **include** Disks that contain a certain tag, in the scope of this policy.
2535

2636
## Policy 3 - Configure backup for Azure Disks (Managed Disks) without a given tag to an existing backup vault in the same region
2737

2838
This policy works the same as Policy 2 above, with the only difference being that you can use this policy to **exclude** Disks that contain a certain tag, from the scope of this policy.
2939

30-
## Supported Scenarios
31-
32-
Before you audit and enforce backups for AKS clusters, see the following scenarios supported:
40+
## Supported and unsupported scenarios for Azure Managed Disk backup using Azure Policy
3341

34-
* The built-in policy is currently supported only for Azure Managed Disks. Ensure that the Backup Vault and backup policy specified during assignment is a Disk backup policy.
42+
Before you audit and enforce backups for Azure Managed Disk, review the following supported and unsupported scenarios:
3543

36-
* The Policies 2 and 3 can be assigned to a single location and subscription at a time. To enable backup for Disks across locations and subscriptions, multiple instances of the policy assignment need to be created, one for each combination of location and subscription.
3744

38-
* For the Policies 1, 2 and 3, management group scope is currently unsupported.
45+
| Policy type | Supported | Unsupported |
46+
| --- | --- | --- |
47+
| Policy 1, 2, 3 | Supported for Azure Managed Disk only. <br><br> Ensure that the Backup vault and backup policy specified during assignment is a Disk backup policy. | Management group scope is currently unsupported. |
48+
|Policy 2 and 3 | Can be assigned to a single location and subscription at a time. <br><br> To enable backup for Disks across locations and subscriptions, multiple instances of the policy assignment need to be created, one for each combination of location and subscription. The specified vault and the disks configured for backup can be under different resource groups. | |
3949

40-
* For the Policies 2 and 3, the specified vault and the disks configured for backup can be under different resource groups.
50+
## Assign built-in Azure Policy for Azure Managed Disk backup
4151

42-
43-
## Using the built-in policies
44-
45-
The below steps describe the end-to-end process of assigning Policy 2: **Configure backup on Managed Disks with a given tag to an existing backup vault in the same location to a given scope** . Similar instructions are applicable for the other policies. Once assigned, any new Managed Disk created in the scope is automatically configured for backup.
52+
This section describes the end-to-end process of assigning Policy 2: **Configure backup on Managed Disks with a given tag to an existing backup vault in the same location to a given scope** . Similar instructions apply for the other policies. Once assigned, any new Managed Disk created in the scope is automatically configured for backup.
4653

4754
To assign Policy 2, follow these steps:
4855

@@ -52,21 +59,21 @@ To assign Policy 2, follow these steps:
5259

5360
3. Filter the list for **Category=Backup** and select the policy named *Configure backup on Managed Disks with a given tag to an existing backup vault in the same location to a given scope*.
5461

55-
:::image type="content" source="./media/backup-managed-disks-policy/policy-dashboard-inline.png" alt-text="Screenshot showing how to filter the list by category on Policy dashboard.":::
62+
:::image type="content" source="./media/backup-managed-disks-policy/policy-dashboard-inline.png" alt-text="Screenshot shows how to filter the list by category on Policy dashboard.":::
5663

5764
4. Select the name of the policy. You're then redirected to the detailed definition for this policy.
5865

59-
:::image type="content" source="./media/backup-managed-disks-policy/policy-definition-blade.png" alt-text="Screenshot showing the Policy Definition pane.":::
66+
:::image type="content" source="./media/backup-managed-disks-policy/policy-definition-blade.png" alt-text="Screenshot shows the Policy Definition pane.":::
6067

6168
5. Select the **Assign** button at the top of the pane. This redirects you to the **Assign Policy** pane.
6269

6370
6. Under **Basics**, select the three dots next to the **Scope** field. It opens up a right context pane where you can select the subscription for the policy to be applied on. You can also optionally select a resource group, so that the policy is applied only for Disks in a particular resource group.
6471

65-
:::image type="content" source="./media/backup-managed-disks-policy/policy-assignment-basics.png" alt-text="Screenshot showing the Policy Assignment Basics tab.":::
72+
:::image type="content" source="./media/backup-managed-disks-policy/policy-assignment-basics.png" alt-text="Screenshot shows the Policy Assignment Basics tab.":::
6673

6774
7. In the **Parameters** tab, choose a location from the drop-down, and select the vault, backup policy to which the Disks in the scope must be associated, and resource group where these disk snapshots are stored. You can also choose to specify a tag name and an array of tag values. A Disk that contains any of the specified values for the given tag is included in the scope of the policy assignment.
6875

69-
:::image type="content" source="./media/backup-managed-disks-policy/policy-assignment-parameters.png" alt-text="Screenshot showing the Policy Assignment Parameters pane.":::
76+
:::image type="content" source="./media/backup-managed-disks-policy/policy-assignment-parameters.png" alt-text="Screenshot shows the Policy Assignment Parameters pane.":::
7077

7178
8. Ensure that **Effect** is set to deployIfNotExists.
7279

@@ -75,8 +82,9 @@ To assign Policy 2, follow these steps:
7582
> [!NOTE]
7683
>
7784
> - Use [remediation](../governance/policy/how-to/remediate-resources.md) to enable policy of existing Managed Disks.
78-
> - It's recommended that this policy not be assigned to more than 200 Disks at a time. If the policy is assigned to more than 200 Disks, it can result in the backup being triggered a few hours later than that specified by the schedule.
85+
> - We recommend that you don’t assign this policy to more than 200 disks. Otherwise, backup operation delays by several hours beyond the scheduled time.
86+
7987

80-
## Next step
88+
## Next steps
8189

8290
[Learn more about Azure Policy](../governance/policy/overview.md)

articles/backup/blob-backup-configure-manage.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Configure and manage backup for Azure Blobs using Azure Backup
33
description: Learn how to configure and manage operational and vaulted backups for Azure Blobs.
44
ms.topic: how-to
5-
ms.date: 09/26/2025
5+
ms.date: 11/25/2025
66
ms.service: azure-backup
77
author: AbhishekMallick-MS
88
ms.author: v-mallicka
@@ -154,17 +154,17 @@ Once backup is configured, changes taking place on block blobs in the storage ac
154154

155155
## Manage backups
156156

157-
You can use [Azure Business Continuity Center](../business-continuity-center/business-continuity-center-overview.md) as your single blade of glass for managing all your backups. Regarding backup for Azure Blobs, you can use Azure Business Continuity Center to do the following operations:
157+
You can use [Resiliency](../resiliency/resiliency-overview.md) as your single blade of glass for managing all your backups. Regarding backup for Azure Blobs, you can use Resiliency to do the following operations:
158158

159159
- As we've seen above, you can use it for creating Backup vaults and policies. You can also view all vaults and policies under the selected subscriptions.
160-
- Azure Business Continuity Center gives you an easy way to [monitor the state of protection](../business-continuity-center/tutorial-monitor-protection-summary.md) of protected storage accounts as well as storage accounts for which [backup isn't currently configured](../business-continuity-center/quick-understand-protection-estate.md#identify-unprotected-resources).
160+
- Resiliency gives you an easy way to [monitor the state of protection](../resiliency/tutorial-monitor-protection-summary.md) of protected storage accounts as well as storage accounts for which [backup isn't currently configured](../resiliency/quick-understand-protection-estate.md#identify-unprotected-resources).
161161
- You can configure backup for any storage accounts using the **+Configure protection** button.
162162
- You can initiate restores using the **Restore** button and track restores using **Jobs**. For more information on performing restores, see [Restore Azure Blobs](blob-restore.md?tabs=vaulted-backup).
163163
- Analyze your backup usage using Backup reports.
164164

165165
:::image type="content" source="./media/blob-backup-configure-manage/manage-azure-blob-backup.png" alt-text="Screenshot shows the Azure Business Continuity Center console to manage the Azure Blob backups." lightbox="./media/blob-backup-configure-manage/manage-azure-blob-backup.png":::
166166

167-
For more information, see [Overview of Azure Business Continuity Center](../business-continuity-center/business-continuity-center-overview.md).
167+
For more information, see [Overview of Resiliency](../resiliency/resiliency-overview.md).
168168

169169
## Stop protection
170170

@@ -177,7 +177,7 @@ To stop backup for a storage account, follow these steps:
177177

178178
1. Go to the backup instance for the storage account being backed up.
179179

180-
You can go to the backup instance from the storage account via **Storage account** > **Data protection** > **Manage backup settings**, or directly from the Business Continuity Center via **Business Continuity Center** > **Protected Items** , and then select **Azure Backup** as a **Solution** in the filter.
180+
You can go to the backup instance from the storage account via **Storage account** > **Data protection** > **Manage backup settings**, or directly from the Resiliency via **Resiliency** > **Protected Items** , and then select **Azure Backup** as a **Solution** in the filter.
181181

182182
:::image type="content" source="./media/blob-backup-configure-manage/storage-account-location.png" alt-text="Screenshot shows the Storage account location.":::
183183

0 commit comments

Comments
 (0)