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 Option to select Firewall SKU #793

Merged
merged 19 commits into from
Sep 8, 2021
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
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
18 changes: 18 additions & 0 deletions docs/wiki/Whats-new.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,24 @@ This article will be updated as and when changes are made to the above and anyth

Here's what's changed in Enterprise Scale:

### September 2021

#### Docs

- *No updates, yet.*

#### Tooling

- Added Option to select Azure Firewall SKU (https://github.com/Azure/Enterprise-Scale/pull/793)

### Policy

- *No updates, yet.*

### Other

- *No updates, yet.*

### August 2021

#### Docs
Expand Down
27 changes: 27 additions & 0 deletions eslzArm/eslz-portal.json
Original file line number Diff line number Diff line change
Expand Up @@ -1463,6 +1463,32 @@
]
}
},
{
"name": "esAzFwSku",
"type": "Microsoft.Common.DropDown",
"label": "Select Azure Firewall Sku",
daltondhcp marked this conversation as resolved.
Show resolved Hide resolved
"defaultValue": "Standard",
"multiselect": false,
"selectAll": false,
"filter": false,
"multiLine": true,
"visible": "[equals(steps('esConnectivityGoalState').esAzFw, 'Yes')]",
"toolTip": "Select Azure Firewall Sku",
"constraints": {
"allowedValues": [
{
"label": "Standard",
"description": "Standard Azure Firewall",
"value": "Standard"
},
{
"label": "Premium",
"description": "Premium Azure Firewall adds support for TLS inspection, IDPS, URL filtering and web categories.",
"value": "Premium"
}
]
}
},
{
"name": "esFwAz",
"type": "Microsoft.Common.DropDown",
Expand Down Expand Up @@ -2311,6 +2337,7 @@
"enableVmMonitoring": "[steps('lzGoalState').esVmMonitoring]",
"enableVmssMonitoring": "[steps('lzGoalState').esVmssMonitoring]",
"vpnOrErZones": "[steps('esConnectivityGoalState').esGwRegionalOrAz]",
"firewallSku": "[steps('esConnectivityGoalState').esAzFwSku]",
"firewallZones": "[steps('esConnectivityGoalState').esFwAz]",
"paToken": "[steps('lzDevOps').esPaToken]",
"principalId": "[steps('lzDevOps').spnSection.esServicePrincipal.objectId]",
Expand Down
20 changes: 20 additions & 0 deletions eslzArm/eslzArm.json
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,14 @@
"type": "string",
"defaultValue": ""
},
"firewallSku": {
"type": "string",
"allowedValues": [
"Standard",
"Premium"
],
"defaultValue": "Standard"
},
"firewallZones": {
"type": "array",
"defaultValue": []
Expand Down Expand Up @@ -1442,6 +1450,9 @@
"subnetMaskForGw": {
"value": "[parameters('subnetMaskForGw')]"
},
"firewallSku": {
"value": "[parameters('firewallSku')]"
},
"firewallZones": {
"value": "[parameters('firewallZones')]"
},
Expand Down Expand Up @@ -1575,6 +1586,9 @@
"enableAzFw": {
"value": "[parameters('enableAzFw')]"
},
"firewallSku": {
"value": "[parameters('firewallSku')]"
},
"addressPrefix": {
"value": "[parameters('addressPrefix')]"
},
Expand Down Expand Up @@ -3141,6 +3155,9 @@
"subnetMaskForGw": {
"value": "[parameters('subnetMaskForGw')]"
},
"firewallSku": {
"value": "[parameters('firewallSku')]"
},
"firewallZones": {
"value": "[parameters('firewallZones')]"
},
Expand Down Expand Up @@ -3278,6 +3295,9 @@
"enableAzFw": {
"value": "[parameters('enableAzFw')]"
},
"firewallSku": {
"value": "[parameters('firewallSku')]"
},
"addressPrefix": {
"value": "[parameters('addressPrefix')]"
},
Expand Down
12 changes: 12 additions & 0 deletions eslzArm/subscriptionTemplates/hubspoke-connectivity.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,14 @@
"description": "Provide subnet for VPN/ER."
}
},
"firewallSku": {
"type": "string",
"allowedValues": [
"Standard",
"Premium"
],
"defaultValue": "Standard"
},
"firewallZones": {
"type": "array",
"defaultValue": []
Expand Down Expand Up @@ -410,6 +418,10 @@
"[concat('Microsoft.Network/virtualNetworks/', variables('hubName'))]"
],
"properties": {
"sku": {
"name": "AZFW_VNet",
"tier": "[parameters('firewallSku')]"
},
"ipConfigurations": [
{
"name": "[variables('azFwIpName')]",
Expand Down
10 changes: 9 additions & 1 deletion eslzArm/subscriptionTemplates/vwan-connectivity.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@
],
"defaultValue": "No"
},
"firewallSku": {
"type": "string",
"allowedValues": [
"Standard",
"Premium"
],
"defaultValue": "Standard"
},
"enableVpnGw": {
"type": "string",
"allowedValues": [
Expand Down Expand Up @@ -198,7 +206,7 @@
"properties": {
"sku": {
"Name": "AZFW_Hub",
"Tier": "Standard"
"Tier": "[parameters('firewallSku')]"
},
"hubIPAddresses": {
"publicIPs": {
Expand Down