Skip to content

Commit e6492e3

Browse files
authored
Merge pull request #298270 from MicrosoftDocs/main
4/15/2025 AM Publish
2 parents 9fc0e3f + 6c489dd commit e6492e3

File tree

77 files changed

+598
-513
lines changed

Some content is hidden

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

77 files changed

+598
-513
lines changed

articles/api-center/includes/api-center-service-limits.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ ms.custom: Include file
1414

1515
| Resource | Free plan<sup>1</sup> | Standard plan<sup>2</sup> |
1616
| ---------------------------------------------------------------------- | -------------------------- |-------------|
17+
| Maximum number of APIs | 200 | 10,000 |
1718
| Maximum number of versions per API | 5 | 100 |
1819
| Maximum number of definitions per version | 5 | 5 |
1920
| Maximum number of deployments per API | 10 | 10 |

articles/app-service/configure-authentication-provider-aad.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Configure Microsoft Entra Authentication
33
description: Learn how to configure Microsoft Entra authentication as an identity provider for your App Service or Azure Functions app.
44
ms.assetid: 6ec6a46c-bce4-47aa-b8a3-e133baef22eb
55
ms.topic: how-to
6-
ms.date: 01/28/2025
6+
ms.date: 03/28/2025
77
ms.custom: fasttrack-edit, AppServiceIdentity
88
author: cephalin
99
ms.author: cephalin

articles/app-service/deploy-authentication-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Authentication Types by Deployment Methods
33
description: Learn the available types of authentication with Azure App Service when you're deploying application code.
44
ms.topic: concept-article
5-
ms.date: 01/24/2025
5+
ms.date: 03/28/2025
66
author: cephalin
77
ms.author: cephalin
88
#customer intent: As an app developer, I want to understand the authentication options available for different deployment methods in Azure App Service.

articles/app-service/deploy-staging-slots.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Set Up Staging Environments
33
description: Learn how to deploy apps to a nonproduction slot and automatically swap into production. Increase the reliability and eliminate app downtime from deployments.
44
ms.assetid: e224fc4f-800d-469a-8d6a-72bcde612450
55
ms.topic: how-to
6-
ms.date: 01/24/2025
6+
ms.date: 03/28/2025
77
author: cephalin
88
ms.author: cephalin
99
ms.custom: fasttrack-edit, devx-track-azurepowershell, devx-track-azurecli, ai-video-demo

articles/app-service/reference-app-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Environment Variables and App Settings Reference
33
description: This article describes the commonly used environment variables in Azure App Service, and which ones can be modified with app settings.
44
ms.topic: conceptual
5-
ms.date: 03/19/2025
5+
ms.date: 03/28/2025
66
author: cephalin
77
ms.author: cephalin
88
---

articles/application-gateway/configuration-http-settings.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: application-gateway
55
author: greg-lindsay
66
ms.service: azure-application-gateway
77
ms.topic: concept-article
8-
ms.date: 03/19/2025
8+
ms.date: 04/14/2025
99
ms.author: greglin
1010
---
1111

@@ -34,9 +34,7 @@ The default affinity cookie name is *ApplicationGatewayAffinity* and you can cha
3434
3535
## Connection draining
3636

37-
Connection draining helps you gracefully remove backend pool members during planned service updates. It applies to backend instances that are
38-
- explicitly removed from the backend pool, or
39-
- reported as unhealthy by the health probes.
37+
Connection draining helps you gracefully remove backend pool members during planned service updates. It applies to backend instances that are explicitly removed from the backend pool.
4038

4139
You can apply this setting to all backend pool members by enabling Connection Draining in the Backend Setting. It ensures that all deregistering instances in a backend pool don't receive any new requests/connections while maintaining the existing connections until the configured timeout value. This process is also true for WebSocket connections.
4240

articles/application-gateway/features.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: application-gateway
55
author: greg-lindsay
66
ms.service: azure-application-gateway
77
ms.topic: concept-article
8-
ms.date: 03/24/2023
8+
ms.date: 04/14/2025
99
ms.author: greglin
1010
---
1111

