Skip to content

Commit 818a633

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into azure-functions-triggers-and-bindings
2 parents b0508b0 + ee76f05 commit 818a633

File tree

105 files changed

+1318
-1838
lines changed

Some content is hidden

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

105 files changed

+1318
-1838
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 335 deletions
Large diffs are not rendered by default.

articles/api-management/api-management-howto-use-azure-monitor.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.custom:
1010
- devdivchpfy22
1111
- build-2025
1212
ms.topic: tutorial
13-
ms.date: 05/14/2025
13+
ms.date: 07/09/2025
1414
ms.author: danlep
1515
---
1616
# Tutorial: Monitor published APIs

articles/api-management/inject-vnet-v2.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ If you want to enable *public* inbound access to an API Management instance in t
5454
* Minimum: /27 (32 addresses)
5555
* Recommended: /24 (256 addresses) - to accommodate scaling of API Management instance
5656

57+
### Network security group
58+
5759
[!INCLUDE [api-management-virtual-network-v2-nsg-rules](../../includes/api-management-virtual-network-v2-nsg-rules.md)]
5860

5961
### Subnet delegation

articles/api-management/integrate-vnet-outbound.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,14 @@ If you want to inject a Premium v2 (preview) API Management instance into a virt
4646
* Minimum: /27 (32 addresses)
4747
* Recommended: /24 (256 addresses) - to accommodate scaling of API Management instance
4848

49+
### Network security group
50+
4951
[!INCLUDE [api-management-virtual-network-v2-nsg-rules](../../includes/api-management-virtual-network-v2-nsg-rules.md)]
5052

53+
> [!IMPORTANT]
54+
> * Inbound NSG rules do not apply when a v2 tier instance is integrated in a virtual network for private outbound access. To enforce inbound NSG rules, use virtual network injection instead of integration.
55+
> * This differs from networking in the classic Premium tier, where inbound NSG rules are enforced in both external and internal virtual network injection modes. [Learn more](virtual-network-injection-resources.md)
56+
5157
### Subnet delegation
5258

5359
The subnet needs to be delegated to the **Microsoft.Web/serverFarms** service.

articles/api-management/monitor-api-management.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Monitor Azure API Management
33
description: Learn how to monitor Azure API Management using Azure Monitor, including data collection, analysis, and alerting.
4-
ms.date: 05/14/2025
4+
ms.date: 07/09/2025
55
ms.custom:
66
- horz-monitor
77
- build-2025
@@ -49,27 +49,31 @@ Azure API Management provides analytics for your APIs so that you can analyze th
4949
5050
With API analytics, analyze the usage and performance of the APIs in your API Management instance across several dimensions, including:
5151

52-
- Time
52+
- Timeline
5353
- Geography
5454
- APIs
5555
- API operations
5656
- Products
5757
- Subscriptions
5858
- Users
5959
- Requests
60+
- Language models (for large language model APIs)
6061

6162
API analytics provides data on requests, including failed and unauthorized requests. Geography values are based on IP address mapping. There can be a delay in the availability of analytics data.
6263

6364
#### Azure Monitor-based dashboard
6465

6566
To use the Azure Monitor-based dashboard, you need a Log Analytics workspace as a data source for API Management gateway logs.
6667

