Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into nethubpage-patch

Author: asudbring

articles/azure-app-configuration/quickstart-javascript.md

@@ -135,4 +135,4 @@ In this quickstart, you created a new App Configuration store and learned how to
 For additional code samples, visit:
 
 > [!div class="nextstepaction"]
-> [Azure App Configuration client library samples](https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/appconfiguration/azure-appconfiguration/samples)
+> [Azure App Configuration client library samples](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/appconfiguration/app-configuration/samples/v1/javascript)

articles/cosmos-db/TOC.yml

@@ -1506,7 +1506,11 @@
             - name: Migrate to continuous backup
               href: migrate-continuous-backup.md
         - name: Manage periodic backup
-          href: configure-periodic-backup-restore.md
+          items:
+          - name: Configure periodic backup
+            href: configure-periodic-backup-restore.md
+          - name: Update backup storage redundancy 
+            href: update-backup-storage-redundancy.md
     - name: Security
       items:
         - name: Configure IP firewall

articles/cosmos-db/configure-periodic-backup-restore.md

@@ -4,7 +4,7 @@ description: This article describes how to configure Azure Cosmos DB accounts wi
 author: kanshiG
 ms.service: cosmos-db
 ms.topic: how-to
-ms.date: 08/30/2021
+ms.date: 11/16/2021
 ms.author: govindk
 ms.reviewer: sngun
 
@@ -32,17 +32,17 @@ Azure Cosmos DB automatically takes backups of your data at regular intervals. T
 
 ## <a id="backup-storage-redundancy"></a>Backup storage redundancy
 
-By default, Azure Cosmos DB stores periodic mode backup data in geo-redundant [blob storage](../storage/common/storage-redundancy.md) that is replicated to a [paired region](../best-practices-availability-paired-regions.md).  
+By default, Azure Cosmos DB stores periodic mode backup data in geo-redundant [blob storage](../storage/common/storage-redundancy.md) that is replicated to a [paired region](../best-practices-availability-paired-regions.md). You can update this default value using Azure PowerShell or CLI and define an Azure policy to enforce a specific storage redundancy option. To learn more, see [update backup storage redundancy](update-backup-storage-redundancy.md) article.
 
 To ensure that your backup data stays within the same region where your Azure Cosmos DB account is provisioned, you can change the default geo-redundant backup storage and configure either locally redundant or zone-redundant storage. Storage redundancy mechanisms store multiple copies of your backups so that it is protected from planned and unplanned events, including transient hardware failure, network or power outages, or massive natural disasters.
 
-Backup data in Azure Cosmos DB is replicated three times in the primary region. You can configure storage redundancy for periodic backup mode at the time of account creation or update it for an existing account. You can use the following three data redundancy options in periodic backup mode:
+You can configure storage redundancy for periodic backup mode at the time of account creation or update it for an existing account. You can use the following three data redundancy options in periodic backup mode:
 
 * **Geo-redundant backup storage:** This option copies your data asynchronously across the paired region.
 
