Skip to content

Commit 1048dcb

Browse files
Merge pull request #297397 from wmgries/consistent-media-tiers-1
Clean up dev overview, soft-delete, and FAQ.
2 parents 6570428 + b1cb31c commit 1048dcb

File tree

3 files changed

+39
-23
lines changed

3 files changed

+39
-23
lines changed

articles/storage/files/storage-files-developer-overview.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,20 @@ ms.author: pauljewell
1313

1414
This article provides an overview of application development with Azure Files and helps you decide which approach is best based on the needs of your app.
1515

16+
## Applies to
17+
| Management model | Billing model | Media tier | Redundancy | SMB | NFS |
18+
|-|-|-|-|:-:|:-:|
19+
| Microsoft.Storage | Provisioned v2 | HDD (standard) | Local (LRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
20+
| Microsoft.Storage | Provisioned v2 | HDD (standard) | Zone (ZRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
21+
| Microsoft.Storage | Provisioned v2 | HDD (standard) | Geo (GRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
22+
| Microsoft.Storage | Provisioned v2 | HDD (standard) | GeoZone (GZRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
23+
| Microsoft.Storage | Provisioned v1 | SSD (premium) | Local (LRS) | ![Yes](../media/icons/yes-icon.png) | ![Yes](../media/icons/yes-icon.png) |
24+
| Microsoft.Storage | Provisioned v1 | SSD (premium) | Zone (ZRS) | ![Yes](../media/icons/yes-icon.png) | ![Yes](../media/icons/yes-icon.png) |
25+
| Microsoft.Storage | Pay-as-you-go | HDD (standard) | Local (LRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
26+
| Microsoft.Storage | Pay-as-you-go | HDD (standard) | Zone (ZRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
27+
| Microsoft.Storage | Pay-as-you-go | HDD (standard) | Geo (GRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
28+
| Microsoft.Storage | Pay-as-you-go | HDD (standard) | GeoZone (GZRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
29+
1630
## About app development with Azure Files
1731

1832
Azure Files offers several ways for developers to access data and manage resources in Azure file shares. The following table lists the approaches, summarizes how they work, and provides guidance on when to use each approach:

articles/storage/files/storage-files-enable-soft-delete.md

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,21 @@ services: storage
1212

1313
# How to enable soft delete on Azure file shares
1414

15-
Azure Files offers soft delete for file shares so that you can easily recover your data when it's mistakenly deleted by an application or other storage account user. To learn more about soft delete, see [How to prevent accidental deletion of Azure file shares](storage-files-prevent-file-share-deletion.md).
15+
Azure Files offers soft delete for file shares so that you can easily recover your data if you mistakenly the file share. To learn more about soft delete, see [How to prevent accidental deletion of Azure file shares](storage-files-prevent-file-share-deletion.md).
1616

1717
## Applies to
18-
19-
| File share type | SMB | NFS |
20-
|-|:-:|:-:|
21-
| Standard file shares (GPv2), LRS/ZRS | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
22-
| Standard file shares (GPv2), GRS/GZRS | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
23-
| Premium file shares (FileStorage), LRS/ZRS | ![Yes](../media/icons/yes-icon.png) | ![Yes](../media/icons/yes-icon.png) |
18+
| Management model | Billing model | Media tier | Redundancy | SMB | NFS |
19+
|-|-|-|-|:-:|:-:|
20+
| Microsoft.Storage | Provisioned v2 | HDD (standard) | Local (LRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
21+
| Microsoft.Storage | Provisioned v2 | HDD (standard) | Zone (ZRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
22+
| Microsoft.Storage | Provisioned v2 | HDD (standard) | Geo (GRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
23+
| Microsoft.Storage | Provisioned v2 | HDD (standard) | GeoZone (GZRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
24+
| Microsoft.Storage | Provisioned v1 | SSD (premium) | Local (LRS) | ![Yes](../media/icons/yes-icon.png) | ![Yes](../media/icons/yes-icon.png) |
25+
| Microsoft.Storage | Provisioned v1 | SSD (premium) | Zone (ZRS) | ![Yes](../media/icons/yes-icon.png) | ![Yes](../media/icons/yes-icon.png) |
26+
| Microsoft.Storage | Pay-as-you-go | HDD (standard) | Local (LRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
27+
| Microsoft.Storage | Pay-as-you-go | HDD (standard) | Zone (ZRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
28+
| Microsoft.Storage | Pay-as-you-go | HDD (standard) | Geo (GRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
29+
| Microsoft.Storage | Pay-as-you-go | HDD (standard) | GeoZone (GZRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
2430

2531
## Prerequisites
2632

@@ -35,12 +41,12 @@ The following sections show how to enable and use soft delete for Azure file sha
3541

3642
1. Sign in to the [Azure portal](https://portal.azure.com).
3743
1. Navigate to your storage account and select **File shares** under **Data storage**.
38-
1. Select **Disabled** next to **Soft delete**. The **Soft delete** settings pane will appear.
44+
1. Select **Disabled** next to **Soft delete**.
3945
1. Select **Enabled** for **Soft delete for all file shares**.
4046
1. Under **File share retention period in days**, use the slider to specify a number between 1 and 365 days.
4147
1. Select **Save** to confirm your data retention settings.
4248

43-
:::image type="content" source="media/storage-how-to-recover-deleted-account/files-enable-soft-delete-new-ui.png" alt-text="Screenshot of the storage account soft delete settings pane. Highlighting the file shares soft delete section, enable toggle, set a retention period, and save. This will enable soft delete for all file shares in your storage account.":::
49+
:::image type="content" source="media/storage-how-to-recover-deleted-account/files-enable-soft-delete-new-ui.png" alt-text="Screenshot of the storage account soft delete settings pane. Highlighting the file shares soft delete section, enable toggle, set a retention period, and save. This enables soft delete for all file shares in your storage account.":::
4450

4551
# [PowerShell](#tab/azure-powershell)
4652
To enable soft delete, you must update the settings for all Azure file shares, also known as the `FileService` properties. The following example enables soft delete for all file shares in a storage account. Remember to replace `<resource-group>` and `<storage-account>` with the appropriate values for your environment.
@@ -93,15 +99,15 @@ az storage account file-service-properties show \
9399
To restore a soft deleted file share:
94100

95101
1. Navigate to your storage account and select **File shares**.
96-
1. On the file share blade, enable **Show deleted shares** to display any shares that have been soft deleted.
102+
1. On the file share blade, enable **Show deleted shares** to display any shares that are soft deleted.
97103

98-
This will display any shares currently in a **Deleted** state.
104+
This displays any shares currently in a **Deleted** state.
99105

100-
:::image type="content" source="media/storage-how-to-recover-deleted-account/undelete-file-share.png" alt-text="If the status column, the column next to the name column, is set to Deleted, then your file share is in a soft deleted state. And will be permanently deleted after your specified retention period.":::
106+
:::image type="content" source="media/storage-how-to-recover-deleted-account/undelete-file-share.png" alt-text="If the status column, the column next to the name column, is set to Deleted, then your file share is in a soft deleted state, and is be permanently deleted after your specified retention period.":::
101107

102-
1. Select the share and select **undelete**. This will restore the share.
108+
1. Select the share and select **undelete** to restore the share.
103109

104-
You can confirm the share is restored since its status switches to **Active**.
110+
You can confirm the share is restored when its status switches to **Active**.
105111

106112
:::image type="content" source="media/storage-how-to-recover-deleted-account/restored-file-share.png" alt-text="If the status column, the column next to the name column, is set to Active, then your file share has been restored.":::
107113

@@ -115,7 +121,7 @@ Get-AzRmStorageShare `
115121
-IncludeDeleted
116122
```
117123

118-
Once you've identified the share you'd like to restore, you can use it with the following command to restore it:
124+
Once you identify the share you want to restore, you can use the following command to restore it:
119125

120126
```PowerShell
121127
Restore-AzRmStorageShare `
@@ -134,7 +140,7 @@ az storage share-rm list \
134140
--include-deleted
135141
```
136142

137-
Once you've identified the share you'd like to restore, you can restore it with the following command:
143+
Once you identify the share you'd like to restore, you can restore it with the following command:
138144

139145
```azurecli
140146
az storage share-rm restore -n deletedshare --deleted-version 01D64EB9886F00C4 -g yourResourceGroup --storage-account yourStorageaccount
@@ -149,11 +155,11 @@ If you want to stop using soft delete, follow these instructions. To permanently
149155
# [Portal](#tab/azure-portal)
150156

151157
1. Navigate to your storage account and select **File shares** under **Data storage**.
152-
1. Select **Enabled** next to **Soft delete**. The **Soft delete** settings pane will appear.
158+
1. Select **Enabled** next to **Soft delete**.
153159
1. Select **Disabled** for **Soft delete for all file shares**.
154160
1. Select **Save** to confirm your data retention settings.
155161

156-
:::image type="content" source="media/storage-how-to-recover-deleted-account/files-disable-soft-delete.png" alt-text="Disabling soft delete will allow you to immediately and permanently delete all file shares in your storage account.":::
162+
:::image type="content" source="media/storage-how-to-recover-deleted-account/files-disable-soft-delete.png" alt-text="Disabling soft delete allows you to immediately and permanently delete any file shares in your storage account.":::
157163

158164
# [PowerShell](#tab/azure-powershell)
159165
You can use the following command to disable soft delete on your storage account.

articles/storage/files/storage-files-faq.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -247,11 +247,7 @@ Alternate data streams are preserved on-premises when Azure File Sync is used.
247247

248248
* <a id="transactions-billing"></a>
249249
**What are transactions in Azure Files, and how are they billed?**
250-
Protocol transactions occur any time a user, application, script, or service interacts with Azure file shares (writing, reading, listing, deleting files, etc.). It's important to remember that some actions that you might perceive as a single operation might actually involve multiple transactions. For standard Azure file shares billed on a pay-as-you-go model, different types of transactions have different prices based on their impact on the file share. Transactions don't affect billing for premium file shares, which are billed using a provisioned model. For more information, see [Understanding billing](understanding-billing.md).
251-
252-
* <a id="share-snapshot-price"></a>
253-
**How much do share snapshots cost?**
254-
Share snapshots are incremental in nature. The base share snapshot is the share itself. All subsequent share snapshots are incremental and store only the difference from the preceding share snapshot. You're billed only for the changed content. If you have a share with 100 GiB of data but only 5 GiB has changed since your last share snapshot, the share snapshot consumes only 5 additional GiB, and you're billed for 105 GiB. For more information about transaction and standard egress charges, see the [Pricing page](https://azure.microsoft.com/pricing/details/storage/files/).
250+
Protocol transactions occur any time a user, application, script, or service interacts with Azure file shares (writing, reading, listing, deleting files, etc.). It's important to remember that some actions that you might perceive as a single operation might actually involve multiple transactions. For pay-as-you-go file shares, different types of transactions have different prices based on their impact on the file share. Transactions don't affect billing for provisioned file shares. For more information, see [Understanding billing](understanding-billing.md).
255251

256252
## Interoperability with other services
257253

0 commit comments

Comments
 (0)