#135382 Added new Application Insights locations support

Sitecore · Nov 23, 2016 · d1d73f6 · d1d73f6
1 parent ca04cbb
commit d1d73f6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/Sitecore 8.2.1/xm/azuredeploy.json b/Sitecore 8.2.1/xm/azuredeploy.json
@@ -152,6 +152,11 @@
       "type": "string",
       "defaultValue": "[concat(parameters('deploymentId'), '-ai')]"
     },
+    "applicationinsights.location": {
+      "type": "string",
+      "defaultValue": "East US",
+      "allowedValues": [ "East US", "South Central US", "North Europe", "West Europe" ]
+    },
     "cm.hostingplan.skuname": {
       "type": "string",
       "defaultValue": "S1"
@@ -528,7 +533,7 @@
       "type": "Microsoft.Insights/Components",
       "name": "[variables('appInsightsNameTidy')]",
       "apiVersion": "[variables('appInsightsApiVersion')]",
-      "location": "Central US",
+      "location": "[parameters('applicationinsights.location')]",
       "properties": {
         "ApplicationId": "[variables('appInsightsNameTidy')]",
         "Application_Type": "web"

diff --git a/Sitecore 8.2.1/xp/azuredeploy.json b/Sitecore 8.2.1/xp/azuredeploy.json
@@ -279,6 +279,11 @@
       "type": "string",
       "defaultValue": "[concat(parameters('deploymentId'), '-ai')]"
     },
+    "applicationinsights.location": {
+      "type": "string",
+      "defaultValue": "East US",
+      "allowedValues": [ "East US", "South Central US", "North Europe", "West Europe" ]
+    },
     "cm.hostingplan.skuname": {
       "type": "string",
       "defaultValue": "S1"
@@ -895,7 +900,7 @@
       "type": "Microsoft.Insights/Components",
       "name": "[variables('appInsightsNameTidy')]",
       "apiVersion": "[variables('appInsightsApiVersion')]",
-      "location": "Central US",
+      "location": "[parameters('applicationinsights.location')]",
       "properties": {
         "ApplicationId": "[variables('appInsightsNameTidy')]",
         "Application_Type": "web"

diff --git a/Sitecore 8.2.1/xp0/azuredeploy.json b/Sitecore 8.2.1/xp0/azuredeploy.json
@@ -144,6 +144,11 @@
       "type": "string",
       "defaultValue": "[concat(parameters('deploymentId'), '-ai')]"
     },
+    "applicationinsights.location": {
+      "type": "string",
+      "defaultValue": "East US",
+      "allowedValues": [ "East US", "South Central US", "North Europe", "West Europe" ]
+    },
     "single.hostingplan.skuname": {
       "type": "string",
       "defaultValue": "S1"
@@ -195,8 +200,8 @@
     },
     "sitecore.admin.password": {
       "type": "securestring",
-	  "minLength": 8,
-	  "maxLength": 128
+      "minLength": 8,
+      "maxLength": 128
     }
   },
   "resources": [
@@ -416,7 +421,7 @@
       "type": "Microsoft.Insights/Components",
       "name": "[variables('appInsightsNameTidy')]",
       "apiVersion": "[variables('appInsightsApiVersion')]",
-      "location": "Central US",
+      "location": "[parameters('applicationinsights.location')]",
       "properties": {
         "ApplicationId": "[variables('appInsightsNameTidy')]",
         "Application_Type": "web"