Skip to content

Commit 9d7cb94

Browse files
VishalS-MicrosoftVishalS-Microsoft
committed
fix: address SFI security compliance issues
1 parent 4450802 commit 9d7cb94

3 files changed

Lines changed: 56 additions & 48 deletions

File tree

‎infra/main.bicep‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -550,19 +550,10 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
550550
{
551551
name: 'SecurityAuditEvents'
552552
streams: [
553-
'Microsoft-WindowsEvent'
554-
]
555-
eventLogName: 'Security'
556-
eventTypes: [
557-
{
558-
eventType: 'Audit Success'
559-
}
560-
{
561-
eventType: 'Audit Failure'
562-
}
553+
'Microsoft-Event'
563554
]
564555
xPathQueries: [
565-
'Security!*[System[(EventID=4624 or EventID=4625)]]'
556+
'Security!*[System[(band(Keywords,13510798882111488)) and (EventID != 4624)]]'
566557
]
567558
}
568559
]
@@ -586,6 +577,16 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
586577
transformKql: 'source'
587578
outputStream: 'Microsoft-Perf'
588579
}
580+
{
581+
streams: [
582+
'Microsoft-Event'
583+
]
584+
destinations: [
585+
'la--1264800308'
586+
]
587+
transformKql: 'source'
588+
outputStream: 'Microsoft-Event'
589+
}
589590
]
590591
}
591592
}
@@ -1596,6 +1597,7 @@ module avmStorageAccount 'br/public:avm/res/storage/storage-account:0.32.0' = {
15961597
tags: tags
15971598
accessTier: 'Hot'
15981599
supportsHttpsTrafficOnly: true
1600+
requireInfrastructureEncryption: true
15991601

16001602
roleAssignments: [
16011603
{

‎infra/main.json‎

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"metadata": {
66
"_generator": {
77
"name": "bicep",
8-
"version": "0.42.1.51946",
9-
"templateHash": "8490920419623942773"
8+
"version": "0.43.1.21952",
9+
"templateHash": "13738770643510560400"
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.\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"
@@ -4991,8 +4991,8 @@
49914991
"metadata": {
49924992
"_generator": {
49934993
"name": "bicep",
4994-
"version": "0.42.1.51946",
4995-
"templateHash": "4286500745908716598"
4994+
"version": "0.43.1.21952",
4995+
"templateHash": "10730664853596253902"
49964996
}
49974997
},
49984998
"definitions": {
@@ -10065,19 +10065,10 @@
1006510065
{
1006610066
"name": "SecurityAuditEvents",
1006710067
"streams": [
10068-
"Microsoft-WindowsEvent"
10069-
],
10070-
"eventLogName": "Security",
10071-
"eventTypes": [
10072-
{
10073-
"eventType": "Audit Success"
10074-
},
10075-
{
10076-
"eventType": "Audit Failure"
10077-
}
10068+
"Microsoft-Event"
1007810069
],
1007910070
"xPathQueries": [
10080-
"Security!*[System[(EventID=4624 or EventID=4625)]]"
10071+
"Security!*[System[(band(Keywords,13510798882111488)) and (EventID != 4624)]]"
1008110072
]
1008210073
}
1008310074
]
@@ -10100,6 +10091,16 @@
1010010091
],
1010110092
"transformKql": "source",
1010210093
"outputStream": "Microsoft-Perf"
10094+
},
10095+
{
10096+
"streams": [
10097+
"Microsoft-Event"
10098+
],
10099+
"destinations": [
10100+
"la--1264800308"
10101+
],
10102+
"transformKql": "source",
10103+
"outputStream": "Microsoft-Event"
1010310104
}
1010410105
]
1010510106
}
@@ -24308,8 +24309,8 @@
2430824309
"metadata": {
2430924310
"_generator": {
2431024311
"name": "bicep",
24311-
"version": "0.42.1.51946",
24312-
"templateHash": "6570260143045999127"
24312+
"version": "0.43.1.21952",
24313+
"templateHash": "11439700826637328776"
2431324314
}
2431424315
},
2431524316
"definitions": {
@@ -27973,8 +27974,8 @@
2797327974
},
2797427975
"dependsOn": [
2797527976
"aiFoundryAiServices",
27976-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
2797727977
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
27978+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
2797827979
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
2797927980
"virtualNetwork"
2798027981
]
@@ -28012,8 +28013,8 @@
2801228013
"metadata": {
2801328014
"_generator": {
2801428015
"name": "bicep",
28015-
"version": "0.42.1.51946",
28016-
"templateHash": "14513113443903512301"
28016+
"version": "0.43.1.21952",
28017+
"templateHash": "14162462247640231136"
2801728018
}
2801828019
},
2801928020
"parameters": {
@@ -42561,8 +42562,8 @@
4256142562
"metadata": {
4256242563
"_generator": {
4256342564
"name": "bicep",
42564-
"version": "0.42.1.51946",
42565-
"templateHash": "15053339789155096730"
42565+
"version": "0.43.1.21952",
42566+
"templateHash": "15245457964306936933"
4256642567
}
4256742568
},
4256842569
"definitions": {
@@ -43593,8 +43594,8 @@
4359343594
"metadata": {
4359443595
"_generator": {
4359543596
"name": "bicep",
43596-
"version": "0.42.1.51946",
43597-
"templateHash": "16493651611122310009"
43597+
"version": "0.43.1.21952",
43598+
"templateHash": "7202268095676731580"
4359843599
},
4359943600
"name": "Site App Settings",
4360043601
"description": "This module deploys a Site App Setting."
@@ -44510,6 +44511,9 @@
4451044511
"supportsHttpsTrafficOnly": {
4451144512
"value": true
4451244513
},
44514+
"requireInfrastructureEncryption": {
44515+
"value": true
44516+
},
4451344517
"roleAssignments": {
4451444518
"value": [
4451544519
{
@@ -54840,8 +54844,8 @@
5484054844
"metadata": {
5484154845
"_generator": {
5484254846
"name": "bicep",
54843-
"version": "0.42.1.51946",
54844-
"templateHash": "4859654437121510695"
54847+
"version": "0.43.1.21952",
54848+
"templateHash": "11204886349087283921"
5484554849
}
5484654850
},
5484754851
"parameters": {

‎infra/main_custom.bicep‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -549,19 +549,10 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
549549
{
550550
name: 'SecurityAuditEvents'
551551
streams: [
552-
'Microsoft-WindowsEvent'
553-
]
554-
eventLogName: 'Security'
555-
eventTypes: [
556-
{
557-
eventType: 'Audit Success'
558-
}
559-
{
560-
eventType: 'Audit Failure'
561-
}
552+
'Microsoft-Event'
562553
]
563554
xPathQueries: [
564-
'Security!*[System[(EventID=4624 or EventID=4625)]]'
555+
'Security!*[System[(band(Keywords,13510798882111488)) and (EventID != 4624)]]'
565556
]
566557
}
567558
]
@@ -585,6 +576,16 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
585576
transformKql: 'source'
586577
outputStream: 'Microsoft-Perf'
587578
}
579+
{
580+
streams: [
581+
'Microsoft-Event'
582+
]
583+
destinations: [
584+
'la--1264800308'
585+
]
586+
transformKql: 'source'
587+
outputStream: 'Microsoft-Event'
588+
}
588589
]
589590
}
590591
}
@@ -1648,6 +1649,7 @@ module avmStorageAccount 'br/public:avm/res/storage/storage-account:0.32.0' = {
16481649
tags: tags
16491650
accessTier: 'Hot'
16501651
supportsHttpsTrafficOnly: true
1652+
requireInfrastructureEncryption: true
16511653

16521654
roleAssignments: [
16531655
{

0 commit comments

Comments
 (0)