Skip to content

Commit f2c6aeb

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into dns-author-chg
2 parents 9663a32 + 20fd6ba commit f2c6aeb

18 files changed

+61
-40
lines changed

articles/azure-resource-manager/templates/deployment-history-deletions.md

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,65 +2,76 @@
22
title: Deployment history deletions
33
description: Describes how Azure Resource Manager automatically deletes deployments from the deployment history. Deployments are deleted when the history is close to exceeding the limit of 800.
44
ms.topic: conceptual
5-
ms.date: 04/28/2025
5+
ms.date: 05/27/2025
66
ms.custom: devx-track-azurecli, devx-track-arm-template
77
---
88

99
# Automatic deletions from deployment history
1010

11-
Every time you deploy a template, information about the deployment is written to the deployment history. Each resource group is limited to 800 deployments in its deployment history.
12-
13-
Azure Resource Manager automatically deletes deployments from your history as you near the limit. Automatic deletion is a change from past behavior. Previously, you had to manually delete deployments from the deployment history to avoid getting an error. This change was implemented on August 6, 2020.
11+
When you deploy resources to Azure, the deployment details are recorded in the deployment history at the scope where the deployment occurs. Each scope—whether it's a [resource group](./deploy-to-resource-group.md), [subscription](./deploy-to-subscription.md), [management group](./deploy-to-management-group.md), [tenant](./deploy-to-tenant.md)—can store up to **800 deployments** in its history. Once this limit is reached, Azure **automatically deletes the oldest deployments** to make space for new ones. This automatic cleanup process was implemented on **August 6, 2020**.
1412

1513
> [!NOTE]
1614
> Deleting a deployment from the history doesn't affect any of the resources that were deployed.
1715
18-
## When deployments are deleted
16+
## Overview of automatic deployment history deletions
1917

2018
Deployments are deleted from your history when you exceed 700 deployments. Azure Resource Manager deletes deployments until the history is down to 600. The oldest deployments are always deleted first.
2119

2220
:::image type="content" border="false" source="./media/deployment-history-deletions/deployment-history.png" alt-text="Diagram of deployment history deletion.":::
2321

2422
> [!IMPORTANT]
25-
> If your resource group is already at the 800 limit, your next deployment fails with an error. The automatic deletion process starts immediately. You can try your deployment again after a short wait.
23+
> If your scope is already at the 800 limit, your next deployment fails with an error. The automatic deletion process starts immediately. You can try your deployment again after a short wait.
2624
2725
In addition to deployments, you also trigger deletions when you run the [what-if operation](./deploy-what-if.md) or validate a deployment.
2826

2927
When you give a deployment the same name as one in the history, you reset its place in the history. The deployment moves to the most recent place in the history. You also reset a deployment's place when you [roll back to that deployment](rollback-on-error.md) after an error.
3028

31-
## Remove locks that block deletions
29+
## Permissions required for automatic deletions
30+
31+
The deletions are requested under the identity of the user who deployed the template. To delete deployments, the user must have access to the **Microsoft.Resources/deployments/delete** action. If the user doesn't have the required permissions, deployments aren't deleted from the history.
32+
33+
If the current user doesn't have the required permissions, automatic deletion is attempted again during the next deployment.
34+
35+
## Handling resource locks
36+
37+
If you have a [CanNotDelete lock](../management/lock-resources.md) on a resource group or a subscription, the deployments for that scope can't be automatically deleted. To enable automatic cleanup of the deployment history, you need to remove the lock.
3238

33-
If you have a [CanNotDelete lock](../management/lock-resources.md) on a resource group, the deployments for that resource group can't be deleted. You must remove the lock to take advantage of automatic deletions in the deployment history.
39+
To delete a resource group lock, run the following commands:
3440

35-
To use PowerShell to delete a lock, run the following commands:
41+
### [PowerShell](#tab/azure-powershell)
3642

