Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Azure Firewall as an option - Bicep code development #499

Closed
wants to merge 131 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
0481461
Add Azure Firewall as an option
yahanda Oct 4, 2023
dbfe56e
Add network rule to whitelist GitHub
yahanda Oct 4, 2023
07da88f
update
yahanda Oct 4, 2023
04d4ec1
fix comflicts
yahanda Oct 10, 2023
1175f19
Rebuild arm template file
yahanda Oct 10, 2023
3478ce8
Merge remote-tracking branch 'upstream/main'
yahanda Oct 25, 2023
012a405
update portal-ui-baseline.json
yahanda Oct 25, 2023
6cdbb46
update portal-ui-baseline.json
yahanda Oct 25, 2023
db688fc
update portal-ui-baseline.json
yahanda Oct 25, 2023
7e62f44
update ui on placement of firewall
yahanda Oct 25, 2023
3794474
updates
danycontre Oct 30, 2023
d72d14e
updates
danycontre Oct 30, 2023
9be2abd
updates
danycontre Oct 30, 2023
ac436eb
updates
danycontre Oct 30, 2023
b9b9de2
Add local test ignores
SvenAelterman Oct 30, 2023
014b900
Update casing in file name
SvenAelterman Oct 31, 2023
17a183d
Disable deleting drive mapping. Update zip.
SvenAelterman Oct 31, 2023
cea5149
updates
danycontre Oct 31, 2023
9d5c5bd
Enclose SecurityPrincipalName in `"`
SvenAelterman Oct 31, 2023
736f9eb
updates
danycontre Oct 31, 2023
597c926
updates
danycontre Oct 31, 2023
4a56034
updates
danycontre Oct 31, 2023
9b9b824
updates
danycontre Nov 1, 2023
e3b2e8a
updates
danycontre Nov 1, 2023
eca1bbe
updates
danycontre Nov 2, 2023
568e3a4
updates
danycontre Nov 2, 2023
eb3bdcc
updates
danycontre Nov 2, 2023
fe74081
updates
danycontre Nov 3, 2023
438e81a
updates
danycontre Nov 6, 2023
8cbc2d3
updates
danycontre Nov 6, 2023
5bbbbca
updates
danycontre Nov 6, 2023
241ed3a
updates
danycontre Nov 6, 2023
db7ebfd
Merge pull request #527 from Azure/aad-fslogix
danycontre Nov 6, 2023
1ce86e4
Merge branch 'svaelter-520' of https://github.com/SvenAelterman/avdac…
moisesjgomez Nov 7, 2023
c9c3b2a
Merge branch 'SvenAelterman-svaelter-520' into groupname-space-update
moisesjgomez Nov 7, 2023
08fb3dc
Update deploy.bicep
moisesjgomez Nov 7, 2023
850d841
Merge branch 'groupname-space-update' of https://github.com/Azure/avd…
moisesjgomez Nov 7, 2023
4403b8e
Update .gitignore
moisesjgomez Nov 7, 2023
6c7e1fe
Update deploy-baseline.json
moisesjgomez Nov 7, 2023
30b3e82
updates
danycontre Nov 7, 2023
7b591b3
Merge pull request #529 from Azure/groupname-space-update
danycontre Nov 7, 2023
45dbd5a
ARM push
danycontre Nov 7, 2023
24d4657
update ui
yahanda Nov 8, 2023
79b36c3
update ui
yahanda Nov 8, 2023
08cce6a
update ui
yahanda Nov 8, 2023
797126b
update ui
yahanda Nov 8, 2023
a2f3ef5
update ui
yahanda Nov 8, 2023
6770e5e
update ui
yahanda Nov 8, 2023
8badf4a
update ui
yahanda Nov 8, 2023
101105a
update ui
yahanda Nov 8, 2023
a417250
update ui
yahanda Nov 8, 2023
1f03997
update ui
yahanda Nov 8, 2023
60ac9aa
update ui
yahanda Nov 8, 2023
e113422
update ui
yahanda Nov 8, 2023
ee6c82c
updates
danycontre Nov 8, 2023
c9c0b40
update ui
yahanda Nov 8, 2023
70dc11d
update ui
yahanda Nov 8, 2023
a74a321
update ui
yahanda Nov 8, 2023
a946b73
update ui
yahanda Nov 8, 2023
91fd8ff
update ui
yahanda Nov 8, 2023
7ea41d3
update ui
yahanda Nov 8, 2023
1ff0ccb
updates
danycontre Nov 8, 2023
5e9d500
updates
danycontre Nov 8, 2023
ad5787d
updates
danycontre Nov 8, 2023
ef3ad40
updates
danycontre Nov 8, 2023
66b8000
updates
danycontre Nov 8, 2023
4d79165
Merge pull request #532 from Azure/ids-updates
danycontre Nov 8, 2023
f8f3a38
update ui
yahanda Nov 9, 2023
4b212f2
update ui
yahanda Nov 9, 2023
3c59f67
Merge remote-tracking branch 'upstream/AzFW'
yahanda Nov 9, 2023
0cc7614
Update deploy.bicep
JCoreMS Nov 9, 2023
f1d2e16
Update deploy.bicep
JCoreMS Nov 9, 2023
e6a2bd5
Update readme.md
JCoreMS Nov 9, 2023
61db8db
Update readme.md
JCoreMS Nov 9, 2023
ac89980
updates
danycontre Nov 11, 2023
3b7e17b
Merge pull request #534 from Azure/issue-533
danycontre Nov 11, 2023
a88b0f2
updates
danycontre Nov 11, 2023
6cf9759
updates
danycontre Nov 13, 2023
46229d3
updates
danycontre Nov 13, 2023
78c5c6b
updates
danycontre Nov 13, 2023
1538411
update bicep
yahanda Nov 13, 2023
74f6f6f
updates
danycontre Nov 13, 2023
49f26c0
updates
danycontre Nov 13, 2023
8fe9711
Merge pull request #537 from Azure/issue-536
danycontre Nov 13, 2023
313f89f
updates
danycontre Nov 13, 2023
c37b973
update bicep
yahanda Nov 13, 2023
8ea98ea
update bicep
yahanda Nov 13, 2023
73d8267
update bicep
yahanda Nov 13, 2023
38e6c9d
update bicep
yahanda Nov 13, 2023
0d8571b
update bicep
yahanda Nov 13, 2023
0eb9e4b
update bicep
yahanda Nov 13, 2023
2d65f23
update bicep
yahanda Nov 13, 2023
2b27837
Merge branch 'Azure:main' into JCore-CARML-ActivityLogAlertsDisplayName
JCoreMS Nov 13, 2023
d949ff1
Merge pull request #538 from JCoreMS/JCore-CARML-ActivityLogAlertsDis…
danycontre Nov 13, 2023
90f5c77
Merge remote-tracking branch 'upstream/main'
yahanda Nov 14, 2023
e3ac133
update bicep
yahanda Nov 14, 2023
361141b
update bicep
yahanda Nov 17, 2023
6dc9643
update bicep
yahanda Nov 17, 2023
7d03dc8
update bicep
yahanda Dec 10, 2023
616381a
update bicep
yahanda Dec 10, 2023
e4110a9
update bicep
yahanda Dec 11, 2023
dcfc683
update bicep
yahanda Dec 11, 2023
92290a3
update bicep
yahanda Dec 11, 2023
040782f
update bicep
yahanda Dec 11, 2023
ed5e3fa
update bicep
yahanda Dec 11, 2023
2f8d196
update bicep
yahanda Dec 11, 2023
e3b2aee
update bicep
yahanda Dec 11, 2023
546cdc2
update bicep
yahanda Dec 11, 2023
d663fe8
update bicep
yahanda Dec 11, 2023
e7c6ff4
update bicep
yahanda Dec 11, 2023
885b996
update bicep
yahanda Dec 11, 2023
2a57221
update bicep
yahanda Dec 11, 2023
27c0c97
update bicep
yahanda Dec 11, 2023
e77472d
update bicep
yahanda Dec 11, 2023
00e6511
fix firewall location to be the same as existing vnet
yahanda Dec 21, 2023
00f7a63
fix firewall location to be the same as existing vnet
yahanda Dec 21, 2023
c8cafb7
fix a bug for different subs with Hub vNet
yahanda Jan 24, 2024
b9b3135
fix a bug for different subs with Hub vNet
yahanda Jan 24, 2024
dead5c3
fix a bug for different subs with Hub vNet
yahanda Jan 24, 2024
899f8fe
added defaultValue for firewallSubnetAddressPrefix
yahanda Feb 19, 2024
ef03989
added defaultValue for firewallSubnetAddressPrefix
yahanda Feb 19, 2024
2f786fc
added defaultValue for firewallSubnetAddressPrefix
yahanda Feb 19, 2024
3d86e36
added defaultValue for firewallSubnetAddressPrefix
yahanda Feb 19, 2024
a62c9a2
added defaultValue for firewallSubnetAddressPrefix
yahanda Feb 19, 2024
479edb0
added defaultValue for firewallSubnetAddressPrefix
yahanda Feb 19, 2024
19bb471
added defaultValue for firewallSubnetAddressPrefix
yahanda Feb 19, 2024
2b6722a
added defaultValue for firewallSubnetAddressPrefix
yahanda Feb 19, 2024
97aae51
added defaultValue for firewallSubnetAddressPrefix
yahanda Feb 19, 2024
1d99ced
added defaultValue for firewallSubnetAddressPrefix
yahanda Feb 19, 2024
920b337
added defaultValue for firewallSubnetAddressPrefix
yahanda Feb 19, 2024
6e1d8c4
fix a bug for firewallSubnetAddressPrefix
yahanda Feb 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,5 @@ Deploy-Baseline.ps1
workload/bicep/parameters/deploy-baseline-parameters-MSA.json

