Skip to content

Commit e574c4a

Browse files
author
Ankita Dutta
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into incu8
2 parents ef2cad5 + 1e77cc6 commit e574c4a

File tree

609 files changed

+5514
-7153
lines changed

Some content is hidden

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

609 files changed

+5514
-7153
lines changed

‎.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,11 @@
480480
"redirect_url": "/azure/azure-health-insights/overview",
481481
"redirect_document_id": false
482482
},
483+
{
484+
"source_path_from_root": "/articles/azure-maps/tutorial-iot-hub-maps.md",
485+
"redirect_url": "/azure/azure-maps",
486+
"redirect_document_id": true
487+
},
483488
{
484489
"source_path_from_root": "/articles/azure-maps/about-creator.md",
485490
"redirect_url": "/azure/azure-maps/creator-indoor-maps",
@@ -2595,6 +2600,11 @@
25952600
"redirect_url": "/azure/azure-maps/zoom-levels-and-tile-grid",
25962601
"redirect_document_id": true
25972602
},
2603+
{
2604+
"source_path": "articles/managed-grafana/how-to-sync-teams-with-azure-ad-groups.md",
2605+
"redirect_url": "how-to-sync-teams-with-entra-groups",
2606+
"redirect_document_id": false
2607+
},
25982608
{
25992609
"source_path_from_root": "/articles/media-services/azure-media-player/azure-media-player-license.md",
26002610
"redirect_url": "/legal/azure-media-player/azure-media-player-license",

‎articles/active-directory-b2c/custom-policy-developer-notes.md

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,19 @@ Azure Active Directory B2C [user flows and custom policies](user-flow-overview.m
3030

3131
- Support requests for public preview features can be submitted through regular support channels.
3232

33-
## User flows
34-
|Feature |User flow |Custom policy |Notes |
35-
|---------|:---------:|:---------:|---------|
36-
| [Sign-up and sign-in](add-sign-up-and-sign-in-policy.md) with email and password. | GA | GA| |
37-
| [Sign-up and sign-in](add-sign-up-and-sign-in-policy.md) with username and password.| GA | GA | |
38-
| [Profile editing flow](add-profile-editing-policy.md) | GA | GA | |
39-
| [Self-Service password reset](add-password-reset-policy.md) | GA| GA| Available in China cloud, but only for custom policies. |
40-
| [Force password reset](force-password-reset.md) | GA | GA | Available in China cloud, but only for custom policies. |
41-
| [Phone sign-up and sign-in](phone-authentication-user-flows.md) | GA | GA | Available in China cloud, but only for custom policies. |
42-
| [Smart lockout](threat-management.md) | GA | GA | |
43-
| [Conditional Access and Identity Protection](conditional-access-user-flow.md) | GA | GA | Not available for SAML applications. Limited CA features are available in China cloud. Identity Protection is not available in China cloud. |
44-
| [CAPTCHA](add-captcha.md) | Preview | Preview | You can enable it during sign-up or sign-in for Local accounts. |
33+
## Feature availability
34+
| Feature | User flow | Custom policy | User flow in China | Custom policy in China | Notes |
35+
|---|:---:|:---:|---|---|---|
36+
| [Sign-up and sign-in](add-sign-up-and-sign-in-policy.md) with email and password. | GA | GA | GA | GA | |
37+
| [Sign-up and sign-in](add-sign-up-and-sign-in-policy.md) with username and password. | GA | GA | GA | GA | |
38+
| [Profile editing flow](add-profile-editing-policy.md) | GA | GA | GA | GA | |
39+
| [Self-Service password reset](add-password-reset-policy.md) | GA | GA | GA | GA | |
40+
| [Force password reset](force-password-reset.md) | GA | GA | NA | GA | |
41+
| [Phone sign-up and sign-in](phone-authentication-user-flows.md) | GA | GA | NA | GA | |
42+
| [Smart lockout](threat-management.md) | GA | GA | NA | NA | |
43+
| [Conditional Access](conditional-access-user-flow.md) | GA | GA | NA | Limited availability | Not available for SAML applications. |
44+
| [Identity Protection](conditional-access-identity-protection-overview.md) | GA | GA | NA | NA | |
45+
| [CAPTCHA](add-captcha.md) | Preview | Preview | NA | NA | You can enable it during sign-up or sign-in for Local accounts. |
4546

4647
## OAuth 2.0 application authorization flows
4748

‎articles/app-service/environment/overview.md

Lines changed: 96 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ An App Service Environment is a single-tenant deployment of Azure App Service th
5050

5151
Applications are hosted in App Service plans, which are created in an App Service Environment. An App Service plan is essentially a provisioning profile for an application host. As you scale out your App Service plan, you create more application hosts with all the apps in that App Service plan on each host. A single App Service Environment v3 can have up to 200 total App Service plan instances across all the App Service plans combined. A single App Service Isolated v2 (Iv2) plan can have up to 100 instances by itself.
5252

53-
When you're deploying onto dedicated hardware (hosts), you're limited in scaling across all App Service plans to the number of cores in this type of environment. An App Service Environment that's deployed on dedicated hosts has 132 vCores available. I1v2 uses two vCores, I2v2 uses four vCores, and I3v2 uses eight vCores per instance. Only I1v2, I2v2 and I3v2 SKU sizes are available on App Service Environment deployed on dedicated hosts.
53+
When you're deploying onto dedicated hardware (hosts), you're limited in scaling across all App Service plans to the number of cores in this type of environment. An App Service Environment that's deployed on dedicated hosts has 132 vCores available. I1v2 uses two vCores, I2v2 uses four vCores, and I3v2 uses eight vCores per instance. Only I1v2, I2v2, and I3v2 SKU sizes are available on App Service Environment deployed on dedicated hosts.
5454

5555
## Virtual network support
5656

57-
The App Service Environment feature is a deployment of Azure App Service into a single subnet on a virtual network. When you deploy an app into an App Service Environment, the app is exposed on the inbound address that's assigned to the App Service Environment. If your App Service Environment is deployed with an internal virtual IP (VIP) address, the inbound address for all the apps will be an address in the App Service Environment subnet. If your App Service Environment is deployed with an external VIP address, the inbound address will be an internet-addressable address, and your apps will be in a public Domain Name System.
57+
The App Service Environment feature is a deployment of Azure App Service into a single subnet on a virtual network. When you deploy an app into an App Service Environment, the app is exposed on the inbound address that's assigned to the App Service Environment. If your App Service Environment is deployed with an internal virtual IP (VIP) address, the inbound address for all the apps is an address in the App Service Environment subnet. If your App Service Environment is deployed with an external VIP address, the inbound address is an internet-addressable address, and your apps are in a public Domain Name System.
5858

59-
The number of addresses that are used by an App Service Environment v3 in its subnet will vary, depending on the number of instances and the amount of traffic. Some infrastructure roles are automatically scaled, depending on the number of App Service plans and the load. The recommended size for your App Service Environment v3 subnet is a `/24` Classless Inter-Domain Routing (CIDR) block with 256 addresses in it, because that size can host an App Service Environment v3 that's scaled out to its limit.
59+
The number of addresses that are used by an App Service Environment v3 in its subnet varies, depending on the number of instances and the amount of traffic. Some infrastructure roles are automatically scaled, depending on the number of App Service plans and the load. The recommended size for your App Service Environment v3 subnet is a `/24` Classless Inter-Domain Routing (CIDR) block with 256 addresses in it, because that size can host an App Service Environment v3 that's scaled out to its limit.
6060

6161
The apps in an App Service Environment don't need any features enabled to access resources on the same virtual network that the App Service Environment is in. If the App Service Environment virtual network is connected to another network, the apps in the App Service Environment can access resources in those extended networks. Traffic can be blocked by user configuration on the network.
6262

@@ -69,14 +69,14 @@ A benefit of using an App Service Environment instead of a multitenant service i
6969
App Service Environment v3 differs from earlier versions in the following ways:
7070

7171
- There are no networking dependencies on the customer's virtual network. You can secure all inbound and outbound traffic and route outbound traffic as you want.
72-
- You can deploy an App Service Environment v3 that's enabled for zone redundancy. You set zone redundancy only during creation and only in regions where all App Service Environment v3 dependencies are zone redundant. In this case, each App Service Plan on the App Service Environment will need to have a minimum of three instances so that they can be spread across zones. For more information, see [Migrate App Service Environment to availability zone support](../../availability-zones/migrate-app-service-environment.md).
72+
- You can deploy an App Service Environment v3 that's enabled for zone redundancy. You set zone redundancy only during creation and only in regions where all App Service Environment v3 dependencies are zone redundant. Zone redundancy is a deployment time only decision. Changing zone redundancy isn't possible after it has been deployed. With zone redundant App Service Environment, each App Service Plan on the App Service Environment needs to have a minimum of three instances so that they can be spread across zones. For more information, see [Migrate App Service Environment to availability zone support](../../availability-zones/migrate-app-service-environment.md).
7373
- You can deploy an App Service Environment v3 on a dedicated host group. Host group deployments aren't zone redundant.
74-
- Scaling is much faster than with an App Service Environment v2. Although scaling still isn't immediate, as in the multitenant service, it's a lot faster.
74+
- Scaling is faster than with an App Service Environment v2. Although scaling still isn't immediate, as in the multitenant service, it's a lot faster.
7575
- Front-end scaling adjustments are no longer required. App Service Environment v3 front ends automatically scale to meet your needs and are deployed on better hosts.
7676
- Scaling no longer blocks other scale operations within the App Service Environment v3. Only one scale operation can be in effect for a combination of OS and size. For example, while your Windows small App Service plan is scaling, you could kick off a scale operation to run at the same time on a Windows medium or anything else other than Windows small.
7777
- You can reach apps in an internal-VIP App Service Environment v3 across global peering. Such access wasn't possible in earlier versions.
7878

79-
A few features that were available in earlier versions of App Service Environment aren't available in App Service Environment v3. For example, you can no longer do the following:
79+
A few features that were available in earlier versions of App Service Environment aren't available in App Service Environment v3. For example, you can no longer do these actions:
8080

8181
- Perform a backup and restore operation on a storage account behind a firewall.
8282
- Access the FTPS endpoint using a custom domain suffix.
@@ -165,6 +165,7 @@ App Service Environment v3 is available in the following regions:
165165
| Southeast Asia | ✅ | ✅ |
166166
| Spain Central | ✅ | ✅** |
167167
| Sweden Central | ✅ | ✅ |
168+
| Sweden South | ✅ | |
168169
| Switzerland North | ✅ | ✅ |
169170
| Switzerland West | ✅ | |
170171
| UAE Central | ✅ | |
@@ -188,22 +189,107 @@ App Service Environment v3 is available in the following regions:
188189
| US DoD Central | ✅ | |
189190
| US DoD East | ✅ | |
190191
| US Gov Arizona | ✅ | |
191-
| US Gov Iowa | | |
192192
| US Gov Texas | ✅ | |
193193
| US Gov Virginia | ✅ |✅ |
194194

195195
### Microsoft Azure operated by 21Vianet
196196

197197
| Region | Single zone support | Availability zone support |
198198
| -------------------- | :--------------------------: | :-------------------------: |
199-
| China East 2 | | |
199+
| | App Service Environment v3 | App Service Environment v3 |
200200
| China East 3 | ✅ | |
201-
| China North 2 | | |
202201
| China North 3 | ✅ | ✅ |
203202

204203
### In-region data residency
205204

206-
An App Service Environment will only store customer data including app content, settings and secrets within the region where it's deployed. All data is guaranteed to remain in the region. For more information, see [Data residency in Azure](https://azure.microsoft.com/explore/global-infrastructure/data-residency/#overview).
205+
An App Service Environment only stores customer data including app content, settings, and secrets within the region where it's deployed. All data is guaranteed to remain in the region. For more information, see [Data residency in Azure](https://azure.microsoft.com/explore/global-infrastructure/data-residency/#overview).
206+
207+
## Pricing tiers
208+
209+
The following sections list the regional pricing tiers (SKUs) availability for App Service Environment v3.
210+
211+
> [!NOTE]
212+
> Windows Container plans currently do not support memory intensive SKUs.
213+
>
214+
215+
### Azure Public:
216+
217+
| Region | Standard | Large | Memory intensive |
218+
| -------------------- | :----------: | :---------: | :---------------: |
219+
| | I1v2-I3v2 | I4v2-I6v2 | I1mv2-I5mv2 |
220+
| Australia Central | ✅ | ✅ | ✅ |
221+
| Australia Central 2 | ✅ | ✅ | ✅ |
222+
| Australia East | ✅ | ✅ | ✅ |
223+
| Australia Southeast | ✅ | ✅ | ✅ |
224+
| Brazil South | ✅ | ✅ | |
225+
| Brazil Southeast | ✅ | ✅ | ✅ |
226+
| Canada Central | ✅ | ✅ | ✅ |
227+
| Canada East | ✅ | ✅ | ✅ |
228+
| Central India | ✅ | ✅ | ✅ |
229+
| Central US | ✅ | ✅ * | |
230+
| East Asia | ✅ | ✅ | ✅ |
231+
| East US | ✅ | ✅ | |
232+
| East US 2 | ✅ | ✅ | ✅ |
233+
| France Central | ✅ | ✅ | ✅ |
234+
| France South | ✅ | ✅ | ✅ |
235+
| Germany North | ✅ | ✅ | ✅ |
236+
| Germany West Central | ✅ | ✅ | ✅ |
237+
| Israel Central | ✅ | ✅ | |
238+
| Italy North | ✅ | ✅ | |
239+
| Japan East | ✅ | ✅ | ✅ |
240+
| Japan West | ✅ | ✅ | ✅ |
241+
| Jio India Central | ✅ | ✅ | |
242+
| Jio India West | ✅ | ✅ | |
243+
| Korea Central | ✅ | ✅ | |
244+
| Korea South | ✅ | ✅ | ✅ |
245+
| Mexico Central | ✅ | ✅ | |
246+
| North Central US | ✅ | ✅ | ✅ |
247+
| North Europe | ✅ | ✅ | ✅ |
248+
| Norway East | ✅ | ✅ | ✅ |
249+
| Norway West | ✅ | ✅ | ✅ |
250+
| Poland Central | ✅ | ✅ | |
251+
| Qatar Central | ✅ | ✅ | |
252+
| South Africa North | ✅ | ✅ | ✅ |
253+
| South Africa West | ✅ | ✅ | ✅ |
254+
| South Central US | ✅ | ✅ | ✅ |
255+
| South India | ✅ | ✅ | |
256+
| Southeast Asia | ✅ | ✅ | ✅ |
257+
| Spain Central | ✅ | ✅ | |
258+
| Sweden Central | ✅ | ✅ | ✅ |
259+
| Sweden South | ✅ | ✅ | ✅ |
260+
| Switzerland North | ✅ | ✅ | ✅ |
261+
| Switzerland West | ✅ | ✅ | ✅ |
262+
| UAE Central | ✅ | ✅ | |
263+
| UAE North | ✅ | ✅ | ✅ |
264+
| UK South | ✅ | ✅ | ✅ |
265+
| UK West | ✅ | ✅ | ✅ |
266+
| West Central US | ✅ | ✅ * | |
267+
| West Europe | ✅ | ✅ * | |
268+
| West India | ✅ | ✅ | |
269+
| West US | ✅ | ✅ | ✅ |
270+
| West US 2 | ✅ | ✅ | ✅ |
271+
| West US 3 | ✅ | ✅ | ✅ |
272+
273+
\* Windows Container doesn't support Large skus in this region.
274+
275+
### Azure Government:
276+
277+
| Region | Standard | Large | Memory intensive |
278+
| -------------------- | :----------: | :---------: | :---------------: |
279+
| | I1v2-I3v2 | I4v2-I6v2 | I1mv2-I5mv2 |
280+
| US DoD Central | ✅ |✅ * | |
281+
| US DoD East | ✅ |✅ * | |
282+
| US Gov Arizona | ✅ |✅ * | |
283+
| US Gov Texas | ✅ |✅ * | |
284+
| US Gov Virginia | ✅ |✅ * | |
285+
286+
### Microsoft Azure operated by 21Vianet:
287+
288+
| Region | Standard | Large | Memory intensive |
289+
| -------------------- | :----------: | :---------: | :---------------: |
290+
| | I1v2-I3v2 | I4v2-I6v2 | I1mv2-I5mv2 |
291+
| China East 3 | ✅ | ✅ * | |
292+
| China North 3 | ✅ | ✅ * | |
207293

208294
## Next steps
209295

0 commit comments

Comments
 (0)