Skip to content

Commit 887a585

Browse files
author
gitName
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ailog
2 parents ee2a20c + 8528d16 commit 887a585

File tree

128 files changed

+2286
-1319
lines changed

Some content is hidden

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

128 files changed

+2286
-1319
lines changed

.github/policies/disallow-edits.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ configuration:
160160
matchAny: true
161161
pattern: articles/reliability/*
162162
- commentContains:
163-
pattern: '#sign-off'
163+
pattern: '\#sign-off'
164164
isRegex: true
165165
- not:
166166
or:

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/app-service/monitor-instances-health-check.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ Imagine you have two applications (or one app with a slot) with Health check ena
203203
If all instances of your application are unhealthy, App Service won't remove instances from the load balancer. In this scenario, taking all unhealthy app instances out of the load balancer rotation would effectively cause an outage for your application. However, the instance replacement will still occur.
204204

205205
### What happens during a slot swap?
206-
Health check configuration is not slot-specific, so after a swap, the Health check configuration of the swapped slot will be applied to the destination slot and vice-versa. For example, if you have Health Check enabled for your staging slot the endpoint configured will be applied to the production slot after a swap.
206+
Health check configuration is not slot-specific, so after a swap, the Health check configuration of the swapped slot will be applied to the destination slot and vice-versa. For example, if you have Health Check enabled for your staging slot the endpoint configured will be applied to the production slot after a swap. We recommend using consistent configuration for both production and non-production slots if possible to prevent any unexpected behavior after the swap.
207207

208208
### Does Health check work on App Service Environments?
209209

articles/app-service/policy-reference.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Built-in policy definitions for Azure App Service
33
description: Lists Azure Policy built-in policy definitions for Azure App Service. These built-in policy definitions provide common approaches to managing your Azure resources.
44
ms.date: 02/06/2024
5-
ms.topic: reference
5+
ms.topic: generated-reference
66
ms.custom: subject-policy-reference
77
author: cephalin
88
ms.author: cephalin
@@ -333,4 +333,4 @@ the link in the **Version** column to view the source on the
333333

334334
- See the built-ins on the [Azure Policy GitHub repo](https://github.com/Azure/azure-policy).
335335
- Review the [Azure Policy definition structure](../governance/policy/concepts/definition-structure.md).
336-
- Review [Understanding policy effects](../governance/policy/concepts/effects.md).
336+
- Review [Understanding policy effects](../governance/policy/concepts/effects.md).

articles/application-gateway/ingress-controller-add-health-probes.md

Lines changed: 2 additions & 1 deletion
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: how-to
8-
ms.date: 9/17/2024
8+
ms.date: 2/28/2025
99
ms.author: greglin
1010
---
1111

@@ -72,3 +72,4 @@ Any property that the readiness or liveness probe can't infer uses the following
7272
## Related content
7373

7474
- [Application Gateway for Containers](for-containers/overview.md)
75+
- [Application Gateway for Containers - Custom Health Probe](for-containers/custom-health-probe.md)

articles/application-gateway/ingress-controller-annotations.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.author: greglin
1414
You can annotate the Kubernetes ingress resource with arbitrary key/value pairs. Application Gateway Ingress Controller (AGIC) relies on annotations to program Azure Application Gateway features that aren't configurable via the ingress YAML. Ingress annotations are applied to all HTTP settings, backend pools, and listeners derived from an ingress resource.
1515

1616
> [!TIP]
17-
> Also see [What is Application Gateway for Containers](for-containers/overview.md).
17+
> Consider [Application Gateway for Containers](for-containers/overview.md) for your Kubernetes ingress solution. For more information, see [Quickstart: Deploy Application Gateway for Containers ALB Controller](for-containers/quickstart-deploy-application-gateway-for-containers-alb-controller.md).
1818
1919
## List of supported annotations
2020

@@ -745,3 +745,8 @@ spec:
745745
```
746746

747747
The preceding example sets a priority of 10 for the request routing rule.
748+
749+
## Next steps
750+
751+
- [Application Gateway for Containers](for-containers/overview.md)
752+
- [Migrate to Application Gateway for Containers](for-containers/migrate-from-agic-to-agc.md)

articles/application-gateway/ingress-controller-cookie-affinity.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,4 @@ spec:
3838
## Related content
3939
4040
- [Application Gateway for Containers](for-containers/overview.md)
41+
- [Application Gateway for Containers - Session Affinity](for-containers/session-affinity.md)

articles/application-gateway/ingress-controller-disable-addon.md

Lines changed: 2 additions & 2 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: how-to
8-
ms.date: 9/17/2024
8+
ms.date: 2/28/2025
99
ms.author: greglin
1010
---
1111

@@ -16,7 +16,7 @@ When you deploy the Application Gateway Ingress Controller (AGIC) as an Azure Ku
1616
The life cycle of the Azure Application Gateway deployment differs when you disable the AGIC add-on, depending on whether you created the Application Gateway deployment by using the AGIC add-on or you deployed it separately from the add-on. You can run the same command to re-enable the AGIC add-on if you ever disable it, or to enable the AGIC add-on by using an existing AKS cluster and Application Gateway deployment.
1717

1818
> [!TIP]
19-
> Consider [Application Gateway for Containers](for-containers/overview.md) for your Kubernetes ingress solution.
19+
> Consider [Application Gateway for Containers](for-containers/overview.md) for your Kubernetes ingress solution. For more information, see [Quickstart: Deploy Application Gateway for Containers ALB Controller](for-containers/quickstart-deploy-application-gateway-for-containers-alb-controller.md).
2020
2121
## Disable the AGIC add-on with an associated Application Gateway deployment
2222

articles/application-gateway/ingress-controller-expose-websocket-server.md

Lines changed: 3 additions & 2 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: how-to
8-
ms.date: 08/01/2023
8+
ms.date: 2/28/2025
99
ms.author: greglin
1010
---
1111

@@ -14,7 +14,7 @@ ms.author: greglin
1414
Azure Application Gateway v2 [provides native support for the WebSocket and HTTP/2 protocols](features.md#websocket-and-http2-traffic). Both Application Gateway and the Kubernetes ingress don't have a user-configurable setting to selectively enable or disable WebSocket support.
1515

1616
> [!TIP]
17-
> Consider [Application Gateway for Containers](for-containers/overview.md) for your Kubernetes ingress solution.
17+
> Consider [Application Gateway for Containers](for-containers/overview.md) for your Kubernetes ingress solution. For more information, see [Quickstart: Deploy Application Gateway for Containers ALB Controller](for-containers/quickstart-deploy-application-gateway-for-containers-alb-controller.md).
1818
1919
## YAML for WebSocket server deployment
2020

@@ -102,3 +102,4 @@ To avoid the `502 Bad Gateway` error, you might need to add an HTTP `GET` handle
102102
## Related content
103103

104104
- [Application Gateway for Containers](for-containers/overview.md)
105+
- [Application Gateway for Containers - WebSocket support](for-containers/websockets.md)

articles/application-gateway/ingress-controller-install-existing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: greg-lindsay
66
ms.service: azure-application-gateway
77
ms.custom: devx-track-arm-template, devx-track-azurecli
88
ms.topic: how-to
9-
ms.date: 9/17/2024
9+
ms.date: 2/28/2025
1010
ms.author: greglin
1111
---
1212

@@ -264,15 +264,15 @@ Use [Cloud Shell](https://shell.azure.com/) to install the AGIC Helm package:
264264
1. Install the Helm chart with the `helm-config.yaml` configuration from the previous step:
265265

266266
```bash
267-
helm install agic-controller oci://mcr.microsoft.com/azure-application-gateway/charts/ingress-azure --version 1.7.5 -f helm-config.yaml
267+
helm install agic-controller oci://mcr.microsoft.com/azure-application-gateway/charts/ingress-azure --version 1.8.0 -f helm-config.yaml
268268
```
269269

270270
Alternatively, you can combine `helm-config.yaml` and the Helm command in one step:
271271

272272
```bash
273273
helm install oci://mcr.microsoft.com/azure-application-gateway/charts/ingress-azure \
274274
--name agic-controller \
275-
--version 1.7.5 \
275+
--version 1.8.0 \
276276
--namespace default \
277277
--debug \
278278
--set appgw.name=applicationgatewayABCD \

0 commit comments

Comments
 (0)