Skip to content

Commit a21d3ee

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into tsk544780-sfi-bastion
2 parents 7444210 + 3bebb44 commit a21d3ee

829 files changed

Lines changed: 15805 additions & 11881 deletions

File tree

Some content is hidden

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

.openpublishing.redirection.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/network-watcher/network-watcher-using-open-source-tools.md",
5+
"redirect_url": "/previous-versions/azure/network-watcher/network-watcher-using-open-source-tools",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/network-watcher/network-watcher-intrusion-detection-open-source-tools.md",
10+
"redirect_url": "/previous-versions/azure/network-watcher/network-watcher-intrusion-detection-open-source-tools",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/frontdoor/migrate-cdn-to-front-door.md",
15+
"redirect_url": "/previous-versions/azure/frontdoor/migrate-cdn-to-front-door",
16+
"redirect_document_id": false
17+
},
318
{
419
"source_path": "articles/synapse-analytics/data-explorer/data-explorer-compare.md",
520
"redirect_url": "/previous-versions/azure/synapse-analytics/data-explorer/data-explorer-compare",
@@ -6430,6 +6445,11 @@
64306445
"redirect_url": "/azure/iot-hub-device-update/",
64316446
"redirect_document_id": false
64326447
},
6448+
{
6449+
"source_path": "articles/reliability/asm-retirement.md",
6450+
"redirect_url": "/azure/azure-resource-manager/management/asm-retirement",
6451+
"redirect_document_id": false
6452+
},
64336453
{
64346454
"source_path": "articles/reliability/reliability-azure-container-apps.md",
64356455
"redirect_url": "/azure/reliability/reliability-container-apps",

CODEOWNERS

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
# Each line is a file pattern followed by one or more owners.
33

44
# Folder paths in this list have been migrated to new repositories and content can no longer be created for these services in this repo.
5-
/articles/aks @tynevi @thomps23 @jasonwhowell
6-
/articles/defender-for-cloud @tynevi @thomps23 @jasonwhowell
7-
/articles/attestation @tynevi @thomps23 @jasonwhowell
8-
/articles/confidential-ledger @tynevi @thomps23 @jasonwhowell
9-
/articles/dedicated-hsm @tynevi @thomps23 @jasonwhowell
10-
/articles/key-vault @tynevi @thomps23 @jasonwhowell
11-
/articles/payment-hsm @tynevi @thomps23 @jasonwhowell
12-
/articles/postgresql @tynevi @thomps23 @jasonwhowell
13-
/articles/cosmos-db @tynevi @thomps23 @jasonwhowell
14-
/articles/dms @tynevi @thomps23 @jasonwhowell
15-
/articles/mariadb @tynevi @thomps23 @jasonwhowell
16-
/articles/mysql @tynevi @thomps23 @jasonwhowell
17-
/articles/managed-instance-apache-cassandra @tynevi @thomps23 @jasonwhowell
5+
/articles/aks @thomps23 @jasonwhowell
6+
/articles/defender-for-cloud @thomps23 @jasonwhowell
7+
/articles/attestation @thomps23 @jasonwhowell
8+
/articles/confidential-ledger @thomps23 @jasonwhowell
9+
/articles/dedicated-hsm @thomps23 @jasonwhowell
10+
/articles/key-vault @thomps23 @jasonwhowell
11+
/articles/payment-hsm @thomps23 @jasonwhowell
12+
/articles/postgresql @thomps23 @jasonwhowell
13+
/articles/cosmos-db @thomps23 @jasonwhowell
14+
/articles/dms @thomps23 @jasonwhowell
15+
/articles/mariadb @thomps23 @jasonwhowell
16+
/articles/mysql @thomps23 @jasonwhowell
17+
/articles/managed-instance-apache-cassandra @thomps23 @jasonwhowell
1818
/articles/virtual-machines @jasonwhowell @thomps23
1919
/articles/virtual-machines-scale-sets @jasonwhowell @thomps23
2020
/articles/container-instances @jasonwhowell @thomps23
@@ -37,3 +37,4 @@
3737
/articles/quotas @jasonwhowell @thomps23
3838
/articles/container-registry @jasonwhowell @thomps23
3939
/articles/kubernetes-fleet @MicrosoftDocs/azure-docs-codeowners
40+
/articles/reliability @thomps23

articles/active-directory-b2c/add-api-connector.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ Content-type: application/json
160160
}
161161
```
162162

163-
The exact claims sent to the API depend on the information is provided by the identity provider. 'email' is always sent.
163+
The exact claims sent to the API depend on the information provided by the identity provider. 'email' is always sent.
164164

165165
### Expected response types from the web API at this step
166166

articles/active-directory-b2c/partner-transmit-security.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ To integrating Transmit DRS into the B2C sign-in page, follow these steps:
127127

128128
Azure AD B2C can obtain a risk recommendation from Transmit using a [API connector](./add-api-connector.md). Passing this request through an intermediate web API (such as using [Azure Functions](/azure/azure-functions/)) provides more flexibility in your implementation logic.
129129

130-
Follow these steps to create an Azure function that uses the action token from the frontend application to get a recommendation from the [Transmit DRS endpoint](https://developer.transmitsecurity.com/openapi/risk/recommendations/#operation/getRiskRecommendation).
130+
Follow these steps to create an Azure function that uses the action token from the frontend application to get a recommendation from the [Transmit DRS endpoint](https://developer.transmitsecurity.com/guides/risk/recommendations#operation/getRiskRecommendation).
131131

132132
1. Create the entry point of your Azure Function, an HTTP-triggered function that processes incoming HTTP requests.
133133

articles/active-directory-b2c/service-limits.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: azure-active-directory
99

1010
ms.topic: reference
11-
ms.date: 08/19/2025
11+
ms.date: 01/08/2026
1212
ms.subservice: b2c
1313
zone_pivot_groups: b2c-policy-type
1414

@@ -186,7 +186,7 @@ The following table lists the administrative configuration limits in the Azure A
186186

187187
## Region specific service limits
188188

189-
As a protection for our customers, Microsoft places some restrictions on telephony verification for certain region codes. The following table lists the region codes and their corresponding limits.
189+
As a protection for our customers, Microsoft places some restrictions on telephony verification for certain region codes. The following table lists the region codes and their corresponding limits. These limits apply to both SMS and Voice verification.
190190

191191
| Region Code | Region Name | Limit per tenant per 60 minutes | Limit per tenant per 24 hours |
192192
|:----------- |:---------------------------------------------- |:------------------------------- | :----------------------------------------|

articles/api-center/includes/api-center-portal-compare-apim-dev-portal.md

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

77
ms.service: azure-api-center
88
ms.topic: include
9-
ms.date: 03/05/2025
9+
ms.date: 01/13/2026
1010
ms.author: danlep
1111
ms.custom: Include file
1212
---
@@ -15,10 +15,10 @@ ms.custom: Include file
1515

1616
The [Azure API Management](../../api-management/api-management-key-concepts.md) and [Azure API Center](../overview.md) services both provide portals for developers to discover and consume APIs:
1717

18-
* The *API Management developer portal* allows users to find managed APIs, learn how to use them, request access, and test them.
19-
* The *API Center portal* (preview) is a multi-gateway portal where users can discover and filter the organization's complete API inventory.
18+
* The *API Management developer portal* allows users to find managed APIs (including groups of APIs managed as products), learn how to use them, request access, and test them.
19+
* The *API Center portal* (preview) is a multigateway portal where users can discover and filter the organization's complete API inventory.
2020

21-
While the two portals share some features, they also have distinct differences. The following table compares current capabilities to help determine which portal to use. Some organizations may prefer one portal, while others may need both.
21+
While the two portals share some features, they also have distinct differences. The following table compares current capabilities to help determine which portal to use. Some organizations might prefer one portal, while others might need both.
2222

2323
| Feature | API Management developer portal | API Center portal (preview) |
2424
| --- | --- | --- |
@@ -30,7 +30,7 @@ While the two portals share some features, they also have distinct differences.
3030
| Add custom widgets | ✔️ ||
3131
| Customize with WordPress | ✔️ ||
3232
| Test APIs in test console | ✔️ | ✔️ |
33-
| Subscribe to APIs | ✔️ ||
33+
| Subscribe to APIs and products | ✔️ ||
3434
| View API usage analytics | ✔️ ||
3535

3636
<sup>1</sup> The API Center portal can contain all APIs in your organization, including those managed in Azure API Management and other platforms, as well as unmanaged APIs and APIs under development.

articles/api-center/self-host-api-center-portal.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: How to self-host the API Center portal, a customer-managed website
44
author: dlepow
55
ms.service: azure-api-center
66
ms.topic: how-to
7-
ms.date: 03/04/2025
7+
ms.date: 01/13/2026
88
ms.author: danlep
99
ms.custom:
1010
# Customer intent: As an API program manager, I want to self-host a portal for developers and other API stakeholders in my organization to discover the APIs in my organization's API center.
@@ -65,20 +65,20 @@ Follow these steps to build and test the API Center portal locally.
6565
```bash
6666
git checkout main
6767
```
68-
1. To configure the service, copy or rename the `public/config.example` file to `public/config.json`.
69-
1. Then edit the `public/config.json` file to point to your service. Update the values in the file as follows:
70-
1. Replace `<service name>` and `<location>` with the name of your API center and the location where it's deployed
68+
1. To configure the service, copy or rename the `config.example.json` file to `config.json`.
69+
1. Then edit the `config.json` file to point to your service. Update the values in the file as follows:
70+
1. Replace `<service name>` and `<region>` with the name of your API center and the location where it's deployed
7171
1. Replace `<client ID>` and `<tenant ID>` with the **Application (client) ID** and **Directory (tenant) ID** of the app registration you created in the previous section.
7272
1. Update the value of `title` to a name that you want to appear in the top bar of the portal.
7373
7474
```json
7575
{
76-
"dataApiHostName": "<service name>.data.<location>.azure-apicenter.ms/workspaces/default",
76+
"dataApiHostName": "<service name>.data.<region>.azure-apicenter.ms",
7777
"title": "API portal",
7878
"authentication": {
7979
"clientId": "<client ID>",
8080
"tenantId": "<tenant ID>",
81-
"scopes": ["https://azure-apicenter.net/user_impersonation"],
81+
"scopes": ["https://azure-apicenter.net/Data.Read.All"],
8282
"authority": "https://login.microsoftonline.com/"
8383
}
8484
}

