Skip to content

Commit 3a42ec9

Browse files
fix: update log analytics destination name variable for consistency
1 parent 832628e commit 3a42ec9

3 files changed

Lines changed: 14 additions & 11 deletions

File tree

infra/main.bicep

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,7 @@ var dataCollectionRulesResourceName = 'dcr-${solutionSuffix}'
476476
var dataCollectionRulesLocation = useExistingLogAnalytics
477477
? existingLogAnalyticsWorkspace!.location
478478
: logAnalyticsWorkspace!.outputs.location
479+
var dcrLogAnalyticsDestinationName = 'la-${logAnalyticsWorkspaceResourceName}-destination'
479480
module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-rule:0.11.0' = if (enablePrivateNetworking && enableMonitoring) {
480481
name: take('avm.res.insights.data-collection-rule.${dataCollectionRulesResourceName}', 64)
481482
params: {
@@ -559,7 +560,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
559560
logAnalytics: [
560561
{
561562
workspaceResourceId: logAnalyticsWorkspaceResourceId
562-
name: 'la--1264800308'
563+
name: dcrLogAnalyticsDestinationName
563564
}
564565
]
565566
}
@@ -569,7 +570,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
569570
'Microsoft-Perf'
570571
]
571572
destinations: [
572-
'la--1264800308'
573+
dcrLogAnalyticsDestinationName
573574
]
574575
transformKql: 'source'
575576
outputStream: 'Microsoft-Perf'
@@ -579,7 +580,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
579580
'Microsoft-Event'
580581
]
581582
destinations: [
582-
'la--1264800308'
583+
dcrLogAnalyticsDestinationName
583584
]
584585
transformKql: 'source'
585586
outputStream: 'Microsoft-Event'

infra/main.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"_generator": {
77
"name": "bicep",
88
"version": "0.43.8.12551",
9-
"templateHash": "6851158611963626540"
9+
"templateHash": "6587818059632090787"
1010
},
1111
"name": "Multi-Agent Custom Automation Engine",
1212
"description": "This module contains the resources required to deploy the [Multi-Agent Custom Automation Engine solution accelerator](https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator) for both Sandbox environments and WAF aligned environments.\n\n> **Note:** This module is not intended for broad, generic use, as it was designed by the Commercial Solution Areas CTO team, as a Microsoft Solution Accelerator. Feature requests and bug fix requests are welcome if they support the needs of this organization but may not be incorporated if they aim to make this module more generic than what it needs to be for its primary use case. This module will likely be updated to leverage AVM resource modules in the future. This may result in breaking changes in upcoming versions when these features are implemented.\n"
@@ -415,6 +415,7 @@
415415
"bastionResourceName": "[format('bas-{0}', variables('solutionSuffix'))]",
416416
"maintenanceConfigurationResourceName": "[format('mc-{0}', variables('solutionSuffix'))]",
417417
"dataCollectionRulesResourceName": "[format('dcr-{0}', variables('solutionSuffix'))]",
418+
"dcrLogAnalyticsDestinationName": "[format('la-{0}-destination', variables('logAnalyticsWorkspaceResourceName'))]",
418419
"proximityPlacementGroupResourceName": "[format('ppg-{0}', variables('solutionSuffix'))]",
419420
"virtualMachineResourceName": "[format('vm-{0}', variables('solutionSuffix'))]",
420421
"virtualMachineAvailabilityZone": 1,
@@ -10077,7 +10078,7 @@
1007710078
"logAnalytics": [
1007810079
{
1007910080
"workspaceResourceId": "[if(variables('useExistingLogAnalytics'), parameters('existingLogAnalyticsWorkspaceId'), reference('logAnalyticsWorkspace').outputs.resourceId.value)]",
10080-
"name": "la--1264800308"
10081+
"name": "[variables('dcrLogAnalyticsDestinationName')]"
1008110082
}
1008210083
]
1008310084
},
@@ -10087,7 +10088,7 @@
1008710088
"Microsoft-Perf"
1008810089
],
1008910090
"destinations": [
10090-
"la--1264800308"
10091+
"[variables('dcrLogAnalyticsDestinationName')]"
1009110092
],
1009210093
"transformKql": "source",
1009310094
"outputStream": "Microsoft-Perf"
@@ -10097,7 +10098,7 @@
1009710098
"Microsoft-Event"
1009810099
],
1009910100
"destinations": [
10100-
"la--1264800308"
10101+
"[variables('dcrLogAnalyticsDestinationName')]"
1010110102
],
1010210103
"transformKql": "source",
1010310104
"outputStream": "Microsoft-Event"
@@ -27974,9 +27975,9 @@
2797427975
},
2797527976
"dependsOn": [
2797627977
"aiFoundryAiServices",
27977-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
2797827978
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
2797927979
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
27980+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
2798027981
"virtualNetwork"
2798127982
]
2798227983
},

infra/main_custom.bicep

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,7 @@ var dataCollectionRulesResourceName = 'dcr-${solutionSuffix}'
475475
var dataCollectionRulesLocation = useExistingLogAnalytics
476476
? existingLogAnalyticsWorkspace!.location
477477
: logAnalyticsWorkspace!.outputs.location
478+
var dcrLogAnalyticsDestinationName = 'la-${logAnalyticsWorkspaceResourceName}-destination'
478479
module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-rule:0.11.0' = if (enablePrivateNetworking && enableMonitoring) {
479480
name: take('avm.res.insights.data-collection-rule.${dataCollectionRulesResourceName}', 64)
480481
params: {
@@ -558,7 +559,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
558559
logAnalytics: [
559560
{
560561
workspaceResourceId: logAnalyticsWorkspaceResourceId
561-
name: 'la--1264800308'
562+
name: dcrLogAnalyticsDestinationName
562563
}
563564
]
564565
}
@@ -568,7 +569,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
568569
'Microsoft-Perf'
569570
]
570571
destinations: [
571-
'la--1264800308'
572+
dcrLogAnalyticsDestinationName
572573
]
573574
transformKql: 'source'
574575
outputStream: 'Microsoft-Perf'
@@ -578,7 +579,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
578579
'Microsoft-Event'
579580
]
580581
destinations: [
581-
'la--1264800308'
582+
dcrLogAnalyticsDestinationName
582583
]
583584
transformKql: 'source'
584585
outputStream: 'Microsoft-Event'

0 commit comments

Comments
 (0)