Merge pull request #113433 from markjbrown/arm-autoscale

Autoscale and Free Tier Templates

Author: shawnmariejones

articles/cosmos-db/how-to-manage-database-account.md

@@ -4,7 +4,7 @@ description: Learn how to manage Azure Cosmos DB resources by using the Azure po
 author: markjbrown
 ms.service: cosmos-db
 ms.topic: conceptual
-ms.date: 12/02/2019
+ms.date: 04/30/2020
 ms.author: mjbrown
 ---
 
@@ -24,11 +24,11 @@ Please see [Create an Azure Cosmos DB account with Azure CLI](manage-with-cli.md
 
 ### <a id="create-database-account-via-ps"></a>Azure PowerShell
 
-Please see [Create an Azure Cosmos DB account with Powershell](manage-with-powershell.md#create-account)
+Please see [Create an Azure Cosmos DB account with PowerShell](manage-with-powershell.md#create-account)
 
 ### <a id="create-database-account-via-arm-template"></a>Azure Resource Manager template
 
-This Azure Resource Manager template will create an Azure Cosmos account for SQL API configured with two regions and options to select consistency level, automatic failover, and multi-master. To deploy this template, click on Deploy to Azure on the readme page, [Create Azure Cosmos account](https://github.com/Azure/azure-quickstart-templates/tree/master/101-cosmosdb-sql)
+Please see [Create Azure Cosmos DB account with Azure Resource Manager templates](manage-sql-with-resource-manager.md)
 
 ## Add/remove regions from your database account
 
@@ -56,7 +56,7 @@ Please see [Add or remove regions with Azure CLI](manage-with-cli.md#add-or-remo
 
 ### <a id="add-remove-regions-via-ps"></a>Azure PowerShell
 
-Please see [Add or remove regions with Powershell](manage-with-powershell.md#update-account)
+Please see [Add or remove regions with PowerShell](manage-with-powershell.md#update-account)
 
 ## <a id="configure-multiple-write-regions"></a>Configure multiple write-regions
 
@@ -72,7 +72,7 @@ Please see [Enable multiple-write regions with Azure CLI](manage-with-cli.md#ena
 
 ### <a id="configure-multiple-write-regions-ps"></a>Azure PowerShell
 
-Please see [Enable multiple-write regions with Powershell](manage-with-powershell.md#multi-master)
+Please see [Enable multiple-write regions with PowerShell](manage-with-powershell.md#multi-master)
 
 ### <a id="configure-multiple-write-regions-arm"></a>Resource Manager template
 
@@ -158,7 +158,7 @@ Please see [Enable automatic failover with Azure CLI](manage-with-cli.md#enable-
 
 ### <a id="enable-automatic-failover-via-ps"></a>Azure PowerShell
 
-Please see [Enable automatic failover with Powershell](manage-with-powershell.md#enable-automatic-failover)
+Please see [Enable automatic failover with PowerShell](manage-with-powershell.md#enable-automatic-failover)
 
 ## Set failover priorities for your Azure Cosmos account
 
@@ -189,7 +189,7 @@ Please see [Set failover priority with Azure CLI](manage-with-cli.md#set-failove
 
 ### <a id="set-failover-priorities-via-ps"></a>Azure PowerShell
 
-Please see [Set failover priority with Powershell](manage-with-powershell.md#modify-failover-priority)
+Please see [Set failover priority with PowerShell](manage-with-powershell.md#modify-failover-priority)
 
 ## <a id="manual-failover"></a>Perform manual failover on an Azure Cosmos account
 
@@ -221,7 +221,7 @@ Please see [Trigger manual failover with Azure CLI](manage-with-cli.md#trigger-m
 
 ### <a id="enable-manual-failover-via-ps"></a>Azure PowerShell
 
-Please see [Trigger manual failover with Powershell](manage-with-powershell.md#trigger-manual-failover)
+Please see [Trigger manual failover with PowerShell](manage-with-powershell.md#trigger-manual-failover)
 
 ## Next steps
 

articles/cosmos-db/manage-cassandra-with-resource-manager.md

@@ -4,238 +4,49 @@ description: Use Azure Resource Manager templates to create and configure Azure
 author: markjbrown
 ms.service: cosmos-db
 ms.topic: conceptual
-ms.date: 04/27/2020
+ms.date: 04/30/2020
 ms.author: mjbrown
 ---
 
 # Manage Azure Cosmos DB Cassandra API resources using Azure Resource Manager templates
 
-This article describes how to perform different operations to automate management of your Azure Cosmos DB accounts, databases and containers using Azure Resource Manager templates. This article has examples for Cassandra API accounts only, to find examples for other API type accounts see: use Azure Resource Manager templates with Azure Cosmos DB's API for [SQL](manage-sql-with-resource-manager.md), [Gremlin](manage-gremlin-with-resource-manager.md), [MongoDB](manage-mongodb-with-resource-manager.md), [Table](manage-table-with-resource-manager.md) articles.
-
-## Create Azure Cosmos account, keyspace and table <a id="create-resource"></a>
-
-Create Azure Cosmos DB resources using an Azure Resource Manager template. This template will create an Azure Cosmos account for Cassandra API with two tables that share 400 RU/s throughput at the keyspace-level. Copy the template and deploy as shown below or visit [Azure Quickstart Gallery](https://azure.microsoft.com/resources/templates/101-cosmosdb-cassandra/) and deploy from the Azure portal. You can also download the template to your local computer or create a new template and specify the local path with the `--template-file` parameter.
-
-> [!NOTE]
-> Account names must be lowercase and 44 or fewer characters.
-> To update RU/s, resubmit the template with updated throughput property values.
-
-```json
-{
-"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
-"contentVersion": "1.0.0.0",
-"parameters": {
-    "accountName": {
-        "type": "string",
-        "defaultValue": "",
-        "metadata": {
-            "description": "Cosmos DB account name, max length 44 characters"
-        }
-    },
-    "location": {
-        "type": "string",
-        "defaultValue": "[resourceGroup().location]",
-        "metadata": {
-            "description": "Location for the Cosmos DB account."
-        }
-    },
-    "primaryRegion":{
-        "type":"string",
-        "metadata": {
-            "description": "The primary replica region for the Cosmos DB account."
-        }
-    },
-    "secondaryRegion":{
-        "type":"string",
-        "metadata": {
-          "description": "The secondary replica region for the Cosmos DB account."
-      }
-    },
-    "defaultConsistencyLevel": {
-        "type": "string",
-        "defaultValue": "Session",
-        "allowedValues": [ "Eventual", "ConsistentPrefix", "Session", "BoundedStaleness", "Strong" ],
-        "metadata": {
-            "description": "The default consistency level of the Cosmos DB account."
-        }
-    },
-    "maxStalenessPrefix": {
-        "type": "int",
-        "defaultValue": 100000,
-        "minValue": 10,
-        "maxValue": 1000000,
-        "metadata": {
-            "description": "Max stale requests. Required for BoundedStaleness. Valid ranges, Single Region: 10 to 1000000. Multi Region: 100000 to 1000000."
-        }
-    },
-    "maxIntervalInSeconds": {
-        "type": "int",
-        "defaultValue": 300,
-        "minValue": 5,
-        "maxValue": 86400,
-        "metadata": {
-            "description": "Max lag time (seconds). Required for BoundedStaleness. Valid ranges, Single Region: 5 to 84600. Multi Region: 300 to 86400."
-        }
-    },
-    "automaticFailover": {
-        "type": "bool",
-        "defaultValue": true,
-        "allowedValues": [ true, false ],
-        "metadata": {
-            "description": "Enable automatic failover for regions"
-        }
-    },
-    "keyspaceName": {
-        "type": "string",
-        "defaultValue": "Keyspace1",
-        "metadata": {
-            "description": "The name for the Cassandra Keyspace"
-        }
-    },
-    "tableName": {
-        "type": "string",
-        "defaultValue": "Table1",
-        "metadata": {
-            "description": "The name for the Cassandra table"
-        }
-    },
-    "throughput": {
-        "type": "int",
-        "defaultValue": 400,
-        "minValue": 400,
-        "maxValue": 1000000,
-        "metadata": {
-            "description": "The throughput for the Cassandra table"
-        }
-    }
-},
-"variables": {
-    "accountName": "[toLower(parameters('accountName'))]",
-    "consistencyPolicy": {
-        "Eventual": {
-            "defaultConsistencyLevel": "Eventual"
-        },
-        "ConsistentPrefix": {
-            "defaultConsistencyLevel": "ConsistentPrefix"
-        },
-        "Session": {
-            "defaultConsistencyLevel": "Session"
-        },
-        "BoundedStaleness": {
-            "defaultConsistencyLevel": "BoundedStaleness",
-            "maxStalenessPrefix": "[parameters('maxStalenessPrefix')]",
-            "maxIntervalInSeconds": "[parameters('maxIntervalInSeconds')]"
-        },
-        "Strong": {
-            "defaultConsistencyLevel": "Strong"
-        }
-    },
-    "locations":
-    [
-        {
-            "locationName": "[parameters('primaryRegion')]",
-            "failoverPriority": 0,
-            "isZoneRedundant": false
-        },
-        {
-            "locationName": "[parameters('secondaryRegion')]",
-            "failoverPriority": 1,
-            "isZoneRedundant": false
-        }
-    ]
-},
-"resources":
-[
-    {
-        "type": "Microsoft.DocumentDB/databaseAccounts",
-        "name": "[variables('accountName')]",
-        "apiVersion": "2020-03-01",
-        "location": "[parameters('location')]",
-        "kind": "GlobalDocumentDB",
-        "properties": {
-            "capabilities": [{ "name": "EnableCassandra" }],
-            "consistencyPolicy": "[variables('consistencyPolicy')[parameters('defaultConsistencyLevel')]]",
-            "locations": "[variables('locations')]",
-            "databaseAccountOfferType": "Standard",
-            "enableAutomaticFailover": "[parameters('automaticFailover')]"
-        }
-    },
-    {
-        "type": "Microsoft.DocumentDB/databaseAccounts/cassandraKeyspaces",
-        "name": "[concat(variables('accountName'), '/', parameters('keyspaceName'))]",
-        "apiVersion": "2020-03-01",
-        "dependsOn": [ "[resourceId('Microsoft.DocumentDB/databaseAccounts/', variables('accountName'))]" ],
-        "properties":{
-            "resource":{
-                "id": "[parameters('keyspaceName')]"
-            }
-        }
-    },
-    {
-        "type": "Microsoft.DocumentDb/databaseAccounts/cassandraKeyspaces/tables",
-        "name": "[concat(variables('accountName'), '/', parameters('keyspaceName'), '/', parameters('tableName'))]",
-        "apiVersion": "2020-03-01",
-        "dependsOn": [ "[resourceId('Microsoft.DocumentDB/databaseAccounts/cassandraKeyspaces', variables('accountName'), parameters('keyspaceName'))]" ],
-        "properties":
-        {
-            "resource":{
-                "id":  "[parameters('tableName')]",
-                "schema": {
-                    "columns": [
-                        { "name": "loadid", "type": "uuid" },
-                        { "name": "machine", "type": "uuid" },
-                        { "name": "cpu", "type": "int" },
-                        { "name": "mtime", "type": "int" },
-                        { "name": "load", "type": "float" }
-                    ],
-                    "partitionKeys": [
-                        { "name": "machine" },
-                        { "name": "cpu" },
-                        { "name": "mtime" }
-                    ],
-                    "clusterKeys": [
-                        { "name": "loadid", "orderBy": "asc" }
-                    ]
-                },
-                "options": { "throughput": "[parameters('throughput')]" }
-            }
-        }
-    }
-]
-}
-```
-
-## Deploy with the Azure CLI
-
-To deploy the Azure Resource Manager template using the Azure CLI, **Copy** the script and select **Try it** to open Azure Cloud Shell. To paste the script, right-click the shell, and then select **Paste**:
-
-```azurecli-interactive
-
-read -p 'Enter the Resource Group name: ' resourceGroupName
-read -p 'Enter the location (i.e. westus2): ' location
-read -p 'Enter the account name: ' accountName
-read -p 'Enter the primary region (i.e. westus2): ' primaryRegion
-read -p 'Enter the secondary region (i.e. eastus2): ' secondaryRegion
-read -p 'Enter the keyspace name: ' keyspaceName
-read -p 'Enter the table name: ' tableName
-read -p 'Enter the throughput: ' throughput
-
-az group create --name $resourceGroupName --location $location
-az group deployment create --resource-group $resourceGroupName \
-   --template-uri https://raw.githubusercontent.com/azure/azure-quickstart-templates/master/101-cosmosdb-cassandra/azuredeploy.json \
-   --parameters accountName=$accountName primaryRegion=$primaryRegion secondaryRegion=$secondaryRegion keyspaceName=$keyspaceName \
-   tableName=$tableName throughput=$throughput
-
-az cosmosdb show --resource-group $resourceGroupName --name accountName --output tsv
-```
-
-The `az cosmosdb show` command shows the newly created Azure Cosmos account after it has been provisioned. If you choose to use a locally installed version of the Azure CLI instead of using Cloud Shell, see the [Azure CLI](/cli/azure/) article.
+In this article, you learn how to use Azure Resource Manager templates to help deploy and manage your Azure Cosmos DB accounts, keyspaces, and tables.
+
+This article has examples for Cassandra API accounts only, to find examples for other API type accounts see: use Azure Resource Manager templates with Azure Cosmos DB's API for [SQL](manage-sql-with-resource-manager.md), [Gremlin](manage-gremlin-with-resource-manager.md), [MongoDB](manage-mongodb-with-resource-manager.md), [Table](manage-table-with-resource-manager.md) articles.
+
+> [!IMPORTANT]
+>
+> * Account names are limited to 44 characters, all lowercase.
+> * To change the throughput values, redeploy the template with updated RU/s.
+> * When you add or remove locations to an Azure Cosmos account, you can't simultaneously modify other properties. These operations must be done separately.
+
+To create any of the Azure Cosmos DB resources below, copy the following example template into a new json file. You can optionally create a parameters json file to use when deploying multiple instances of the same resource with different names and values. There are many ways to deploy Azure Resource Manager templates including, [Azure portal](../azure-resource-manager/templates/deploy-portal.md), [Azure CLI](../azure-resource-manager/templates/deploy-cli.md), [Azure PowerShell](../azure-resource-manager/templates/deploy-powershell.md) and [GitHub](../azure-resource-manager/templates/deploy-to-azure-button.md).
+
+<a id="create-autoscale"></a>
+
+## Azure Cosmos account for Cassandra with autoscale throughput
+
+This template creates an Azure Cosmos account in two regions with options for consistency and failover, with a keyspace and table configured for autoscale throughput. This template is also available for one-click deploy from Azure Quickstart Templates Gallery.
+
+[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2F101-cosmosdb-cassandra-autosscale%2Fazuredeploy.json)
+
+:::code language="json" source="~/quickstart-templates/101-cosmosdb-cassandra-autoscale/azuredeploy.json":::
+
+<a id="create-manual"></a>
+
+## Azure Cosmos account for Cassandra with manual throughput
+
+This template creates an Azure Cosmos account in two regions with options for consistency and failover, with a keyspace and table configured for manual throughput. This template is also available for one-click deploy from Azure Quickstart Templates Gallery.
+
+[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2F101-cosmosdb-cassandra%2Fazuredeploy.json)
+
+:::code language="json" source="~/quickstart-templates/101-cosmosdb-cassandra/azuredeploy.json":::
 
 ## Next steps
 
 Here are some additional resources:
 
-- [Azure Resource Manager documentation](/azure/azure-resource-manager/)
-- [Azure Cosmos DB resource provider schema](/azure/templates/microsoft.documentdb/allversions)
-- [Azure Cosmos DB Quickstart templates](https://azure.microsoft.com/resources/templates/?resourceType=Microsoft.DocumentDB&pageNumber=1&sort=Popular)
-- [Troubleshoot common Azure Resource Manager deployment errors](../azure-resource-manager/templates/common-deployment-errors.md)
+* [Azure Resource Manager documentation](/azure/azure-resource-manager/)
+* [Azure Cosmos DB resource provider schema](/azure/templates/microsoft.documentdb/allversions)
+* [Azure Cosmos DB Quickstart templates](https://azure.microsoft.com/resources/templates/?resourceType=Microsoft.DocumentDB&pageNumber=1&sort=Popular)
+* [Troubleshoot common Azure Resource Manager deployment errors](../azure-resource-manager/templates/common-deployment-errors.md)