Skip to content

Commit 2de4644

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into scalablegw
2 parents 23799b8 + d7eb300 commit 2de4644

File tree

434 files changed

+2562
-4681
lines changed

Some content is hidden

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

434 files changed

+2562
-4681
lines changed

.openpublishing.redirection.json

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,90 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/fxt-edge-filer/add-nodes.md",
5+
"redirect_url": "/previous-versions/azure/fxt-edge-filer/add-nodes",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/fxt-edge-filer/add-storage.md",
10+
"redirect_url": "/previous-versions/azure/fxt-edge-filer/add-storage",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/fxt-edge-filer/additional-doc.md",
15+
"redirect_url": "/previous-versions/azure/fxt-edge-filer/additional-doc",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/fxt-edge-filer/cluster-create.md",
20+
"redirect_url": "/previous-versions/azure/fxt-edge-filer/cluster-create",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/fxt-edge-filer/configure-network.md",
25+
"redirect_url": "/previous-versions/azure/fxt-edge-filer/configure-network",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/fxt-edge-filer/index.yml",
30+
"redirect_url": "/previous-versions/azure/fxt-edge-filer/index",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "articles/fxt-edge-filer/install.md",
35+
"redirect_url": "/previous-versions/azure/fxt-edge-filer/install",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "articles/fxt-edge-filer/monitor.md",
40+
"redirect_url": "/previous-versions/azure/fxt-edge-filer/monitor",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "articles/fxt-edge-filer/mount-clients.md",
45+
"redirect_url": "/previous-versions/azure/fxt-edge-filer/mount-clients",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "articles/fxt-edge-filer/network-power.md",
50+
"redirect_url": "/previous-versions/azure/fxt-edge-filer/network-power",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "articles/fxt-edge-filer/node-password.md",
55+
"redirect_url": "/previous-versions/azure/fxt-edge-filer/node-password",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "articles/fxt-edge-filer/overview.md",
60+
"redirect_url": "/previous-versions/azure/fxt-edge-filer/overview",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "articles/fxt-edge-filer/port-list.md",
65+
"redirect_url": "/previous-versions/azure/fxt-edge-filer/port-list",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path": "articles/fxt-edge-filer/power-off.md",
70+
"redirect_url": "/previous-versions/azure/fxt-edge-filer/power-off",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path": "articles/fxt-edge-filer/specs.md",
75+
"redirect_url": "/previous-versions/azure/fxt-edge-filer/specs",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path": "articles/fxt-edge-filer/support-ticket.md",
80+
"redirect_url": "/previous-versions/azure/fxt-edge-filer/support-ticket",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path": "articles/fxt-edge-filer/supported-ciphers.md",
85+
"redirect_url": "/previous-versions/azure/fxt-edge-filer/supported-ciphers",
86+
"redirect_document_id": false
87+
},
388
{
489
"source_path": "articles/backup/azure-elastic-storage-area-network-backup-manage.md",
590
"redirect_url": "/azure/backup/azure-elastic-san-backup-manage",
51 KB
Loading

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ 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: 06/18/2025
7+
ms.date: 06/25/2025
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

13-
# Synchronize APIs from an API Management instance (preview)
13+
# Synchronize APIs from an API Management instance
1414

1515
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.
1616

@@ -30,7 +30,6 @@ When you integrate an API Management instance as an API source, the following ha
3030
API Management APIs automatically synchronize to the API center whenever existing APIs' settings change (for example, new versions are added), new APIs are created, or APIs are deleted. This synchronization is one-way from API Management to your Azure API center, meaning API updates in the API center aren't synchronized back to the API Management instance.
3131

3232
> [!NOTE]
33-
> * Integration of Azure API Management is currently in preview.
3433
> * 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).
3534
> * An integrated API Management instance can be configured in a virtual network.
3635
> * API updates in API Management typically synchronize to your API center within minutes, but synchronization can take up to 24 hours.
@@ -70,7 +69,8 @@ You can integrate an API Management instance using the portal or the Azure CLI.
7069
1. Under **Platforms**, select **Integrations**.
7170
1. Select **+ New integration** > **From Azure API Management**.
7271
1. In the **Integrate your Azure API Management Service** page:
73-
1. Select the **Subscription**, **Resource group**, and **Azure API Management service** that you want to integrate.
72+
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).
73+
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.
7575
If you haven't already configured a managed identity with access to the API Management instance, enable **Automatically configure managed identity and assign permissions**. This selection automatically assigns the API center's system-assigned managed identity the necessary permissions to synchronize APIs from the API Management instance.
7676
1. In **Environment details**, enter an **Environment title** (name), **Environment type**, and optional **Description**.
@@ -98,9 +98,7 @@ az apic integration create apim \
9898
```
9999
---
100100

101-
The environment is added in your API center. The API Management APIs are imported to the API center inventory.
102-
103-
:::image type="content" source="media/synchronize-api-management-apis/environment-link-list.png" alt-text="Screenshot of environment list in the portal.":::
101+
The API Management instance is integrated as an environment in your API center. The API Management APIs are synchronized to the API center inventory.
104102

105103
[!INCLUDE [delete-api-integration](includes/delete-api-integration.md)]
106104

articles/api-management/export-api-postman.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: dlepow
55

66
ms.service: azure-api-management
77
ms.topic: how-to
8-
ms.date: 08/06/2024
8+
ms.date: 06/26/2025
99
ms.author: danlep
1010
---
1111
# Export API definition to Postman for API testing, monitoring, and development
@@ -35,9 +35,6 @@ To enhance development of your APIs, you can export an API fronted in API Manage
3535

3636
1. In the portal, under **APIs**, select an API.
3737
1. In the context menu (**...**), select **Export** > **Postman**.
38-
39-
:::image type="content" source="media/export-api-postman/export-to-postman.png" alt-text="Screenshot of exporting an API to Postman in the Azure portal.":::
40-
4138
1. In the **Run in** dialog, select the Postman location to export to. You can select the option for the desktop app if you've installed it locally.
4239
1. In Postman, select a Postman workspace to import the API to. The default is *My Workspace*.
4340
1. In Postman, select **Generate collection from this API** to automatically generate a collection from the API definition. If needed, configure advanced import options, or accept default values. Select **Import**.
Binary file not shown.

articles/app-service/app-service-hybrid-connections.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,15 @@ When a Hybrid Connection is added to your app, you can see details on it simply
8989

9090
To create a Hybrid Connection using an ARM/Bicep template, add the following resource to your existing template. You must include the `userMetadata` to have a valid Hybrid Connection. If you don't include the `userMetadata`, the Hybrid Connection doesn't work. If you create the Hybrid Connection in the Azure portal, this property is automatically filled in for you.
9191

92-
The `userMetadata` property should be a string representation of a JSON array in the format `[{"key": "endpoint", "value : "host:port"}]`. The following Bicep template has a sample for this property. For more information, see [Microsoft.Relay namespaces/hybridConnections](/azure/templates/microsoft.relay/namespaces/hybridconnections).
92+
The `userMetadata` property should be a string representation of a JSON array in the format `[{/"key/": /"endpoint/", /"value/" : /"<HOST>:<PORT>/"}]`. For more information, see [Microsoft.Relay namespaces/hybridConnections](/azure/templates/microsoft.relay/namespaces/hybridconnections).
9393

9494
```bicep
9595
resource hybridConnection 'Microsoft.Relay/namespaces/hybridConnections@2024-01-01' = {
9696
parent: relayNamespace
9797
name: hybridConnectionName
9898
properties: {
9999
requiresClientAuthorization: true
100-
userMetadata: '[{"key": "endpoint", "value : "<HOST>:<PORT>"}]'
100+
userMetadata: '[{/"key/": /"endpoint/", /"value/" : /"<HOST>:<PORT>/"}]'
101101
}
102102
}
103103
```

0 commit comments

Comments
 (0)