Merge pull request #926 from microsoft/psl-hb-dcrdestname-fix

Prajwal-Microsoft · web-flow · commit f619b80a0d1a · 2026-05-22T10:35:30.000Z
fix: Update log analytics destination name variable in Bicep
diff --git a/infra/main.bicep b/infra/main.bicep
@@ -377,6 +377,7 @@ module bastionHost 'br/public:avm/res/network/bastion-host:0.8.2' = if (enablePr
 
 
 var dataCollectionRulesResourceName = 'dcr-${solutionSuffix}'
+var dcrLogAnalyticsDestinationName = 'la-${logAnalyticsWorkspaceResourceName}-destination'
 var dataCollectionRulesLocation = useExistingLogAnalytics
   ? existingLogAnalyticsWorkspace!.location
   : logAnalyticsWorkspace!.outputs.location
@@ -463,7 +464,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
         logAnalytics: [
           {
             workspaceResourceId: logAnalyticsWorkspaceResourceId
-            name: 'la--1264800308'
+            name: dcrLogAnalyticsDestinationName
           }
         ]
       }
@@ -473,7 +474,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
             'Microsoft-Perf'
           ]
           destinations: [
-            'la--1264800308'
+            dcrLogAnalyticsDestinationName
           ]
           transformKql: 'source'
           outputStream: 'Microsoft-Perf'
@@ -483,7 +484,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
             'Microsoft-Event'
           ]
           destinations: [
-            'la--1264800308'
+            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.43.8.12551",
-      "templateHash": "1762309424496235679"
+      "templateHash": "18442421312669656903"
     }
   },
   "parameters": {
@@ -325,6 +325,7 @@
     "applicationInsightsResourceName": "[format('appi-{0}', variables('solutionSuffix'))]",
     "bastionHostName": "[format('bas-{0}', variables('solutionSuffix'))]",
     "dataCollectionRulesResourceName": "[format('dcr-{0}', variables('solutionSuffix'))]",
+    "dcrLogAnalyticsDestinationName": "[format('la-{0}-destination', variables('logAnalyticsWorkspaceResourceName'))]",
     "jumpboxVmName": "[take(format('vm-jumpbox-{0}', variables('solutionSuffix')), 15)]",
     "privateDnsZones": [
       "privatelink.cognitiveservices.azure.com",
@@ -9078,7 +9079,7 @@
                 "logAnalytics": [
                   {
                     "workspaceResourceId": "[if(variables('useExistingLogAnalytics'), parameters('existingLogAnalyticsWorkspaceId'), reference('logAnalyticsWorkspace').outputs.resourceId.value)]",
-                    "name": "la--1264800308"
+                    "name": "[variables('dcrLogAnalyticsDestinationName')]"
                   }
                 ]
               },
@@ -9088,7 +9089,7 @@
                     "Microsoft-Perf"
                   ],
                   "destinations": [
-                    "la--1264800308"
+                    "[variables('dcrLogAnalyticsDestinationName')]"
                   ],
                   "transformKql": "source",
                   "outputStream": "Microsoft-Perf"
@@ -9098,7 +9099,7 @@
                     "Microsoft-Event"
                   ],
                   "destinations": [
-                    "la--1264800308"
+                    "[variables('dcrLogAnalyticsDestinationName')]"
                   ],
                   "transformKql": "source",
                   "outputStream": "Microsoft-Event"
@@ -29627,8 +29628,8 @@
       },
       "dependsOn": [
         "aiFoundryAiServices",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
         "virtualNetwork"
       ]
@@ -39943,10 +39944,10 @@
         }
       },
       "dependsOn": [
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageFile)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageDfs)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageFile)]",
         "userAssignedIdentity",
         "virtualNetwork"
       ]
diff --git a/infra/main_custom.bicep b/infra/main_custom.bicep
@@ -360,6 +360,7 @@ module bastionHost 'br/public:avm/res/network/bastion-host:0.8.2' = if (enablePr
 
 
 var dataCollectionRulesResourceName = 'dcr-${solutionSuffix}'
+var dcrLogAnalyticsDestinationName = 'la-${logAnalyticsWorkspaceResourceName}-destination'
 var dataCollectionRulesLocation = useExistingLogAnalytics
   ? existingLogAnalyticsWorkspace!.location
   : logAnalyticsWorkspace!.outputs.location
@@ -446,7 +447,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
         logAnalytics: [
           {
             workspaceResourceId: logAnalyticsWorkspaceResourceId
-            name: 'la--1264800308'
+            name: dcrLogAnalyticsDestinationName
           }
         ]
       }
