Skip to content

Commit 75e283b

Browse files
anishtrakruanishtrakru
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into dtl-managedidentity
2 parents 47620fc + 9351527 commit 75e283b

File tree

303 files changed

+2287
-1730
lines changed

Some content is hidden

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

303 files changed

+2287
-1730
lines changed

‎articles/active-directory-b2c/age-gating.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Age gating in Azure Active Directory B2C (Azure AD B2C) enables you to identify
2525
>This feature is in public preview. Do not use feature for production applications.
2626
>
2727
28-
When age gating is enabled for a user flow, users are asked for their date of birth, and country of residence. If a user signs in that hasn't previously entered the information, they'll need to enter it the next time they sign in. The rules are applied every time a user signs in.
28+
When age gating is enabled for a user flow, users are asked for their date of birth, and country/region of residence. If a user signs in that hasn't previously entered the information, they'll need to enter it the next time they sign in. The rules are applied every time a user signs in.
2929

3030
![Screenshot of age gating information gather flow](./media/age-gating/age-gating-information-gathering.png)
3131

@@ -69,7 +69,7 @@ After your tenant is set up to use age gating, you can then use this feature in
6969
1. To test your policy, select **Run user flow**.
7070
1. For **Application**, select the web application named *testapp1* that you previously registered. The **Reply URL** should show `https://jwt.ms`.
7171
1. Select the **Run user flow** button.
72-
1. Sign-in with a local or social account. Then select your country of residence, and date of birth that simulate a minor.
72+
1. Sign-in with a local or social account. Then select your country/region of residence, and date of birth that simulate a minor.
7373
1. Repeat the test, and select a date of birth that simulates an adult.
7474

7575
When you sign-in as a minor, you should see the following error message: *Unfortunately, your sign on has been blocked. Privacy and online safety laws in your country prevent access to accounts belonging to children.*

