Skip to content

Commit 3863b1e

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-limits-entra-service-link
2 parents 87ab3b0 + e33e152 commit 3863b1e

19 files changed

+235
-30
lines changed

articles/azure-compute-fleet/faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ sections:
7979
- question: |
8080
Can a Compute Fleet resource be moved ?
8181
answer: |
82-
No. Compute Fleet doesn't currently support that capability. If you need to move, you can consider deleting it and using the Azure Resource Manager template to create another one in another location/subscription/resource group.
82+
No. Compute Fleet doesn't currently support that capability. If you need to move, you can consider deleting it and using the Azure Resource Manager template to create another one in another location, subscription, or resource group.
8383
8484
8585

articles/azure-functions/functions-bindings-azure-sql-output.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ To return [multiple output bindings](./dotnet-isolated-process-guide.md#multiple
5050
public static class OutputType
5151
{
5252
[SqlOutput("dbo.ToDo", connectionStringSetting: "SqlConnectionString")]
53-
public ToDoItem ToDoItem { get; set; }
54-
public HttpResponseData HttpResponse { get; set; }
53+
public static ToDoItem ToDoItem { get; set; }
54+
public static HttpResponseData HttpResponse { get; set; }
5555
}
5656
```
5757

articles/azure-netapp-files/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,8 @@
369369
href: manage-default-individual-user-group-quotas.md
370370
- name: Manage storage with cool access
371371
href: manage-cool-access.md
372+
- name: Manage file access logs
373+
href: manage-file-access-logs.md
372374
- name: Update Terraform-managed volume
373375
href: terraform-manage-volume.md
374376
- name: Manage application volume groups

articles/azure-netapp-files/azure-government.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ All [Azure NetApp Files features](whats-new.md) available on Azure public cloud
2525
| Azure NetApp Files features | Azure public cloud availability | Azure Government availability |
2626
|:--- |:--- |:--- |
2727
| Azure NetApp Files large volumes | Generally available (GA) | Generally available [(select regions)](large-volumes-requirements-considerations.md#supported-regions) |
28+
| Azure NetApp Files file access logs | Public preview | Public preview [(select regions)](manage-file-access-logs.md#supported-regions) |
2829

2930
## Portal access
3031

articles/azure-netapp-files/azure-netapp-files-create-volumes-smb.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ Before creating an SMB volume, you need to create an Active Directory connection
7373
The subnet you specify must be delegated to Azure NetApp Files.
7474

7575
If you haven't delegated a subnet, you can select **Create new** on the Create a Volume page. Then in the Create Subnet page, specify the subnet information, and select **Microsoft.NetApp/volumes** to delegate the subnet for Azure NetApp Files. In each VNet, only one subnet can be delegated to Azure NetApp Files.
76+
77+
:::image type="content" source="./media/shared/azure-netapp-files-create-subnet.png" alt-text="Screenshot of create new subnet interface." lightbox="./media/shared/azure-netapp-files-create-subnet.png":::
7678

77-
![Create subnet](./media/shared/azure-netapp-files-create-subnet.png)
78-
7979
* **Network features**
8080
In supported regions, you can specify whether you want to use **Basic** or **Standard** network features for the volume. See [Configure network features for a volume](configure-network-features.md) and [Guidelines for Azure NetApp Files network planning](azure-netapp-files-network-topologies.md) for details.
8181

articles/azure-netapp-files/azure-netapp-files-create-volumes.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@ This article shows you how to create an NFS volume. For SMB volumes, see [Create
8383
Specify the subnet that you want to use for the volume.
8484
The subnet you specify must be delegated to Azure NetApp Files.
8585
86-
If you have not delegated a subnet, you can select **Create new** on the Create a Volume page. Then in the Create Subnet page, specify the subnet information, and select **Microsoft.NetApp/volumes** to delegate the subnet for Azure NetApp Files. In each Virtual Network, only one subnet can be delegated to Azure NetApp Files.
86+
If you have not delegated a subnet, you can click **Create new** on the Create a Volume page. Then in the Create Subnet page, specify the subnet information, and select **Microsoft.NetApp/volumes** to delegate the subnet for Azure NetApp Files. In each VNet, only one subnet can be delegated to Azure NetApp Files.
87+
88+
:::image type="content" source="../media/azure-netapp-files/azure-netapp-files-new-volume.png" alt-text="Screenshot of create new volume interface." lightbox="../media/azure-netapp-files/azure-netapp-files-new-volume.png":::
8789

8890
![Create subnet](./media/shared/azure-netapp-files-create-subnet.png)
8991

articles/azure-netapp-files/faq-security.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ For the complete list of Azure NetApp Files permissions, see Azure resource prov
4848

4949
Azure NetApp Files is an Azure native service. All PUT, POST, and DELETE APIs against Azure NetApp Files are logged. For example, the logs show activities such as who created the snapshot, who modified the volume, and so on.
5050

51+
Azure NetApp Files also offers [file access logging](manage-file-access-logs.md).
52+
5153
For the complete list of API operations, see [Azure NetApp Files REST API](/rest/api/netapp/).
5254

5355
## Can I use Azure policies with Azure NetApp Files?

articles/azure-netapp-files/kerberos.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -170,22 +170,22 @@ New machine accounts are created when an Azure NetApp Files SMB volume is provis
170170
| First new SMB volume | New SMB machine account/DNS name |
171171
| Subsequent SMB volumes created in short succession from first SMB volume | Reused SMB machine account/DNS name (in most cases). |
172172
| Subsequent SMB volumes created much later than first SMB volume | The service determines if new machine account is needed. It's possible multiple machine accounts can be created, which creates multiple IP address endpoints. |
173-
| First dual protocol volume | New SMB machine account/DNS name |
174-
| Subsequent dual protocol volumes created in short succession from first dual protocol volume | Reused SMB machine account/DNS name (in most cases) |
175-
| Subsequent dual protocol volumes created much later than first dual protocol volume | The service determines if a new machine account is needed. It's possible multiple machine accounts can be created, which creates multiple IP address endpoints |
176-
| First SMB volume created after dual protocol volume | New SMB machine account/DNS name |
177-
| First dual protocol volume created after SMB volume | New SMB machine account/DNS name |
173+
| First dual-protocol volume | New SMB machine account/DNS name |
174+
| Subsequent dual-protocol volumes created in short succession from first dual-protocol volume | Reused SMB machine account/DNS name (in most cases) |
175+
| Subsequent dual-protocol volumes created much later than first dual-protocol volume | The service determines if a new machine account is needed. It's possible multiple machine accounts can be created, which creates multiple IP address endpoints |
176+
| First SMB volume created after dual-protocol volume | New SMB machine account/DNS name |
177+
| First dual-protocol volume created after SMB volume | New SMB machine account/DNS name |
178178

179-
The SMB machine account created for the Azure NetApp Files SMB (or dual protocol) volume uses a naming convention that adheres to the [15-character maximum that is enforced by Active Directory](/troubleshoot/windows-server/active-directory/naming-conventions-for-computer-domain-site-ou). The name uses the structure of [SMB Server prefix specified in Active Directory connection configuration]-[unique numeric identifier].
179+
The SMB machine account created for the Azure NetApp Files SMB (or dual-protocol) volume uses a naming convention that adheres to the [15-character maximum that is enforced by Active Directory](/troubleshoot/windows-server/active-directory/naming-conventions-for-computer-domain-site-ou). The name uses the structure of [SMB Server prefix specified in Azure AD connection configuration]-[unique numeric identifier].
180180

181181
For instance, if you've [configured your AD connections](create-active-directory-connections.md) to use the SMB server prefix "AZURE," the SMB machine account that Azure NetApp Files creates resembles "AZURE-7806." That same name is used in the UNC path for the SMB share (for example, \\AZURE-7806) and is the name that dynamic DNS services use to create the A/AAAA record.
182182

183183
>[!NOTE]
184-
>Because a name like AZURE-7806 can be hard to remember, it's beneficial to create a CNAME record as a DNS alias for Azure NetApp Files volumes. For more information, see [Creating SMB server aliases](#creating-smb-server-aliases).
184+
>Because a name like "AZURE-7806" can be difficult to remember, it's beneficial to create a CNAME record as a DNS alias for Azure NetApp Files volumes. For more information, see [Creating SMB server aliases](#creating-smb-server-aliases).
185185
186186
:::image type="content" source="media/kerberos/multiple-dns-smb.png" alt-text="Diagram of multiple machine accounts/DNS entries in Azure NetApp Files." lightbox="media/kerberos/multiple-dns-smb.png":::
187187

188-
In some cases, when creating multiple SMB and/or dual protocol volumes, the configuration can end up with multiple disparate SMB machine accounts and DNS names.
188+
In some cases, when creating multiple SMB and/or dual-protocol volumes, the configuration can end up with multiple disparate SMB machine accounts and DNS names.
189189

190190
If a single namespace for user access across the volumes is desired, this can present a challenge in configuration, as a single CNAME alias can only point to a single A/AAAA host record, while using multiple identical A/AAAA record aliases can result in unpredictability of data access in accessing volumes across different SMB machine accounts, as there's no guarantee that the endpoint the client selects in the DNS lookup contains the expected volume due to the round-robin nature of DNS record selection in those configurations.
191191

@@ -196,7 +196,7 @@ To address this limitation, [Azure NetApp Files volumes can participate as targe
196196

197197
### SMB Kerberos SPN creation workflow
198198

199-
The following diagram illustrates how an SMB Kerberos SPN is created when an Azure NetApp Files SMB or dual protocol volume is created. SMB SPNs are associated with SMB machine account objects in the domain. The SPN can be viewed and managed via the machine account properties using the attribute editor in the Advanced view.
199+
The following diagram illustrates how an SMB Kerberos SPN is created when an Azure NetApp Files SMB or dual-protocol volume is created. SMB SPNs are associated with SMB machine account objects in the domain. The SPN can be viewed and managed via the machine account properties using the attribute editor in the Advanced view.
200200

201201
:::image type="content" source="media/kerberos/azure-smb-properties.png" alt-text="Screenshot of Azure-SMB properties." lightbox="media/kerberos/azure-smb-properties.png":::
202202

@@ -337,7 +337,7 @@ When an Azure NetApp Files volume is mounting using Kerberos, a Kerberos ticket
337337
- The SMB service ticket is retrieved from the KDC.
338338
- Azure NetApp Files attempts to map the Windows user requesting access to the share to a valid UNIX user.
339339
- A Kerberos TGS request is made using the SMB server Kerberos credentials stored with the SMB server’s keytab from initial SMB server creation to use for an LDAP server bind.
340-
- LDAP is searched for a UNIX user that is mapped to the SMB user requesting share access. If no UNIX user exists in LDAP, then the default UNIX user `pcuser` is used by Azure NetApp Files for name mapping (files/folders written in dual protocol volumes use the mapped UNIX user as the UNIX owner).
340+
- LDAP is searched for a UNIX user that is mapped to the SMB user requesting share access. If no UNIX user exists in LDAP, then the default UNIX user `pcuser` is used by Azure NetApp Files for name mapping (files/folders written in dual-protocol volumes use the mapped UNIX user as the UNIX owner).
341341
- Another negotiate protocol/session request/tree connect is performed, this time using the SMB server’s Kerberos SPN to the Active Directory DC’s IPC$ share.
342342
- A named pipe is established to the share via the `srvsvc`.
343343
- A NETLOGON session is established to the share and the Windows user is authenticated.
@@ -456,7 +456,7 @@ In most cases, knowing these steps in depth won’t be necessary for day-to-day
456456

457457
### NFS Kerberos SPN creation workflow
458458

459-
The following diagram shows how an NFS SPN is created when an Azure NetApp Files NFS or dual protocol volume is created with Kerberos enabled. In most cases, knowing detailed steps in depth won’t be necessary for day-to-day administration tasks, but are useful in troubleshooting any failures when attempting to create an SMB volume in Azure NetApp Files.
459+
The following diagram shows how an NFS SPN is created when an Azure NetApp Files NFS or dual-protocol volume is created with Kerberos enabled. In most cases, knowing detailed steps in depth won’t be necessary for day-to-day administration tasks, but are useful in troubleshooting any failures when attempting to create an SMB volume in Azure NetApp Files.
460460

461461
:::image type="content" source="media/kerberos/nfs-keberos-spn.png" alt-text="Diagram of NFS Kerberos SPN creation workflow." lightbox="media/kerberos/nfs-keberos-spn.png":::
462462

0 commit comments

Comments
 (0)