@@ -104,15 +104,11 @@ For more information, see [WebSocket support](application-gateway-websocket.md)
104104

105105
## Connection draining
106106

107-
Connection draining helps you achieve graceful removal of backend pool members during planned service updates or problems with backend health. This setting is enabled via the [Backend Setting](configuration-http-settings.md) and is applied to all backend pool members during rule creation. Once enabled, the application gateway ensures all deregistering instances of a backend pool don't receive any new requests while allowing existing requests to complete within a configured time limit. It applies to cases where backend instances are:
108-
- explicitly removed from the backend pool after a configuration change by a user, or
109-
- reported as unhealthy by the health probes
110-
111-
The only exception is when requests continue to be proxied to the deregistering instances because of gateway-managed session affinity.
107+
Connection draining helps you achieve graceful removal of backend pool members during planned service updates or problems with backend health. This setting is enabled via the [Backend Setting](configuration-http-settings.md) and is applied to all backend pool members during rule creation. Once enabled, the application gateway ensures all deregistering instances of a backend pool don't receive any new requests while allowing existing requests to complete within a configured time limit. It applies to cases where backend instances are explicitly removed from the backend pool after a configuration change by a user.
112108

113109
The connection draining is honored for WebSocket connections as well. Connection draining is invoked for every single update to the gateway. To prevent connection loss to existing members of the backend pool, make sure to enable connection draining.
114110