‎articles/active-directory-b2c/localization-string-ids.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ The Following are the IDs for a content definition with an ID of `api.phonefacto
318318
| `error_phone_throttled` | You hit the limit on the number of call attempts. Try again shortly. | `>= 1.2.3` |
319319
| `error_throttled` | You hit the limit on the number of verification attempts. Try again shortly. | `>= 1.2.3` |
320320
| `error_incorrect_code` | The verification code you have entered does not match our records. Please try again, or request a new code. | `All` |
321-
| `countryList` | See [the countries list](#phone-factor-authentication-page-example). | `All` |
321+
| `countryList` | See [the countries/regions list](#phone-factor-authentication-page-example). | `All` |
322322
| `error_448` | The phone number you provided is unreachable. | `All` |
323323
| `error_449` | User has exceeded the number of retry attempts. | `All` |
324324
| `verification_code_input_placeholder_text` | Verification code | `All` |

‎articles/active-directory-b2c/sign-in-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Your local account identity provider includes a Username option that lets users
4444

4545
Phone sign-in is a passwordless option in your local account identity provider settings. This method lets users sign up for your app using a phone number as their primary identifier. One-time passwords are sent to your users via SMS text messages. Users will have the following experience during sign-up and sign-in:
4646

47-
- **Sign-in**: If the user has an existing account with phone number as their identifier, the user enters their phone number and selects *Sign in*. They confirm the country and phone number by selecting *Continue*, and a one-time verification code is sent to their phone. The user enters the verification code and selects *Continue* to sign in.
47+
- **Sign-in**: If the user has an existing account with phone number as their identifier, the user enters their phone number and selects *Sign in*. They confirm the country/region and phone number by selecting *Continue*, and a one-time verification code is sent to their phone. The user enters the verification code and selects *Continue* to sign in.
4848
- **Sign-up**: If the user doesn't already have an account for your application, they can create one by clicking on the *Sign up now* link.
4949
1. A sign-up page appears, where the user selects their *Country*, enters their phone number, and selects *Send Code*.
5050
1. A one-time verification code is sent to the user's phone number. The user enters the *Verification Code* on the sign-up page, and then selects *Verify Code*. (If the user can't retrieve the code, they can select *Send New Code*).

‎articles/api-management/TOC.yml

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -108,20 +108,26 @@
108108
items:
109109
- name: Networking options
110110
href: virtual-network-concepts.md
111-
- name: VNet injection (service) - requirements
112-
href: virtual-network-injection-resources.md
113-
- name: VNet integration (workspace gateway) - requirements
111+
- name: Network isolation - classic tiers
112+
items:
113+
- name: Virtual network injection (classic tiers) - requirements
114+
href: virtual-network-injection-resources.md
115+
- name: Deploy to virtual network - external
116+
href: api-management-using-with-vnet.md
117+
- name: Deploy to virtual network - internal
118+
href: api-management-using-with-internal-vnet.md
119+
- name: Integrate Application Gateway in internal virtual network
120+
href: api-management-howto-integrate-internal-vnet-appgateway.md
121+
- name: Network isolation - v2 tiers
122+
items:
123+
- name: Virtual network injection (v2 tiers)
124+
href: inject-vnet-v2.md
125+
- name: Virtual network integration (v2 tiers)
126+
href: integrate-vnet-outbound.md
127+
- name: Virtual network integration (workspace gateway) - requirements
114128
href: virtual-network-workspaces-resources.md
115-
- name: Deploy to a VNet - external
116-
href: api-management-using-with-vnet.md
117-
- name: Deploy to a VNet - internal
118-
href: api-management-using-with-internal-vnet.md
119-
- name: Integrate Application Gateway in an internal virtual network
120-
href: api-management-howto-integrate-internal-vnet-appgateway.md
121129
- name: Connect privately using private endpoint
122130
href: private-endpoint.md
123-
- name: Integrate with VNet for outbound requests
124-
href: integrate-vnet-outbound.md
125131
- name: Retrieve IP addresses
126132
href: api-management-howto-ip-addresses.md
127133
- name: Defend against DDoS attacks
@@ -694,7 +700,7 @@
694700
- name: Built-in analytics dashboard retirement (March 2027)
695701
href: breaking-changes/analytics-dashboard-retirement-march-2027.md
696702
- name: Regional availability
697-
href: https://azure.microsoft.com/global-infrastructure/services/
703+
href: api-management-region-availability.md
698704
- name: Microsoft Q&A question page
699705
href: /answers/tags/29/azure-api-management
700706
- name: Stack Overflow

‎articles/api-management/api-management-capacity.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ author: dlepow
66

77
ms.service: azure-api-management
88
ms.topic: how-to
9-
ms.date: 08/26/2024
9+
ms.date: 10/01/2024
1010
ms.author: danlep
1111
ms.custom: fasttrack-edit
1212
---
1313

1414
# Capacity of an Azure API Management instance
1515

16-
[!INCLUDE [api-management-availability-premium-dev-standard-basic-standardv2-basicv2](../../includes/api-management-availability-premium-dev-standard-basic-standardv2-basicv2.md)]
16+
[!INCLUDE [api-management-availability-premium-dev-standard-basic-premiumv2-standardv2-basicv2](../../includes/api-management-availability-premium-dev-standard-basic-premiumv2-standardv2-basicv2.md)]
1717

1818
API Management provides [Azure Monitor metrics](api-management-howto-use-azure-monitor.md#view-metrics-of-your-apis) to detect use of system capacity, helping you troubleshoot gateway problems and make informed decisions whether to [scale or upgrade](upgrade-and-scale.md) an API Management instance to accommodate more load.
1919

‎articles/api-management/api-management-features.md

Lines changed: 38 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,62 @@
11
---
2-
title: Feature-based comparison of the Azure API Management tiers | Microsoft Docs
2+
title: Feature-based comparison of Azure API Management tiers
33
description: Compare API Management tiers based on the features they offer. See a table that summarizes the key features available in each pricing tier.
44
services: api-management
55
author: dlepow
66

77
ms.service: azure-api-management
8-
ms.topic: article
9-
ms.date: 03/13/2024
8+
ms.topic: concept-article
9+
ms.date: 10/15/2024
1010
ms.author: danlep
1111
---
1212

1313
# Feature-based comparison of the Azure API Management tiers
1414

1515
[!INCLUDE [api-management-availability-all-tiers](../../includes/api-management-availability-all-tiers.md)]
1616

17-
Each API Management [pricing tier](api-management-key-concepts.md#api-management-tiers) offers a distinct set of features and per unit [capacity](api-management-capacity.md). The following table summarizes the key features available in each of the tiers. Some features might work differently or have different capabilities depending on the tier. In such cases the differences are called out in the documentation articles describing these individual features.
17+
Each API Management [pricing tier](api-management-key-concepts.md#api-management-tiers) offers a distinct set of features to meet the needs of different customers. The following table summarizes the key features available in each of the tiers. Some features might work differently or have different capabilities depending on the tier. In such cases the differences are called out in the documentation articles describing these individual features.
1818

1919
> [!IMPORTANT]
2020
> * The Developer tier is for non-production use cases and evaluations. It doesn't offer SLA.
2121
> * The Consumption tier isn't available in the US Government cloud or the Microsoft Azure operated by 21Vianet cloud.
2222
> * For information about APIs supported in the API Management gateway available in different tiers, see [API Management gateways overview](api-management-gateways-overview.md#backend-apis).
2323
2424

25-
| Feature | Consumption | Developer | Basic | Basic v2 |Standard | Standard v2 | Premium |
26-
| -------------------------------------------------------------------------------------------- | ----------- | --------- | --------- | --------- | ----- | -------- | ------- |
27-
| Microsoft Entra integration<sup>1</sup> | No | Yes | No | Yes | Yes | Yes | Yes |
28-
| Virtual Network (VNet) injection support | No | Yes | No | No | No | No | Yes |
29-
| Private endpoint support for inbound connections | No | Yes | Yes | No | Yes | No | Yes |
30-
| Outbound virtual network integration support | No | No | No | No | No | Yes | No |
31-
| Multi-region deployment | No | No | No | No | No | No | Yes |
32-
| Availability zones | No | No | No | No | No | No | Yes |
33-
| Multiple custom domain names for gateway | No | Yes | No | No | No | No | Yes |
34-
| Developer portal<sup>2</sup> | No | Yes | Yes | Yes | Yes | Yes | Yes |
35-
| Built-in cache | No | Yes | Yes | Yes | Yes | Yes | Yes |
36-
| [External cache](./api-management-howto-cache-external.md) | Yes | Yes | Yes | Yes | Yes | Yes |Yes |
37-
| Autoscaling | No | No | Yes | No | Yes | No |Yes |
38-
| API analytics | No | Yes | Yes | Yes | Yes | Yes | Yes |
39-
| [Self-hosted gateway](self-hosted-gateway-overview.md)<sup>3</sup> | No | Yes | No | No | No | No | Yes |
40-
| [Workspaces](workspaces-overview.md) | No | No | No | No | No | No | Yes |
41-
| [TLS settings](api-management-howto-manage-protocols-ciphers.md) | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
42-
| [Client certificate authentication](api-management-howto-mutual-certificates-for-clients.md) | Yes | Yes | Yes | Yes | Yes | Yes |Yes |
43-
| [Policies](api-management-howto-policies.md)<sup>4</sup> | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
44-
| [Credential manager](credentials-overview.md) | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
45-
| [Backup and restore](api-management-howto-disaster-recovery-backup-restore.md) | No | Yes | Yes | No | Yes | No | Yes |
46-
| [Management over Git](api-management-configuration-repository-git.md) | No | Yes | Yes |No | Yes | No | Yes |
47-
| Direct management API | No | Yes | Yes | No | Yes |No | Yes |
48-
| Azure Monitor metrics | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
49-
| Azure Monitor and Log Analytics request logs | No | Yes | Yes | Yes | Yes | Yes |Yes |
50-
| Application Insights request logs | Yes | Yes | Yes | Yes | Yes | Yes |Yes |
51-
| Static IP | No | Yes | Yes | No |Yes | No | Yes |
25+
| Feature | Consumption | Developer | Basic | Basic v2 |Standard | Standard v2 | Premium | Premium v2 (preview) |
26+
| -------------------------------------------------------------------------------------------- | ----------- | --------- | --------- | --------- | ----- | -------- | ------- | ------- |
27+
| Microsoft Entra integration<sup>1</sup> | No | Yes | No | Yes | Yes | Yes | Yes | Yes |
28+
| Virtual network injection support | No | Yes | No | No | No | No | Yes | Yes |
29+
| Private endpoint support for inbound connections | No | Yes | Yes | No | Yes | No | Yes | No |
30+
| Outbound virtual network integration support | No | No | No | No | No | Yes | No | Yes |
31+
| Multi-region deployment | No | No | No | No | No | No | Yes | No |
32+
| Availability zones | No | No | No | No | No | No | Yes | No |
33+
| Multiple custom domain names for gateway | No | Yes | No | No | No | No | Yes | No |
34+
| Developer portal<sup>2</sup> | No | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
35+
| Built-in cache | No | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
36+
| [External cache](./api-management-howto-cache-external.md) | Yes | Yes | Yes | Yes | Yes | Yes |Yes | Yes
37+
| Autoscaling | No | No | Yes | No | Yes | No |Yes | No |
38+
| API analytics | No | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
39+
| [Self-hosted gateway](self-hosted-gateway-overview.md)<sup>3</sup> | No | Yes | No | No | No | No | Yes | No |
40+
| [Workspaces](workspaces-overview.md) | No | No | No | No | No | No | Yes | No |
41+
| [TLS settings](api-management-howto-manage-protocols-ciphers.md) | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
42+
| [Client certificate authentication](api-management-howto-mutual-certificates-for-clients.md) | Yes | Yes | Yes | Yes | Yes | Yes |Yes | Yes |
43+
| [Policies](api-management-howto-policies.md)<sup>4</sup> | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
44+
| [Credential manager](credentials-overview.md) | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
45+
| [Backup and restore](api-management-howto-disaster-recovery-backup-restore.md) | No | Yes | Yes | No | Yes | No | Yes | No |
46+
| [Management over Git](api-management-configuration-repository-git.md) | No | Yes | Yes |No | Yes | No | Yes | No |
47+
| Azure Monitor metrics | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
48+
| Azure Monitor and Log Analytics request logs | No | Yes | Yes | Yes | Yes | Yes |Yes | Yes |
49+
| Application Insights request logs | Yes | Yes | Yes | Yes | Yes | Yes |Yes | Yes |
50+
| Static IP | No | Yes | Yes | No |Yes | No | Yes | No |
5251

5352
<sup>1</sup> Enables the use of Microsoft Entra ID (and Azure AD B2C) as an identity provider for user sign in on the developer portal.<br/>
5453
<sup>2</sup> Including related functionality such as users, groups, issues, applications, and email templates and notifications.<br/>
55-
<sup>3</sup> See [Gateway overview](api-management-gateways-overview.md#feature-comparison-managed-versus-self-hosted-gateways) for a feature comparison of managed versus self-hosted gateways. In the Developer tier self-hosted gateways are limited to a single gateway node. <br/>
54+
<sup>3</sup> See [Gateway overview](api-management-gateways-overview.md#feature-comparison-managed-versus-self-hosted-gateways) for a feature comparison of managed versus self-hosted gateways. In the Developer tier, self-hosted gateways are limited to a single gateway node. <br/>
5655
<sup>4</sup> See [Gateway overview](api-management-gateways-overview.md#policies) for differences in policy support in the classic, v2, consumption, and self-hosted gateways. <br/>
56+
57+
## Related content
58+
59+
* [Overview of Azure API Management](api-management-key-concepts.md)
60+
* [API Management limits](/azure/azure-resource-manager/management/azure-subscription-service-limits?toc=/azure/api-management/toc.json&bc=/azure/api-management/breadcrumb/toc.json#api-management-limits)
61+
* [V2 tiers overview](v2-service-tiers-overview.md)
62+
* [API Management pricing](https://azure.microsoft.com/pricing/details/api-management/)

0 commit comments

Comments
 (0)