Skip to content

Commit a3ea3f9

Browse files
authored
Merge branch 'main' into reliability-spring-apps-remove
2 parents 70cb007 + d2972af commit a3ea3f9

263 files changed

Lines changed: 2630 additions & 1603 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
@@ -7923,6 +7923,16 @@
79237923
"source_path": "articles/reliability/reliability-spring-apps.md",
79247924
"redirect_url": "/azure/reliability/overview-reliability-guidance",
79257925
"redirect_document_id": false
7926+
},
7927+
{
7928+
"source_path": "articles/iot-hub-device-update/device-update-simulator.md",
7929+
"redirect_url": "/azure/iot-hub-device-update/",
7930+
"redirect_document_id": false
7931+
},
7932+
{
7933+
"source_path": "articles/iot-hub-device-update/device-update-azure-real-time-operating-system.md",
7934+
"redirect_url": "/azure/iot-hub-device-update/",
7935+
"redirect_document_id": false
79267936
}
79277937

79287938

articles/active-directory-b2c/azure-monitor.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ In summary, you'll use Azure Lighthouse to allow a user or group in your Azure A
6969

7070
- An Azure AD B2C account with [Global Administrator](/entra/identity/role-based-access-control/permissions-reference#global-administrator) role on the Azure AD B2C tenant.
7171

72-
- A Microsoft Entra account with the [Owner](../role-based-access-control/built-in-roles.md#owner) role in the Microsoft Entra subscription. See how to [Assign a user as an administrator of an Azure subscription](../role-based-access-control/role-assignments-portal-subscription-admin.yml).
72+
- A Microsoft Entra account with the [Owner](../role-based-access-control/built-in-roles.md#owner) role in the Microsoft Entra subscription. See how to [Assign a user as an administrator of an Azure subscription](/azure/role-based-access-control/role-assignments-portal-subscription-admin).
7373

7474
## 1. Create or choose resource group
7575

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,5 +199,5 @@ After importing APIs from API Management, you can view and manage the imported A
199199
* [Azure CLI reference for Azure API Center](/cli/azure/apic)
200200
* [Azure CLI reference for API Management](/cli/azure/apim)
201201
* [Use the Azure CLI to manage your API inventory](manage-apis-azure-cli.md)
202-
* [Assign Azure roles to a managed identity](../role-based-access-control/role-assignments-portal-managed-identity.yml)
202+
* [Assign Azure roles to a managed identity](/azure/role-based-access-control/role-assignments-portal-managed-identity)
203203
* [Azure API Management documentation](../api-management/index.yml)

articles/api-center/includes/configure-managed-identity-apim-reader.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.author: danlep
1111
ms.custom: Include file
1212
---
1313

14-
To allow import of APIs, assign your API center's managed identity the **API Management Service Reader** role in your API Management instance. You can use the [portal](../../role-based-access-control/role-assignments-portal-managed-identity.yml) or the Azure CLI.
14+
To allow import of APIs, assign your API center's managed identity the **API Management Service Reader** role in your API Management instance. You can use the [portal](/azure/role-based-access-control/role-assignments-portal-managed-identity) or the Azure CLI.
1515

1616
#### [Portal](#tab/portal)
1717

articles/api-center/includes/configure-managed-identity-kv-secret-user.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.author: danlep
1111
ms.custom: Include file
1212
---
1313

14-
To allow import of APIs, assign your API center's managed identity the **Key Vault Secrets User** role in your Azure key vault. You can use the [portal](../../role-based-access-control/role-assignments-portal-managed-identity.yml) or the Azure CLI.
14+
To allow import of APIs, assign your API center's managed identity the **Key Vault Secrets User** role in your Azure key vault. You can use the [portal](/azure/role-based-access-control/role-assignments-portal-managed-identity) or the Azure CLI.
1515

1616
#### [Portal](#tab/portal)
1717

articles/api-management/genai-gateway-capabilities.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ More information:
233233

234234
* [AI gateway reference architecture using API Management](/ai/playbook/technology-guidance/generative-ai/dev-starters/genai-gateway/reference-architectures/apim-based)
235235
* [AI hub gateway landing zone accelerator](https://github.com/Azure-Samples/ai-hub-gateway-solution-accelerator)
236-
* [Designing and implementing a gateway solution with Azure OpenAI resources](/ai/playbook/technology-guidance/generative-ai/dev-starters/gemonitoring API Management with Azurenai-gateway/)
236+
* [Designing and implementing a gateway solution with Azure OpenAI resources](/ai/playbook/technology-guidance/generative-ai/dev-starters/genai-gateway/)
237237
* [Use a gateway in front of multiple Azure OpenAI deployments](/azure/architecture/ai-ml/guide/azure-openai-gateway-multi-backend)
238238

239239
## Related content

articles/api-management/get-started-create-service-instance-cli.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
title: Quickstart - Create Azure API Management instance - CLI
2+
title: Quickstart - Create Azure API Management Instance - CLI
33
description: Use this quickstart to create a new Azure API Management instance by using the Azure CLI.
44
author: dlepow
55
ms.service: azure-api-management
66
ms.topic: quickstart
77
ms.custom: mode-api, devx-track-azurecli, devdivchpfy22
8-
ms.date: 12/11/2023
8+
ms.date: 10/14/2025
99
ms.author: danlep
1010
ms.devlang: azurecli
1111
---
@@ -38,7 +38,7 @@ az group create --name myResourceGroup --location centralus
3838

3939
Now that you have a resource group, you can create an API Management instance. Create one by using the [az apim create](/cli/azure/apim#az-apim-create) command and provide a service name and publisher details. The service name must be unique within Azure.
4040

41-
In the following example, *myapim* is used for the service name. Update the name to a unique value. Also update the name of the API publisher's organization and the email address to receive notifications.
41+
In the following example, *myapim* is used for the service name. Update the name to a unique value. Also update the name of the API publisher's organization, and to receive notifications update the email address.
4242

4343
```azurecli-interactive
4444
az apim create --name myapim --resource-group myResourceGroup \

articles/api-management/powershell-create-service-instance.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
2-
title: Quickstart - Create API Management instance - PowerShell
2+
title: Quickstart - Create API Management Instance - PowerShell
33
description: Use this quickstart to create a new Azure API Management instance by using Azure PowerShell cmdlets.
44
services: api-management
55
author: dlepow
66
ms.service: azure-api-management
77
ms.topic: quickstart
88
ms.custom: mvc, devx-track-azurepowershell, mode-api, devdivchpfy22
9-
ms.date: 12/12/2023
9+
ms.date: 10/14/2025
1010
ms.author: danlep
1111
---
1212

@@ -44,7 +44,7 @@ In the following example, *myapim* is used for the service name. Update the name
4444
By default, the command creates the instance in the Developer tier, an economical option to evaluate Azure API Management. This tier isn't for production use. For more information about the API Management tiers, see [Feature-based comparison of the Azure API Management tiers](api-management-features.md).
4545

4646
> [!TIP]
47-
> This is a long-running action. It can take between 30 and 40 minutes to create and activate an API Management service in this tier.
47+
> This command can take between 30 and 40 minutes to create and activate an API Management service in this tier.
4848
4949
```azurepowershell-interactive
5050
New-AzApiManagement -Name "myapim" -ResourceGroupName "myResourceGroup" `
@@ -67,7 +67,7 @@ Name : myapim
6767
Location : West US
6868
Sku : Developer
6969
Capacity : 1
70-
CreatedTimeUtc : 9/9/2022 9:07:43 PM
70+
CreatedTimeUtc : 10/13/2025 9:54:18 PM
7171
ProvisioningState : Succeeded
7272
RuntimeUrl : https://myapim.azure-api.net
7373
RuntimeRegionalUrl : https://myapi-westus-01.regional.azure-api.net

articles/api-management/vscode-create-service-instance.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
title: Quickstart - Create Azure API Management instance - VS Code
2+
title: Quickstart - Create Azure API Management Instance - Visual Studio Code
33
description: Use this quickstart to create an Azure API Management instance with the API Management extension for Visual Studio Code.
44
ms.service: azure-api-management
55
author: dlepow
66
ms.author: danlep
77
ms.topic: quickstart
8-
ms.date: 12/12/2023
8+
ms.date: 10/14/2025
99
ms.custom: mode-api, devdivchpfy22
1010
---
1111

@@ -21,7 +21,7 @@ This quickstart describes the steps to create a new API Management instance usin
2121

2222
[!INCLUDE [quickstarts-free-trial-note](~/reusable-content/ce-skilling/azure/includes/quickstarts-free-trial-note.md)]
2323

24-
Also, ensure you've installed the following:
24+
Also, ensure that you install:
2525

2626
- [Visual Studio Code](https://code.visualstudio.com/)
2727

@@ -37,15 +37,15 @@ Select **Sign in to Azure...** to launch a browser window and sign in to your Mi
3737

3838
## Create an API Management instance
3939

40-
Once you're signed in to your Microsoft account, the *Azure: API Management* Explorer pane will list your Azure subscription(s). You can enable and disable this Explorer pane in the *Azure API Management Extension Settings*.
40+
Once you're signed in to your Microsoft account, the *Azure: API Management* Explorer pane lists your Azure subscriptions. You can enable and disable this Explorer pane in the *Azure API Management Extension Settings*.
4141

4242
Right-click on the subscription you'd like to use, and select **Create API Management in Azure**.
4343

4444
![Create API Management wizard in VS Code](./media/vscode-create-service-instance/vscode-apim-create.png)
4545

4646
In the pane that opens, supply a name for the new API Management instance. It must be globally unique within Azure and consist of 1-50 alphanumeric characters and/or hyphens. It should also start with a letter and end with an alphanumeric character.
4747

48-
A new API Management instance (and parent resource group) will be created with the specified name. By default, the instance is created in the *West US* region with *Consumption* tier.
48+
A new API Management instance and parent resource group are created with the specified name. By default, the instance is created in the *West US* region with *Consumption* tier.
4949

5050
> [!TIP]
5151
> If you enable **Advanced Creation** in the *Azure API Management Extension Settings*, you can also specify an [API Management tier](https://azure.microsoft.com/pricing/details/api-management/), Azure region, and [resource group](../azure-resource-manager/management/overview.md) to deploy your API Management instance.

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

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to create and use hybrid connections in Azure App Service
44
author: seligj95
55
ms.assetid: 66774bde-13f5-45d0-9a70-4e9536a4f619
66
ms.topic: how-to
7-
ms.date: 07/07/2025
7+
ms.date: 10/15/2025
88
ms.update-cycle: 1095-days
99
ms.author: jordanselig
1010
#customer intent: As an app developer, I want to understand the usage of Hybrid Connections to provide access to apps in Azure App Service.
@@ -119,7 +119,7 @@ App Service Hybrid Connections are only available in Basic, Standard, Premium, a
119119
|:----|:----|
120120
| Basic | 5 per plan |
121121
| Standard | 25 per plan |
122-
| Premium (v1-v3) | 220 per app |
122+
| Premium (v1-v4) | 220 per app |
123123
| IsolatedV2 | 220 per app |
124124

125125
The App Service plan UI shows you how many Hybrid Connections are being used and by what apps.
@@ -242,6 +242,23 @@ You can also show the details of a specific Hybrid Connection with the `hcm show
242242

243243
:::image type="content" source="media/app-service-hybrid-connections/hybrid-connections-hcm-details-cli.png" alt-text="Screenshot of Hybrid Connection Details in CLI.":::
244244

245+
### Configure proxy server settings
246+
247+
If you need to configure proxy server settings for the Hybrid Connection Manager, edit the `ProxySettings` section in the `appsettings.json` file located at:
248+
249+
- **Windows**: `C:\ProgramData\HybridConnectionManager\`
250+
- **Linux**: `/usr/share/HybridConnectionManager/`
251+
252+
After you edit the configuration file, restart the Hybrid Connection Manager service to apply the new proxy settings:
253+
254+
- **Windows**: Restart the service through **Services** from the **Start Menu**.
255+
- **Linux**: Run `systemctl restart hybridconnectionmanager.service`.
256+
257+
Configuring a proxy server routes requests from the Hybrid Connection Manager through the selected proxy server before reaching the destination. Ensure your proxy server supports HTTP/HTTPS traffic so that the Hybrid Connection Manager can communicate with the Azure Relay Service.
258+
259+
> [!NOTE]
260+
> All addresses set in `appsettings.json` (`ProxyAddress`, `BypassList`) should be in RegEx format if not an exact match.
261+
245262
### Redundancy
246263

247264
Each Hybrid Connection Manager can support multiple Hybrid Connections. Multiple Hybrid Connection Managers can support any Hybrid Connection. The default behavior is to route traffic across the configured Hybrid Connection Managers for any given endpoint. If you want high availability on your Hybrid Connections from your network, run multiple Hybrid Connection Managers on separate machines. The load distribution algorithm used by the Relay service to distribute traffic to the Hybrid Connection Managers is random assignment.

0 commit comments

Comments
 (0)