Skip to content

Commit 34b9778

Browse files
author
gitName
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into appp
2 parents efd5301 + 5b49158 commit 34b9778

File tree

83 files changed

+596
-420
lines changed

Some content is hidden

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

83 files changed

+596
-420
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/durable/durable-functions-entities.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ For more information on the class-based syntax and how to use it, see [Defining
131131

132132
```csharp
133133
[Function(nameof(Counter))]
134-
public static Task DispatchAsync([EntityTrigger] TaskEntityDispatcher dispatcher)
134+
public static Task Counter([EntityTrigger] TaskEntityDispatcher dispatcher)
135135
{
136136
return dispatcher.DispatchAsync(operation =>
137137
{

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-netapp-files/configure-access-control-lists.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
2-
title: Configure access control lists with Azure NetApp Files | Microsoft Docs
2+
title: Configure access control lists with Azure NetApp Files
33
description: Learn how to configure access control lists (ACLs) on NFSv4.1 with Azure NetApp Files.
44
author: b-ahibbard
55
ms.service: azure-netapp-files
66
ms.topic: how-to
7-
ms.date: 07/10/2025
7+
ms.date: 07/14/2025
88
ms.author: anfdocs
99
# Customer intent: "As a system administrator, I want to configure access control lists on NFSv4.1 volumes in Azure NetApp Files, so that I can manage fine-grained file permissions for users and groups to enhance security and control over shared resources."
1010
---
@@ -58,10 +58,9 @@ To learn more about ACLs in Azure NetApp Files, see [Understand NFSv4.x ACLs](nf
5858
```bash
5959
nfs4_setfacl -a A::[email protected]:RWX /nfsldap/engineering
6060
```
61-
6261
- If you're configuring an ACE for [file access logs](manage-file-access-logs.md), you must use the `U:` prefix to denote the ACE is an audit ACE. The following example configures an audit log for everyone for successful and failed access attempts:
63-
`nfs4_setfacl -a U:fdiSF:EVERYONE@:rwaDdxtTnNcCoy /<mount_point>`
64-
62+
`nfs4_setfacl -a U:fdiSF:EVERYONE@:rwaDdxtTnNcCoy /<mount_point>`.
63+
- To apply ACLs recursively on a directory and its contents, use the `-R` option with the `nfs4_setfacl` command. This option ensures the ACL changes are applied to all files and subdirectories within the specified directory.
6564
6665
## Next steps
6766

articles/azure-netapp-files/configure-kerberos-encryption.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Configure NFSv4.1 Kerberos encryption for Azure NetApp Files | Microsoft Docs
2+
title: Configure NFSv4.1 Kerberos encryption for Azure NetApp Files
33
description: Describes how to configure NFSv4.1 Kerberos encryption for Azure NetApp Files and the performance impact.
44
services: azure-netapp-files
55
author: b-hchen

articles/azure-netapp-files/configure-network-features.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Configure network features for an Azure NetApp Files volume | Microsoft Docs
2+
title: Configure network features for an Azure NetApp Files volume
33
description: Describes the options for network features and how to configure the Network Features option for a volume.
44
services: azure-netapp-files
55
author: b-hchen
@@ -41,7 +41,7 @@ Two settings are available for network features:
4141
* When you change the network features option of existing volumes from Basic to Standard network features, access to existing Basic networking volumes might be lost if your UDR or NSG implementations prevent the Basic networking volumes from connecting to DNS and domain controllers. You might also lose the ability to update information, such as the site name, in the Active Directory connector if all volumes can’t communicate with DNS and domain controllers. For guidance about UDRs and NSGs, see [Configure network features for an Azure NetApp Files volume](azure-netapp-files-network-topologies.md#udrs-and-nsgs).
4242

4343
>[!NOTE]
44-
> The networking features of the DP volume are not affected by changing the source volume from Basic to Standard network features.
44+
> The networking features of the data protection volume aren't affected by changing the source volume from Basic to Standard network features.
4545
4646
## <a name="set-the-network-features-option"></a>Set network features option during volume creation
4747

@@ -108,7 +108,7 @@ You can edit the network features option of existing volumes from *Basic* to *St
108108
109109
If your Azure NetApp Files volume is managed using Terraform, editing the network features requires additional steps. Terraform-managed Azure resources store their state in a local file, which is in your Terraform module or in Terraform Cloud.
110110
111-
Updating the network features of your volume alters the underlying network sibling set of the NIC utilized by that volume. This NIC can be utilized by other volumes you own, and other NICs can share the same network sibling set. **If not performed correctly, updating the network features of one Terraform-managed volume can inadvertently update the network features of several other volumes.**
111+
Updating the network features of your volume alters the underlying network sibling set of the NIC utilized by that volume. This NIC can be utilized by other volumes you own, and other NICs can share the same network sibling set. **If performed incorrectly, updating the network features of one Terraform-managed volume can inadvertently update the network features of several other volumes.**
112112
113113
>[!IMPORTANT]
114114
>A discontinuity between state data and remote Azure resource configurations--notably, in the `network_features` argument--can result in the destruction of one or more volumes and possible data loss upon running `terraform apply`. Carefully follow the workaround outlined here to safely update the network features from Basic to Standard of Terraform-managed volumes.
@@ -120,7 +120,7 @@ The name of the state file in your Terraform module is `terraform.tfstate`. It c
120120
121121
:::image type="content" source="./media/configure-network-features/terraform-module.png" alt-text="Screenshot of Terraform module." lightbox="./media/configure-network-features/terraform-module.png":::
122122
123-
Do _not_ manually update the `terraform.tfstate` file. Likewise, the `network_features` argument in the `*.tf` and `*.tf.json` configuration files should also not be updated until you follow the steps outlined here as this would cause a mismatch in the arguments of the remote volume and the local configuration file representing that remote volume. When Terraform detects a mismatch between the arguments of remote resources and local configuration files representing those remote resources, Terraform can destroy the remote resources and reprovision them with the arguments in the local configuration files. This can cause data loss in a volume.
123+
Do ***not*** manually update the `terraform.tfstate` file. Likewise, the `network_features` argument in the `*.tf` and `*.tf.json` configuration files should also not be updated until you follow the steps outlined here as this would cause a mismatch in the arguments of the remote volume and the local configuration file representing that remote volume. When Terraform detects a mismatch between the arguments of remote resources and local configuration files representing those remote resources, Terraform can destroy the remote resources and reprovision them with the arguments in the local configuration files. This can cause data loss in a volume.
124124
125125
By following the steps outlined here, the `network_features` argument in the `terraform.tfstate` file is automatically updated by Terraform to have the value of "Standard" without destroying the remote volume, thus indicating the network features has been successfully updated to Standard.
126126
@@ -141,7 +141,7 @@ Changing the network features for an Azure NetApp Files Volume can impact the ne
141141
All Terraform configuration files that define these volumes need to be updated, meaning you need to find the Terraform configuration files that define these volumes. The configuration files representing the affected volumes might not be in the same Terraform module.
142142
143143
>[!IMPORTANT]
144-
>With the exception of the single volume you know is managed by Terraform, additional affected volumes might not be managed by Terraform. An additional volume that is listed as being in the same network sibling set does not mean that this additional volume is managed by Terraform.
144+
>With the exception of the single volume you know is managed by Terraform, additional affected volumes might not be managed by Terraform. Another volume that's listed as being in the same network sibling set doesn't mean this other volume is managed by Terraform.
145145
146146
#### Modify the affected volumes’ configuration files
147147
@@ -151,7 +151,7 @@ You must modify the configuration files for each affected volume managed by Terr
151151
>Depending on your volume’s lifecycle configuration block settings in your Terraform configuration file, your volume can be destroyed, including possible data loss upon running `terraform apply`. Ensure you know which affected volumes are managed by Terraform and which are not.
152152
153153
1. Locate the affected Terraform-managed volumes configuration files.
154-
1. Add the `ignore_changes = [network_features]` to the volume's `lifecycle` configuration block. If the `lifecycle` block does not exist in that volume’s configuration, add it.
154+
1. Add the `ignore_changes = [network_features]` to the volume's `lifecycle` configuration block. If the `lifecycle` block doesn't exist in that volume’s configuration, add it.
155155
156156
:::image type="content" source="./media/configure-network-features/terraform-lifecycle.png" alt-text="Screenshot of the lifecycle configuration." lightbox="./media/configure-network-features/terraform-lifecycle.png":::
157157
@@ -174,7 +174,7 @@ The `ignore_changes` feature is intended to be used when a resource’s referenc
174174
:::image type="content" source="./media/configure-network-features/terraform-plan-output.png" alt-text="Screenshot of terraform plan command output." lightbox="./media/configure-network-features/terraform-plan-output.png":::
175175
176176
>[!IMPORTANT]
177-
> As a safety precaution, execute `terraform plan` before executing `terraform apply`. The command `terraform plan` allows you to create a “plan” file, which contains the changes to your remote resources. This plan allows you to know if any of your affected volumes will be destroyed by running `terraform apply`.
177+
> As a safety precaution, execute `terraform plan` before executing `terraform apply`. The command `terraform plan` allows you to create a “plan” file, which contains the changes to your remote resources. This plan allows you to know if any of your affected volumes can be destroyed by running `terraform apply`.
178178
179179
1. Run `terraform apply` to update the `terraform.tfstate` file.
180180
@@ -194,7 +194,7 @@ Once you've update the volumes' network features, you must also modify the `netw
194194
195195
1. Repeat for each affected Terraform-managed volume.
196196
1. Verify that the updated configuration files accurately represent the configuration of the remote resources by running `terraform plan`. Confirm the output reads "No changes."
197-
1. Run `terraform apply` to complete the update.
197+
1. To complete the update, run `terraform apply`.
198198
199199
## Next steps
200200

0 commit comments

Comments
 (0)