Skip to content

Commit 7adc453

Browse files
Kanchan-MicrosoftKanchan-Microsoft
committed
fix: update event stream names and enforce security settings in Bicep templates
1 parent d6066e3 commit 7adc453

3 files changed

Lines changed: 56 additions & 6 deletions

File tree

‎infra/main.bicep‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
433433
{
434434
name: 'SecurityAuditEvents'
435435
streams: [
436-
'Microsoft-WindowsEvent'
436+
'Microsoft-Event'
437437
]
438438
eventLogName: 'Security'
439439
eventTypes: [
@@ -469,6 +469,16 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
469469
transformKql: 'source'
470470
outputStream: 'Microsoft-Perf'
471471
}
472+
{
473+
streams: [
474+
'Microsoft-Event'
475+
]
476+
destinations: [
477+
'la-${dataCollectionRulesResourceName}'
478+
]
479+
transformKql: 'source'
480+
outputStream: 'Microsoft-Event'
481+
}
472482
]
473483
}
474484
}
@@ -654,6 +664,7 @@ module avmStorageAccount 'br/public:avm/res/storage/storage-account:0.32.0' = {
654664
defaultAction: (enablePrivateNetworking) ? 'Deny' : 'Allow'
655665
ipRules: []
656666
}
667+
requireInfrastructureEncryption: true
657668
supportsHttpsTrafficOnly: true
658669
accessTier: 'Hot'
659670
tags: tags
@@ -1048,6 +1059,7 @@ module avmContainerApp_API 'br/public:avm/res/app/container-app:0.22.1' = {
10481059
ingressExternal: true
10491060
activeRevisionsMode: 'Single'
10501061
ingressTransport: 'auto'
1062+
ingressAllowInsecure: false
10511063
corsPolicy: {
10521064
allowedOrigins: [
10531065
'*'
@@ -1089,6 +1101,7 @@ module avmContainerApp_Web 'br/public:avm/res/app/container-app:0.22.1' = {
10891101
ingressTargetPort: 3000
10901102
activeRevisionsMode: 'Single'
10911103
ingressTransport: 'auto'
1104+
ingressAllowInsecure: false
10921105
scaleSettings: {
10931106
maxReplicas: enableScalability ? 3 : 2
10941107
minReplicas: enableScalability ? 2 : 1
@@ -1723,6 +1736,7 @@ module avmContainerApp_API_update 'br/public:avm/res/app/container-app:0.22.1' =
17231736
ingressExternal: true
17241737
activeRevisionsMode: 'Single'
17251738
ingressTransport: 'auto'
1739+
ingressAllowInsecure: false
17261740
corsPolicy: {
17271741
allowedOrigins: [
17281742
'*'

‎infra/main.json‎

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"_generator": {
77
"name": "bicep",
88
"version": "0.42.1.51946",
9-
"templateHash": "312988678863218513"
9+
"templateHash": "11967716103255684929"
1010
},
1111
"name": "Content Processing Solution Accelerator",
1212
"description": "Bicep template to deploy the Content Processing Solution Accelerator with AVM compliance."
@@ -14607,7 +14607,7 @@
1460714607
{
1460814608
"name": "SecurityAuditEvents",
1460914609
"streams": [
14610-
"Microsoft-WindowsEvent"
14610+
"Microsoft-Event"
1461114611
],
1461214612
"eventLogName": "Security",
1461314613
"eventTypes": [
@@ -14642,6 +14642,16 @@
1464214642
],
1464314643
"transformKql": "source",
1464414644
"outputStream": "Microsoft-Perf"
14645+
},
14646+
{
14647+
"streams": [
14648+
"Microsoft-Event"
14649+
],
14650+
"destinations": [
14651+
"[format('la-{0}', variables('dataCollectionRulesResourceName'))]"
14652+
],
14653+
"transformKql": "source",
14654+
"outputStream": "Microsoft-Event"
1464514655
}
1464614656
]
1464714657
}
@@ -28050,6 +28060,9 @@
2805028060
"ipRules": []
2805128061
}
2805228062
},
28063+
"requireInfrastructureEncryption": {
28064+
"value": true
28065+
},
2805328066
"supportsHttpsTrafficOnly": {
2805428067
"value": true
2805528068
},
@@ -42481,10 +42494,10 @@
4248142494
},
4248242495
"dependsOn": [
4248342496
"avmAiServices",
42484-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
4248542497
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
42486-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
4248742498
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
42499+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
42500+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
4248842501
"virtualNetwork"
4248942502
]
4249042503
},
@@ -45910,6 +45923,9 @@
4591045923
"ingressTransport": {
4591145924
"value": "auto"
4591245925
},
45926+
"ingressAllowInsecure": {
45927+
"value": false
45928+
},
4591345929
"corsPolicy": {
4591445930
"value": {
4591545931
"allowedOrigins": [
@@ -47515,6 +47531,9 @@
4751547531
"ingressTransport": {
4751647532
"value": "auto"
4751747533
},
47534+
"ingressAllowInsecure": {
47535+
"value": false
47536+
},
4751847537
"scaleSettings": {
4751947538
"value": {
4752047539
"maxReplicas": "[if(parameters('enableScalability'), 3, 2)]",
@@ -63175,6 +63194,9 @@
6317563194
"ingressTransport": {
6317663195
"value": "auto"
6317763196
},
63197+
"ingressAllowInsecure": {
63198+
"value": false
63199+
},
6317863200
"corsPolicy": {
6317963201
"value": {
6318063202
"allowedOrigins": [

‎infra/main_custom.bicep‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
436436
{
437437
name: 'SecurityAuditEvents'
438438
streams: [
439-
'Microsoft-WindowsEvent'
439+
'Microsoft-Event'
440440
]
441441
eventLogName: 'Security'
442442
eventTypes: [
@@ -472,6 +472,16 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
472472
transformKql: 'source'
473473
outputStream: 'Microsoft-Perf'
474474
}
475+
{
476+
streams: [
477+
'Microsoft-Event'
478+
]
479+
destinations: [
480+
'la-${dataCollectionRulesResourceName}'
481+
]
482+
transformKql: 'source'
483+
outputStream: 'Microsoft-Event'
484+
}
475485
]
476486
}
477487
}
@@ -657,6 +667,7 @@ module avmStorageAccount 'br/public:avm/res/storage/storage-account:0.32.0' = {
657667
defaultAction: (enablePrivateNetworking) ? 'Deny' : 'Allow'
658668
ipRules: []
659669
}
670+
requireInfrastructureEncryption: true
660671
supportsHttpsTrafficOnly: true
661672
accessTier: 'Hot'
662673
tags: tags
@@ -1061,6 +1072,7 @@ module avmContainerApp_API 'br/public:avm/res/app/container-app:0.22.1' = {
10611072
ingressExternal: true
10621073
activeRevisionsMode: 'Single'
10631074
ingressTransport: 'auto'
1075+
ingressAllowInsecure: false
10641076
corsPolicy: {
10651077
allowedOrigins: [
10661078
'*'
@@ -1107,6 +1119,7 @@ module avmContainerApp_Web 'br/public:avm/res/app/container-app:0.22.1' = {
11071119
ingressTargetPort: 3000
11081120
activeRevisionsMode: 'Single'
11091121
ingressTransport: 'auto'
1122+
ingressAllowInsecure: false
11101123
scaleSettings: {
11111124
maxReplicas: enableScalability ? 3 : 2
11121125
minReplicas: enableScalability ? 2 : 1
@@ -1756,6 +1769,7 @@ module avmContainerApp_API_update 'br/public:avm/res/app/container-app:0.22.1' =
17561769
ingressExternal: true
17571770
activeRevisionsMode: 'Single'
17581771
ingressTransport: 'auto'
1772+
ingressAllowInsecure: false
17591773
corsPolicy: {
17601774
allowedOrigins: [
17611775
'*'

0 commit comments

Comments
 (0)