Skip to content

Commit fe1ee93

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents 1878518 + b502db6 commit fe1ee93

338 files changed

Lines changed: 7854 additions & 4787 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: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
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+
},
313
{
414
"source_path": "articles/frontdoor/migrate-cdn-to-front-door.md",
515
"redirect_url": "/previous-versions/azure/frontdoor/migrate-cdn-to-front-door",

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/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 \

articles/api-center/synchronize-aws-gateway-apis.md

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Integrate an Amazon API Gateway to Azure API Center for automatic s
44
author: dlepow
55
ms.service: azure-api-center
66
ms.topic: how-to
7-
ms.date: 06/02/2025
7+
ms.date: 01/21/2026
88
ms.author: danlep
99
ms.custom:
1010
- devx-track-azurecli
@@ -24,9 +24,9 @@ Integrating Amazon API Gateway as an API source for your API center enables cont
2424

2525
When you integrate an Amazon API Gateway as an API source, the following happens:
2626

27-
1. APIs, and optionally API definitions (specs), from the API Gateway are added to the API center inventory.
27+
1. The API center inventory adds APIs, and optionally API definitions (specs), from the API Gateway.
2828
1. You configure an [environment](key-concepts.md#environment) of type *Amazon API Gateway* in the API center.
29-
1. An associated [deployment](key-concepts.md#deployment) is created for each synchronized API definition.
29+
1. You create an associated [deployment](key-concepts.md#deployment) for each synchronized API definition.
3030

3131
Synchronization is one-way from Amazon API Gateway to your Azure API center, meaning API updates in the API center aren't synchronized back to Amazon API Gateway.
3232

@@ -42,9 +42,9 @@ Synchronization is one-way from Amazon API Gateway to your Azure API center, mea
4242

4343
## Prerequisites
4444

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

47-
* An Azure key vault. If you need to create one, see [Quickstart: Create a key vault using the Azure portal](/azure/key-vault/general/quick-create-portal). To add or manage secrets in the key vault, at least the **Key Vault Secrets Officer** role or equivalent permissions are required.
47+
* An Azure key vault. If you need to create one, see [Quickstart: Create a key vault using the Azure portal](/azure/key-vault/general/quick-create-portal). To add or manage secrets in the key vault, you need at least the **Key Vault Secrets Officer** role or equivalent permissions.
4848

4949
* An [Amazon API Gateway](https://docs.aws.amazon.com/apigateway/).
5050

@@ -56,22 +56,22 @@ Synchronization is one-way from Amazon API Gateway to your Azure API center, mea
5656
[!INCLUDE [install-apic-extension](includes/install-apic-extension.md)]
5757

5858
> [!NOTE]
59-
> 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.
59+
> You can run Azure CLI command examples in this article in PowerShell or a bash shell. Where needed because of different variable syntax, separate command examples are provided for the two shells.
6060
6161
## Create IAM user access keys
6262

6363
To authenticate your API center to Amazon API Gateway, you need access keys for an AWS IAM user.
6464

65-
To generate the required access key ID and secret key using the AWS Management Console, see [Create an access key for yourself](https://docs.aws.amazon.com/IAM/latest/UserGuide/access-key-self-managed.html#Using_CreateAccessKey) in the AWS documentation.
65+
To generate the required access key ID and secret key by using the AWS Management Console, see [Create an access key for yourself](https://docs.aws.amazon.com/IAM/latest/UserGuide/access-key-self-managed.html#Using_CreateAccessKey) in the AWS documentation.
6666

6767
Save your access keys in a safe location. You'll store them in Azure Key Vault in the next steps.
6868

6969
> [!CAUTION]
70-
> Access keys are long-term credentials, and you should manage them as securely as you would a password. Learn more about [securing access keys](https://docs.aws.amazon.com/IAM/latest/UserGuide/securing_access-keys.html)
70+
> Access keys are long-term credentials. Manage them as securely as you would a password. Learn more about [securing access keys](https://docs.aws.amazon.com/IAM/latest/UserGuide/securing_access-keys.html)
7171
7272
## Store IAM user access keys in Azure Key Vault
7373

74-
Manually upload and securely store the two IAM user access keys in Azure Key Vault using the configuration recommended in the following table. For more information, see [Quickstart: Set and retrieve a secret from Azure Key Vault using the Azure portal](/azure/key-vault/secrets/quick-create-portal).
74+
Manually upload and securely store the two IAM user access keys in Azure Key Vault by using the configuration recommended in the following table. For more information, see [Quickstart: Set and retrieve a secret from Azure Key Vault using the Azure portal](/azure/key-vault/secrets/quick-create-portal).
7575

7676

7777
| AWS secret | Upload options | Name | Secret value |
@@ -81,7 +81,7 @@ Manually upload and securely store the two IAM user access keys in Azure Key Vau
8181

8282
:::image type="content" source="media/synchronize-aws-gateway-apis/key-vault-secrets.png" alt-text="Screenshot of secrets list in Azure Key Vault in the portal.":::
8383

84-
Take note of the **Secret identifier** of each secret, a URI similar to `https://<key-vault-name>.vault.azure.net/secrets/<secret-name>`. You'll use these identifiers in the next steps.
84+
Take note of the **Secret identifier** of each secret, a URI similar to `https://<key-vault-name>.vault.azure.net/secrets/<secret-name>`. You use these identifiers in the next steps.
8585

8686

8787
[!INCLUDE [enable-managed-identity](includes/enable-managed-identity.md)]
@@ -93,19 +93,19 @@ Take note of the **Secret identifier** of each secret, a URI similar to `https:/
9393

9494
## Integrate an Amazon API Gateway
9595

96-
You can integrate an Amazon API Gateway using the portal or the Azure CLI.
96+
You can integrate an Amazon API Gateway by using the portal or the Azure CLI.
9797

9898
#### [Portal](#tab/portal)
99-
1. In the [portal](https://portal.azure.com), navigate to your API center.
99+
1. In the [portal](https://portal.azure.com), go to your API center.
100100
1. Under **Platforms**, select **Integrations**.
101101
1. Select **+ New integration** > **From Amazon API Gateway**.
102-
1. In the **Integrate your Amazon API Gateway Service** page:
103-
1. For the **AWS access key** and **AWS secret access key**, click **Select** and select the subscription, key vault, secret that you stored.
104-
1. Select the **AWS region** where the Amazon API Gateway is deployed.
102+
1. In **Integrate your Amazon API Gateway Service**:
103+
1. For the **AWS access key** and **AWS secret access key**, select **Select** and choose the subscription, key vault, and secret that you stored.
104+
1. Select the **AWS region** where you deployed the Amazon API Gateway.
105105
1. In **Integration details**, enter an identifier.
106106
1. In **Environment details**, enter an **Environment title** (name), **Environment type**, and optional **Description**.
107107
1. In **API Details**:
108-
1. Select a **Lifecycle** for the synchronized APIs. (You can update this value for the APIs after they're added to your API center.)
108+
1. Select a **Lifecycle** for the synchronized APIs. (You can update this value for the APIs after you add them to your API center.)
109109
1. Optionally, select whether to include API definitions with the synchronized APIs.
110110
1. Select **Create**.
111111

@@ -116,9 +116,14 @@ You can integrate an Amazon API Gateway using the portal or the Azure CLI.
116116

117117
Run the [az apic integration create aws](/cli/azure/apic/integration/create#az-apic-integration-create-aws) (preview) command to integrate an Amazon API Gateway to your API center.
118118

119+
> [!NOTE]
120+
>
121+
> * This command is only available in the preview version of the APIC extension.
122+
> * Install the new preview version before using this command.
123+
119124
* Provide the names of the resource group, API center, and integration.
120125

121-
* Provide the Key Vault secret identifiers for the AWS access key and secret access key, and the AWS region where the Amazon API Gateway is deployed.
126+
* Provide the Key Vault secret identifiers for the AWS access key and secret access key, and the AWS region where you deployed the Amazon API Gateway.
122127

123128
```azurecli
124129
az apic integration create aws \
@@ -131,7 +136,7 @@ az apic integration create aws \
131136
```
132137
---
133138

134-
The environment is added in your API center. The Amazon API Gateway APIs are imported to the API center inventory.
139+
The environment is added to your API center. The Amazon API Gateway APIs are imported to the API center inventory.
135140

136141
[!INCLUDE [delete-api-integration](includes/delete-api-integration.md)]
137142

0 commit comments

Comments
 (0)