feature/DEV-76707: Adding develop branch support

Author: choudharypooja

arm-template-deployment/deployRGParent.json

@@ -1,6 +1,15 @@
 {
   "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
   "contentVersion": "1.0.0.0",
+  "variables": {
+    "sourceCodeBranch" : "master",  // the branch to checkout the code from ('develop' for testing purpose)
+    "templateBaseUri": "[concat('https://raw.githubusercontent.com/logicmonitor/lm-logs-azure/',variables('sourceCodeBranch'),'/arm-template-deployment/')]",
+    "deploymentResourceGroupName": "[concat('lm-logs','-',parameters('LM_Company_name'), '-', replace(parameters('resource_group_region'),' ',''),'-group')]",
+    "eventhubNamespace": "[concat('lm-logs','-',parameters('LM_Company_name'), '-', replace(parameters('resource_group_region'),' ',''))]",
+    "eventhubLogsName": "log-hub",
+    "subscriptionId": "[subscription().subscriptionId]",
+    "eventHubAuthorizationRuleId": "[concat('/subscriptions/', variables('subscriptionId'), '/resourceGroups/', variables('deploymentResourceGroupName'), '/providers/Microsoft.EventHub/namespaces/', variables('eventhubNamespace'), '/authorizationRules/RootManageSharedAccessKey')]"
+  },
   "parameters": {
     "resource_group_region": {
       "type": "String"
@@ -30,27 +39,8 @@
         "description": "Enable Activity logs to be sent to the event hub that will get created in this deployment"
       },
       "defaultValue": "Yes"
-    },
-    "sourceCodeBranch": {
-      "type": "String",
-      "allowedValues": [
-        "master",
-        "develop"
-      ],
-      "metadata": {
-        "description": "Github branch from which the code is to be deployed"
-      },
-      "defaultValue": "master"
     }
   },
-  "variables": {
-    "templateBaseUri": "[concat('https://raw.githubusercontent.com/logicmonitor/lm-logs-azure/',parameters('sourceCodeBranch'),'/arm-template-deployment/')]",
-    "deploymentResourceGroupName": "[concat('lm-logs','-',parameters('LM_Company_name'), '-', replace(parameters('resource_group_region'),' ',''),'-group')]",
-    "eventhubNamespace": "[concat('lm-logs','-',parameters('LM_Company_name'), '-', replace(parameters('resource_group_region'),' ',''))]",
-    "eventhubLogsName": "log-hub",
-    "subscriptionId": "[subscription().subscriptionId]",
-    "eventHubAuthorizationRuleId": "[concat('/subscriptions/', variables('subscriptionId'), '/resourceGroups/', variables('deploymentResourceGroupName'), '/providers/Microsoft.EventHub/namespaces/', variables('eventhubNamespace'), '/authorizationRules/RootManageSharedAccessKey')]"
-  },
   "resources": [
     {
       "type": "Microsoft.Resources/resourceGroups",
@@ -88,7 +78,7 @@
             "value": "[parameters('Azure_Client_Id')]"
           },
           "sourceCodeBranch": {
-            "value": "[parameters('sourceCodeBranch')]"
+            "value": "[variables('sourceCodeBranch')]"
           }
         }
       },

arm-template-deployment/deploymentParentScript.json

@@ -1,6 +1,13 @@
 {
   "$schema": "https://schema.management.azure.com/schemas/2018-05-01/deploymentTemplate.json#",
   "contentVersion": "1.0.0.0",
+  "variables": {
+    "sourceCodeBranch": "master",  // the branch to checkout the code from ('develop' for testing purpose)
+    "templateBaseUri": "[concat('https://raw.githubusercontent.com/logicmonitor/lm-logs-azure/',variables('sourceCodeBranch'),'/arm-template-deployment/')]",
+    "deploymentResourceGroupName": "[concat('lm-logs-',parameters('LM_Company_name'),'-',resourceGroup().Location,'-group')]",
+    "managedIdentityName": "[concat('msi-', variables('deploymentResourceGroupName'), '-deploy')]",
+    "managedIdentityId": "[concat('/subscriptions/', subscription().subscriptionId, '/resourceGroups/', variables('deploymentResourceGroupName'), '/providers/Microsoft.ManagedIdentity/userAssignedIdentities/', variables('managedIdentityName'))]"
+  },
   "parameters": {
     "subscriptionId": {
       "type": "String"
@@ -12,25 +19,8 @@
       "defaultValue": "[utcNow()]",
       "type": "String",
       "metadata": "Please do not edit this setting"
-    },
-    "sourceCodeBranch": {
-      "type": "String",
-      "allowedValues": [
-        "master",
-        "develop"
-      ],
-      "metadata": {
-        "description": "branch from which the code is to be deployed"
-      },
-      "defaultValue": "master"
     }
   },
-  "variables": {
-    "templateBaseUri": "[concat('https://raw.githubusercontent.com/logicmonitor/lm-logs-azure/',parameters('sourceCodeBranch'),'/arm-template-deployment/')]",
-    "deploymentResourceGroupName": "[concat('lm-logs-',parameters('LM_Company_name'),'-',resourceGroup().Location,'-group')]",
-    "managedIdentityName": "[concat('msi-', variables('deploymentResourceGroupName'), '-deploy')]",
-    "managedIdentityId": "[concat('/subscriptions/', subscription().subscriptionId, '/resourceGroups/', variables('deploymentResourceGroupName'), '/providers/Microsoft.ManagedIdentity/userAssignedIdentities/', variables('managedIdentityName'))]"
-  },
   "resources": [
     {
       "type": "Microsoft.Resources/deployments",
@@ -62,7 +52,7 @@
             "value": "[resourceGroup().Location]"
           },
           "sourceCodeBranch": {
-            "value": "[parameters('sourceCodeBranch')]"
+            "value": "[variables('sourceCodeBranch')]"
           }
         }
       },

diagnostic-settings-scripts/policyCreationAndRemediationTemplate.ps1

@@ -60,6 +60,7 @@ $eventhubNameSpace = $targetResourceGroup.replace('-group','')
 $eventhubName = 'log-hub'
 $eventhubAuthorizationId = 'RootManageSharedAccessKey'
 $templateUri = 'https://raw.githubusercontent.com/logicmonitor/lm-logs-azure/'+$sourceCodeBranch+'/arm-template-deployment/ARMTemplateExport.json'
+
 Get-AzResourceGroup -Name $targetResourceGroup -ErrorVariable notPresent -ErrorAction SilentlyContinue
 if ($notPresent) {
     Write-Host "target resource group not present..."