Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into nr-100222-phpwebapp-1906169

Author: v-niranjan

articles/active-directory/saas-apps/sonarqube-tutorial.md

@@ -162,7 +162,7 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
 
 ### Create Sonarqube test user
 
-In this section, you create a user called B.Simon in Sonarqube. Work with [Sonarqube Client support team](https://www.sonarsource.com/support/) to add the users in the Sonarqube platform. Users must be created and activated before you use single sign-on. 
+In this section, you create a user called B.Simon in Sonarqube. Work with [Sonarqube Client support team](https://sonarsource.com/company/contact/) to add the users in the Sonarqube platform. Users must be created and activated before you use single sign-on. 
 
 ## Test SSO 
 

articles/azure-app-configuration/TOC.yml

@@ -124,6 +124,8 @@
       href: concept-feature-management.md
     - name: Event handling
       href: concept-app-configuration-event.md
+    - name: Soft delete
+      href: concept-soft-delete.md
     - name: Security
       items:
         - name: Encrypt using customer-managed keys
@@ -162,6 +164,8 @@
       href: howto-convert-to-the-new-spring-boot.md
     - name: Move a resource between Azure regions 
       href: howto-move-resource-between-regions.md
+    - name: Recover App Configuration stores (Preview)
+      href: howto-recover-deleted-stores-in-azure-app-configuration.md
 - name: Reference
   items:
     - name: Client libraries

articles/azure-app-configuration/concept-soft-delete.md

@@ -0,0 +1,56 @@
+---
+title: Soft Delete in Azure App Configuration
+description: Soft Delete in Azure App Configuration 
+author: muksvso
+ms.author: mubatra
+ms.service: azure-app-configuration
+ms.custom: devx-track-dotnet
+ms.topic: conceptual
+ms.date: 03/01/2022
+---
+
+# Soft delete
+
+Azure App Configuration's Soft delete feature allows recovery of your data such as key-values, feature flags, and revision history of a deleted store. It's automatically enabled for all stores in the standard tier. In this article, learn more about the soft delete feature and its functionality.
+
+Learn how to [recover Azure App Configuration stores](./howto-recover-deleted-stores-in-azure-app-configuration.md) using the soft delete feature.
+
+> [!NOTE]
+> When an App Configuration store is soft-deleted, services that are integrated with the store will be deleted. For example Azure RBAC roles assignments, managed identity, Event Grid subscriptions, and private endpoints. Recovering a soft-deleted App Configuration store will not restore these services. They will need to be recreated.
+
+## Scenarios
+
+The soft delete feature addresses the recovery of the deleted stores, whether the deletion was accidental or intentional. The soft delete feature will act as a safeguard in the following scenarios:
+
+* **Recovery of a deleted App Configuration store**: A deleted app configuration store could be recovered in the retention time period.
+
+* **Permanent deletion of App Configuration store**: This feature helps you to permanently delete an app configuration store.
+
+## Recover
+Recover is the operation to get the stores in a soft deleted state back to an active state where one can request the store for configuration and feature management.
+
+## Retention period
+A variable to specify the time period, in days, for which a soft deleted store will be retained. This value can only be set at the creation of store and once set, it can't be changed. Once the retention period elapses, the store will be permanently deleted automatically.
+
+## Purge
+Purge is the operation to permanently delete the stores in a soft deleted state, provided the store doesn't have purge-protection enabled. To recreate the App Configuration store with the same name as a deleted store, you need to purge the store first if it's not already past the retention period.
+
+## Purge protection
+With Purge protection enabled, soft deleted stores can't be purged in the retention period. If disabled, the soft deleted store can be purged before the retention period expires. Once purge protection is enabled on a store, it can't be disabled.
+
+## Permissions to recover or purge store
+
+A user has to have below permissions to recover or purge a soft-deleted app configuration store. The built-in Contributor and Owner roles already have the required permissions to recover and purge.
+
+- Permission to recover - `Microsoft.AppConfiguration/configurationStores/write`
+
+- Permission to purge - `Microsoft.AppConfiguration/configurationStores/action`
+
+## Billing implications
+
+There won't be any charges for the soft deleted stores. Once you recover a soft deleted store, the usual charges will start applying. Soft delete isn't available with free tier.
+
+## Next steps
+
+> [!div class="nextstepaction"]
+> [Recover Azure App Configuration stores](./howto-recover-deleted-stores-in-azure-app-configuration.md)  

articles/azure-app-configuration/howto-recover-deleted-stores-in-azure-app-configuration.md

@@ -0,0 +1,87 @@
+---
+title: Recover Azure App Configuration stores (Preview)
+description: Recover/Purge Azure App Configuration soft deleted Stores
+author: muksvso
+ms.author: mubatra
+ms.service: azure-app-configuration
+ms.custom: devx-track-dotnet
+ms.topic: how-to
+ms.date: 03/01/2022
+---
+
+# Recover Azure App Configuration stores (Preview)
+
+This article covers the soft delete feature of Azure App Configuration stores. You'll learn about how to set retention policy, enable purge protection, recover and purge a soft-deleted store.
+
+To learn more about the concept of soft delete feature, see [Soft-Delete in Azure App Configuration](./concept-soft-delete.md).
+
+## Prerequisites
+
+* An Azure subscription - [create one for free](https://azure.microsoft.com/free/dotnet)
+
+* Refer to the [Soft-Delete in Azure App Configuration](./concept-soft-delete.md#permissions-to-recover-or-purge-store) for permissions requirements.
+
+## Set retention policy and enable purge protection at store creation
+
+To create a new App Configuration store in the  Azure portal, follow these steps:
+
+1. Sign in to the [Azure portal](https://portal.azure.com). In the upper-left corner of the home page, select **Create a resource**. In the **Search the Marketplace** box, type *App Configuration* and press Enter.
+
+    :::image type="content" source="./media/how-to-soft-delete-app-config-3.png" alt-text="In MarketPlace Search results, App Configuration is highlighted":::
+
+1. Select **App Configuration** from the search results, and then select **Create**.
+
+    :::image type="content" source="./media/how-to-soft-delete-app-config-7.png" alt-text="In Snapshot, Create option is highlighted":::
+
+1. On the **Create App Configuration** pane, enter the following settings:
+
+    | Setting | Suggested value | Description |
+    |---|---|---|
+    | **Subscription** | Your subscription | Select the Azure subscription for your store |
+    | **Resource group** | Your resource group | Select the Azure resource group for your store |
+    | **Resource name** | Globally unique name | Enter a unique resource name to use for the App Configuration store. This name can't be the same name as the previous configuration store. |
+    | **Location** | Your desired Location | Select the region you want to create your configuration store in. |
+    | **Pricing tier** | *Standard* | Select the standard pricing tier. For more information, see the [App Configuration pricing page](https://azure.microsoft.com/pricing/details/app-configuration). |
+    | **Days to retain deleted stores** | Retention period for soft deleted stores | Select the number of days for which you would want the soft deleted stores and their content to be retained. |
+    | **Enable Purge protection** | Purge protection status | Check to enable Purge protection on the store so no one can purge it before the retention period expires. |
+
+    :::image type="content" source="./media/how-to-soft-delete-app-config-6.png" alt-text="In Create, Recovery options are highlighted":::
+
+1. Select **Review + create** to validate your settings.
+1. Select **Create**. The deployment might take a few minutes.
+
+## Enable Purge Protection in an existing store
+
+1. Log in to the Azure portal.
+1. Select your standard tier App Configuration store.
+1. Refer to the screenshot below on where to check for the soft delete status of an existing store.
+
+    :::image type="content" source="./media/how-to-soft-delete-app-config-1.png" alt-text="In Overview, Soft-delete is highlighted.":::
+
+1. Click on the **Enabled** value of Soft Delete. You'll be redirected to the **properties** of your store. At the bottom of the page, you can review the information related to soft delete. The Retention period is shown as "Days to retain deleted stores". You can't change this value once it's set. The Purge protection check box shows whether purge protection is enabled for this particular store or not. Once enabled, purge protection can't be disabled.
+
+    :::image type="content" source="./media/how-to-soft-delete-app-config-2.png" alt-text="In Properties, Soft delete, Days to retain are highlighted.":::
+
+## List, recover, or purge a soft deleted App Configuration store
+
+1. Log in to the Azure portal.
+1. Click on the search bar at the top of the page.
+1. Search for "App Configuration" and click on **App Configuration** under **Services**. Don't click on an individual App Configuration store.
+1. At the top of the screen, click the option to **Manage deleted stores**. A context pane will open on the right side of your screen.
+
+    :::image type="content" source="./media/how-to-soft-delete-app-config-4.png" alt-text="On App Configuration stores, the Manage deleted stores option is highlighted.":::
+
+1. Select your subscription from the drop box. If you've deleted one or more App Configuration stores, these stores will appear in the context pane on the right. Click "Load More" at the bottom of the context pane if not all deleted stores are loaded.
+1. Once you find the store that you wish to recover or purge, select the checkbox next to it. You can select multiple stores
+1. Please click **Recover** at the bottom of the context pane to recover the store OR
+   click **Purge** option to permanently delete the store. Note you won't be able to purge a store when purge protection is enabled.
+
+    :::image type="content" source="./media/how-to-soft-delete-app-config-5.png" alt-text="On Manage deleted stores panel, one store is selected, and the Recover button is highlighted.":::
+
+## Recover an App Configuration store with customer-managed key enabled
+
+When recovering stores that use customer-managed keys, there are extra steps that need to be performed to access the recovered data. This is because the recovered store, will no longer have a managed identity assigned that has access to the customer-managed key. A new managed identity should be assigned to the store and the customer managed key settings should be reconfigured to use the newly assigned identity. When updating the managed key settings to use the newly assigned identity, ensure to continue using the same key from the key vault. For more details on how to use customer-managed keys in App Configuration stores, refer to [Use customer-managed keys to encrypt your App Configuration data](./concept-customer-managed-keys.md).
+
+## Next steps
+> [!div class="nextstepaction"]
+> [Soft-Delete in Azure App Configuration](./concept-soft-delete.md)

articles/azure-app-configuration/index.yml

@@ -48,6 +48,14 @@ landingContent:
           url: concept-key-value.md
         - text: Point-in-time snapshot
           url: concept-point-time-snapshot.md
+        - text: Feature Management
+          url: concept-feature-management.md
+        - text: Azure App Configuration Events 
+          url: concept-app-configuration-event.md
+        - text: Soft delete
+          url: concept-soft-delete.md
+          
+        
   - title: Create and code with Azure App Configuration
     linkLists:
       - linkListType: quickstart