refactor: update log analytics resource naming in Bicep templates

Kanchan-Microsoft · Kanchan-Microsoft · commit 85ea0b0e266e · 2026-05-20T17:10:34.000+05:30
diff --git a/infra/main.bicep b/infra/main.bicep
@@ -362,6 +362,8 @@ module maintenanceConfiguration 'br/public:avm/res/maintenance/maintenance-confi
 
 var dataCollectionRulesResourceName = 'dcr-${solutionSuffix}'
 var dataCollectionRulesLocation = logAnalyticsWorkspace!.outputs.location
+var logAnalyticsWorkspaceResourceName = 'log-${solutionSuffix}'
+var dcrLogAnalyticsDestinationName = 'la-${logAnalyticsWorkspaceResourceName}-destination'
 module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-rule:0.11.0' = if (enablePrivateNetworking && enableMonitoring) {
   name: take('avm.res.insights.data-collection-rule.${dataCollectionRulesResourceName}', 64)
   params: {
@@ -445,7 +447,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
         logAnalytics: [
           {
             workspaceResourceId: logAnalyticsWorkspace!.outputs.resourceId
-            name: 'la-${dataCollectionRulesResourceName}'
+            name: dcrLogAnalyticsDestinationName
           }
         ]
       }
@@ -455,7 +457,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
             'Microsoft-Perf'
           ]
           destinations: [
-            'la-${dataCollectionRulesResourceName}'
+            dcrLogAnalyticsDestinationName
           ]
           transformKql: 'source'
           outputStream: 'Microsoft-Perf'
@@ -465,7 +467,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
             'Microsoft-Event'
           ]
           destinations: [
-            'la-${dataCollectionRulesResourceName}'
+            dcrLogAnalyticsDestinationName
           ]
           transformKql: 'source'
           outputStream: 'Microsoft-Event'
diff --git a/infra/main.json b/infra/main.json
@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.42.1.51946",
-      "templateHash": "12078312041649297460"
+      "templateHash": "3337141965130997882"
     },
     "name": "Content Processing Solution Accelerator",
     "description": "Bicep template to deploy the Content Processing Solution Accelerator with AVM compliance."
@@ -243,6 +243,8 @@
     "bastionHostName": "[format('bas-{0}', variables('solutionSuffix'))]",
     "jumpboxVmName": "[take(format('vm-{0}', variables('solutionSuffix')), 15)]",
     "dataCollectionRulesResourceName": "[format('dcr-{0}', variables('solutionSuffix'))]",
+    "logAnalyticsWorkspaceResourceName": "[format('log-{0}', variables('solutionSuffix'))]",
+    "dcrLogAnalyticsDestinationName": "[format('la-{0}-destination', variables('logAnalyticsWorkspaceResourceName'))]",
     "privateDnsZones": [
       "privatelink.cognitiveservices.azure.com",
       "privatelink.openai.azure.com",
@@ -14619,7 +14621,7 @@
                 "logAnalytics": [
                   {
                     "workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]",
-                    "name": "[format('la-{0}', variables('dataCollectionRulesResourceName'))]"
+                    "name": "[variables('dcrLogAnalyticsDestinationName')]"
                   }
                 ]
               },
@@ -14629,7 +14631,7 @@
                     "Microsoft-Perf"
                   ],
                   "destinations": [
-                    "[format('la-{0}', variables('dataCollectionRulesResourceName'))]"
+                    "[variables('dcrLogAnalyticsDestinationName')]"
                   ],
                   "transformKql": "source",
                   "outputStream": "Microsoft-Perf"
@@ -14639,7 +14641,7 @@
                     "Microsoft-Event"
                   ],
                   "destinations": [
-                    "[format('la-{0}', variables('dataCollectionRulesResourceName'))]"
+                    "[variables('dcrLogAnalyticsDestinationName')]"
                   ],
                   "transformKql": "source",
                   "outputStream": "Microsoft-Event"
@@ -42485,10 +42487,10 @@
       },
       "dependsOn": [
         "avmAiServices",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
         "virtualNetwork"
       ]
     },
diff --git a/infra/main_custom.bicep b/infra/main_custom.bicep
@@ -365,6 +365,8 @@ module maintenanceConfiguration 'br/public:avm/res/maintenance/maintenance-confi
 
 var dataCollectionRulesResourceName = 'dcr-${solutionSuffix}'
 var dataCollectionRulesLocation = logAnalyticsWorkspace!.outputs.location
+var logAnalyticsWorkspaceResourceName = 'log-${solutionSuffix}'
+var dcrLogAnalyticsDestinationName = 'la-${logAnalyticsWorkspaceResourceName}-destination'
 module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-rule:0.11.0' = if (enablePrivateNetworking && enableMonitoring) {
   name: take('avm.res.insights.data-collection-rule.${dataCollectionRulesResourceName}', 64)
   params: {
@@ -448,7 +450,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
         logAnalytics: [
           {
             workspaceResourceId: logAnalyticsWorkspace!.outputs.resourceId
-            name: 'la-${dataCollectionRulesResourceName}'
+            name: dcrLogAnalyticsDestinationName
           }
         ]
       }