@@ -456,7 +457,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
             'Microsoft-Perf'
           ]
           destinations: [
-            'la--1264800308'
+            dcrLogAnalyticsDestinationName
           ]
           transformKql: 'source'
           outputStream: 'Microsoft-Perf'
@@ -466,7 +467,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
             'Microsoft-Event'
           ]
           destinations: [
-            'la--1264800308'
+            dcrLogAnalyticsDestinationName
           ]
           transformKql: 'source'
           outputStream: 'Microsoft-Event'

Original file line number	Diff line number	Diff line change
`@@ -377,6 +377,7 @@ module bastionHost 'br/public:avm/res/network/bastion-host:0.8.2' = if (enablePr`
`377`	`377`
`378`	`378`
`379`	`379`	`var dataCollectionRulesResourceName = 'dcr-${solutionSuffix}'`
	`380`	`+var dcrLogAnalyticsDestinationName = 'la-${logAnalyticsWorkspaceResourceName}-destination'`
`380`	`381`	`var dataCollectionRulesLocation = useExistingLogAnalytics`
`381`	`382`	`? existingLogAnalyticsWorkspace!.location`
`382`	`383`	`: logAnalyticsWorkspace!.outputs.location`
`@@ -463,7 +464,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-`
`463`	`464`	`logAnalytics: [`
`464`	`465`	`{`
`465`	`466`	`workspaceResourceId: logAnalyticsWorkspaceResourceId`
`466`		`- name: 'la--1264800308'`
	`467`	`+ name: dcrLogAnalyticsDestinationName`
`467`	`468`	`}`
`468`	`469`	`]`
`469`	`470`	`}`
`@@ -473,7 +474,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-`
`473`	`474`	`'Microsoft-Perf'`
`474`	`475`	`]`
`475`	`476`	`destinations: [`
`476`		`- 'la--1264800308'`
	`477`	`+ dcrLogAnalyticsDestinationName`
`477`	`478`	`]`
`478`	`479`	`transformKql: 'source'`
`479`	`480`	`outputStream: 'Microsoft-Perf'`
`@@ -483,7 +484,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-`
`483`	`484`	`'Microsoft-Event'`
`484`	`485`	`]`
`485`	`486`	`destinations: [`
`486`		`- 'la--1264800308'`
	`487`	`+ dcrLogAnalyticsDestinationName`
`487`	`488`	`]`
`488`	`489`	`transformKql: 'source'`
`489`	`490`	`outputStream: 'Microsoft-Event'`
Original file line number	Diff line number	Diff line change
`@@ -360,6 +360,7 @@ module bastionHost 'br/public:avm/res/network/bastion-host:0.8.2' = if (enablePr`
`360`	`360`
`361`	`361`
`362`	`362`	`var dataCollectionRulesResourceName = 'dcr-${solutionSuffix}'`
	`363`	`+var dcrLogAnalyticsDestinationName = 'la-${logAnalyticsWorkspaceResourceName}-destination'`
`363`	`364`	`var dataCollectionRulesLocation = useExistingLogAnalytics`
`364`	`365`	`? existingLogAnalyticsWorkspace!.location`
`365`	`366`	`: logAnalyticsWorkspace!.outputs.location`
`@@ -446,7 +447,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-`
`446`	`447`	`logAnalytics: [`
`447`	`448`	`{`
`448`	`449`	`workspaceResourceId: logAnalyticsWorkspaceResourceId`
`449`		`- name: 'la--1264800308'`
	`450`	`+ name: dcrLogAnalyticsDestinationName`
`450`	`451`	`}`
`451`	`452`	`]`
`452`	`453`	`}`
`@@ -456,7 +457,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-`
`456`	`457`	`'Microsoft-Perf'`
`457`	`458`	`]`
`458`	`459`	`destinations: [`
`459`		`- 'la--1264800308'`
	`460`	`+ dcrLogAnalyticsDestinationName`
`460`	`461`	`]`
`461`	`462`	`transformKql: 'source'`
`462`	`463`	`outputStream: 'Microsoft-Perf'`
`@@ -466,7 +467,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-`
`466`	`467`	`'Microsoft-Event'`
`467`	`468`	`]`
`468`	`469`	`destinations: [`
`469`		`- 'la--1264800308'`
	`470`	`+ dcrLogAnalyticsDestinationName`
`470`	`471`	`]`
`471`	`472`	`transformKql: 'source'`
`472`	`473`	`outputStream: 'Microsoft-Event'`