Merge pull request #112343 from roygara/fSD

Soft delete Files + Blobs

Author: Jak-MS

articles/storage/files/TOC.yml

@@ -31,6 +31,8 @@
     href: storage-files-networking-overview.md
   - name: About cloud tiering
     href: storage-sync-cloud-tiering.md
+  - name: Prevent accidental data deletion
+    href: storage-files-prevent-file-share-deletion.md
   - name: About storage accounts
     href: ../common/storage-account-options.md?toc=%2fazure%2fstorage%2ffiles%2ftoc.json
   - name: Azure file share snapshots
@@ -118,6 +120,8 @@
       href: storage-sync-files-server-registration.md
     - name: Add an Azure File Sync Server endpoint
       href: storage-sync-files-server-endpoint.md
+    - name: Enable soft delete
+      href: storage-files-enable-soft-delete.md
     - name: Manage storage in Azure independent clouds
       href: ../common/storage-powershell-independent-clouds.md?toc=%2fazure%2fstorage%2ffiles%2ftoc.json
     - name: Manage data redundancy

articles/storage/files/media/storage-how-to-recover-deleted-account/disable-soft-delete-files.png

@@ -0,0 +1,94 @@
+---
+title: Enable soft delete - Azure file shares
+description: Learn how to enable soft delete on Azure file shares for data recovery and preventing accidental deletion.
+author: roygara
+ms.service: storage
+ms.topic: conceptual
+ms.date: 05/22/2020
+ms.author: rogarana
+ms.subservice: files
+services: storage
+---
+
+# Enable soft delete on Azure file shares
+
+Azure Storage offers soft delete for file shares so that you can more easily recover your data when it is 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).
+
+The following sections show how to enable and use soft delete for Azure file shares on an existing storage account:
+
+# [Portal](#tab/azure-portal)
+
+1. Sign into the [Azure portal](https://portal.azure.com/).
+1. Navigate to your storage account and select **Soft delete** under **File service**.
+1. Select **Enabled** for **file share soft delete**.
+1. Select **File share retention period in days** and enter a number of your choosing.
+1. Select **Save** to confirm your data retention settings.
+
+:::image type="content" source="media/storage-how-to-recover-deleted-account/enable-soft-delete-files.png" alt-text="Screenshot of the storage account soft delete settings pane. Highlighting the file shares section, enable toggle, set a retention period, and save. This will enable soft delete for all file shares in your storage account.":::
+
+# [PowerShell](#tab/azure-powershell)
+
+To enable soft delete, you must update a file client's service properties. The following example enables soft delete for all file shares in a storage account:
+
+```azurepowershell-interactive
+$rgName = "yourResourceGroupName"
+$accountName = "yourStorageAccountName"
+
+Update-AzStorageFileServiceProperty -ResourceGroupName $rgName -StorageAccountName $accountName -EnableShareDeleteRetentionPolicy $true -ShareRetentionDays 7
+```
+
+You can verify if soft delete is enabled and view its retention policy with the following command:
+
+```azurepowershell-interactive
+Get-AzStorageFileServiceProperty -ResourceGroupName $rgName -StorageAccountName $accountName
+```
+---
+
+## Restore soft deleted file share
+
+# [Portal](#tab/azure-portal)
+
+To restore a soft deleted file share:
+
+1. Navigate to your storage account and select **File shares**.
+1. On the file share blade, enable **Show deleted shares** to display any shares that have been soft deleted.
+
+    This will display any shares currently in a **Deleted** state.
+
+    :::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.":::
+
+1. Select the share and select **undelete**, this will restore the share.
+
+    You can confirm the share is restored since its status switches to **Active**.
+
+    :::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.":::
+
+# [PowerShell](#tab/azure-powershell)
+
+To restore a soft deleted file share, use the following command:
+
+```azurepowershell-interactive
+Restore-AzRmStorageShare -ResourceGroupName $rgname -StorageAccountName $accountName -DeletedShareVersion 01D5E2783BDCDA97
+```
+---
+
+## Disable soft delete
+
+If you wish to stop using soft delete, or permanently delete a file share, follow these instructions:
+
+# [Portal](#tab/azure-portal)
+
+1. Navigate to your storage account and select **Soft delete** under **Settings**.
+1. Under **File shares** select **Disabled** for **Soft delete for file shares**.
+1. Select **Save** to confirm your data retention settings.
+
+    :::image type="content" source="media/storage-how-to-recover-deleted-account/disable-soft-delete-files.png" alt-text="Disabling soft delete will allow you to immediately and permanently delete all file shares in your storage account at your leisure.":::
+
+# [PowerShell](#tab/azure-powershell)
+
+You can use the following command to disable soft delete on your storage account:
+
+```azurepowershell-interactive
+Update-AzStorageFileServiceProperty -ResourceGroupName $rgName -StorageAccountName $accountName -EnableShareDeleteRetentionPolicy $false
+```
+---

articles/storage/files/media/storage-how-to-recover-deleted-account/enable-soft-delete-files.png

@@ -0,0 +1,51 @@
+---
+title: Prevent accidental deletion - Azure file shares
+description: Learn about soft delete for Azure file shares and how you can use it to for data recovery and preventing accidental deletion.
+author: roygara
+ms.service: storage
+ms.topic: conceptual
+ms.date: 05/22/2020
+ms.author: rogarana
+ms.subservice: files
+services: storage
+---
+
+# Prevent accidental deletion of Azure file shares
+
+Azure Storage now offers soft delete for file shares so that you can more easily recover your data when it is mistakenly deleted by an application or other storage account user.
+
+## How soft delete works
+
+When enabled, soft delete enables you to save and recover your file shares when they are deleted. When data is deleted, it transitions to a soft deleted state instead of being permanently erased. You can configure the amount of time soft deleted data is recoverable before it is permanently expired.
+
+Soft delete can be enabled on new or existing file shares. Soft delete is also backwards compatible, so you don't have to make any changes to your applications to take advantage of the protections of soft delete. 
+
+For soft-deleted premium file shares, the file share quota (the provisioned size of a file share) is used in the total storage account quota calculation until the soft-deleted share expiry date, when the share is fully deleted.
+
+### Availability
+
+Soft delete for Azure file shares is available on all storage tiers, all storage account types, and in every region that Azure Files is available in.
+
+## Configuration settings
+
+Soft delete for file shares is enabled at the storage account level, the soft delete settings apply to all file shares within a storage account. When you create a new storage account, soft delete is off by default. Soft delete is also off by default for existing storage accounts. You can toggle the feature on and off at any time during the life of a storage account.
+
+If you enable soft delete for file shares, delete some file shares, and then disable soft delete, you will still be able to access and recover those file shares, if those shares were saved when soft delete was enabled. When you turn on soft delete, you also need to configure the retention period.
+
+The retention period indicates the amount of time that soft deleted file shares are stored and available for recovery. For file shares that are explicitly deleted, the retention period clock starts when the data is deleted. Currently you can retain soft deleted shares for between 1 and 365 days.
+
+You can change the soft delete retention period at any time. An updated retention period will only apply to shares deleted after the retention period has been updated. Shares deleted prior to the retention period update will expire based on the retention period that was configured when that data was deleted.
+
+To permanently delete a file share that is in a soft delete state prior to its expiry time, you must undelete the share, disable soft delete, and then delete the share again. Then you should reenable soft delete, since any other file shares in that storage account will be vulnerable to accidental deletion while soft delete is off.
+
+## Pricing and billing
+
+Both standard and premium file shares are billed on the used capacity when soft deleted, rather than provisioned capacity. Additionally, premium file shares are billed at the snapshot rate while in the soft delete state. Standard file shares are billed at the regular rate while in the soft delete state. You will not be charged for data that is permanently deleted after the configured retention period.
+
+For more details on prices for Azure File Storage in general, see the [Azure File Storage Pricing Page](https://azure.microsoft.com/pricing/details/storage/files/).
+
+When you initially turn on soft delete, we recommend using a small retention period to better understand how the feature affects your bill.
+
+## Next steps
+
+To learn how to enable and use soft delete, proceed to [Enable soft delete](storage-files-enable-soft-delete.md)

articles/storage/files/media/storage-how-to-recover-deleted-account/restored-file-share.png

@@ -78,7 +78,7 @@ helping to improve data protection and recoverability. You can use the REST API,
 
 Before you deploy the share snapshot scheduler, carefully consider your share snapshot frequency and retention settings to avoid incurring unnecessary charges.
 
-Share snapshots provide only file-level protection. Share snapshots don't prevent fat-finger deletions on a file share or storage account. To help protect a storage account from accidental deletions, you can lock the storage account or the resource group.
+Share snapshots provide only file-level protection. Share snapshots don't prevent fat-finger deletions on a file share or storage account. To help protect a storage account from accidental deletions, you can either [enable soft delete](storage-files-prevent-file-share-deletion.md), or lock the storage account and/or the resource group.
 
 ## Next steps
 - Working with share snapshots in: