Support for Application Insights Daily Cap configuration from paramet…

…ers in 8.2.7
Sitecore · Jul 16, 2018 · 099960d · 099960d
1 parent 3e7949b
commit 099960d
Show file tree

Hide file tree

Showing 8 changed files with 101 additions and 7 deletions.
diff --git a/Sitecore 8.2.7/xdb/azuredeploy.json b/Sitecore 8.2.7/xdb/azuredeploy.json
@@ -145,6 +145,10 @@
       "minLength": 1,
       "defaultValue": "[concat(parameters('deploymentId'), '-ai-pp')]"
     },
+    "applicationInsightsDataVolumeCap": {
+      "type": "string",
+      "defaultValue": ""
+    },
 
     "prcHostingPlanName": {
       "type": "string",
@@ -407,6 +411,9 @@
           "applicationInsightsPricePlan": {
             "value": "[parameters('applicationInsightsPricePlan')]"
           },
+          "applicationInsightsDataVolumeCap": {
+            "value": "[parameters('applicationInsightsDataVolumeCap')]"
+          },
 
           "sitecoreSKU": {
             "value": "[parameters('sitecoreSKU')]"

diff --git a/Sitecore 8.2.7/xdb/nested/infrastructure.json b/Sitecore 8.2.7/xdb/nested/infrastructure.json
@@ -129,6 +129,10 @@
       "minLength": 1,
       "defaultValue": "[concat(parameters('deploymentId'), '-ai-pp')]"
     },
+    "applicationInsightsDataVolumeCap": {
+      "type": "string",
+      "defaultValue": ""
+    },
 
     "sitecoreSKU": {
       "type": "string",
@@ -591,7 +595,7 @@
       "properties": {
        "CurrentBillingFeatures": "[parameters('resourceSizes').ApplicationInsightsPricePlan.CurrentBillingFeatures]",
        "DataVolumeCap": {
-         "Cap": "[parameters('resourceSizes').ApplicationInsightsPricePlan.DataVolumeCap.Cap]"
+        "Cap": "[if(empty(parameters('applicationInsightsDataVolumeCap')), parameters('resourceSizes').ApplicationInsightsPricePlan.DataVolumeCap.Cap, float(parameters('applicationInsightsDataVolumeCap')))]"
         }
        },
       "dependsOn": [

diff --git a/Sitecore 8.2.7/xm/azuredeploy.json b/Sitecore 8.2.7/xm/azuredeploy.json
@@ -36,7 +36,7 @@
     },
     "templateLinkBase": {
       "type": "string",
-      "defaultValue": "[uri(replace(json(string(deployment().properties.templateLink)).uri,' ','%20'), '.')]"
+      "defaultValue": "[uri(replace(json(string(deployment().properties.templateLink)).uri, ' ', '%20'), '.')]"
     },
     "templateLinkAccessToken": {
       "type": "securestring",
@@ -146,7 +146,11 @@
       "minLength": 1,
       "defaultValue": "[concat(parameters('deploymentId'), '-ai-pp')]"
     },
-
+    "applicationInsightsDataVolumeCap": {
+      "type": "string",
+      "defaultValue": ""
+    },
+
     "cmHostingPlanName": {
       "type": "string",
       "defaultValue": "[concat(parameters('deploymentId'), '-cm-hp')]"
@@ -358,6 +362,9 @@
           "applicationInsightsPricePlan": {
             "value": "[parameters('applicationInsightsPricePlan')]"
           },
+          "applicationInsightsDataVolumeCap": {
+            "value": "[parameters('applicationInsightsDataVolumeCap')]"
+          },          
 
           "sitecoreSKU": {
             "value": "[parameters('sitecoreSKU')]"

diff --git a/Sitecore 8.2.7/xm/nested/infrastructure.json b/Sitecore 8.2.7/xm/nested/infrastructure.json
@@ -130,7 +130,11 @@
       "minLength": 1,
       "defaultValue": "[concat(parameters('deploymentId'), '-ai-pp')]"
     },
-
+    "applicationInsightsDataVolumeCap": {
+      "type": "string",
+      "defaultValue": ""
+    },
+
     "sitecoreSKU": {
       "type": "string",
       "allowedValues": [ "xM1", "xM2", "xM3", "xM4", "xM5" ],
@@ -588,7 +592,7 @@
       "properties": {
        "CurrentBillingFeatures": "[parameters('resourceSizes').ApplicationInsightsPricePlan.CurrentBillingFeatures]",
        "DataVolumeCap": {
-         "Cap": "[parameters('resourceSizes').ApplicationInsightsPricePlan.DataVolumeCap.Cap]"
+        "Cap": "[if(empty(parameters('applicationInsightsDataVolumeCap')), parameters('resourceSizes').ApplicationInsightsPricePlan.DataVolumeCap.Cap, float(parameters('applicationInsightsDataVolumeCap')))]"
         }
        },
       "dependsOn": [

diff --git a/Sitecore 8.2.7/xp/azuredeploy.json b/Sitecore 8.2.7/xp/azuredeploy.json
@@ -149,6 +149,10 @@
       "minLength": 1,
       "defaultValue": "[concat(parameters('deploymentId'), '-ai-pp')]"
     },
+    "applicationInsightsDataVolumeCap": {
+      "type": "string",
+      "defaultValue": ""
+    },
 
     "cmHostingPlanName": {
       "type": "string",
@@ -513,6 +517,9 @@
           "applicationInsightsPricePlan": {
             "value": "[parameters('applicationInsightsPricePlan')]"
           },
+          "applicationInsightsDataVolumeCap": {
+            "value": "[parameters('applicationInsightsDataVolumeCap')]"
+          },
 
           "sitecoreSKU": {
             "value": "[parameters('sitecoreSKU')]"

diff --git a/Sitecore 8.2.7/xp/nested/infrastructure.json b/Sitecore 8.2.7/xp/nested/infrastructure.json
@@ -155,6 +155,10 @@
       "minLength": 1,
       "defaultValue": "[concat(parameters('deploymentId'), '-ai-pp')]"
     },
+    "applicationInsightsDataVolumeCap": {
+      "type": "string",
+      "defaultValue": ""
+    },
 
     "sitecoreSKU": {
       "type": "string",
@@ -770,8 +774,8 @@
       "apiVersion": "[variables('appInsightsApiVersion')]",
       "properties": {
        "CurrentBillingFeatures": "[parameters('resourceSizes').ApplicationInsightsPricePlan.CurrentBillingFeatures]",
-       "DataVolumeCap": {
-         "Cap": "[parameters('resourceSizes').ApplicationInsightsPricePlan.DataVolumeCap.Cap]"
+        "DataVolumeCap": {
+          "Cap": "[if(empty(parameters('applicationInsightsDataVolumeCap')), parameters('resourceSizes').ApplicationInsightsPricePlan.DataVolumeCap.Cap, float(parameters('applicationInsightsDataVolumeCap')))]"
         }
        },
       "dependsOn": [

diff --git a/Sitecore 8.2.7/xp0/azuredeploy.json b/Sitecore 8.2.7/xp0/azuredeploy.json
@@ -161,6 +161,22 @@
       "defaultValue": "East US"
     },
 
+    "applicationInsightsPricePlan": {
+      "type": "string",
+      "minLength": 1,
+      "defaultValue": "[concat(parameters('deploymentId'), '-ai-pp')]"
+    },
+    "applicationInsightsCurrentBillingFeatures": {
+      "type": "string",
+      "minLength": 1,
+      "defaultValue": "Basic",
+      "allowedValues": [ "Basic", "Application Insights Enterprise" ]
+    },
+    "applicationInsightsDataVolumeCap": {
+      "type": "string",
+      "defaultValue": "0.33"
+    },
+
     "singleHostingPlanName": {
       "type": "string",
       "defaultValue": "[concat(parameters('deploymentId'), '-single-hp')]"
@@ -351,6 +367,16 @@
             "value": "[parameters('applicationInsightsLocation')]"
           },
 
+          "applicationInsightsPricePlan": {
+            "value": "[parameters('applicationInsightsPricePlan')]"
+          },
+          "applicationInsightsCurrentBillingFeatures": {
+            "value": "[parameters('applicationInsightsCurrentBillingFeatures')]"
+          },
+          "applicationInsightsDataVolumeCap": {
+            "value": "[parameters('applicationInsightsDataVolumeCap')]"
+          },
+
           "singleHostingPlanName": {
             "value": "[parameters('singleHostingPlanName')]"
           },

diff --git a/Sitecore 8.2.7/xp0/nested/infrastructure.json b/Sitecore 8.2.7/xp0/nested/infrastructure.json
@@ -17,6 +17,7 @@
     "repDbNameTidy": "[toLower(trim(parameters('reportingSqlDatabaseName')))]",
     "searchServiceNameTidy": "[toLower(trim(parameters('searchServiceName')))]",
     "appInsightsNameTidy": "[toLower(trim(parameters('applicationInsightsName')))]",
+    "appInsightsPricePlanTidy": "[toLower(trim(parameters('applicationInsightsPricePlan')))]",
     "sitecoreTags": {
       "provider": "b51535c2-ab3e-4a68-95f8-e2e3c9a19299"
     }
@@ -132,6 +133,22 @@
       "defaultValue": "East US"
     },
 
+    "applicationInsightsPricePlan": {
+      "type": "string",
+      "minLength": 1,
+      "defaultValue": "[concat(parameters('deploymentId'), '-ai-pp')]"
+    },
+    "applicationInsightsCurrentBillingFeatures": {
+      "type": "string",
+      "minLength": 1,
+      "defaultValue": "Basic",
+      "allowedValues": [ "Basic", "Application Insights Enterprise" ]
+    },
+    "applicationInsightsDataVolumeCap": {
+      "type": "string",
+      "defaultValue": "0.33"
+    },
+
     "singleHostingPlanName": {
       "type": "string",
       "defaultValue": "[concat(parameters('deploymentId'), '-single-hp')]"
@@ -337,6 +354,24 @@
       "tags": {
         "provider": "[variables('sitecoreTags').provider]"
       }
+    },
+    {
+      "type": "Microsoft.Insights/Components/CurrentBillingFeatures",
+      "name": "[concat(variables('appInsightsNameTidy'), '/', variables('appInsightsPricePlanTidy'))]",
+      "apiVersion": "[variables('appInsightsApiVersion')]",
+      "location": "[parameters('applicationInsightsLocation')]",      
+      "properties": {
+        "CurrentBillingFeatures": "[parameters('applicationInsightsCurrentBillingFeatures')]",
+        "DataVolumeCap": {
+          "Cap": "[float(parameters('applicationInsightsDataVolumeCap'))]"
+        }
+      },
+      "dependsOn": [
+        "[resourceId('Microsoft.Insights/Components', variables('appInsightsNameTidy'))]"
+      ],
+      "tags": {
+        "provider": "[variables('sitecoreTags').provider]"
+      }
     }
   ],
   "outputs": {