Skip to content

Commit e46e76e

Browse files
author
gitName
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into copstu
2 parents ce3b873 + ca7457c commit e46e76e

File tree

248 files changed

+1984
-539
lines changed

Some content is hidden

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

248 files changed

+1984
-539
lines changed

articles/active-directory-b2c/partner-ping-identity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ You can use basic user flows or advanced Identity Enterprise Framework (IEF) pol
9595

9696
![Screenshot of the subject sub claim URL on the Token compatibility dialog.](./media/partner-ping/token-setting.png)
9797

98-
In the advanced policies, configuration includes the IssuanceClaimPattern metadata element to AuthorityWithTfp value in the [JWT token issuer technical profile](./jwt-issuer-technical-profile.md).
98+
In the advanced policies, configuration includes the IssuanceClaimPattern metadata element to AuthorityWithTfp value in the [JWT issuer technical profile](./jwt-issuer-technical-profile.md).
9999

100100
## Configure PingAccess and PingFederate
101101

articles/analysis-services/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,4 +147,4 @@
147147
- name: Stack Overflow
148148
href: https://stackoverflow.com/questions/tagged/azure-analysis-services
149149
- name: Videos
150-
href: https://azure.microsoft.com/resources/videos/index/?services=analysis-services&sort=newest
150+
href: https://azure.microsoft.com/resources/videos/

articles/api-management/TOC.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
href: configure-custom-domain.md
8181
- name: Use an external cache
8282
href: api-management-howto-cache-external.md
83-
- name: Migrate from stv1 to stv2 platform
8483
- name: Configure update settings
8584
href: configure-service-update-settings.md
8685
- name: Move instances between regions