67-
If you need to configure one, the following are brief steps to send gateway logs to a Log Analytics workspace. For more information, see [Tutorial: Monitor published APIs](api-management-howto-use-azure-monitor.md#resource-logs). This procedure is a one-time setup.
68+
If you need to configure one, the following are brief steps to send gateway logs to a Log Analytics workspace. For more information, see [Enable diagnostic setting for Azure Monitor logs](#enable-diagnostic-setting-for-azure-monitor-logs), later in this article. This procedure is a one-time setup.
6869

6970
1. In the [Azure portal](https://portal.azure.com), navigate to your API Management instance.
7071
1. In the left-hand menu, under **Monitoring**, select **Diagnostic settings** > **+ Add diagnostic setting**.
7172
1. Enter a descriptive name for the diagnostic setting.
7273
1. In **Logs**, select **Logs related to ApiManagement Gateway**.
74+
> [!TIP]
75+
> To collect logs for large language model (LLM) APIs for display on the Azure Monitor-based dashboard, also select **Logs related to generative AI gateway**.
76+
7377
1. In **Destination details**, select **Send to Log Analytics** and select a Log Analytics workspace in the same or a different subscription. If you need to create a workspace, see [Create a Log Analytics workspace](/azure/azure-monitor/logs/quick-create-workspace).
7478
1. Make sure **Resource specific** is selected as the destination table.
7579
1. Select **Save**.
@@ -111,7 +115,7 @@ This section shows you how to enable Azure Monitor logs for auditing and trouble
111115
|API Management gateway | Requests processed by the API Management gateway, including HTTP methods, protocols, request and response bodies, headers, timings, error details, and cache involvement. | Adjust settings for all APIs, or override them for individual APIs.<br/><br/>In API Management instances configured with [workspaces](workspaces-overview.md), gateway logs can be collected individually for each workspace and aggregated for centralized access by the platform team. |
112116
|WebSocket connections | Events for [WebSocket API](websocket-api.md) connections, starting from the handshake until the connection is terminated. |
113117
|Developer portal usage | Requests that are received and processed by the API Management [developer portal](developer-portal-overview.md), including user authentication actions, views of API details, and API testing in the interactive test console.|
114-
| Generative AI gateway | Requests processed by the API Management gateway for large language model (LLM) REST APIs such as Azure OpenAI APIs, including token usage, models, and optionally details of request prompts and response completions. | Enable logging of request messages and/or response messages for specific LLM APIs.
118+
| Generative AI gateway | Requests processed by the API Management gateway for large language model (LLM) REST APIs such as Azure AI Foundry APIs, including token usage, models, and optionally details of request prompts and response completions. | Enable logging of request messages and/or response messages for specific LLM APIs.
115119

116120
For more information, see [API Management monitoring data reference](monitor-api-management-reference.md).
117121

articles/api-management/virtual-network-workspaces-resources.md

Lines changed: 13 additions & 11 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: concept-article
8-
ms.date: 06/18/2025
8+
ms.date: 07/08/2025
99
ms.author: danlep
1010
---
1111

@@ -45,7 +45,6 @@ For information about configuring subnet delegation, see [Add or remove a subnet
4545

4646
#### [Virtual network integration](#tab/external)
4747

48-
4948
For virtual network integration, the subnet needs to be delegated to the **Microsoft.Web/serverFarms** service.
5049

5150
:::image type="content" source="media/virtual-network-injection-workspaces-resources/delegate-external.png" alt-text="Screenshot showing subnet delegation to Microsoft.Web/serverFarms in the portal.":::
@@ -65,21 +64,20 @@ For virtual network injection, the subnet needs to be delegated to the **Microso
6564
6665
---
6766

67+
## Network security group
6868

69-
## Network security group (NSG) rules
69+
#### [Virtual network integration](#tab/external)
7070

71-
A network security group (NSG) must be attached to the subnet to explicitly allow certain inbound or outbound connectivity. Configure the following rules in the NSG. Set the priority of these rules higher than that of the default rules.
71+
[!INCLUDE [api-management-virtual-network-v2-nsg-rules](../../includes/api-management-virtual-network-v2-nsg-rules.md)]
7272

73-
Configure other NSG rules to meet your organization's network access requirements.
7473

75-
#### [Virtual network integration](#tab/external)
74+
#### [Virtual network injection](#tab/internal)
7675

77-
| Direction | Source | Source port ranges | Destination | Destination port ranges | Protocol | Action | Purpose |
78-
|-------|--------------|----------|---------|------------|-----------|-----|--------|
79-
| Inbound | AzureLoadBalancer | * | Workspace gateway subnet range | 80 | TCP | Allow | Allow internal health ping traffic |
80-
| Inbound | Internet | * | Workspace gateway subnet range | 80,443 | TCP | Allow | Allow inbound traffic |
76+
A network security group (NSG) must be associated with the subnet. To set up a network security group, see [Create a network security group](../virtual-network/manage-network-security-group.md).
8177

82-
#### [Virtual network injection](#tab/internal)
78+
* Configure the following rules in the NSG. Set the priority of these rules higher than that of the default rules.
79+
* Configure other outbound rules you need for the gateway to reach your API backends.
80+
* Configure other NSG rules to meet your organization’s network access requirements. For example, NSG rules can also be used to block outbound traffic to the internet and allow access only to resources in your virtual network.
8381

8482
| Direction | Source | Source port ranges | Destination | Destination port ranges | Protocol | Action | Purpose |
8583
|-------|--------------|----------|---------|------------|-----------|-----|--------|
@@ -89,6 +87,10 @@ Configure other NSG rules to meet your organization's network access requirement
8987

9088
---
9189

90+
> [!IMPORTANT]
91+
> * Inbound NSG rules do not apply when you integrate a workspace gateway in a virtual network for private outbound access. To enforce inbound NSG rules, use virtual network injection instead of integration.
92+
> * This differs from networking in the classic Premium tier, where inbound NSG rules are enforced in both external and internal virtual network injection modes. [Learn more](virtual-network-injection-resources.md)
93+
9294
## DNS settings for virtual network injection
9395

9496
For virtual network injection, you have to manage your own DNS to enable inbound access to your workspace gateway.

articles/app-service/configure-authentication-provider-aad.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ The created app registration authenticates incoming requests for your Microsoft
265265

266266
Your application code is often the best place to handle custom authorization logic. However, for common scenarios, the Microsoft identity platform provides built-in checks that you can use to limit access.
267267

268-
This section shows how to enable built-in checks by using the [App Service authentication V2 API](./configure-authentication-api-version.md). Currently, the only way to configure these built-in checks is by using [Azure Resource Manager templates](/azure/templates/microsoft.web/sites/config-authsettingsv2) or the [REST API](/rest/api/appservice/web-apps/update-auth-settings-v2).
268+
This section shows how to enable built-in checks by using the [App Service authentication V2 API](./configure-authentication-api-version.md). Currently, the only way to configure these built-in checks is by using [Azure Resource Manager templates](/azure/templates/microsoft.web/sites/config-authsettingsv2) or the [REST API](/rest/api/appservice/web-apps/update-auth-settings-v-2).
269269

270270
Within the API object, the Microsoft Entra identity provider configuration has a `validation` section that can include a `defaultAuthorizationPolicy` object, as shown in the following structure:
271271

articles/app-service/invoke-openapi-web-app-from-azure-ai-agent-service.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: 'Invoke an App Service web app from Azure AI Foundry Agent Service'
33
description: Learn how to integrate App Service with AI Foundry Agent Service and get started with agentic AI
44
author: seligj95
55
ms.author: jordanselig
6-
ms.date: 06/13/2025
6+
ms.date: 07/11/2025
77
ms.update-cycle: 180-days
88
ms.topic: article
99
ms.custom:
@@ -95,7 +95,7 @@ For detailed guidance with screenshots and additional information, see [Add Open
9595
After setting up the AI Agent and adding the OpenAPI Specified Tool, you need to configure your App Service with the appropriate environment variables so the app knows which agent to connect to. The app already has a managed identity assigned that gives it access to the AI Agent Service. This managed identity is required for the app to reach the agent and is created with the azd template.
9696
9797
1. From the Agents dashboard where you added the OpenAPI tool, note the **agent ID**. It's in the format `asst_<unique-identifier>`.
98-
1. Select **Overview** in the menu note the **project's connection string**. It's in the format `<region>.api.azureml.ms;<subscription-id>;<resource-group-name>;<project-name>`.
98+
1. Select **Overview** in the menu and note the **project's connection string**. It's in the format `<region>.api.azureml.ms;<subscription-id>;<resource-group-name>;<project-name>`.
9999
1. Navigate to your App Service in the Azure portal.
100100
1. Select **Environment variables** in the left menu.
101101
1. In the **App settings** tab, select **+ Add** and add the following setting:

articles/application-gateway/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
- name: Architecture best practices for Azure Application Gateway v2
1313
href: /azure/well-architected/service-guides/azure-application-gateway?toc=/azure/application-gateway/toc.json&bc=/azure/application-gateway/breadcrumb/toc.json
1414
- name: What is load balancing and content delivery?
15-
href: /azure/networking/load-balancer-content-delivery/load-balancing-content-delivery-overview.md
15+
href: /azure/networking/load-balancer-content-delivery/load-balancing-content-delivery-overview
1616
- name: Choose a load balancing solution
1717
href: /azure/architecture/guide/technology-choices/load-balancing-overview?toc=/azure/load-balancer/toc.json
1818
- name: Create Application Gateway - Portal

articles/azure-functions/functions-create-first-function-resource-manager.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Before you begin, you must have an Azure account with an active subscription. [C
3030

3131
## Review the template
3232

33-
The template used in this quickstart is from [Azure Quickstart Templates](https://azure.microsoft.com/resources/templates/function-app-flex-managed-identities/).
33+
The template used in this quickstart is from [Azure Quickstart Templates](/samples/azure/azure-quickstart-templates/function-app-flex-managed-identities/).
3434

3535
:::code language="json" source="~/quickstart-templates/quickstarts/microsoft.web/function-app-flex-managed-identities/azuredeploy.json":::
3636

0 commit comments

Comments
 (0)