Skip to content

Commit 6b39c90

Browse files
Roopan-MicrosoftRoopan-Microsoft
authored
Merge pull request #855 from microsoft/psl-logging-improvements
fix: Removed the diagnostic settings from AppInsights to avoid duplicate logs
2 parents 47f28ee + ea2d90f commit 6b39c90

3 files changed

Lines changed: 17 additions & 20 deletions

File tree

‎infra/main.bicep‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,6 @@ module applicationInsights 'br/public:avm/res/insights/component:0.6.0' = if (en
373373
flowType: 'Bluefield'
374374
// WAF aligned configuration for Monitoring
375375
workspaceResourceId: enableMonitoring ? logAnalyticsWorkspaceResourceId : ''
376-
diagnosticSettings: enableMonitoring ? [{ workspaceResourceId: logAnalyticsWorkspaceResourceId }] : null
377376
}
378377
}
379378

‎infra/main.json‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"metadata": {
66
"_generator": {
77
"name": "bicep",
8-
"version": "0.40.2.10011",
9-
"templateHash": "17476534152468179054"
8+
"version": "0.41.2.15936",
9+
"templateHash": "7834026170340721066"
1010
},
1111
"name": "Multi-Agent Custom Automation Engine",
12-
"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"
12+
"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.\r\n\r\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.\r\n"
1313
},
1414
"parameters": {
1515
"solutionName": {
@@ -3703,8 +3703,7 @@
37033703
"flowType": {
37043704
"value": "Bluefield"
37053705
},
3706-
"workspaceResourceId": "[if(parameters('enableMonitoring'), if(variables('useExistingLogAnalytics'), createObject('value', parameters('existingLogAnalyticsWorkspaceId')), createObject('value', reference('logAnalyticsWorkspace').outputs.resourceId.value)), createObject('value', ''))]",
3707-
"diagnosticSettings": "[if(parameters('enableMonitoring'), createObject('value', createArray(createObject('workspaceResourceId', if(variables('useExistingLogAnalytics'), parameters('existingLogAnalyticsWorkspaceId'), reference('logAnalyticsWorkspace').outputs.resourceId.value)))), createObject('value', null()))]"
3706+
"workspaceResourceId": "[if(parameters('enableMonitoring'), if(variables('useExistingLogAnalytics'), createObject('value', parameters('existingLogAnalyticsWorkspaceId')), createObject('value', reference('logAnalyticsWorkspace').outputs.resourceId.value)), createObject('value', ''))]"
37083707
},
37093708
"template": {
37103709
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
@@ -4921,8 +4920,8 @@
49214920
"metadata": {
49224921
"_generator": {
49234922
"name": "bicep",
4924-
"version": "0.40.2.10011",
4925-
"templateHash": "16969845928384020185"
4923+
"version": "0.41.2.15936",
4924+
"templateHash": "8667922205584012198"
49264925
}
49274926
},
49284927
"definitions": {
@@ -22453,8 +22452,8 @@
2245322452
"metadata": {
2245422453
"_generator": {
2245522454
"name": "bicep",
22456-
"version": "0.40.2.10011",
22457-
"templateHash": "8742987061721021759"
22455+
"version": "0.41.2.15936",
22456+
"templateHash": "8365054813170845685"
2245822457
}
2245922458
},
2246022459
"definitions": {
@@ -25440,8 +25439,8 @@
2544025439
}
2544125440
},
2544225441
"dependsOn": [
25443-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
2544425442
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
25443+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
2544525444
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
2544625445
"logAnalyticsWorkspace",
2544725446
"userAssignedIdentity",
@@ -25481,8 +25480,8 @@
2548125480
"metadata": {
2548225481
"_generator": {
2548325482
"name": "bicep",
25484-
"version": "0.40.2.10011",
25485-
"templateHash": "7507285802464480889"
25483+
"version": "0.41.2.15936",
25484+
"templateHash": "5789718034225488560"
2548625485
}
2548725486
},
2548825487
"parameters": {
@@ -34461,8 +34460,8 @@
3446134460
"metadata": {
3446234461
"_generator": {
3446334462
"name": "bicep",
34464-
"version": "0.40.2.10011",
34465-
"templateHash": "8640881069237947782"
34463+
"version": "0.41.2.15936",
34464+
"templateHash": "14525082674956141939"
3446634465
}
3446734466
},
3446834467
"definitions": {
@@ -35474,8 +35473,8 @@
3547435473
"metadata": {
3547535474
"_generator": {
3547635475
"name": "bicep",
35477-
"version": "0.40.2.10011",
35478-
"templateHash": "10706743168754451638"
35476+
"version": "0.41.2.15936",
35477+
"templateHash": "1185169597469996118"
3547935478
},
3548035479
"name": "Site App Settings",
3548135480
"description": "This module deploys a Site App Setting."
@@ -44644,8 +44643,8 @@
4464444643
"metadata": {
4464544644
"_generator": {
4464644645
"name": "bicep",
44647-
"version": "0.40.2.10011",
44648-
"templateHash": "15348022841521786626"
44646+
"version": "0.41.2.15936",
44647+
"templateHash": "8488390916703184584"
4464944648
}
4465044649
},
4465144650
"parameters": {

‎infra/main_custom.bicep‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,6 @@ module applicationInsights 'br/public:avm/res/insights/component:0.6.0' = if (en
372372
flowType: 'Bluefield'
373373
// WAF aligned configuration for Monitoring
374374
workspaceResourceId: enableMonitoring ? logAnalyticsWorkspaceResourceId : ''
375-
diagnosticSettings: enableMonitoring ? [{ workspaceResourceId: logAnalyticsWorkspaceResourceId }] : null
376375
}
377376
}
378377

0 commit comments

Comments
 (0)