add gov region

zhaomuzhi · Jun 24, 2020 · 14e326c · 14e326c
1 parent 547dd7f
commit 14e326c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 40 deletions.
diff --git a/101-cosmosdb-gremlin-autoscale/README.md b/101-cosmosdb-gremlin-autoscale/README.md
@@ -18,8 +18,10 @@ Below are the parameters which can be configured in the parameters file or templ
 - **Automatic Failover:** Select whether to enable automatic failover on the account.
 - **Database Name:** Enter the database name for the account.
 - **Graph Name:** Enter the name for the graph.
-- **Throughput Policy:** Select Manual or Autoscale throughput policy.
-- **Manual Provisioned Throughput:** Enter the RU/s for the graph when Throughput Policy is Manual (default 400).
-- **Autoscale Max Throughput:** Enter the maximum RU/s for the graph when Throughput Policy is Autoscale (default 4000).
+- **Autoscale Max Throughput:** Enter the maximum autoscale RU/s for the graph (default and minimum 4000).
 
-[![Deploy To Azure](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazure.svg?sanitize=true)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2F101-cosmosdb-gremlin-autoscale%2Fazuredeploy.json)  [![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.svg?sanitize=true)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2F101-cosmosdb-gremlin-autoscale%2Fazuredeploy.json)
+[![Deploy To Azure](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazure.svg?sanitize=true)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2F101-cosmosdb-gremlin-autoscale%2Fazuredeploy.json)  
+
+[![Deploy To Azure Gov](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazuregov.svg?sanitize=true)](https://portal.azure.us/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2F101-cosmosdb-gremlin-autoscale%2Fazuredeploy.json)
+
+[![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.svg?sanitize=true)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2F101-cosmosdb-gremlin-autoscale%2Fazuredeploy.json)
diff --git a/101-cosmosdb-gremlin-autoscale/azuredeploy.json b/101-cosmosdb-gremlin-autoscale/azuredeploy.json
@@ -83,33 +83,13 @@
                 "description": "The name for the Gremlin graph"
             }
         },
-        "throughputPolicy":{
-            "type": "string",
-            "defaultValue": "Autoscale",
-            "allowedValues": [ 
-                "Manual", 
-                "Autoscale" 
-            ],
-            "metadata": {
-                "description": "The throughput policy for the graph"
-            }
-        },
-        "manualProvisionedThroughput": {
-            "type": "int",
-            "defaultValue": 400,
-            "minValue": 400,
-            "maxValue": 1000000,
-            "metadata": {
-                "description": "Throughput value when using Provisioned Throughput Policy for the graph"
-            }
-        },
         "autoscaleMaxThroughput": {
             "type": "int",
             "defaultValue": 4000,
             "minValue": 4000,
             "maxValue": 1000000,
             "metadata": {
-                "description": "Maximum throughput when using Autoscale Throughput Policy for the graph"
+                "description": "Maximum autoscale throughput for the graph"
             }
         }
     },
@@ -145,16 +125,7 @@
                 "failoverPriority": 1,
                 "isZoneRedundant": false
             }
-        ],
-        "throughputPolicy": {
-            "Manual": {
-                "throughput": "[parameters('manualProvisionedThroughput')]"
-            },
-            "Autoscale": {
-                "autoscaleSettings": { "maxThroughput": "[parameters('autoscaleMaxThroughput')]" }
-            }
-        },
-        "throughputPolicyToUse": "[if(equals(parameters('throughputPolicy'), 'Manual'), variables('throughputPolicy').Manual, variables('throughputPolicy').Autoscale)]"
+        ]
     },
     "resources": [
         {
@@ -218,7 +189,11 @@
                         "kind": "Hash"
                     }
                 },
-                "options": "[variables('throughputPolicyToUse')]"
+                "options": {
+                    "autoscaleSettings": { 
+                        "maxThroughput": "[parameters('autoscaleMaxThroughput')]" 
+                    }
+                }
             }
         }
     ]

diff --git a/101-cosmosdb-gremlin-autoscale/metadata.json b/101-cosmosdb-gremlin-autoscale/metadata.json
@@ -5,8 +5,5 @@
   "description": "This template creates an Azure Cosmos DB account for Gremlin API in two regions with one database and one graph using autoscale throughput.",
   "summary": "This template creates an Azure Cosmos DB account for Gremlin API in two regions with one database and one graph using autoscale throughput.",
   "githubUsername": "markjbrown",
-  "dateUpdated": "2020-05-18",
-  "environments": [
-    "AzureCloud"
-  ]
+  "dateUpdated": "2020-06-24"
 }