Skip to content

Commit 5d51fc9

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into us297871-content-curation
2 parents 0ba26f5 + 148a553 commit 5d51fc9

17 files changed

+53
-35
lines changed

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
/articles/mysql @tynevi @thomps23
1717
/articles/managed-instance-apache-cassandra @tynevi @thomps23
1818
/articles/virtual-machines @jasonwhowell @thomps23
19-
/articles/virtual-machines-scale-set @jasonwhowell @thomps23
19+
/articles/virtual-machines-scale-sets @jasonwhowell @thomps23
2020
/articles/container-instances @jasonwhowell @thomps23
2121
/articles/service-fabric @jasonwhowell @thomps23

articles/azure-functions/functions-reference.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,12 @@ For example, the `connection` property for an Azure Blob trigger definition migh
163163
164164
### Configure an identity-based connection
165165

166-
Some connections in Azure Functions can be configured to use an identity instead of a secret. Support depends on the extension using the connection. In some cases, a connection string may still be required in Functions even though the service to which you're connecting supports identity-based connections. For a tutorial on configuring your function apps with managed identities, see the [creating a function app with identity-based connections tutorial](./functions-identity-based-connections-tutorial.md).
167-
166+
Some connections in Azure Functions can be configured to use an identity instead of a secret. Support depends on the runtime version and the extension using the connection. In some cases, a connection string may still be required in Functions even though the service to which you're connecting supports identity-based connections. For a tutorial on configuring your function apps with managed identities, see the [creating a function app with identity-based connections tutorial](./functions-identity-based-connections-tutorial.md).
168167

