Merge pull request #25 from InRule/5.7.0-1

5.7.0 ai updates
InRule · Feb 10, 2021 · 6093cb7 · 6093cb7
2 parents 4fd381f + 06ec05e
commit 6093cb7
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 3 deletions.
diff --git a/Dynamics/InRule.Dynamics.Service.json b/Dynamics/InRule.Dynamics.Service.json
@@ -123,6 +123,13 @@
         "description": "If createOrUpdateAppInsightsResource is set to false and you have an existing App Insights resource you'd like to use instead, provide the Instrumentation key here. If createOrUpdateAppInsightsResource is set to true, leave this blank and provide a value for 'appInsightsResourceName' instead"
       }
     },
+    "appInsightsConnectionString": {
+      "type": "string",
+      "defaultValue": "[concat('InstrumentationKey=', parameters('appInsightsInstrumentationKey'), ';')]",
+      "metadata": {
+        "description": "If createOrUpdateAppInsightsResource is set to false and you have an existing App Insights resource you'd like to use instead, provide the Connection String here. If createOrUpdateAppInsightsResource is set to true, leave this blank and provide a value for 'appInsightsResourceName' instead"
+      }
+    },
     "appInsightsResourceName": {
       "type": "string",
       "defaultValue": "[concat(parameters('appServiceName'),'AppInsights')]",
@@ -150,6 +157,19 @@
     "appInsightsResourceName": "[if(empty(parameters('appInsightsResourceName')), concat(parameters('appServiceName'),'Insights'), parameters('appInsightsResourceName'))]"
   },
   "resources": [
+    {
+      "apiVersion": "2020-06-01",
+      "name": "pid-8503e38f-f07e-4250-a1c3-b2b781cdbec5",
+      "type": "Microsoft.Resources/deployments",
+      "properties": {
+        "mode": "Incremental",
+        "template": {
+          "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+          "contentVersion": "1.0.0.0",
+          "resources": []
+        }
+      }
+    },
     {
       "name": "[parameters('relayName')]",
       "type": "Microsoft.Relay/namespaces",
@@ -161,7 +181,7 @@
       "condition": "[parameters('createOrUpdateAppInsightsResource')]",
       "name": "[variables('appInsightsResourceName')]",
       "type": "Microsoft.Insights/components",
-      "apiVersion": "2015-05-01",
+      "apiVersion": "2018-05-01-preview",
       "location": "[parameters('appInsightsLocation')]",
       "dependsOn": [
         "[concat('Microsoft.Relay/namespaces/', parameters('relayName'))]"
@@ -256,7 +276,7 @@
             "inrule:crm:s2s:crmOrgUrl": "[parameters('orgUrl')]",
             "inrule:repository:licensing:licenseFolder": "D:\\home\\site\\wwwroot",
             "inrule:logging:level": "Warn",
-            "inrule:logging:appInsights:instrumentationKey": "[if(empty(parameters('appInsightsResourceName')), parameters('appInsightsInstrumentationKey'), reference(resourceId('Microsoft.Insights/components', parameters('appInsightsResourceName')), '2015-05-01').InstrumentationKey)]"
+            "APPLICATIONINSIGHTS_CONNECTION_STRING": "[if(parameters('createOrUpdateAppInsightsResource'), reference(resourceId('Microsoft.Insights/components', parameters('appInsightsResourceName')), '2018-05-01-preview').ConnectionString, parameters('appInsightsConnectionString'))]"
           }
         },
         {

diff --git a/Salesforce/InRule.Salesforce.Service.json b/Salesforce/InRule.Salesforce.Service.json
@@ -138,6 +138,13 @@
         "description": "If createOrUpdateAppInsightsResource is set to false and you have an existing App Insights resource you'd like to use instead, provide the Instrumentation key here. If createOrUpdateAppInsightsResource is set to true, leave this blank and provide a value for 'appInsightsResourceName' instead"
       }
     },
+    "appInsightsConnectionString": {
+      "type": "string",
+      "defaultValue": "[concat('InstrumentationKey=', parameters('appInsightsInstrumentationKey'), ';')]",
+      "metadata": {
+        "description": "If createOrUpdateAppInsightsResource is set to false and you have an existing App Insights resource you'd like to use instead, provide the Connection String here. If createOrUpdateAppInsightsResource is set to true, leave this blank and provide a value for 'appInsightsResourceName' instead"
+      }
+    },
     "appInsightsResourceName": {
       "type": "string",
       "defaultValue": "[concat(parameters('appServiceName'),'AppInsights')]",
@@ -165,11 +172,24 @@
     "appInsightsResourceName": "[if(empty(parameters('appInsightsResourceName')), concat(parameters('appServiceName'),'Insights'), parameters('appInsightsResourceName'))]"
   },
   "resources": [
+    {
+      "apiVersion": "2020-06-01",
+      "name": "pid-33e2dfaf-aab8-4fa0-94fb-3e0b7f491cbd",
+      "type": "Microsoft.Resources/deployments",
+      "properties": {
+        "mode": "Incremental",
+        "template": {
+          "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+          "contentVersion": "1.0.0.0",
+          "resources": []
+        }
+      }
+    },
     {
       "condition": "[parameters('createOrUpdateAppInsightsResource')]",
       "name": "[variables('appInsightsResourceName')]",
       "type": "Microsoft.Insights/components",
-      "apiVersion": "2015-05-01",
+      "apiVersion": "2018-05-01-preview",
       "location": "[parameters('appInsightsLocation')]",
       "kind": "web",
       "tags": {
@@ -258,6 +278,7 @@
             "inrule:sf:ruleService:basicPwd": "[parameters('executionServiceBasicPassword')]",
             "inrule:repository:licensing:licenseFolder": "D:\\home\\site\\wwwroot",
             "inrule:logging:level": "Warn",
+            "APPLICATIONINSIGHTS_CONNECTION_STRING": "[if(parameters('createOrUpdateAppInsightsResource'), reference(resourceId('Microsoft.Insights/components', parameters('appInsightsResourceName')), '2018-05-01-preview').ConnectionString, parameters('appInsightsConnectionString'))]",
             "inrule:logging:appInsights:instrumentationKey": "[if(empty(parameters('appInsightsResourceName')), parameters('appInsightsInstrumentationKey'), reference(resourceId('Microsoft.Insights/components', parameters('appInsightsResourceName')), '2015-05-01').InstrumentationKey)]"
           }
         }