3743
```azurepowershell-interactive
3844
$lockId = (Get-AzResourceLock -ResourceGroupName lockedRG).LockId
3945
Remove-AzResourceLock -LockId $lockId
4046
```
4147

42-
To use Azure CLI to delete a lock, run the following commands:
48+
To delete a resource group lock, run the following commands:
49+
50+
### [Azure CLI](#tab/azure-cli)
4351

4452
```azurecli-interactive
4553
lockid=$(az lock show --resource-group lockedRG --name deleteLock --output tsv --query id)
4654
az lock delete --ids $lockid
4755
```
4856

49-
## Required permissions
57+
### [REST](#tab/rest)
5058

51-
The deletions are requested under the identity of the user who deployed the template. To delete deployments, the user must have access to the **Microsoft.Resources/deployments/delete** action. If the user doesn't have the required permissions, deployments aren't deleted from the history.
59+
```rest
60+
DELETE https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Authorization/locks/{lockName}?api-version=2016-09-01
61+
```
5262

53-
If the current user doesn't have the required permissions, automatic deletion is attempted again during the next deployment.
63+
---
5464

55-
## Opt out of automatic deletions
65+
## Opting out of automatic deletions
5666

57-
You can opt out of automatic deletions from the history. **Use this option only when you want to manage the deployment history yourself.** The limit of 800 deployments in the history is still enforced. If you exceed 800 deployments, you'll receive an error and your deployment will fail.
67+
You can opt out of automatic deletion to manually manage your deployment history. **Use this option cautiously**, as the **800-deployment limit** remains enforced, and exceeding it causes deployment failures.
5868