115-
For information on time limits, see [Backend Settings configuration](configuration-http-settings.md#connection-draining).
111+
For more details, see [Backend Settings configuration](configuration-http-settings.md#connection-draining).
116112

117113
## Custom error pages
118114

articles/azure-cache-for-redis/index.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
- ignite-2024
1111

1212

13-
ms.date: 03/11/2025
13+
ms.date: 04/14/2025
1414
appliesto:
1515
- ✅ Azure Cache for Redis
1616

@@ -76,10 +76,10 @@ landingContent:
7676
- linkListType: overview
7777
links:
7878
- text: What is Azure Managed Redis?
79-
url: ../redis/overview.md
79+
url: /azure/redis/overview
8080
- text: What's new?
81-
url: ../redis/whats-new.md
81+
url: /azure/redis/whats-new
8282
- text: Azure Managed Redis architecture
83-
url: ../redis/architecture.md
83+
url: /azure/redis/architecture
8484
- text: Moving to Azure Managed Redis from Azure Cache for Redis
85-
url: ../redis/migrate/migrate-overview.md
85+
url: /azure/redis/migrate/migrate-overview

articles/azure-resource-manager/bicep/parameters.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ param storageAccountName string
150150

151151
When you hover your cursor over **storageAccountName** in Visual Studio Code, you see the formatted text:
152152

153-
:::image type="content" source="./media/parameters/vscode-bicep-extension-description-decorator-markdown.png" alt-text="Use Markdown-formatted text in VSCode":::
153+
:::image type="content" source="./media/parameters/vscode-bicep-extension-description-decorator-markdown.png" alt-text="Use Markdown-formatted text in VS Code":::
154154

155155
Make sure the text follows proper Markdown formatting; otherwise, it might not display correctly when rendered.
156156

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,35 @@
11
---
2-
title: Mission critical workload labeling
3-
description: Understand how to label mission critical workloads in Azure for Microsoft workload assessments
2+
title: Label mission-critical workloads
3+
description: Learn how to label mission-critical workloads in Azure to assess Microsoft workloads.
44
ms.topic: conceptual
5-
ms.date: 03/20/2025
5+
ms.date: 04/14/2025
66
---
7-
# Mission critical workload labeling
87

9-
Azure provides a robust, scalable cloud platform with various tools and services to help you manage and optimize your resources. This document outlines how to tag resources in an Azure tenant for identifying mission-critical workloads and determining potential resiliency improvements. Tagging your resources streamlines the onboarding of your workload definition for Microsoft assessments, providing a more concisely targeted review.
8+
# Label mission-critical workloads
109

11-
## Understanding Azure tags
10+
Azure provides a robust, scalable cloud platform with various tools and services to help you manage and optimize your resources. This document outlines how to tag resources in an Azure tenant to identify mission-critical workloads and determine potential resiliency improvements. Tagging your resources streamlines how your workload definitions are onboarded for Microsoft assessments, providing a more concisely targeted review.
1211

13-
For an introduction to tagging of Azure resources and to learn about requirements and limitations refer to the following article.
12+
## Understand Azure tags
1413

15-
[Use tags to organize your Azure resources and management hierarchy - Azure Resource Manager | Microsoft Learn](/azure/azure-resource-manager/management/tag-resources)
14+
For an introduction about tagging Azure resources and to learn about requirements and limitations, refer to [Use tags to organize your Azure resources and management hierarchy](/azure/azure-resource-manager/management/tag-resources).
1615

17-
## Why identify mission critical workloads?
16+
## Why identify mission-critical workloads?
1817

19-
Identifying mission critical related resources brings numerous benefits including resource management, cost management and optimization, security, automation and workload optimization. By tagging these resources, you can group them as part of a mission critical workload. These tags help in accurately identifying and managing these essential workloads. You can read more about tagging usage here [Resource naming and tagging decision guide - Cloud Adoption Framework | Microsoft Learn](/azure/cloud-adoption-framework/ready/azure-best-practices/resource-naming-and-tagging-decision-guide).
18+
The term _workload_ refers to a collection of application resources that support a common business goal or the execution of a common business process with multiple services, such as APIs and data stores, that work together to deliver specific end-to-end functionality.
2019

21-
This article aligns with workload optimization, where tagging can help inform of opportunities to improve resiliency and further enhance your Service Level Objectives.
20+
Mission-critical workload resources are often spread across multiple resource groups and subscriptions. Regardless of the resource location, each resource within a mission-critical workload should be included in the workload definition and tagged appropriately.
2221

23-
*This documentation supports a Microsoft assessment of your environment using the tagging approach described. Your Microsoft contact reviews this tagging approach with you at the beginning of the assessment. If you don't have an engagement with Microsoft, you can still follow the guidance to realize the benefits outlined earlier.*
22+
Identifying related mission-critical resources has benefits that include resource management, cost management and optimization, security, automation, and workload optimization. By tagging resources, you to group them into a mission-critical workload where tags accurately identify and manage these essential workloads.
2423

25-
The term workload refers to a collection of application resources that support a common business goal or the execution of a common business process, with multiple services, such as APIs and data stores, working together to deliver specific end-to-end functionality.
24+
In a scenario where a mission-critical workload depends on a service that's shared across multiple workloads, such as an Azure ExpressRoute gateway or an Azure Firewall, the shared resources should also be included in the workload definition and tagged appropriately. See the examples in the following section for how to tag values on shared services.
2625

27-
Mission critical workload resources are often spread across multiple resource groups and subscriptions. Regardless of the resource location, each resource within the mission critical workload should be included in the workload definition and tagged appropriately.
26+
This article aligns with workload optimization, and tagging can identify opportunities to improve resiliency and further enhance your Service Level Objectives.
2827

29-
In a scenario where a mission critical workload depends on a service that is shared across multiple workloads, such as an ExpressRoute gateway or an Azure Firewall, the shared resources should also be included in the workload definition and tagged appropriately. See the example in the previous section for tag values to be used on shared services.
28+
*This documentation recommends the tagging approach described to support a Microsoft assessment of your environment. Your Microsoft contact reviews this tagging approach with you at the beginning of the assessment. If you don't have an engagement with Microsoft, you can still follow the guidance to realize the benefits outlined earlier.*
3029

31-
For further insights into defining a workload, refer to the following article.
30+
## Mission-critical predefined tags
3231

33-
[Azure Well-Architected Framework workloads - Microsoft Azure Well-Architected Framework | Microsoft Learn](/azure/well-architected/workloads)
34-
35-
## Mission critical predefined tags
36-
37-
To enable use by Microsoft in a workload assessment, the tags used for mission critical workloads must use the following tag name and adhere to the value format.
32+
To enable use by Microsoft in a workload assessment, the tags used for mission-critical workloads must use the following tag name and adhere to the value format:
3833

3934
> [!Important]
4035
> Tag values must **NOT** contain numeric or non-English characters.
@@ -47,14 +42,14 @@ To enable use by Microsoft in a workload assessment, the tags used for mission c
4742

4843
### Examples
4944

50-
#### Mission critical workload #1
45+
#### Mission-critical workload #1
5146

5247
| **Workload Component** | **Tag Name** | **Tag Value** |
5348
|---|---|---|
5449
| **Workload A** | Azure.MissionCriticalWorkload | Finance-Workload |
5550
| **Shared Services** | Azure.MissionCriticalWorkload | SharedServices-ExpressRoute |
5651

57-
#### Mission critical workload #2
52+
#### Mission-critical workload #2
5853

5954
| **Workload Component** | **Tag Name** | **Tag Value** |
6055
|---|---|---|
@@ -64,11 +59,16 @@ To enable use by Microsoft in a workload assessment, the tags used for mission c
6459

6560
## How to apply Azure tags
6661

67-
Tagging of mission critical workloads requires that tags be applied to each of the individual Azure resources that make up the workload. Tags can be applied to resources in the Azure portal, with Azure Policy, or via automation tools. Review the following guidance to determine the approach that works best for your organization.
62+
Tagging mission-critical workloads requires that tags be applied to each Azure resource that makes up a workload. Tags can be applied to resources in the Azure portal, with Azure Policy, or via automation tools. Review the following guidance to determine the approach that works best for your organization:
63+
64+
- Azure portal: [Apply tags with Azure portal](/azure/azure-resource-manager/management/tag-resources-portal)
65+
- Azure Policy: [Assign policy definitions for tag compliance](/azure/azure-resource-manager/management/tag-policies)
66+
- Azure PowerShell: [Apply tags with Azure PowerShell](/azure/azure-resource-manager/management/tag-resources-powershell)
67+
- Azure CLI: [Apply tags with Azure CLI](/azure/azure-resource-manager/management/tag-resources-cli)
68+
- Bicep: [Apply tags with Bicep](/azure/azure-resource-manager/management/tag-resources-bicep)
69+
- Terraform: [Microsoft.Resources/tags](/azure/templates/microsoft.resources/tags?pivots=deployment-language-terraform)
70+
71+
## Next steps
6872

69-
- Azure portal: [Tag resources, resource groups, and subscriptions with Azure portal - Azure Resource Manager | Microsoft Learn](/azure/azure-resource-manager/management/tag-resources-portal)
70-
- Azure Policy: [Policy definitions for tagging resources - Azure Resource Manager | Microsoft Learn](/azure/azure-resource-manager/management/tag-policies)
71-
- Azure PowerShell: [Tag resources, resource groups, and subscriptions with Azure PowerShell - Azure Resource Manager | Microsoft Learn](/azure/azure-resource-manager/management/tag-resources-powershell)
72-
- Azure CLI: [Tag resources, resource groups, and subscriptions with Azure CLI - Azure Resource Manager | Microsoft Learn](/azure/azure-resource-manager/management/tag-resources-cli)
73-
- Bicep: [Tag resources, resource groups, and subscriptions with Bicep - Azure Resource Manager | Microsoft Learn](/azure/azure-resource-manager/management/tag-resources-bicep)
74-
- Terraform: [Microsoft.Resources/tags - Bicep, ARM template & Terraform AzAPI reference | Microsoft Learn](/azure/templates/microsoft.resources/tags)
73+
- For more information about defining workloads, see [Azure Well-Architected Framework workloads](/azure/well-architected/workloads).
74+
- To learn more about using tags, see the Azure Cloud Adoption Framework [Resource naming and tagging decision guide](/azure/cloud-adoption-framework/ready/azure-best-practices/resource-naming-and-tagging-decision-guide).

0 commit comments

Comments
 (0)