# local test files
localTest
localTest

Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ param name string
@description('Optional. Location for all resources.')
param location string = resourceGroup().location

@description('Optional. The display name of the scheduled query rule.')
param alertDisplayName string = ''

@description('Optional. The description of the scheduled query rule.')
param alertDescription string = ''

Expand Down Expand Up @@ -91,7 +94,7 @@ resource queryRule 'Microsoft.Insights/scheduledQueryRules@2021-02-01-preview' =
autoMitigate: (kind == 'LogAlert') ? autoMitigate : null
criteria: criterias
description: alertDescription
displayName: name
displayName: !empty(alertDisplayName) ? alertDisplayName : name
enabled: enabled
evaluationFrequency: (kind == 'LogAlert' && !empty(evaluationFrequency)) ? evaluationFrequency : null
muteActionsDuration: (kind == 'LogAlert' && !empty(suppressForMinutes)) ? suppressForMinutes : null
Expand Down
5 changes: 5 additions & 0 deletions carml/1.3.0/Microsoft.Insights/scheduledQueryRules/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ This module deploys a scheduled query rule.
| Parameter Name | Type | Default Value | Allowed Values | Description |
| :-- | :-- | :-- | :-- | :-- |
| `actions` | array | `[]` | | Actions to invoke when the alert fires. |
| `alertDisplayName` | string | `''` | | The display name of the scheduled query rule. |
| `alertDescription` | string | `''` | | The description of the scheduled query rule. |
| `autoMitigate` | bool | `True` | | The flag that indicates whether the alert should be automatically resolved or not. Relevant only for rules of the kind LogAlert. |
| `enabled` | bool | `True` | | The flag which indicates whether this scheduled query rule is enabled. |
Expand Down Expand Up @@ -213,6 +214,7 @@ module scheduledQueryRules './Microsoft.Insights/scheduledQueryRules/deploy.bice
]
// Non-required parameters
alertDescription: 'My sample Alert'
alertDisplayName: 'My alert friendly name'
autoMitigate: false
enableDefaultTelemetry: '<enableDefaultTelemetry>'
evaluationFrequency: 'PT5M'
Expand Down Expand Up @@ -290,6 +292,9 @@ module scheduledQueryRules './Microsoft.Insights/scheduledQueryRules/deploy.bice
"alertDescription": {
"value": "My sample Alert"
},
"alertDisplayName": {
"value": "My alert friendly name"
},
"autoMitigate": {
"value": false
},
Expand Down
13 changes: 7 additions & 6 deletions carml/1.3.0/Microsoft.Network/azureFirewalls/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,12 @@ param virtualHubId string = ''
param threatIntelMode string = 'Deny'

@description('Optional. Zone numbers e.g. 1,2,3.')
param zones array = [
'1'
'2'
'3'
]
param zones array = []
// param zones array = [
// '1'
// '2'
// '3'
// ]

@description('Optional. Diagnostic Storage Account resource identifier.')
param diagnosticStorageAccountId string = ''
Expand Down Expand Up @@ -222,7 +223,7 @@ module publicIPAddress '../../Microsoft.Network/publicIPAddresses/deploy.bicep'
]
location: location
diagnosticStorageAccountId: diagnosticStorageAccountId
diagnosticLogsRetentionInDays: diagnosticLogsRetentionInDays
//diagnosticLogsRetentionInDays: diagnosticLogsRetentionInDays
diagnosticWorkspaceId: diagnosticWorkspaceId
diagnosticEventHubAuthorizationRuleId: diagnosticEventHubAuthorizationRuleId
diagnosticEventHubName: diagnosticEventHubName
Expand Down
Loading
Loading