articles/api-center/synchronize-api-management-apis.md

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ description: Integrate an API Management instance to Azure API Center for automa
44
author: dlepow
55
ms.service: azure-api-center
66
ms.topic: how-to
7-
ms.date: 07/22/2025
7+
ms.date: 01/20/2026
88
ms.author: danlep
99
ms.custom: devx-track-azurecli
1010
# Customer intent: As an API program manager, I want to integrate my Azure API Management instance with my API center and synchronize API Management APIs to my inventory.
1111
---
1212

1313
# Synchronize APIs from an API Management instance
1414

15-
This article shows how to integrate an API Management instance so that the instances's APIs are continuously kept up to date in your [API center](overview.md) inventory.
15+
This article shows how to integrate an API Management instance so that the instance's APIs are continuously kept up to date in your [API center](overview.md) inventory.
1616

1717
> [!TIP]
1818
> This article explains how to integrate an API Management instance from your API center. Alternatively, quickly set up integration directly from an API Management instance. In the left menu of your instance, under **APIs**, select **API Center**, and select a target API center in your subscription to synchronize APIs to.
@@ -31,7 +31,7 @@ API Management APIs automatically synchronize to the API center whenever existin
3131

3232
> [!NOTE]
3333
> * There are [limits](../azure-resource-manager/management/azure-subscription-service-limits.md?toc=/azure/api-center/toc.json&bc=/azure/api-center/breadcrumb/toc.json#azure-api-center-limits) for the number of integrated API Management instances (API sources).
34-
> * An integrated API Management instance can be configured in a virtual network.
34+
> * You can configure an integrated API Management instance in a virtual network.
3535
> * API updates in API Management typically synchronize to your API center within minutes, but synchronization can take up to 24 hours.
3636
> * API definitions also synchronize to the API center if you select the option to include them during integration.
3737
@@ -41,7 +41,7 @@ API Management APIs automatically synchronize to the API center whenever existin
4141

4242
## Prerequisites
4343

44-
* An API center in your Azure subscription. If you haven't created one, see [Quickstart: Create your API center](set-up-api-center.md).
44+
* An API center in your Azure subscription. If you didn't create an API center, see [Quickstart: Create your API center](set-up-api-center.md).
4545

4646
* An Azure API Management instance, in the same or a different subscription. The instance must be in the same directory.
4747

@@ -51,7 +51,7 @@ API Management APIs automatically synchronize to the API center whenever existin
5151
[!INCLUDE [install-apic-extension](includes/install-apic-extension.md)]
5252

5353
> [!NOTE]
54-
> Azure CLI command examples in this article can run in PowerShell or a bash shell. Where needed because of different variable syntax, separate command examples are provided for the two shells.
54+
> You can run Azure CLI command examples in this article in PowerShell or a bash shell. Where different variable syntax is required, the article provides separate command examples for the two shells.
5555
5656
[!INCLUDE [enable-managed-identity](includes/enable-managed-identity.md)]
5757

@@ -61,14 +61,14 @@ API Management APIs automatically synchronize to the API center whenever existin
6161

6262
## Integrate an API Management instance
6363

64-
You can integrate an API Management instance using the portal or the Azure CLI.
64+
You can integrate an API Management instance by using the portal or the Azure CLI.
6565

6666
#### [Portal](#tab/portal)
6767

68-
1. In the [portal](https://portal.azure.com), navigate to your API center.
68+
1. In the [portal](https://portal.azure.com), go to your API center.
6969
1. Under **Platforms**, select **Integrations**.
7070
1. Select **+ New integration** > **From Azure API Management**.
71-
1. In the **Integrate your Azure API Management Service** page:
71+
1. In **Integrate your Azure API Management Service**:
7272
1. Select whether to synchronize all APIs from the API Management instance or only APIs that are in an API Management [workspace](../api-management/workspaces-overview.md).
7373
1. Select the **Subscription**, **Resource group**, and **Azure API Management service** that you want to integrate. If you want to synchronize only APIs from a workspace, make a selection in **Choose a workspace**.
7474
1. In **Integration details**, enter an identifier.
@@ -85,9 +85,14 @@ You can integrate an API Management instance using the portal or the Azure CLI.
8585

8686
Run the [az apic integration create apim](/cli/azure/apic/integration/create#az-apic-integration-create-apim) command to integrate an API Management instance to your API center.
8787

88+
> [!NOTE]
89+
>
90+
> * This command is only available in the preview version of the APIC extension.
91+
> * Install the new preview version before using this command.
92+
8893
* Provide the names of the resource group, API center, and integration.
8994

90-
* If the API Management instance and the API center are in the same resource group, you can provide the API Management instance name as the value of `azure-apim`; otherwise, provide the Azure resource ID.
95+
* If the API Management instance and the API center are in the same resource group, you can provide the API Management instance name as the value of `azure-apim`. Otherwise, provide the Azure resource ID.
9196

9297
```azurecli
9398
az apic integration create apim \

0 commit comments

Comments
 (0)