From 146a17163db537b086b01a0be066b34da3f62ede Mon Sep 17 00:00:00 2001 From: Connor Lynch Date: Thu, 5 Dec 2019 15:45:05 -0600 Subject: [PATCH] Update Arm Temps for 5.5.0 --- Dynamics/InRule.Dynamics.Service.json | 29 ++++++++++++-- .../InRule.Dynamics.Service.parameters.json | 5 ++- Salesforce/InRule.Salesforce.Service.json | 39 ++++++++++++++++--- .../InRule.Salesforce.Service.parameters.json | 12 ++++++ doc/ircatalog-arm-template-deployment.md | 2 +- 5 files changed, 75 insertions(+), 12 deletions(-) diff --git a/Dynamics/InRule.Dynamics.Service.json b/Dynamics/InRule.Dynamics.Service.json index 0523eb6..70ce172 100644 --- a/Dynamics/InRule.Dynamics.Service.json +++ b/Dynamics/InRule.Dynamics.Service.json @@ -85,15 +85,36 @@ "appInsightsInstrumentationKey": { "type": "string" }, + "appInsightsResourceName": { + "type": "string" + }, + "appInsightsLocation": { + "type": "string", + "defaultValue": "[resourceGroup().location]" + }, "packageUri": { "type": "string", "defaultValue": "[concat('https://github.com/InRule/AzureAppServices/releases/download/v', parameters('inRuleVersion'),'/InRule.CRM.WebJob.zip')]" } }, "variables": { - "appServicePlanName": "[if(empty(parameters('appServicePlanName')), concat(parameters('appServiceName'),'Plan'), parameters('appServicePlanName'))]" + "appServicePlanName": "[if(empty(parameters('appServicePlanName')), concat(parameters('appServiceName'),'Plan'), parameters('appServicePlanName'))]", + "appInsightsResourceName": "[if(empty(parameters('appInsightsResourceName')), concat(parameters('appServiceName'),'Insights'), parameters('appInsightsResourceName'))]" }, "resources": [ + { + "condition": "[not(empty(parameters('appInsightsResourceName')))]", + "name": "[variables('appInsightsResourceName')]", + "type": "Microsoft.Insights/components", + "apiVersion": "2015-05-01", + "location": "[parameters('appInsightsLocation')]", + "kind": "web", + "tags": { + "[concat('hidden-link:', resourceGroup().id, '/providers/Microsoft.Web/sites/', parameters('appInsightsResourceName'))]": "Resource" + }, + "properties": { + } + }, { "condition": "[parameters('createAppServicePlan')]", "name": "[variables('appServicePlanName')]", @@ -162,7 +183,7 @@ "inrule:crm:s2s:crmOrgUrl": "[parameters('orgUrl')]", "inrule:repository:licensing:licenseFolder": "D:\\home\\site\\wwwroot", "inrule:logging:level": "Warn", - "inrule:logging:appInsights:instrumentationKey": "[parameters('appInsightsInstrumentationKey')]" + "inrule:logging:appInsights:instrumentationKey": "[if(empty(parameters('appInsightsResourceName')), parameters('appInsightsInstrumentationKey'), reference(resourceId('Microsoft.Insights/components', parameters('appInsightsResourceName'))).InstrumentationKey)]" } }, { @@ -175,7 +196,7 @@ "[concat('Microsoft.Web/sites/', parameters('appServiceName'))]" ], "properties": { - "DynamicsCrm": { + "DynamicsCRM": { "value": "[parameters('crmConnectionString')]", "type": "Custom" } @@ -195,6 +216,6 @@ "relayKey": { "type": "string", "value": "[listKeys(resourceId('Microsoft.Relay/namespaces/authorizationRules', parameters('relayName'), 'RootManageSharedAccessKey'), providers('Microsoft.Relay', 'namespaces').apiVersions[0]).primaryKey]" - } + } } } diff --git a/Dynamics/InRule.Dynamics.Service.parameters.json b/Dynamics/InRule.Dynamics.Service.parameters.json index 4bf2e8f..0d4c8e3 100644 --- a/Dynamics/InRule.Dynamics.Service.parameters.json +++ b/Dynamics/InRule.Dynamics.Service.parameters.json @@ -27,7 +27,7 @@ "value": "" }, "crmConnectionString": { - "value": "" + "value": "" }, "appServicePlanName": { "value": "" @@ -37,6 +37,9 @@ }, "appInsightsInstrumentationKey": { "value": "" + }, + "appInsightsResourceName": { + "value": "" } } } \ No newline at end of file diff --git a/Salesforce/InRule.Salesforce.Service.json b/Salesforce/InRule.Salesforce.Service.json index 3c9ebcf..a6eaad0 100644 --- a/Salesforce/InRule.Salesforce.Service.json +++ b/Salesforce/InRule.Salesforce.Service.json @@ -82,21 +82,47 @@ "type": "string", "defaultValue": "5.5.0" }, + "appInsightsInstrumentationKey": { + "type": "string" + }, + "appInsightsResourceName": { + "type": "string" + }, + "appInsightsLocation": { + "type": "string", + "defaultValue": "[resourceGroup().location]" + }, "packageUri": { "type": "string", "defaultValue": "[concat('https://github.com/InRule/AzureAppServices/releases/download/v', parameters('inRuleVersion'),'/InRule.Salesforce.WebService.zip')]" } }, - "variables": {}, + "variables": { + "appServicePlanName": "[if(empty(parameters('appServicePlanName')), concat(parameters('appServiceName'),'Plan'), parameters('appServicePlanName'))]", + "appInsightsResourceName": "[if(empty(parameters('appInsightsResourceName')), concat(parameters('appServiceName'),'Insights'), parameters('appInsightsResourceName'))]" + }, "resources": [ + { + "condition": "[not(empty(parameters('appInsightsResourceName')))]", + "name": "[variables('appInsightsResourceName')]", + "type": "Microsoft.Insights/components", + "apiVersion": "2015-05-01", + "location": "[parameters('appInsightsLocation')]", + "kind": "web", + "tags": { + "[concat('hidden-link:', resourceGroup().id, '/providers/Microsoft.Web/sites/', parameters('appInsightsResourceName'))]": "Resource" + }, + "properties": { + } + }, { "condition": "[parameters('createAppServicePlan')]", - "name": "[parameters('appServicePlanName')]", + "name": "[variables('appServicePlanName')]", "type": "Microsoft.Web/serverfarms", "apiVersion": "2016-09-01", "location": "[resourceGroup().location]", "properties": { - "name": "[parameters('appServicePlanName')]" + "name": "[variables('appServicePlanName')]" }, "sku": { "name": "[parameters('appServicePlanSkuName')]" @@ -108,13 +134,13 @@ "apiVersion": "2016-08-01", "location": "[resourceGroup().location]", "dependsOn": [ - "[resourceId(parameters('servicePlanResourceGroupName'), 'Microsoft.Web/serverfarms', parameters('appServicePlanName'))]" + "[resourceId(parameters('servicePlanResourceGroupName'), 'Microsoft.Web/serverfarms', variables('appServicePlanName'))]" ], "tags": { "[concat('hidden-related:', resourceId(parameters('servicePlanResourceGroupName'), 'Microsoft.Web/serverfarms', parameters('appServicePlanName')))]": "Resource" }, "properties": { - "serverFarmId": "[resourceId(parameters('servicePlanResourceGroupName'), 'Microsoft.Web/serverfarms', parameters('appServicePlanName'))]" + "serverFarmId": "[resourceId(parameters('servicePlanResourceGroupName'), 'Microsoft.Web/serverfarms', variables('appServicePlanName'))]" }, "resources": [ { @@ -154,7 +180,8 @@ "inrule:sf:ruleService:basicPwd": "[parameters('executionServiceBasicPassword')]", "inrule:sf:ruleService:basicRealm": "[parameters('executionServiceBasicRealm')]", "inrule:repository:licensing:licenseFolder": "D:\\home\\site\\wwwroot", - "inrule:logging:level": "Warn" + "inrule:logging:level": "Warn", + "inrule:logging:appInsights:instrumentationKey": "[if(empty(parameters('appInsightsResourceName')), parameters('appInsightsInstrumentationKey'), reference(resourceId('Microsoft.Insights/components', parameters('appInsightsResourceName'))).InstrumentationKey)]" } } ] diff --git a/Salesforce/InRule.Salesforce.Service.parameters.json b/Salesforce/InRule.Salesforce.Service.parameters.json index 24c189e..2685a11 100644 --- a/Salesforce/InRule.Salesforce.Service.parameters.json +++ b/Salesforce/InRule.Salesforce.Service.parameters.json @@ -40,6 +40,18 @@ }, "executionServiceBasicRealm": { "value": "" + }, + "appServicePlanName": { + "value": "" + }, + "inRuleVersion": { + "value": "5.5.0" + }, + "appInsightsResourceName": { + "value": "" + }, + "appInsightsInstrumentationKey": { + "value": "" } } } \ No newline at end of file diff --git a/doc/ircatalog-arm-template-deployment.md b/doc/ircatalog-arm-template-deployment.md index 33aa27c..913348b 100644 --- a/doc/ircatalog-arm-template-deployment.md +++ b/doc/ircatalog-arm-template-deployment.md @@ -4,7 +4,7 @@ In this section we will be deploying the irCatalog® as well as the irCatalog Ma If you have not done so already, please read the [prerequisites](../README.md#prerequisites) before you get started. -Get the template and parameters file from the `source.zip` here [here](https://github.com/InRule/AzureAppServices/releases). Both will be needed to continue with this deployment option. +Get the template and parameters file from the `source.zip` [here](https://github.com/InRule/AzureAppServices/releases). Both will be needed to continue with this deployment option. # Update the template parameters