Skip to content

Commit d506fb4

Browse files
authored
Merge branch 'MicrosoftDocs:main' into TOCupdates
2 parents eddb96a + bb70e81 commit d506fb4

File tree

690 files changed

+1602
-2424
lines changed

Some content is hidden

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

690 files changed

+1602
-2424
lines changed

articles/azure-functions/functions-consumption-costs.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Estimating consumption-based costs in Azure Functions
33
description: Learn how to better estimate the costs that you might incur when running your function app in either the Consumption plan or the Flex Consumption plan in Azure Functions.
4-
ms.date: 11/05/2024
4+
ms.date: 02/10/2025
55
ms.topic: conceptual
66
ms.custom:
77
- build-2024
@@ -52,24 +52,24 @@ Consider a function app that is comprised only of HTTP triggers with and these b
5252
+ HTTP triggers handle 10 concurrent requests.
5353
+ The instance memory size setting is `2048 MB`.
5454
+ There are _no always ready instances configured_, which means the app can scale to zero.
55-
<!--- Update these example calculations after 12/1 based on GA pricing -->
55+
5656
In a situation like this, the pricing depends more on the kind of work being done during code execution. Let's look at two workload scenarios:
5757

5858
+ **CPU-bound workload:** In a CPU-bound workload, there's no advantage to processing multiple requests in parallel in the same instance. This means that you're better off distributing each request to its own instance so requests complete as a quickly as possible without contention. In this scenario, you should set a low [HTTP trigger concurrency](./functions-concurrency.md#http-trigger-concurrency) of `1`. With 10 concurrent requests, the app scales to a steady state of roughly 10 instances, and each instance is continuously active processing one request at a time.
5959

60-
Because the size of each instance is ~2 GB, the consumption for a single continuously active instance is `2 GB * 3600 s = 7200 GB-s`, which at the assumed on-demand execution rate (without any free grants applied) is `$0.1152 USD` per hour per instance. Because the CPU-bound app is scaled to 10 instance, the total hourly rate for execution time is `$1.152 USD`.
60+
Because the size of each instance is ~2 GB, the consumption for a single continuously active instance is `2 GB * 3600 s = 7200 GB-s`. Assuming an on-demand execution rate of $0.000026 GB-s (without any free grants applied) becomes `$0.1872 USD` per hour per instance. Because the CPU-bound app is scaled to 10 instance, the total hourly rate for execution time is `$1.872 USD`.
6161

62-
Similarly, the on-demand per-execution charge (without any free grants) of 40 requests per second is equal to `40 * 3600 = 144,000` or 0.144 million executions per hour. The total (grant-free) hourly cost of executions is then `0.144 * $0.20`, which is `$0.0288` per hour.
62+
Similarly, the on-demand per-execution charge (without any free grants) of 40 requests per second is equal to `40 * 3600 = 144,000` or `0.144 million` executions per hour. Assuming an on-demand rate of `$0.40` per million executions, the total (grant-free) hourly cost of executions is `0.144 * $0.40`, which is `$0.0576` per hour.
6363

64-
In this scenario, the total hourly cost of running on-demand on 10 instances is `$1.152 + $0.0288 = $1.1808 USD`.
64+
In this scenario, the total hourly cost of running on-demand on 10 instances is `$1.872 + $0.0576s = $1.9296 USD`.
6565

6666
+ **IO bound workload:** In an IO-bound workload, most of the application time is spent waiting on incoming request, which might be limited by network throughput or other upstream factors. Because of the limited inputs, the code can process multiple operations concurrently without negative impacts. In this scenario, assume you can process all 10 concurrent requests on the same instance.
6767

68-
Because consumption charges are based only on the memory of each active instance, the consumption charge calculation is simply `2 GB * 3600 s = 7200 GB-s`, which at the assumed on-demand execution rate (without any free grants applied) is `$0.1152 USD` per hour for the single instance.
68+
Because consumption charges are based only on the memory of each active instance, the consumption charge calculation is simply `2 GB * 3600 s = 7200 GB-s`, which at the assumed on-demand execution rate (without any free grants applied) is `$0.1872 USD` per hour for the single instance.
6969

70-
As in the CPU-bound scenario, the on-demand per-execution charge (without any free grants) of 40 requests per second is equal to `40 * 3600 = 144,000` or 0.144 million executions per hour. In this case, the total (grant-free) hourly cost of executions `0.144 * $0.20`, which is `$0.0288` per hour.
70+
As in the CPU-bound scenario, the on-demand per-execution charge (without any free grants) of 40 requests per second is equal to `40 * 3600 = 144,000` or 0.144 million executions per hour. In this case, the total (grant-free) hourly cost of executions `0.144 * $0.40`, which is `$0.0576` per hour.
7171

72-
In this scenario, the total hourly cost of running on-demand on a single instance is `$0.1152 + $0.0288 = $0.144 USD`.
72+
In this scenario, the total hourly cost of running on-demand on a single instance is `$0.1872 + $0.0576 = $0.245 USD`.
7373

7474
### [Consumption plan](#tab/consumption-plan)
7575

articles/azure-resource-manager/management/create-private-link-access-portal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Create private link for managing resources - Azure portal
33
description: Use Azure portal to create private link for managing resources.
44
ms.topic: conceptual
5-
ms.date: 09/26/2024
5+
ms.date: 02/09/2025
66
---
77

88
# Use portal to create private link for managing Azure resources
@@ -13,7 +13,7 @@ This article explains how to use [Azure Private Link](../../private-link/index.y
1313

1414
## Create resource management private link
1515

16-
When you create a resource management private link, the private link association is automatically created for you.
16+
When you create a resource management private link, the portal automatically creates the private link association for you.
1717

1818
1. In the [portal](https://portal.azure.com), search for **Resource management private links** and select it from the available options.
1919

articles/azure-resource-manager/management/delete-resource-group.md

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
2-
title: Delete resource group and resources
3-
description: Describes how to delete resource groups and resources. It describes how Azure Resource Manager orders the deletion of resources when a deleting a resource group. It describes the response codes and how Resource Manager handles them to determine if the deletion succeeded.
2+
title: Delete Resource Groups and Resources
3+
description: Describes how to delete resource groups and resources. It describes how Azure Resource Manager orders the deletion of resources when you delete a resource group. It describes the response codes and how Resource Manager handles them to determine if the deletion succeeded.
44
ms.topic: conceptual
5-
ms.date: 09/26/2024
5+
ms.date: 02/09/2025
66
ms.custom: devx-track-arm-template
77
content_well_notification:
88
- AI-contribution
@@ -17,7 +17,7 @@ This article shows how to delete resource groups and resources. It describes how
1717
> To delete a resource group, you must first remove any underlying resource locks and backup data.
1818
>
1919
20-
## How order of deletion is determined
20+
## How Resource Manager determines the order of deletion
2121

2222
When you delete a resource group, Resource Manager determines the order to delete resources. It uses the following order:
2323

@@ -27,7 +27,7 @@ When you delete a resource group, Resource Manager determines the order to delet
2727

2828
3. The remaining resources are deleted after the previous two categories.
2929

30-
After the order is determined, Resource Manager issues a DELETE operation for each resource. It waits for any dependencies to finish before proceeding.
30+
After Resource Manager determines the order, it issues a DELETE operation for each resource. It waits for any dependencies to finish before proceeding.
3131

3232
For synchronous operations, the expected successful response codes are:
3333

@@ -36,18 +36,17 @@ For synchronous operations, the expected successful response codes are:
3636
* 404
3737

3838
For asynchronous operations, the expected successful response is 202. Resource Manager tracks the location header or the azure-async operation header to determine the status of the asynchronous delete operation.
39-
4039
### Deletion errors
4140

42-
When a delete operation returns an error, Resource Manager retries the DELETE call. Retries happen for the 5xx, 429 and 408 status codes. By default, the time period for retry is 15 minutes.
41+
When a delete operation returns an error, Resource Manager retries the DELETE call. Retries happen for the 5xx, 429, and 408 status codes. By default, the time period for retry is 15 minutes.
4342

4443
## After deletion
4544

46-
Resource Manager issues a GET call on each resource that it tried to delete. The response of this GET call is expected to be 404. When Resource Manager gets a 404, it considers the deletion to have completed successfully. Resource Manager removes the resource from its cache.
45+
Resource Manager issues a GET call on each resource that it tried to delete. The response of this GET call is expected to be 404. When Resource Manager gets a 404, it considers the deletion to be successful. Resource Manager removes the resource from its cache.
4746

4847
However, if the GET call on the resource returns a 200 or 201, Resource Manager recreates the resource.
4948

50-
If the GET operation returns an error, Resource Manager retries the GET for the following error code:
49+
If the GET operation returns an error, Resource Manager retries the GET for the following error codes:
5150

5251
* Less than 100
5352
* 408
@@ -57,11 +56,11 @@ If the GET operation returns an error, Resource Manager retries the GET for the
5756
For other error codes, Resource Manager fails the deletion of the resource.
5857

5958
> [!IMPORTANT]
60-
> Resource Group deletion is irreversible.
59+
> Resource group deletion is irreversible.
6160
6261
## Delete resource group
6362

64-
Use one of the following methods to delete the resource group.
63+
To delete the resource group, use one of the following methods.
6564

6665
# [PowerShell](#tab/azure-powershell)
6766

@@ -81,9 +80,9 @@ az group delete --name ExampleResourceGroup
8180

8281
1. Select **Delete resource group**.
8382

84-
:::image type="content" source="./media/delete-resource-group/delete-group.png" alt-text="Screenshot of the Delete resource group button in the Azure portal.":::
83+
:::image type="content" source="./media/delete-resource-group/delete-group.png" alt-text="Screenshot of the 'Delete resource group' button in the Azure portal.":::
8584

86-
1. To confirm the deletion, type the name of the resource group
85+
1. To confirm the deletion, type the name of the resource group.
8786

8887
# [Python](#tab/azure-python)
8988

@@ -104,7 +103,7 @@ rg_result = resource_client.resource_groups.begin_delete("exampleGroup")
104103

105104
## Delete resource
106105

107-
Use one of the following methods to delete a resource.
106+
To delete a resource, use one of the following methods.
108107

109108
# [PowerShell](#tab/azure-powershell)
110109

@@ -164,34 +163,34 @@ resource_client.resources.begin_delete_by_id(
164163
To delete a resource group, you need access to the delete action for the **Microsoft.Resources/subscriptions/resourceGroups** resource.
165164

166165
> [!IMPORTANT]
167-
> The only permission required to delete a resource group is permission to the delete action for deleting resource groups. You do **not** need permission to delete individual resources within that resource group. Additionally, delete actions that are specified in **notActions** for a roleAssignment are superseded by the resource group delete action. This is consistent with the scope hierarchy in the Azure role-based access control model.
166+
> The only permission required to delete a resource group is permission to the delete action for deleting resource groups. You don't need permission to delete individual resources within that resource group. Additionally, delete actions that are specified in **notActions** for a roleAssignment are superseded by the resource group delete action. This requirement is consistent with the scope hierarchy in the Azure role-based access control model.
168167
169168
For a list of operations, see [Azure resource provider operations](../../role-based-access-control/resource-provider-operations.md). For a list of built-in roles, see [Azure built-in roles](../../role-based-access-control/built-in-roles.md).
170169

171-
If you have the required access, but the delete request fails, it may be because there's a [lock on the resources or resource group](lock-resources.md). Even if you didn't manually lock a resource group, [a related service may have automatically locked it](lock-resources.md#managed-applications-and-locks). Or, the deletion can fail if the resources are connected to resources in other resource groups that aren't being deleted. For example, you can't delete a virtual network with subnets that are still in use by a virtual machine.
170+
If you have the required access, but the delete request fails, it might be because there's a [lock on the resources or resource group](lock-resources.md). Even if you didn't manually lock a resource group, [a related service might automatically lock it](lock-resources.md#managed-applications-and-locks). Or, the deletion can fail if the resources are connected to resources in other resource groups that aren't being deleted. For example, you can't delete a virtual network with subnets that a virtual machine uses.
172171

173172
## Can I recover a deleted resource group?
174173

175174
No, you can't recover a deleted resource group. However, you might be able to restore some recently deleted resources.
176175

177176
Some resource types support *soft delete*. You might have to configure soft delete before you can use it. For information about enabling soft delete, see:
178177

179-
* [Azure Key Vault soft-delete overview](/azure/key-vault/general/soft-delete-overview)
180-
* [Azure Storage - Soft delete for containers](../../storage/blobs/soft-delete-container-overview.md)
181-
* [Azure Storage - Soft delete for blobs](../../storage/blobs/soft-delete-blob-overview.md)
178+
* [Soft-delete overview - Azure Key Vault](/azure/key-vault/general/soft-delete-overview)
179+
* [Soft delete for containers - Azure Storage](../../storage/blobs/soft-delete-container-overview.md)
180+
* [Soft delete for blobs - Azure Storage](../../storage/blobs/soft-delete-blob-overview.md)
182181
* [Soft delete for Azure Backup](../../backup/backup-azure-security-feature-cloud.md)
183182
* [Soft delete for SQL server in Azure VM and SAP HANA in Azure VM workloads](../../backup/soft-delete-sql-saphana-in-azure-vm.md)
184183
* [Soft delete for virtual machines](../..//backup/soft-delete-virtual-machines.md)
185184

186185
To restore deleted resources, see:
187186

188187
* [Recover deleted Azure AI services resources](/azure/ai-services/manage-resources)
189-
* [Microsoft Entra - Recover from deletions](../../active-directory/architecture/recover-from-deletions.md)
188+
* [Recover from deletions - Microsoft Entra](../../active-directory/architecture/recover-from-deletions.md)
190189

191190
You can also [open an Azure support case](/azure/azure-portal/supportability/how-to-create-azure-support-request). Provide as much detail as you can about the deleted resources, including their resource IDs, types, and resource names. Request that the support engineer check if the resources can be restored.
192191

193192
> [!NOTE]
194-
> Recovery of deleted resources is not possible under all circumstances. A support engineer will investigate your scenario and advise you whether it's possible.
193+
> Recovery of deleted resources isn't possible under all circumstances. A support engineer investigates your scenario and advises you whether it's possible.
195194
196195
## Next steps
197196

articles/azure-resource-manager/management/extension-resource-types.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
2-
title: Extension resource types
3-
description: Lists the Azure resource types are used to extend the capabilities of other resource types.
2+
title: Extension Resource Types
3+
description: Lists the Azure resource types that you use to extend the capabilities of other resource types.
44
ms.topic: conceptual
5-
ms.date: 07/24/2024
5+
ms.date: 02/09/2025
66
---
77

88
# Resource types that extend capabilities of other resources
99

10-
An extension resource is a resource that adds to another resource's capabilities. For example, resource lock is an extension resource. You apply a resource lock to another resource to prevent it from being deleted or modified. It doesn't make sense to create a resource lock by itself. An extension resource is always applied to another resource.
10+
An extension resource is a resource that adds to another resource's capabilities. For example, resource lock is an extension resource. You apply a resource lock to another resource to prevent it from being deleted or modified. It doesn't make sense to create a resource lock by itself. You always apply an extension resource to another resource.
1111

1212
## Microsoft.Advisor
1313

articles/azure-resource-manager/management/manage-private-link-access-commands.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
2-
title: Manage resource management private links
2+
title: Manage Resource Management Private Links
33
description: Use APIs to manage existing resource management private links
44
ms.topic: conceptual
55
ms.custom: devx-track-azurecli, devx-track-azurepowershell
6-
ms.date: 09/26/2024
6+
ms.date: 02/09/2025
77
---
88

99
# Manage resource management private links
1010

11-
This article explains how you to work with existing resource management private links. It shows API operations for getting and deleting existing resources.
11+
This article explains how to work with existing resource management private links. It shows API operations for getting and deleting existing resources.
1212

1313
If you need to create a resource management private link, see [Use portal to create private link for managing Azure resources](create-private-link-access-portal.md) or [Use APIs to create private link for managing Azure resources](create-private-link-access-commands.md).
1414

0 commit comments

Comments
 (0)