Skip to content

Commit 9eb2b87

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vnet-toc-patch
2 parents ec5862e + 9ffcf7e commit 9eb2b87

File tree

668 files changed

+5980
-18906
lines changed

Some content is hidden

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

668 files changed

+5980
-18906
lines changed

.github/policies/disallow-edits.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ configuration:
160160
matchAny: true
161161
pattern: articles/reliability/*
162162
- commentContains:
163-
pattern: \#sign-off
164-
isRegex: false
163+
pattern: '\#sign-off'
164+
isRegex: true
165165
- not:
166166
or:
167167
- isActivitySender:

.openpublishing.redirection.json

Lines changed: 85 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,80 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/automation/change-tracking/enable-from-portal.md",
5+
"redirect_url": "/azure/automation/change-tracking/enable-vms-monitoring-agent",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/automation/change-tracking/enable-from-vm.md",
10+
"redirect_url": "/azure/automation/change-tracking/enable-vms-monitoring-agent",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/automation/change-tracking/enable-from-automation-account.md",
15+
"redirect_url": "/azure/automation/change-tracking/enable-vms-monitoring-agent",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/automation/change-tracking/configure-alerts.md",
20+
"redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/automation/change-tracking/enable-from-runbook.md",
25+
"redirect_url": "/azure/automation/change-tracking/manage-change-tracking-monitoring-agent",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/automation/change-tracking/manage-change-tracking.md",
30+
"redirect_url": "/azure/automation/change-tracking/manage-change-tracking-monitoring-agent",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "articles/automation/change-tracking/manage-inventory-vms.md",
35+
"redirect_url": "/azure/automation/change-tracking/manage-change-tracking-monitoring-agent",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "articles/automation/change-tracking/manage-scope-configurations.md",
40+
"redirect_url": "/azure/automation/change-tracking/enable-vms-monitoring-agent",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "articles/automation/change-tracking/overview.md",
45+
"redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "articles/automation/change-tracking/remove-feature.md",
50+
"redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "articles/automation/change-tracking/remove-vms-from-change-tracking.md",
55+
"redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "articles/automation/how-to/region-mappings.md",
60+
"redirect_url": "/azure/automation/change-tracking/region-mappings-monitoring-agent",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "articles/automation/automation-tutorial-installed-software.md",
65+
"redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path": "articles/automation/troubleshoot/change-tracking.md",
70+
"redirect_url": "/azure/automation/change-tracking/guidance-migration-log-analytics-monitoring-agent",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path": "articles/automation/troubleshoot/onboarding.md",
75+
"redirect_url": "/azure/automation/change-tracking/guidance-migration-log-analytics-monitoring-agent",
76+
"redirect_document_id": false
77+
},
378
{
479
"source_path": "articles/migrate/tutorial-modernize-asp-net-aks.md",
580
"redirect_url": "/azure/migrate/migrate-services-overview",
@@ -1865,6 +1940,11 @@
18651940
"redirect_url": "/azure/api-management/monitor-api-management",
18661941
"redirect_document_id": false
18671942
},
1943+
{
1944+
"source_path_from_root": "/articles/vpn-gateway/vpn-gateway-cross-premises-options.md",
1945+
"redirect_url": "/previous-versions/azure/vpn-gateway/vpn-gateway-about-vpn-gateway-settings",
1946+
"redirect_document_id": false
1947+
},
18681948
{
18691949
"source_path_from_root": "/articles/vpn-gateway/vpn-gateway-about-forced-tunneling.md",
18701950
"redirect_url": "/previous-versions/azure/vpn-gateway/vpn-gateway-about-forced-tunneling",
@@ -4085,36 +4165,6 @@
40854165
"redirect_url": "/azure/notification-hubs/notification-hubs-push-notification-http2-token-authentication",
40864166
"redirect_document_id": false
40874167
},
4088-
{
4089-
"source_path_from_root": "/articles/openshift/howto-encrypt-data-disks.md",
4090-
"redirect_url": "/azure/openshift/howto-byok",
4091-
"redirect_document_id": false
4092-
},
4093-
{
4094-
"source_path_from_root": "/articles/openshift/howto-deploy-java-jboss-enterprise-application-platform-with-auto-redeploy.md",
4095-
"redirect_url": "/azure/openshift/index",
4096-
"redirect_document_id": false
4097-
},
4098-
{
4099-
"source_path_from_root": "/articles/openshift/quickstart-portal.md",
4100-
"redirect_url": "/azure/openshift/create-cluster",
4101-
"redirect_document_id": false
4102-
},
4103-
{
4104-
"source_path_from_root": "/articles/openshift/tutorial-connect-cluster.md",
4105-
"redirect_url": "/azure/openshift/connect-cluster",
4106-
"redirect_document_id": false
4107-
},
4108-
{
4109-
"source_path_from_root": "/articles/openshift/tutorial-create-cluster.md",
4110-
"redirect_url": "/azure/openshift/create-cluster",
4111-
"redirect_document_id": false
4112-
},
4113-
{
4114-
"source_path_from_root": "/articles/openshift/tutorial-delete-cluster.md",
4115-
"redirect_url": "/azure/openshift/delete-cluster",
4116-
"redirect_document_id": false
4117-
},
41184168
{
41194169
"source_path_from_root": "/articles/operator-service-manager/overview.md",
41204170
"redirect_url": "azure/operator-service-manager/azure-operator-service-manager-overview",
@@ -5979,6 +6029,11 @@
59796029
"source_path": "articles/reliability/availability-zones-baseline.md",
59806030
"redirect_url": "/azure/reliability/availability-zones-migration-overview",
59816031
"redirect_document_id": false
6032+
},
6033+
{
6034+
"source_path_from_root": "/articles/virtual-network/virtual-network-for-azure-services.md",
6035+
"redirect_url": "/azure/virtual-network/vnet-integration-for-azure-services",
6036+
"redirect_document_id": false
59826037
}
59836038
]
59846039
}

articles/active-directory-b2c/multi-factor-authentication.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,19 @@ In Azure AD B2C, you can delete a user's TOTP authenticator app enrollment. The
133133

134134
Learn how to [delete a user's Software OATH token authentication method](/graph/api/softwareoathauthenticationmethod-delete) using the Microsoft Graph API.
135135

136+
### SMS pricing tiers by country/region
137+
138+
The following table provides details about the different pricing tiers for SMS based authentication services across various countries or regions. For pricing details, see [Azure AD B2C pricing](https://azure.microsoft.com/pricing/details/active-directory-b2c/).
139+
140+
SMS is an add-on feature and requires a linked subscription. If your subscription expires or is cancelled, end users will no longer be able to authenticate using SMS, which could block them from signing in depending on your MFA policy.
141+
142+
|Tier |Countries/Regions |
143+
|-----------------------------------|-------------------|
144+
|Phone Authentication Low Cost |Australia, Brazil, Brunei, Canada, Chile, China, Colombia, Cyprus, North Macedonia, Poland, Portugal, South Korea, Thailand, Türkiye, United States |
145+
|Phone Authentication Mid Low Cost |Greenland, Albania, American Samoa, Austria, Bahamas, Bahrain, Bosnia & Herzegovina, Botswana, Costa Rica, Czech Republic, Denmark, Estonia, Faroe Islands, Finland, France, Greece, Hong Kong SAR, Hungary, Iceland, Ireland, Italy, Japan, Latvia, Lithuania, Luxembourg, Macao SAR, Malta, Mexico, Micronesia, Moldova, Namibia, New Zealand, Nicaragua, Norway, Romania, São Tomé and Príncipe, Seychelles Republic, Singapore, Slovakia, Solomon Islands, Spain, Sweden, Switzerland, Taiwan, United Kingdom, United States Virgin Islands, Uruguay |
146+
|Phone Authentication Mid High Cost |Andorra, Angola, Anguilla, Antarctica, Antigua and Barbuda, Argentina, Armenia, Aruba, Barbados, Belgium, Benin, Bolivia, Bonaire, Curaçao, Saba, Sint Eustatius and Sint Maarten, British Virgin Islands, Bulgaria, Burkina Faso, Cameroon, Cayman Islands, Central African Republic, Cook Islands, Côte d’Ivoire, Croatia, Diego Garcia, Djibouti, Dominican Republic, Dominican Republic, Dominican Republic, Ecuador, El Salvador, Eritrea, Falkland Islands, Fiji, French Guiana, French Polynesia, Gambia, Georgia, Germany, Gibraltar, Grenada, Guadeloupe, Guam, Guinea, Guyana, Honduras, India, Kenya, Kiribati, Laos, Liberia, Malaysia, Marshall Islands, Martinique, Mauritius, Monaco, Montenegro, Montserrat, Netherlands, New Caledonia, Niue, Oman, Palau, Panama, Paraguay, Peru, Puerto Rico, Puerto Rico, Réunion, Rwanda, Saint Helena, Ascension and Tristan de Cunha, Saint Kitts & Nevis, Saint Lucia, Saint Pierre & Miquelon, Saint Vincent and the Grenadines, Saipan, Samoa, San Marino, Saudi Arabia, Sint Maarten, Slovenia, South Africa, South Sudan, Suriname, Swaziland (New Name is Kingdom of Eswatini), Timor-Leste, Tokelau, Tonga, Turks & Caicos, Tuvalu, United Arab Emirates, Vanuatu, Venezuela, Vietnam, Wallis and Futuna |
147+
|Phone Authentication High Cost |Liechtenstein, Bermuda, Cabo Verde, Cambodia, Democratic Republic of Congo, Dominica, Egypt, Equatorial Guinea, Ghana, Guatemala, Guinea-Bissau, Israel, Jamaica, Jamaica, Kosovo, Lesotho, Maldives, Mali, Mauritania, Morocco, Mozambique, Papua New Guinea, Philippines, Qatar, Sierra Leone, Trinidad & Tobago, Ukraine, Zimbabwe, Afghanistan, Algeria, Azerbaijan, Bangladesh, Belarus, Belize, Bhutan, Burundi, Chad, Comoros, Congo, Ethiopia, Gabonese Republic, Haiti, Indonesia, Iraq, Jordan, Kuwait, Kyrgyzstan, Lebanon, Libya, Madagascar, Malawi, Mongolia, Myanmar, Nauru, Nepal, Niger, Nigeria, Pakistan, Palestinian National Authority, Russia, Senegal, Serbia, Somalia, Sri Lanka, Sudan, Tajikistan, Tanzania, Togolese Republic, Tunisia, Turkmenistan, Uganda, Uzbekistan, Yemen, Zambia |
148+
136149
::: zone pivot="b2c-custom-policy"
137150

138151
## Next steps

articles/api-management/api-management-faq.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,3 +138,6 @@ sections:
138138
When you clone an API, the new instance is created with a system-generated value for the name, which you can't change. To specify a name for the API,
139139
manually create a new API and import the API definition. For more information, see [Import an API](api-management-howto-import-api.md).
140140
141+
- question: Can I integrate Azure API Management directly with Azure database solutions?
142+
answer: |
143+
Yes, you can integrate Azure API Management directly with other Azure services without an intermediary. For example, Azure API Management can integrate directly with Azure Cosmos DB REST APIs for CRUD operations, eliminating the need for intermediate services like Azure Functions.

articles/api-management/api-management-gateways-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ The following tables compare features available in the following API Management
107107
| [Service Fabric](/azure/service-fabric/service-fabric-api-management-overview) | Developer, Premium |||||
108108
| [Pass-through GraphQL](graphql-apis-overview.md) | ✔️ | ✔️ |✔️ | ✔️ | ✔️ |
109109
| [Synthetic GraphQL](graphql-apis-overview.md)| ✔️ | ✔️ | ✔️<sup>1</sup> | ✔️<sup>1</sup> ||
110-
| [Pass-through WebSocket](websocket-api.md) | ✔️ | ✔️ || ✔️ | |
110+
| [Pass-through WebSocket](websocket-api.md) | ✔️ | ✔️ || ✔️ | ✔️ |
111111
| [Pass-through gRPC](grpc-api.md) |||| ✔️ ||
112112
| [OData](import-api-from-odata.md) | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
113113
| [Azure OpenAI and LLM](azure-openai-api-from-specification.md) | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |

articles/api-management/api-management-key-concepts.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ API Management integrates with many complementary Azure services to create enter
141141
* **[Event Hubs](api-management-howto-log-event-hubs.md)** for streaming events​
142142
* **[Azure Redis](api-management-howto-cache-external.md)** for caching responses​ with Azure Cache for Redis or Azure Managed Redis​
143143
* Several Azure compute offerings commonly used to build and host APIs on Azure, including **[Functions](import-function-app-as-api.md)**, **[Logic Apps](import-logic-app-as-api.md)**, **[Web Apps](import-app-service-as-api.md)**, **[Service Fabric](how-to-configure-service-fabric-backend.yml)**, and others including **[Azure OpenAI](azure-openai-api-from-specification.md)** service.​
144+
* Azure database offerings, including [Azure Cosmos DB](cosmosdb-data-source-policy.md), enabling direct CRUD (Create, Read, Update, Delete) operations without requiring intermediate compute resources.
144145

145146
**More information**:
146147
* [Basic enterprise integration](/azure/architecture/reference-architectures/enterprise-integration/basic-enterprise-integration?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json)

articles/api-management/websocket-api.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ ms.custom: template-how-to
1515

1616
With API Management’s WebSocket API solution, API publishers can quickly add a WebSocket API in API Management via the Azure portal, Azure CLI, Azure PowerShell, and other Azure tools.
1717

18-
[!INCLUDE [api-management-workspace-availability](../../includes/api-management-workspace-availability.md)]
19-
2018
WebSocket APIs can be secured by applying API Management's [access control policies](api-management-policies.md#authentication-and-authorization) to the initial handshake operation. You can also test WebSocket APIs using the API test consoles in both Azure portal and developer portal. Building on existing observability capabilities, API Management provides metrics and logs for monitoring and troubleshooting WebSocket APIs.
2119

2220
In this article, you will:
@@ -106,7 +104,7 @@ Per the [WebSocket protocol](https://tools.ietf.org/html/rfc6455), when a client
106104
Use standard API Management and Azure Monitor features to [monitor](api-management-howto-use-azure-monitor.md) WebSocket APIs:
107105

108106
* View API metrics in Azure Monitor
109-
* Optionally enable diagnostic settings to collect and view API Management gateway logs, which include WebSocket API operations
107+
* Optionally enable diagnostic settings to collect and view API Management gateway logs, which include WebSocket API operations, or WebSocket connection logs
110108

111109
For example, the following screenshot shows recent WebSocket API responses with code `101` from the **ApiManagementGatewayLogs** table. These results indicate the successful switch of the requests from TCP to the WebSocket protocol.
112110

articles/api-management/workspaces-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ The following constraints currently apply to workspace gateways:
103103
* APIs in workspaces aren't covered by Defender for APIs
104104
* Workspace gateways don't support the API Management service's credential manager
105105
* Workspace gateways support only internal cache; external cache isn't supported
106-
* Workspace gateways don't support synthetic GraphQL APIs and WebSocket APIs
106+
* Workspace gateways don't support synthetic GraphQL APIs
107107
* Workspace gateways don't support creating APIs directly from Azure resources such as Azure OpenAI Service, App Service, Function Apps, and so on
108108
* Request metrics can't be split by workspace in Azure Monitor; all workspace metrics are aggregated at the service level
109109
* Azure Monitor logs are aggregated at the service level; workspace-level logs aren't available

articles/app-service/app-service-web-configure-tls-mutual-auth.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
---
2-
title: Configure TLS mutual authentication
3-
description: Learn how to authenticated client certificates on TLS. Azure App Service can make the client certificate available to the app code for verification.
4-
2+
title: Set up TLS mutual authentication
3+
description: Learn how to set up TLS mutual authentication in Azure App Service for secure two-way communication between client and server.
4+
keywords: TLS mutual authentication, Azure App Service security, secure client-server communication
55
author: msangapu-msft
66
ms.author: msangapu
77
ms.assetid: cd1d15d3-2d9e-4502-9f11-a306dac4453a
88
ms.topic: article
9-
ms.date: 06/21/2024
9+
ms.date: 02/14/2025
1010
ms.devlang: csharp
1111
ms.custom: devx-track-csharp, devx-track-extended-java, devx-track-js, devx-track-python
1212
---
13-
# Configure TLS mutual authentication for Azure App Service
13+
# Configure TLS mutual authentication in Azure App Service
1414

1515
You can restrict access to your Azure App Service app by enabling different types of authentication for it. One way to do it is to request a client certificate when the client request is over TLS/SSL and validate the certificate. This mechanism is called Transport Layer Security (TLS) mutual authentication or client certificate authentication. This article shows how to set up your app to use client certificate authentication.
1616

articles/app-service/app-service-web-tutorial-custom-domain.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
---
2-
title: 'Map existing custom DNS name'
3-
description: Learn how to add an existing custom DNS domain name (vanity domain) to a web app, mobile app back end, or API app in Azure App Service.
2+
title: 'Set up an existing custom domain name for your app'
3+
description: Learn how to set up and map an existing custom domain name for your App Service app to improve branding and user access.
44
keywords: app service, azure app service, domain mapping, domain name, existing domain, hostname, vanity domain
55

66
ms.assetid: dc446e0e-0958-48ea-8d99-441d2b947a7c
77
ms.topic: how-to
8-
ms.date: 08/27/2024
8+
ms.date: 02/14/2025
99
ms.custom: mvc
1010
ms.author: msangapu
1111
author: msangapu-msft
1212
---
1313

14-
# Map an existing custom DNS name to Azure App Service
14+
# Set up an existing custom domain in Azure App Service
1515

1616
[!INCLUDE [regionalization-note](./includes/regionalization-note.md)]
1717

0 commit comments

Comments
 (0)