59-
To disable automatic deletions at the tenant or the management group scope, open a support ticket. For the instructions, see [Request support](./overview.md#get-support).
69+
> [!IMPORTANT]
70+
> Opting out is available only for subscription scopes, as it's controlled by the subscription-level `Microsoft.Resources/DisableDeploymentGrooming` feature flag. You can't opt out for only a particular resource group. For tenant or management group scopes, open a [support ticket](./overview.md#get-support) to disable automatic deletion.
6071
61-
To disable automatic deletions at the subscription scope, register the `Microsoft.Resources/DisableDeploymentGrooming` feature flag. When you register the feature flag, you opt out of automatic deletions for the entire Azure subscription. You can't opt out for only a particular resource group. To reenable automatic deletions, unregister the feature flag.
72+
To disable automatic deletion at the subscription scope (affects all resource groups within it):
6273

63-
# [PowerShell](#tab/azure-powershell)
74+
### [PowerShell](#tab/azure-powershell)
6475

6576
For PowerShell, use [Register-AzProviderFeature](/powershell/module/az.resources/Register-AzProviderFeature).
6677

@@ -76,7 +87,7 @@ Get-AzProviderFeature -ProviderNamespace Microsoft.Resources -FeatureName Disabl
7687

7788
To reenable automatic deletions, use Azure REST API or Azure CLI.
7889

79-
# [Azure CLI](#tab/azure-cli)
90+
### [Azure CLI](#tab/azure-cli)
8091

8192
For Azure CLI, use [az feature register](/cli/azure/feature#az-feature-register).
8293

@@ -96,7 +107,7 @@ To reenable automatic deletions, use [az feature unregister](/cli/azure/feature#
96107
az feature unregister --namespace Microsoft.Resources --name DisableDeploymentGrooming
97108
```
98109

99-
# [REST](#tab/rest)
110+
### [REST](#tab/rest)
100111

101112
For REST API, use [Features - Register](/rest/api/resources/features/register).
102113

articles/backup/backup-azure-recovery-services-vault-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Overview of Recovery Services vaults
33
description: An overview of Recovery Services vaults.
44
ms.topic: overview
5-
ms.date: 01/17/2025
5+
ms.date: 05/28/2025
66
ms.service: azure-backup
77
author: jyothisuri
88
ms.author: jsuri
@@ -12,7 +12,7 @@ ms.custom: engagement-fy24
1212

1313
This article describes the features of a Recovery Services vault.
1414

15-
A Recovery Services vault is a storage entity in Azure that houses data. The data is typically copies of data, or configuration information for virtual machines (VMs), workloads, servers, or workstations. You can use Recovery Services vaults to hold backup data for various Azure services such as IaaS VMs (Linux or Windows) and SQL Server in Azure VMs. Recovery Services vaults support System Center DPM, Windows Server, Azure Backup Server, and more. Recovery Services vaults make it easy to organize your backup data, while minimizing management overhead.
15+
A Recovery Services vault is a storage entity in Azure that houses data. The data is typically copies of data, or configuration information for virtual machines (VMs), workloads, servers, or workstations. You can use Recovery Services vaults to hold backup data for various Azure services such as IaaS VMs (Linux or Windows) and SQL Server in Azure VMs. Recovery Services vaults support System Center DPM, Windows Server, Azure Backup Server, and more. Recovery Services vaults make it easy to organize your backup data, while minimizing management overhead. Learn about the [types of vault supported for backup and restore](/azure/backup/backup-azure-backup-faq#what-are-the-various-vaults-supported-for-backup-and-restore-).
1616

1717
## Key features
1818

articles/backup/backup-vault-overview.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,19 @@
22
title: Overview of the Backup vaults
33
description: An overview of Backup vaults.
44
ms.topic: overview
5-
ms.date: 09/30/2024
5+
ms.date: 05/28/2025
66
ms.custom: references_regions
77
ms.service: azure-backup
88
author: jyothisuri
99
ms.author: jsuri
1010
---
1111
# Backup vaults overview
1212

13-
This article describes the features of a Backup vault. A Backup vault is a storage entity in Azure that houses backup data for certain newer workloads that Azure Backup supports. You can use Backup vaults to hold backup data for various Azure services, such as Azure Blob, Azure Database for PostgreSQL servers and newer workloads that Azure Backup will support. Backup vaults make it easy to organize your backup data, while minimizing management overhead. Backup vaults are based on the Azure Resource Manager model of Azure, which provides features such as:
13+
This article describes the features of a Backup vault. A Backup vault is a storage entity in Azure that houses backup data for certain newer workloads that Azure Backup supports. You can use Backup vaults to hold backup data for various Azure services, such as Azure Blob, Azure Database for PostgreSQL servers and newer workloads that Azure Backup will support. Backup vaults make it easy to organize your backup data, while minimizing management overhead. Learn about the [types of vault supported for backup and restore](/azure/backup/backup-azure-backup-faq#what-are-the-various-vaults-supported-for-backup-and-restore-).
14+
15+
## Key features
16+
17+
Backup vaults are based on the Azure Resource Manager model of Azure, which provides features such as:
1418

1519
- **Enhanced capabilities to help secure backup data**: With Backup vaults, Azure Backup provides security capabilities to protect cloud backups. The security features ensure you can secure your backups, and safely recover data, even if production and backup servers are compromised. [Learn more](backup-azure-security-feature.md)
1620

articles/communication-services/concepts/analytics/logs/call-diagnostics-updates-log-schema.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ When using the Call Diagnostics Updates Log Schema, always refer to the highest
4242

4343
### More about log versions and data latency
4444

45-
The call diagnostics updates log schema may require approximately 60 minutes following the end of a call to propogate data, most logs may be available within 40 minutes.
45+
The call diagnostics updates log schema may require approximately 60 minutes following the end of a call to propagate data, most logs may be available within 40 minutes.
4646

4747
After a call ends, an initial version (version 1) of the log is sent to the CallSummaryUpdates and CallDiagnosticUpdates tables. Initial versions may contain `null` values, if more information becomes available updated versions of the logs are created with more complete information. For example, client data can be delayed because of network connectivity issues between the client computer and our servers, or something as simple as a user closing the lid on their laptop post-call before their client data was sent and re-opening it hours (or days) later.
4848

articles/communication-services/concepts/analytics/logs/call-summary-updates-log-schema.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ When using the call summary updates log schema, always refer to the highest `Cal
4343

4444
### More about log versions and data latency
4545

46-
The call summary updates log schema may require approximately 60 minutes following the end of a call to propogate data, most logs may be available within 40 minutes.
46+
The call summary updates log schema may require approximately 60 minutes following the end of a call to propagate data, most logs may be available within 40 minutes.
4747

4848
After a call ends, an initial version (version 1) of the log is sent to the CallSummaryUpdates and CallDiagnosticUpdates tables. Initial versions may contain `null` values, if more information becomes available updated versions of the logs are created with more complete information. For example, client data can be delayed because of network connectivity issues between the client computer and our servers, or something as simple as a user closing the lid on their laptop post-call before their client data was sent and re-opening it hours (or days) later.
4949

articles/container-apps/tutorial-ci-cd-runners-jobs.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,13 +243,15 @@ To run a self-hosted runner, you need to create a personal access token (PAT) in
243243
GITHUB_PAT="<GITHUB_PAT>"
244244
REPO_OWNER="<REPO_OWNER>"
245245
REPO_NAME="<REPO_NAME>"
246+
REGISTRATION_TOKEN_API_URL="<YOUR_REGISTRATION_TOKEN_API_URL>"
246247
```
247248
248249
# [PowerShell](#tab/powershell)
249250
```powershell
250251
$GITHUB_PAT="<GITHUB_PAT>"
251252
$REPO_OWNER="<REPO_OWNER>"
252253
$REPO_NAME="<REPO_NAME>"
254+
$REGISTRATION_TOKEN_API_URL="<YOUR_REGISTRATION_TOKEN_API_URL>"
253255
```
254256
255257
---
@@ -261,6 +263,7 @@ To run a self-hosted runner, you need to create a personal access token (PAT) in
261263
| `<GITHUB_PAT>` | The GitHub PAT you generated. |
262264
| `<REPO_OWNER>` | The owner of the repository you created earlier. This value is usually your GitHub username. |
263265
| `<REPO_NAME>` | The name of the repository you created earlier. This value is the same name you entered in the *Repository name* field. |
266+
| `<YOUR_REGISTRATION_TOKEN_API_URL>` | The registration token API URL in the *entrypoint.sh* file. | For example, 'https://myapi.example.com/get-token' |
264267
265268
## Build the GitHub Actions runner container image
266269
@@ -647,15 +650,13 @@ To run a self-hosted runner, you need to create a personal access token (PAT) in
647650
AZP_TOKEN="<AZP_TOKEN>"
648651
ORGANIZATION_URL="<ORGANIZATION_URL>"
649652
AZP_POOL="container-apps"
650-
REGISTRATION_TOKEN_API_URL="<YOUR_REGISTRATION_TOKEN_API_URL>"
651653
```
652654
653655
# [PowerShell](#tab/powershell)
654656
```powershell
655657
$AZP_TOKEN="<AZP_TOKEN>"
656658
$ORGANIZATION_URL="<ORGANIZATION_URL>"
657659
$AZP_POOL="container-apps"
658-
$REGISTRATION_TOKEN_API_URL="<YOUR_REGISTRATION_TOKEN_API_URL>"
659660
```
660661
661662
---
@@ -666,7 +667,6 @@ To run a self-hosted runner, you need to create a personal access token (PAT) in
666667
|---|---|---|
667668
| `<AZP_TOKEN>` | The Azure DevOps PAT you generated. | |
668669
| `<ORGANIZATION_URL>` | The URL of your Azure DevOps organization. Make sure no trailing `/` is present at the end of the URL. | For example, `https://dev.azure.com/myorg` or `https://myorg.visualstudio.com`. |
669-
| `<YOUR_REGISTRATION_TOKEN_API_URL>` | The registration token API URL in the *entrypoint.sh* file. | For example, 'https://myapi.example.com/get-token' |
670670
671671
## Build the Azure Pipelines agent container image
672672

articles/cyclecloud/cluster-references/configuration-reference.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ Configuration object attributes behave like other objects, but are extended to p
1717
No quotes are necessary for strings or for boolean expressions, true or false.
1818

1919
``` ini
20-
[[[configuraton my-project]]]
20+
[[[configuration my-project]]]
2121
Attribute1 = Value1
2222
Attribute2 = Value2
2323
KeyAttribute3.Attribute3 = true
2424

25-
[[[configuraton cyclecloud.mounts.mount1]]]
25+
[[[configuration cyclecloud.mounts.mount1]]]
2626
Attribute1 = Value1
2727
```
2828

articles/defender-for-iot/organizations/how-to-manage-device-inventory-for-organizations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Use any of the following options to modify or filter the devices shown:
3030
| **Sort devices** | Select a column header to sort the devices by that column. Select it again to change the sort direction. |
3131
|**Filter devices shown** | Either use the **Search** box to search for specific device details, or select **Add filter** to filter the devices shown. <br><br> In the **Add filter** box, define your filter by column name, operator, and value. Select **Apply** to apply your filter.<br><br> You can apply multiple filters at the same time. Search results and filters aren't saved when you refresh the **Device inventory** page. <br><br> The **Last active time** and **Network location (Preview)** filters are on by default. |
3232
|**Modify columns shown** | Select **Edit columns** :::image type="icon" source="media/how-to-manage-device-inventory-on-the-cloud/edit-columns-icon.png" border="false":::. In the **Edit columns** pane:<br><br> - Select the **+ Add Column** button to add new columns to the grid.<br> - Drag and drop fields to change the columns order.<br>- To remove a column, select the **Delete** :::image type="icon" source="media/how-to-manage-device-inventory-on-the-cloud/trashcan-icon.png" border="false"::: icon to the right.<br>- To reset the columns to their default settings, select **Reset** :::image type="icon" source="media/how-to-manage-device-inventory-on-the-cloud/reset-icon.png" border="false":::. <br><br>Select **Save** to save any changes made. |
33-
| **Group devices** | From the **Group by** above the gird, select a category, such as **Class**, **Data source**, **Location**, **Purdue level**, **Site**, **Type**, **Vendor**, or **Zone**, to group the devices shown. Inside each group, devices retain the same column sorting. To remove the grouping, select **No grouping**. |
33+
| **Group devices** | From the **Group by** above the grid, select a category, such as **Class**, **Data source**, **Location**, **Purdue level**, **Site**, **Type**, **Vendor**, or **Zone**, to group the devices shown. Inside each group, devices retain the same column sorting. To remove the grouping, select **No grouping**. |
3434

3535
For more information, see [Device inventory column data](device-inventory.md#device-inventory-column-data).
3636

articles/event-grid/includes/event-grid-create-event-subscriptions-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
1. If you are on the **Topics** page of your Event Grid namespace in the Azure portal, select your topic from the list of topics. If you are on the **Topics** page, follow instructions from [create, view, and manage a namespace topics](../create-view-manage-namespace-topics.md) to identify the topic you want to use to create the event subscription.
1515

1616
:::image type="content" source="../media/create-view-manage-event-subscriptions/select-topic.png" alt-text="Screenshot showing Event Grid topics page with a topic selected." lightbox="../media/create-view-manage-event-subscriptions/select-topic.png":::
17-
1. On the **Event Gird Namespace Topic** page, select **Subscriptions** option in the **Entities** section on the left menu.
17+
1. On the **Event Grid Namespace Topic** page, select **Subscriptions** option in the **Entities** section on the left menu.
1818
1. On the **Subscriptions** page, select "**+ Subscription**" button on the command bar.
1919

2020
:::image type="content" source="../media/create-view-manage-event-subscriptions/event-subscription-create.png" alt-text="Screenshot showing Event Grid event subscription create." lightbox="../media/create-view-manage-event-subscriptions/event-subscription-create.png":::

0 commit comments

Comments
 (0)