169168
> [!NOTE]
170169
> When running in a Consumption or Elastic Premium plan, your app uses the [`WEBSITE_AZUREFILESCONNECTIONSTRING`](functions-app-settings.md#website_contentazurefileconnectionstring) and [`WEBSITE_CONTENTSHARE`](functions-app-settings.md#website_contentshare) settings when connecting to Azure Files on the storage account used by your function app. Azure Files doesn't support using managed identity when accessing the file share. For more information, see [Azure Files supported authentication scenarios](../storage/files/storage-files-active-directory-overview.md#supported-authentication-scenarios)
171170
171+
Identity-based connections are only supported on Functions 4.x, If you are using version 1.x, you must first [migrate to version 4.x](./migrate-version-1-version-4.md).
172172

173173
The following components support identity-based connections:
174174

@@ -255,6 +255,15 @@ An identity-based connection for an Azure service accepts the following common p
255255

256256
Other options may be supported for a given connection type. Refer to the documentation for the component making the connection.
257257

258+
##### Azure SDK Environment Variables
259+
260+
> [!CAUTION]
261+
> Use of the Azure SDK's [`EnvironmentCredential`][environment-credential] environment variables is not recommended due to the potentially unintentional impact on other connections. They also are not fully supported when deployed to Azure Functions.
262+
263+
The environment variables associated with the Azure SDK's [`EnvironmentCredential`][environment-credential] can also be set, but these are not processed by the Functions service for scaling in Consumption plans. These environment variables are not specific to any one connection and will apply as a default unless a corresponding property is not set for a given connection. For example, if `AZURE_CLIENT_ID` is set, this would be used as if `<CONNECTION_NAME_PREFIX>__clientId` had been configured. Explicitly setting `<CONNECTION_NAME_PREFIX>__clientId` would override this default.
264+
265+
[environment-credential]: /dotnet/api/azure.identity.environmentcredential
266+
258267
##### Local development with identity-based connections
259268

260269
> [!NOTE]

articles/azure-netapp-files/snapshots-delete.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: azure-netapp-files
55
author: b-hchen
66
ms.service: azure-netapp-files
77
ms.topic: how-to
8-
ms.date: 09/16/2021
8+
ms.date: 03/16/2024
99
ms.author: anfdocs
1010
---
1111

articles/azure-netapp-files/snapshots-edit-hide-path.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: azure-netapp-files
55
author: b-hchen
66
ms.service: azure-netapp-files
77
ms.topic: how-to
8-
ms.date: 09/16/2021
8+
ms.date: 03/16/2024
99
ms.author: anfdocs
1010
---
1111

articles/azure-netapp-files/snapshots-introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: azure-netapp-files
55
author: b-hchen
66
ms.service: azure-netapp-files
77
ms.topic: conceptual
8-
ms.date: 11/22/2022
8+
ms.date: 06/03/2024
99
ms.author: anfdocs
1010
---
1111
# How Azure NetApp Files snapshots work

articles/azure-netapp-files/snapshots-manage-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: azure-netapp-files
55
author: b-hchen
66
ms.service: azure-netapp-files
77
ms.topic: how-to
8-
ms.date: 05/18/2023
8+
ms.date: 03/18/2024
99
ms.author: anfdocs
1010
---
1111

articles/azure-netapp-files/snapshots-restore-file-client.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: b-hchen
66
ms.service: azure-netapp-files
77
ms.custom: linux-related-content
88
ms.topic: how-to
9-
ms.date: 09/16/2021
9+
ms.date: 03/16/2024
1010
ms.author: anfdocs
1111
---
1212

articles/azure-netapp-files/snapshots-restore-file-single.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ services: azure-netapp-files
55
author: b-hchen
66
ms.service: azure-netapp-files
77
ms.topic: how-to
8-
ms.date: 05/04/2023
8+
ms.date: 03/04/2024
99
ms.author: anfdocs
1010
---
1111

1212
# Restore individual files using single-file snapshot restore
1313

14-
If you do not want to [restore the entire snapshot to a new volume](snapshots-restore-new-volume.md) or [copy large files across the network](snapshots-restore-file-client.md), you can use the single-file snapshot restore feature to recover individual files directly within a volume from a snapshot. This option does not require an external client data copy.
14+
If you don't want to [restore the entire snapshot to a new volume](snapshots-restore-new-volume.md) or [copy large files across the network](snapshots-restore-file-client.md), you can use the single-file snapshot restore feature to recover individual files directly within a volume from a snapshot. This option doesn't require an external client data copy.
1515

1616
The single-file snapshot restore feature enables you to restore a single file or a list of files (up to 10 files at a time) from a snapshot. You can specify a specific destination location or folder for the files to be restored to.
1717

@@ -20,8 +20,8 @@ The single-file snapshot restore feature enables you to restore a single file or
2020
* If you use this feature to restore files to be new files, ensure that the volume has enough logical free space to accommodate the files.
2121
* You can restore up to 10 files at a time, specified in a total length of 1024 characters.
2222
* All the directories in the destination path that you specify must be present in the active file system.
23-
The restore operation does not create directories in the process. If the specified destination path is invalid (doesn't exist in Active file system), the restore operation will fail.
24-
* If you don’t specify a destination path, the files will be restored to the original file location. If the files already exist in the original location, they will be overwritten by the files restored from the snapshot.
23+
The restore operation doesn't create directories in the process. If the specified destination path is invalid (doesn't exist in Active file system), the restore operation will fail.
24+
* If you don’t specify a destination path, the files restore to the original file location. If the files already exist in the original location, they are overwritten by the files restored from the snapshot.
2525
* A volume can have only one active file-restore operation. If you want to restore additional files, you must wait until the current restore operation is complete before triggering another restore operation.
2626
* *During the file restore operation*, the following restrictions apply:
2727
* You can't create new snapshots on the volume.
@@ -32,9 +32,9 @@ The restore operation does not create directories in the process. If the specifi
3232

3333
1. Navigate to the volume that has the snapshot to use for restoring files.
3434

35-
2. Click **Snapshots** to display the list of volume snapshots.
35+
2. Select **Snapshots** to display the list of volume snapshots.
3636

37-
3. Right-click the snapshot that you want to use for restoring files, and then select **Restore Files** from the menu.
37+
3. Right-click the snapshot that you want to use for restoring files, then select **Restore Files** from the menu.
3838

3939
[ ![Snapshot that shows how to access the Restore Files menu item.](./media/snapshots-restore-file-single/snapshot-restore-files-menu.png) ](./media/snapshots-restore-file-single/snapshot-restore-files-menu.png#lightbox)
4040

@@ -45,14 +45,14 @@ The restore operation does not create directories in the process. If the specifi
4545
* Regardless of the volume’s protocol type (NFS, SMB, or dual protocol), directories in the path must be specified using forward slashes (`/`) and not backslashes (`\`).
4646

4747
2. In the **Destination Path** field, provide the location in the volume where the specified files are to be restored to.
48-
* If you don’t specify a destination path, the files are restored to their original location. If files with the same names already exist in the original location, they are overwritten by the files restored from the snapshot.
48+
* If you don’t specify a destination path, the files are restored to their original location. If files with the same names already exist in the original location, they're overwritten by the files restored from the snapshot.
4949
* If you specify a destination path:
5050
* Ensure that all directories in the path are present in the active file system. Otherwise, the restore operation fails.
5151
For example, if you specify `/CurrentCopy/contoso` as the destination path, the `/CurrentCopy/contoso` path must already exist.
5252
* By specifying a destination path, all files specified in the File Paths field are restored to the destination path (folder).
5353
* Regardless of the volume’s protocol type (NFS, SMB, or dual protocol), directories in the path must be specified using forward slashes (`/`) and not backslashes (`\`).
5454

55-
3. Click **Restore** to begin the restore operation.
55+
3. Select **Restore** to initiate the restore operation.
5656

5757
![Snapshot the Restore Files window.](./media/snapshots-restore-file-single/snapshot-restore-files-window.png)
5858

@@ -86,8 +86,8 @@ The path `/volume-azure-nfs/currentCopy/contoso` must be valid in the active fil
8686

8787
From the Azure portal:
8888

89-
1. Click **Snapshots**. Right-click the snapshot `daily-10-min-past-12am.2021-09-08_0010`.
90-
2. Click **Restore Files**.
89+
1. Select **Snapshots**. Right-click the snapshot `daily-10-min-past-12am.2021-09-08_0010`.
90+
2. Select **Restore Files**.
9191
3. Specify **`/contoso/vm-8976.vmdk`** in File Paths.
9292
4. Specify **`/currentCopy/contoso`** in Destination Path.
9393

@@ -127,8 +127,8 @@ Destination path in the active file system:
127127
The path `N:\currentCopy\contoso` must be valid in the active file system.
128128

129129
From the Azure portal:
130-
1. Click **Snapshots**. Select the snapshot `daily-10-min-past-12am.2021-09-08_0010`.
131-
2. Click **Restore Files**.
130+
1. Select **Snapshots**. Select the snapshot `daily-10-min-past-12am.2021-09-08_0010`.
131+
2. Select **Restore Files**.
132132
3. Specify **`/contoso/vm-9981.vmdk`** in File Paths.
133133
4. Specify **`/currentCopy/contoso`** in Destination Path.
134134

articles/azure-netapp-files/snapshots-restore-new-volume.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: azure-netapp-files
55
author: b-hchen
66
ms.service: azure-netapp-files
77
ms.topic: how-to
8-
ms.date: 02/22/2023
8+
ms.date: 03/22/2024
99
ms.author: anfdocs
1010
---
1111

articles/azure-netapp-files/snapshots-revert-volume.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ services: azure-netapp-files
55
author: b-hchen
66
ms.service: azure-netapp-files
77
ms.topic: how-to
8-
ms.date: 02/28/2023
8+
ms.date: 03/28/2024
99
ms.author: anfdocs
1010
---
1111

1212
# Revert a volume using snapshot revert with Azure NetApp Files
1313

14-
The [snapshot](snapshots-introduction.md) revert functionality enables you to quickly revert a volume to the state it was in when a particular snapshot was taken. In most cases, reverting a volume is much faster than restoring individual files from a snapshot to the active file system. It is also more space efficient compared to restoring a snapshot to a new volume.
14+
The [snapshot](snapshots-introduction.md) revert functionality enables you to quickly revert a volume to the state it was in when a particular snapshot was taken. In most cases, reverting a volume is faster than restoring individual files from a snapshot to the active file system. It's also more space efficient compared to restoring a snapshot to a new volume.
1515

1616
You can find the Revert Volume option in the Snapshots menu of a volume. After you select a snapshot for reversion, Azure NetApp Files reverts the volume to the data and timestamps that it contained when the selected snapshot was taken.
1717

@@ -22,7 +22,7 @@ The revert functionality is also available in configurations with volume replica
2222
2323
## Considerations
2424

25-
* Reverting a volume using snapshot revert is not supported on [Azure NetApp Files volumes that have backups](backup-requirements-considerations.md).
25+
* Reverting a volume using snapshot revert isn't supported on [Azure NetApp Files volumes that have backups](backup-requirements-considerations.md).
2626
* In configurations with a volume replication relationship, a SnapMirror snapshot is created to synchronize between the source and destination volumes. This snapshot is created in addition to any user-created snapshots. **When reverting a source volume with an active volume replication relationship, only snapshots that are more recent than this SnapMirror snapshot can be used in the revert operation.**
2727

2828
## Steps
@@ -31,8 +31,7 @@ The revert functionality is also available in configurations with volume replica
3131

3232
![Screenshot that describes the right-click menu of a snapshot.](./media/shared/snapshot-right-click-menu.png)
3333

34-
2. In the Revert Volume to Snapshot window,
35-
type the name of the volume, and click **Revert**.
34+
2. In the Revert Volume to Snapshot window, enter the name of the volume then select **Revert**.
3635

3736
The volume is now restored to the point in time of the selected snapshot.
3837

0 commit comments

Comments
 (0)