Skip to content

Commit 5fce779

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into sergaz-aiosdk
2 parents 81ebb31 + 4f67bc6 commit 5fce779

36 files changed

+431
-341
lines changed

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

articles/azure-web-pubsub/howto-monitor-data-reference.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ Metrics provide insights into the operational state of the service. The availabl
2525
|Inbound Traffic|Bytes|Sum|The inbound traffic to the service.|No Dimensions|
2626
|Outbound Traffic|Bytes|Sum|The outbound traffic from the service.|No Dimensions|
2727
|Server Load|Percent|Max / Avg|The percentage of server load.|No Dimensions|
28+
|Rest API Response Time|Count|Sum|The response time of REST API request categorized by endpoint.|ResponseTime, RestApiCategory|
29+
|Client Request Status Code|Count|Sum|The status code of client connection requests.|ClientType, Status|
2830

2931
For more information, see [Metrics](concept-metrics.md).
3032

articles/backup/backup-mabs-unattended-install.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ title: Silent installation of Azure Backup Server V4
33
description: Use a PowerShell script to silently install Azure Backup Server V4. This kind of installation is also called an unattended installation.
44
ms.service: azure-backup
55
ms.topic: how-to
6-
ms.date: 09/18/2024
7-
author: jyothisuri
8-
ms.author: jsuri
6+
ms.date: 07/14/2025
7+
author: AbhishekMallick-MS
8+
ms.author: v-mallicka
99
# Customer intent: As a system administrator, I want to execute a silent installation of Azure Backup Server V4 using PowerShell, so that I can streamline the setup process without manual intervention.
1010
---
1111
# Run an unattended installation of Azure Backup Server
@@ -68,7 +68,8 @@ You can use these flags for the installation:</br>
6868

6969
After you install Backup Server, learn how to prepare your server, or begin protecting a workload.
7070

71-
- [Prepare Backup Server workloads](backup-azure-microsoft-azure-backup.md)
72-
- [Use Backup Server to back up a VMware server](backup-azure-backup-server-vmware.md)
73-
- [Use Backup Server to back up SQL Server](backup-azure-sql-mabs.md)
74-
- [Add Modern Backup Storage to Backup Server](backup-mabs-add-storage.md)
71+
- [Prepare Backup Server workloads](backup-azure-microsoft-azure-backup.md).
72+
- [Use Backup Server to back up a VMware server](backup-azure-backup-server-vmware.md).
73+
- [Use Backup Server to back up SQL Server](backup-azure-sql-mabs.md).
74+
- [Add Modern Backup Storage to Backup Server](backup-mabs-add-storage.md).
75+
- [Manage telemetry settings in MABS](manage-telemetry.md).

articles/backup/index.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ metadata:
88
description: The Azure Backup service provides simple, secure, and cost-effective solutions to back up your data and recover it from the Microsoft Azure cloud.
99
ms.service: azure-backup
1010
ms.topic: landing-page
11-
author: jyothisuri
12-
ms.author: jsuri
13-
ms.date: 07/02/2025
11+
author: AbhishekMallick-MS
12+
ms.author: v-mallicka
13+
ms.date: 07/14/2025
1414

1515
# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
1616

@@ -164,6 +164,10 @@ landingContent:
164164
url: backup-support-matrix-mars-agent.md
165165
- text: FAQ - MARS agent
166166
url: backup-azure-file-folder-backup-faq.yml
167+
- linkListType: how-to-guide
168+
links:
169+
- text: Offline backup for MARS with customer-owned disks
170+
url: backup-azure-backup-import-export.md
167171
# Card
168172
- title: Back up with Microsoft Azure Backup Server (MABS) and DPM
169173
linkLists:
@@ -183,8 +187,8 @@ landingContent:
183187
url: offline-backup-azure-data-box.md
184188
- text: Offline backup using Azure Data Box for DPM and MABS
185189
url: offline-backup-azure-data-box-dpm-mabs.md
186-
- text: Offline backup for MARS with customer-owned disks
187-
url: backup-azure-backup-import-export.md
190+
- text: Manage telemetry settings in MABS
191+
url: manage-telemetry.md
188192
# Card
189193
- title: Manage at scale
190194
linkLists:

articles/backup/microsoft-azure-backup-server-protection-v3-ur1.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
title: MABS (Azure Backup Server) V3 UR1 protection matrix
33
description: This article provides a support matrix listing all workloads, data types, and installations that Azure Backup Server protects.
4-
ms.date: 11/23/2024
4+
ms.date: 07/14/2025
55
ms.topic: reference
66
ms.custom: engagement-fy24, linux-related-content
77
ms.service: azure-backup
8-
author: jyothisuri
9-
ms.author: jsuri
8+
author: AbhishekMallick-MS
9+
ms.author: v-mallicka
1010
# Customer intent: As a backup administrator, I want to review the protection matrix for Azure Backup Server, so that I can ensure all critical workloads and data types are supported for backup and recovery in my environment.
1111
---
1212

@@ -167,4 +167,6 @@ MABS doesn't support protecting the following data types:
167167

168168
## Next steps
169169

170-
* [Support matrix for backup with Microsoft Azure Backup Server or System Center DPM](backup-support-matrix-mabs-dpm.md)
170+
- [Support matrix for backup with Microsoft Azure Backup Server or System Center DPM](backup-support-matrix-mabs-dpm.md).
171+
- [Manage telemetry settings in MABS](manage-telemetry.md).
172+

0 commit comments

Comments
 (0)