@@ -458,7 +460,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
             'Microsoft-Perf'
           ]
           destinations: [
-            'la-${dataCollectionRulesResourceName}'
+            dcrLogAnalyticsDestinationName
           ]
           transformKql: 'source'
           outputStream: 'Microsoft-Perf'
@@ -468,7 +470,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
             'Microsoft-Event'
           ]
           destinations: [
-            'la-${dataCollectionRulesResourceName}'
+            dcrLogAnalyticsDestinationName
           ]
           transformKql: 'source'
           outputStream: 'Microsoft-Event'

Original file line number	Diff line number	Diff line change
`@@ -362,6 +362,8 @@ module maintenanceConfiguration 'br/public:avm/res/maintenance/maintenance-confi`
`362`	`362`
`363`	`363`	`var dataCollectionRulesResourceName = 'dcr-${solutionSuffix}'`
`364`	`364`	`var dataCollectionRulesLocation = logAnalyticsWorkspace!.outputs.location`
	`365`	`+var logAnalyticsWorkspaceResourceName = 'log-${solutionSuffix}'`
	`366`	`+var dcrLogAnalyticsDestinationName = 'la-${logAnalyticsWorkspaceResourceName}-destination'`
`365`	`367`	`module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-rule:0.11.0' = if (enablePrivateNetworking && enableMonitoring) {`
`366`	`368`	`name: take('avm.res.insights.data-collection-rule.${dataCollectionRulesResourceName}', 64)`
`367`	`369`	`params: {`
`@@ -445,7 +447,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-`
`445`	`447`	`logAnalytics: [`
`446`	`448`	`{`
`447`	`449`	`workspaceResourceId: logAnalyticsWorkspace!.outputs.resourceId`
`448`		`- name: 'la-${dataCollectionRulesResourceName}'`
	`450`	`+ name: dcrLogAnalyticsDestinationName`
`449`	`451`	`}`
`450`	`452`	`]`
`451`	`453`	`}`
`@@ -455,7 +457,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-`
`455`	`457`	`'Microsoft-Perf'`
`456`	`458`	`]`
`457`	`459`	`destinations: [`
`458`		`- 'la-${dataCollectionRulesResourceName}'`
	`460`	`+ dcrLogAnalyticsDestinationName`
`459`	`461`	`]`
`460`	`462`	`transformKql: 'source'`
`461`	`463`	`outputStream: 'Microsoft-Perf'`
`@@ -465,7 +467,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-`
`465`	`467`	`'Microsoft-Event'`
`466`	`468`	`]`
`467`	`469`	`destinations: [`
`468`		`- 'la-${dataCollectionRulesResourceName}'`
	`470`	`+ dcrLogAnalyticsDestinationName`
`469`	`471`	`]`
`470`	`472`	`transformKql: 'source'`
`471`	`473`	`outputStream: 'Microsoft-Event'`
Original file line number	Diff line number	Diff line change
`@@ -365,6 +365,8 @@ module maintenanceConfiguration 'br/public:avm/res/maintenance/maintenance-confi`
`365`	`365`
`366`	`366`	`var dataCollectionRulesResourceName = 'dcr-${solutionSuffix}'`
`367`	`367`	`var dataCollectionRulesLocation = logAnalyticsWorkspace!.outputs.location`
	`368`	`+var logAnalyticsWorkspaceResourceName = 'log-${solutionSuffix}'`
	`369`	`+var dcrLogAnalyticsDestinationName = 'la-${logAnalyticsWorkspaceResourceName}-destination'`
`368`	`370`	`module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-rule:0.11.0' = if (enablePrivateNetworking && enableMonitoring) {`
`369`	`371`	`name: take('avm.res.insights.data-collection-rule.${dataCollectionRulesResourceName}', 64)`
`370`	`372`	`params: {`
`@@ -448,7 +450,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-`
`448`	`450`	`logAnalytics: [`
`449`	`451`	`{`
`450`	`452`	`workspaceResourceId: logAnalyticsWorkspace!.outputs.resourceId`
`451`		`- name: 'la-${dataCollectionRulesResourceName}'`
	`453`	`+ name: dcrLogAnalyticsDestinationName`
`452`	`454`	`}`
`453`	`455`	`]`
`454`	`456`	`}`
`@@ -458,7 +460,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-`
`458`	`460`	`'Microsoft-Perf'`
`459`	`461`	`]`
`460`	`462`	`destinations: [`
`461`		`- 'la-${dataCollectionRulesResourceName}'`
	`463`	`+ dcrLogAnalyticsDestinationName`
`462`	`464`	`]`
`463`	`465`	`transformKql: 'source'`
`464`	`466`	`outputStream: 'Microsoft-Perf'`
`@@ -468,7 +470,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-`
`468`	`470`	`'Microsoft-Event'`
`469`	`471`	`]`
`470`	`472`	`destinations: [`
`471`		`- 'la-${dataCollectionRulesResourceName}'`
	`473`	`+ dcrLogAnalyticsDestinationName`
`472`	`474`	`]`
`473`	`475`	`transformKql: 'source'`
`474`	`476`	`outputStream: 'Microsoft-Event'`