articles/api-management/api-management-howto-autoscale.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ The article walks through the process of configuring autoscale and suggests opti
2424
> * An API Management service in the **Consumption** tier scales automatically based on the traffic - without any additional configuration needed.
2525
> * Currently, autoscale is not supported for the [workspace gateway](workspaces-overview.md#workspace-gateway) in API Management workspaces.
2626
27+
[!INCLUDE [api-management-service-update-behavior](../../includes/api-management-service-update-behavior.md)]
28+
2729
## Prerequisites
2830

2931
To follow the steps from this article, you must:
@@ -38,7 +40,6 @@ To follow the steps from this article, you must:
3840
Certain limitations and consequences of scaling decisions need to be considered before configuring autoscale behavior.
3941

4042
+ The [pricing tier](api-management-features.md) of your API Management instance determines the [maximum number of units](upgrade-and-scale.md#upgrade-and-scale) you may scale to. For example, the **Standard tier** can be scaled to 4 units. You can add any number of units to the **Premium** tier.
41-
+ The scaling process takes at least 20 minutes.
4243
+ If the service is locked by another operation, the scaling request will fail and retry automatically.
4344
+ If your service instance is deployed in multiple regions (locations), only units in the **Primary location** can be autoscaled with Azure Monitor autoscale. Units in other locations can only be scaled manually.
4445
+ If your service instance is configured with [availability zones](zone-redundancy.md) in the **Primary location**, be aware of the number of zones when configuring autoscaling. The number of API Management units in autoscale rules and limits must be a multiple of the number of zones.
@@ -73,7 +74,7 @@ Follow these steps to configure autoscale for an Azure API Management service:
7374
|*Action* | | |
7475
| Operation | Increase count by | |
7576
| Instance count | 1 | Scale out the Azure API Management instance by 1 unit. |
76-
| Cool down (minutes) | 60 | It takes at least 20 minutes for the API Management service to scale out. In most cases, the cool down period of 60 minutes prevents from triggering many scale-outs. |
77+
| Cool down (minutes) | 60 | In most cases, the cool down period of 60 minutes prevents from triggering many scale-outs. |
7778

7879
1. Select **Add** to save the rule.
7980
1. To add another rule, select **Add a rule**.

articles/api-management/api-management-howto-ca-certificates.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ Follow the steps below to upload a new CA certificate. If you have not created a
4242
1. Select **Save**. This operation may take a few minutes.
4343

4444
> [!NOTE]
45-
> - The process of assigning the certificate might take 15 minutes or more depending on the size of the deployment. The Developer SKU has downtime during the process. The Basic and higher SKUs don't have downtime during the process.
46-
> - You can also upload a CA certificate using the `New-AzApiManagementSystemCertificate` PowerShell command.
45+
> You can also upload a CA certificate using the `New-AzApiManagementSystemCertificate` PowerShell command.
4746
4847
## <a name="step1a"> </a>Delete a CA certificate
4948

articles/api-management/api-management-howto-deploy-multi-region.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,12 @@ When adding a region, you configure:
2323

2424
* [Virtual network](virtual-network-concepts.md) settings in the added region, if networking is configured in the existing region or regions.
2525

26-
>[!IMPORTANT]
26+
> [!IMPORTANT]
2727
> The feature to enable storing customer data in a single region is currently only available in the Southeast Asia Region (Singapore) of the Asia Pacific Geo. For all other regions, customer data is stored in Geo.
2828
29+
[!INCLUDE [api-management-service-update-behavior](../../includes/api-management-service-update-behavior.md)]
30+
31+
2932
## About multi-region deployment
3033

3134
[!INCLUDE [api-management-multi-region-concepts](../../includes/api-management-multi-region-concepts.md)]

articles/api-management/api-management-howto-disaster-recovery-backup-restore.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ This article shows how to automate backup and restore operations of your API Man
3434

3535
[!INCLUDE [updated-for-az](~/reusable-content/ce-skilling/azure/includes/updated-for-az.md)]
3636

37+
[!INCLUDE [api-management-service-update-behavior](../../includes/api-management-service-update-behavior.md)]
38+
39+
3740
## Prerequisites
3841

3942
* An API Management service instance. If you don't have one, see [Create an API Management service instance](get-started-create-service-instance.md).
@@ -291,8 +294,6 @@ Restore-AzApiManagement -ResourceGroupName $apiManagementResourceGroup -Name $ap
291294
-SourceBlobName $blobName -AccessType "UserAssignedManagedIdentity" ` -identityClientId $identityid
292295
```
293296

294-
Restore is a long-running operation that may take up to 45 minutes or more to complete.
295-
296297
### [CLI](#tab/cli)
297298

298299
In the following examples,
@@ -320,8 +321,6 @@ az apim restore --resource-group $apiManagementResourceGroup --name $apiManageme
320321
--storage-account-name $storageAccountName --storage-account-key $storageKey --storage-account-container $containerName --backup-name $backupName
321322
```
322323

323-
Restore is a long-running operation that may take up to 45 minutes or more to complete.
324-
325324
### [REST](#tab/rest)
326325

327326
To restore an API Management service from a previously created backup, make the following HTTP request:
@@ -380,7 +379,7 @@ In the body of the request, specify the existing storage account name, blob cont
380379

381380
Set the value of the `Content-Type` request header to `application/json`.
382381

383-
Restore is a long-running operation that may take up to 30 or more minutes to complete. If the request succeeded and the restore process began, you receive a `202 Accepted` response status code with a `Location` header. Make `GET` requests to the URL in the `Location` header to find out the status of the operation. While the restore is in progress, you continue to receive a `202 Accepted` status code. A response code of `200 OK` indicates successful completion of the restore operation.
382+
Restore is a long-running operation that may take several minutes to complete. If the request succeeded and the restore process began, you receive a `202 Accepted` response status code with a `Location` header. Make `GET` requests to the URL in the `Location` header to find out the status of the operation. While the restore is in progress, you continue to receive a `202 Accepted` status code. A response code of `200 OK` indicates successful completion of the restore operation.
384383

385384
---
386385

articles/api-management/api-management-using-with-internal-vnet.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ For configurations specific to the *external* mode, where the API Management end
4040

4141
[!INCLUDE [updated-for-az](~/reusable-content/ce-skilling/azure/includes/updated-for-az.md)]
4242

43+
[!INCLUDE [api-management-service-update-behavior](../../includes/api-management-service-update-behavior.md)]
44+
4345
[!INCLUDE [api-management-virtual-network-prerequisites](../../includes/api-management-virtual-network-prerequisites.md)]
4446

4547
## Enable VNet connection
@@ -59,8 +61,6 @@ For configurations specific to the *external* mode, where the API Management end
5961
1. Continue configuring VNet settings for the remaining locations of your API Management instance.
6062
1. In the top navigation bar, select **Save**.
6163

62-
It can take 15 to 45 minutes to update the API Management instance. The Developer tier has downtime during the process. The Basic and higher SKUs don't have downtime during the process.
63-
6464
After successful deployment, you should see your API Management service's **private** virtual IP address and **public** virtual IP address on the **Overview** blade. For more information about the IP addresses, see [Routing](#routing) in this article.
6565

6666
:::image type="content" source="media/api-management-using-with-internal-vnet/api-management-internal-vnet-dashboard.png" alt-text="Public and private IP addressed in Azure portal":::

articles/api-management/api-management-using-with-vnet.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ For configurations specific to the *internal* mode, where the endpoints are acce
2626

2727
[!INCLUDE [updated-for-az](~/reusable-content/ce-skilling/azure/includes/updated-for-az.md)]
2828

29+
[!INCLUDE [api-management-service-update-behavior](../../includes/api-management-service-update-behavior.md)]
30+
2931
[!INCLUDE [api-management-virtual-network-prerequisites](../../includes/api-management-virtual-network-prerequisites.md)]
3032

3133
## Enable VNet connection
@@ -49,9 +51,7 @@ For configurations specific to the *internal* mode, where the endpoints are acce
4951

5052
1. Continue configuring VNet settings for the remaining locations of your API Management instance.
5153

52-
7. In the top navigation bar, select **Save**.
53-
54-
It can take 15 to 45 minutes to update the API Management instance. Instances in the Developer tier have downtime during the process. Instances in the Premium tier don't have downtime during the process.
54+
1. In the top navigation bar, select **Save**.
5555

5656
### Enable connectivity using a Resource Manager template (`stv2` compute platform)
5757

articles/api-management/configure-custom-domain.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ When you create an Azure API Management service instance in the Azure cloud, Azu
2727
> [!NOTE]
2828
> Currently, custom domain names aren't supported in a [workspace gateway](workspaces-overview.md#workspace-gateway).
2929
30+
[!INCLUDE [api-management-service-update-behavior](../../includes/api-management-service-update-behavior.md)]
31+
3032
## Prerequisites
3133

3234
- An API Management instance. For more information, see [Create an Azure API Management instance](get-started-create-service-instance.md).
@@ -167,11 +169,6 @@ Choose the steps according to the [domain certificate](#domain-certificate-optio
167169
1. Select **Add**, or select **Update** for an existing endpoint.
168170
1. Select **Save**.
169171

170-
> [!NOTE]
171-
> The process of assigning the certificate may take 15 minutes or more depending on size of deployment. Developer tier has downtime, while Basic and higher tiers do not.
172-
173-
174-
175172
---
176173

177174
## DNS configuration

0 commit comments

Comments
 (0)