-* **Zone-redundant backup storage:** This option copies your data asynchronously across three Azure availability zones in the primary region.
+* **Zone-redundant backup storage:** This option copies your data synchronously across three Azure availability zones in the primary region. For more information, see [Zone-redundant storage.](../storage/common/storage-redundancy.md#redundancy-in-the-primary-region)
 
-* **Locally-redundant backup storage:** This option copies your data asynchronously three times within a single physical location in the primary region.
+* **Locally-redundant backup storage:** This option copies your data synchronously three times within a single physical location in the primary region. For more information, see [locally-redundant storage.](../storage/common/storage-redundancy.md#redundancy-in-the-primary-region)
 
 > [!NOTE]
 > Zone-redundant storage is currently available only in [specific regions](high-availability.md#availability-zone-support). Depending on the region you select for a new account or the region you have for an existing account; the zone-redundant option will not be available.
@@ -68,10 +68,10 @@ Use the following steps to change the default backup options for an existing Azu
 
    * **Copies of data retained** - By default, two backup copies of your data are offered at free of charge. There is an extra charge if you need more than two copies. See the Consumed Storage section in the [Pricing page](https://azure.microsoft.com/pricing/details/cosmos-db/) to know the exact price for extra copies.
 
-   * **Backup storage redundancy** - Choose the required storage redundancy option, see the [Backup storage redundancy](#backup-storage-redundancy) section for available options. By default, your existing periodic backup mode accounts have geo-redundant storage. You can choose other storage such as locally redundant to ensure the backup is not replicated to another region. The changes made to an existing account are applied to only future backups. After the backup storage redundancy of an existing account is updated, it may take up to twice the backup interval time for the changes to take effect and **you will lose access to restore the older backups immediately.**
+   * **Backup storage redundancy** - Choose the required storage redundancy option, see the [Backup storage redundancy](#backup-storage-redundancy) section for available options. By default, your existing periodic backup mode accounts have geo-redundant storage if the region where the account is being provisioned supports it. Otherwise, the account fallback to the highest redundancy option available. You can choose other storage such as locally redundant to ensure the backup is not replicated to another region. The changes made to an existing account are applied to only future backups. After the backup storage redundancy of an existing account is updated, it may take up to twice the backup interval time for the changes to take effect and **you will lose access to restore the older backups immediately.**
 
    > [!NOTE]
-   > You must have the Azure [Cosmos DB Account Reader Role](../role-based-access-control/built-in-roles.md#cosmos-db-account-reader-role) role assigned at the subscription level to configure backup storage redundancy.
+   > You must have the Azure [Cosmos DB Operator role](../role-based-access-control/built-in-roles.md#cosmos-db-operator) role assigned at the subscription level to configure backup storage redundancy.
 
    :::image type="content" source="./media/configure-periodic-backup-restore/configure-backup-options-existing-accounts.png" alt-text="Configure backup interval, retention, and storage redundancy for an existing Azure Cosmos account." border="true":::
 

articles/cosmos-db/update-backup-storage-redundancy.md

@@ -0,0 +1,124 @@
+---
+title: Update backup storage redundancy for Azure Cosmos DB periodic backup accounts
+description: Learn how to update the backup storage redundancy using Azure CLI, and PowerShell. You can also configure an Azure policy on your accounts to enforce the required storage redundancy.
+author: kanshiG
+ms.service: cosmos-db
+ms.topic: how-to
+ms.date: 11/16/2021
+ms.author: govindk
+ms.reviewer: sngun
+
+---
+
+# Update backup storage redundancy for Azure Cosmos DB periodic backup accounts
+[!INCLUDE[appliesto-all-apis](includes/appliesto-all-apis.md)]
+
+By default, Azure Cosmos DB stores periodic mode backup data in geo-redundant [blob storage](../storage/common/storage-redundancy.md) that is replicated to a [paired region](../best-practices-availability-paired-regions.md). You can override the default backup storage redundancy. This article explains how to update the backup storage redundancy using Azure CLI and PowerShell. It also shows how to configure an Azure policy on your accounts to enforce the required storage redundancy.
+
+## Update using CLI
+
+Use the following steps to update the backup storage redundancy on an existing account using Azure CLI:
+
+1. Install the latest version if Azure CLI or a version higher than or equal to 2.30.0. If you have the "cosmosdb-preview" extension installed, make sure to remove it.
+
+1. Use the following command to get the backup redundancy options available in the regions where your account exists:
+
+   ```azurecli-interactive
+   az cosmosdb locations show --location <region_Name>
+   ```
+
+   ```bash
+    {
+     "id": "subscriptionId/<Subscription_ID>/providers/Microsoft.DocumentDB/locations/eastus/",
+     "name": "East US",
+     "properties": {
+       "backupStorageRedundancies": [
+         "Geo",
+         "Zone",
+         "Local"
+       ],
+       "isResidencyRestricted": false,
+       "supportsAvailabilityZone": true
+     },
+     "type": "Microsoft.DocumentDB/locations"
+    }
+   ```
+
+   The previous command shows a list of backup redundancies available in the specific region. Supported values are displayed in the `backupStorageRedundancies` property. For example some regions such as "East US" support three redundancy options "Geo", "Zone", and "Local" whereas some regions like "UAE North" support only "Geo" and "Local" redundancy options. Before updating, choose the backup storage redundancy option that is supported in all the regions where your account exists.
+
+1. Run the following command with the chosen backup redundancy option to update the backup redundancy on an existing account:
+
+   ```azurecli-interactive
+   az cosmosdb update -n <account_Name> -g <resource_Group> --backup-redundancy "Geo"
+   ```
+
+1. Run the following command to create a new account with the chosen backup redundancy option:
+
+   ```azurecli-interactive
+   az cosmosdb create -n <account_Name> -g <resource_Group> --backup-redundancy "Geo" --locations regionName=westus
+   ```
+
+## Update using PowerShell
+
+1. Install the latest version of Azure PowerShell or a version higher than or equal to 1.4.0
+
+   ```powershell-interactive
+   Install-Module -Name Az.CosmosDB -RequiredVersion 1.4.0
+   ```
+
+1. Use the following command to get the backup redundancy options available in the regions where your account exists:
+
+   ```powershell-interactive
+   $location = Get-AzCosmosDBLocation -Location <region_Name>
+   $location.Properties.BackupStorageRedundancies
+   ```
+
+   The previous command shows a list of backup redundancies available in the specific region. Supported values are displayed in the `backupStorageRedundancies` property. For example some regions such as "East US" support three redundancy options "Geo", "Zone", and "Local" whereas some regions like "UAE North" support only "Geo" and "Local" redundancy options. Before updating, choose the backup storage redundancy option that is supported in all the regions where your account exists.
+
+1. Run the following command with the chosen backup redundancy option to update the backup redundancy on an existing account:
+
+   ```powershell-interactive
+   Update-AzCosmosDBAccount `
+   -Name <account_Name> `
+   -ResourceGroupName <resource_Group> `
+   -BackupStorageRedundancy "Geo"
+   ```
+
+1. Run the following command to create a new account with the chosen backup redundancy option:
+
+   ```powershell-interactive
+   New-AzCosmosDBAccount `
+    -Name <account_Name> `
+    -ResourceGroupName <resource_Group> `
+    -Location <region_Name> `
+    -BackupPolicyType Periodic`
+    -BackupStorageRedundancy "Geo"
+
+   ```
+
+## Add a policy for the backup storage redundancy
+
+Azure Policy helps you to enforce organizational standards and to assess compliance at-scale. The following sample shows how to add an Azure policy for the database accounts to have a backup redundancy of type "Zone".
+
+```json
+"parameters": {},
+    "policyRule": {
+      "if": {
+        "allOf": [
+          {
+            "field": "Microsoft.DocumentDB/databaseAccounts/backupPolicy.periodicModeProperties.backupStorageRedundancy",
+            "match": "Zone"
+          }
+        ]
+      },
+      "then": {
+        "effect": "audit"
+      }
+    }
+```
+
+## Next steps
+
+* Provision an Azure Cosmos DB account with [periodic backup mode'(configure-periodic-backup-restore.md).
+* Provision an account with continuous backup using [Azure portal](provision-account-continuous-backup.md#provision-portal), [PowerShell](provision-account-continuous-backup.md#provision-powershell), [CLI](provision-account-continuous-backup.md#provision-cli), or [Azure Resource Manager](provision-account-continuous-backup.md#provision-arm-template).
+* Restore continuous backup account using [Azure portal](restore-account-continuous-backup.md#restore-account-portal), [PowerShell](restore-account-continuous-backup.md#restore-account-powershell), [CLI](restore-account-continuous-backup.md#restore-account-cli), or [Azure Resource Manager](restore-account-continuous-backup.md#restore-arm-template).