Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var builtInRoleNames = {
'Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9980e02c-c2be-4d73-94e8-173b1dc7cf3c')
}

resource applicationGateway 'Microsoft.Network/applicationGateways@2021-02-01' existing = {
resource applicationGateway 'Microsoft.Network/applicationGateways@2021-05-01' existing = {
name: last(split(resourceId, '/'))
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ var builtInRoleNames = {
'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
}

resource azureFirewall 'Microsoft.Network/azureFirewalls@2021-02-01' existing = {
resource azureFirewall 'Microsoft.Network/azureFirewalls@2021-05-01' existing = {
name: last(split(resourceId, '/'))
}

Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Network/firewallPolicies/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
params: {}
}

resource firewallPolicy 'Microsoft.Network/firewallPolicies@2021-03-01' = {
resource firewallPolicy 'Microsoft.Network/firewallPolicies@2021-05-01' = {
name: name
location: location
tags: tags
Expand Down
14 changes: 7 additions & 7 deletions arm/Microsoft.Network/firewallPolicies/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ This module deploys Network Firewall Policies.

| Resource Type | API Version |
| :-- | :-- |
| `Microsoft.Network/firewallPolicies` | 2021-03-01 |
| `Microsoft.Network/firewallPolicies/ruleCollectionGroups` | 2021-03-01 |
| `Microsoft.Network/firewallPolicies` | 2021-05-01 |
| `Microsoft.Network/firewallPolicies/ruleCollectionGroups` | 2021-05-01 |
| `Microsoft.Network/firewallPolicies/ruleGroups` | 2020-04-01 |

## Parameters
Expand All @@ -19,9 +19,9 @@ This module deploys Network Firewall Policies.
| `certificateName` | string | | | Optional. Name of the CA certificate. |
| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered |
| `defaultWorkspaceId` | string | | | Optional. Default Log Analytics Resource ID for Firewall Policy Insights. |
| `enableProxy` | bool | | | Optional. Enable DNS Proxy on Firewalls attached to the Firewall Policy. |
| `enableProxy` | bool | `False` | | Optional. Enable DNS Proxy on Firewalls attached to the Firewall Policy. |
| `fqdns` | array | `[]` | | Optional. List of FQDNs for the ThreatIntel Allowlist. |
| `insightsIsEnabled` | bool | | | Optional. A flag to indicate if the insights are enabled on the policy. |
| `insightsIsEnabled` | bool | `False` | | Optional. A flag to indicate if the insights are enabled on the policy. |
| `ipAddresses` | array | `[]` | | Optional. List of IP addresses for the ThreatIntel Allowlist. |
| `keyVaultSecretId` | string | | | Optional. Secret Id of (base-64 encoded unencrypted pfx) Secret or Certificate object stored in KeyVault. |
| `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. |
Expand All @@ -33,7 +33,7 @@ This module deploys Network Firewall Policies.
| `ruleGroups` | _[ruleGroups](ruleGroups/readme.md)_ array | `[]` | | Optional. Rule groups. |
| `servers` | array | `[]` | | Optional. List of Custom DNS Servers. |
| `signatureOverrides` | array | `[]` | | Optional. List of specific signatures states. |
| `systemAssignedIdentity` | bool | | | Optional. Enables system assigned managed identity on the resource. |
| `systemAssignedIdentity` | bool | `False` | | Optional. Enables system assigned managed identity on the resource. |
| `tags` | object | `{object}` | | Optional. Tags of the Firewall policy resource. |
| `threatIntelMode` | string | `Off` | `[Alert, Deny, Off]` | Optional. The operation mode for Threat Intel. |
| `tier` | string | `Standard` | `[Premium, Standard]` | Optional. Tier of Firewall Policy. |
Expand Down Expand Up @@ -81,5 +81,5 @@ You can specify multiple user assigned identities to a resource by providing add
## Template references

- ['firewallPolicies/ruleGroups' Parent Documentation](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/firewallPolicies)
- [Firewallpolicies](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/firewallPolicies)
- [Firewallpolicies/Rulecollectiongroups](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/firewallPolicies/ruleCollectionGroups)
- [Firewallpolicies](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/firewallPolicies)
- [Firewallpolicies/Rulecollectiongroups](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/firewallPolicies/ruleCollectionGroups)
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
params: {}
}

resource firewallPolicy 'Microsoft.Network/firewallPolicies@2021-03-01' existing = {
resource firewallPolicy 'Microsoft.Network/firewallPolicies@2021-05-01' existing = {
name: firewallPolicyName
}

resource ruleCollectionGroup 'Microsoft.Network/firewallPolicies/ruleCollectionGroups@2021-03-01' = {
resource ruleCollectionGroup 'Microsoft.Network/firewallPolicies/ruleCollectionGroups@2021-05-01' = {
name: name
parent: firewallPolicy
properties: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This module deploys Network Firewall Policies Rule Collection Groups.

| Resource Type | API Version |
| :-- | :-- |
| `Microsoft.Network/firewallPolicies/ruleCollectionGroups` | 2021-03-01 |
| `Microsoft.Network/firewallPolicies/ruleCollectionGroups` | 2021-05-01 |

## Parameters

Expand Down Expand Up @@ -43,4 +43,4 @@ For remaining properties, see [FirewallPolicyRuleCollection objects](https://doc

## Template references

- [Firewallpolicies/Rulecollectiongroups](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/firewallPolicies/ruleCollectionGroups)
- [Firewallpolicies/Rulecollectiongroups](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/firewallPolicies/ruleCollectionGroups)
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
params: {}
}

resource firewallPolicy 'Microsoft.Network/firewallPolicies@2021-03-01' existing = {
resource firewallPolicy 'Microsoft.Network/firewallPolicies@2021-05-01' existing = {
name: firewallPolicyName
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
params: {}
}

resource networkWatcher 'Microsoft.Network/networkWatchers@2021-03-01' existing = {
resource networkWatcher 'Microsoft.Network/networkWatchers@2021-05-01' existing = {
name: networkWatcherName
}

resource connectionMonitor 'Microsoft.Network/networkWatchers/connectionMonitors@2021-03-01' = {
resource connectionMonitor 'Microsoft.Network/networkWatchers/connectionMonitors@2021-05-01' = {
name: name
parent: networkWatcher
tags: tags
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This template deploys Connection Monitors.

| Resource Type | API Version |
| :-- | :-- |
| `Microsoft.Network/networkWatchers/connectionMonitors` | 2021-03-01 |
| `Microsoft.Network/networkWatchers/connectionMonitors` | 2021-05-01 |

## Parameters

Expand Down Expand Up @@ -49,4 +49,4 @@ Tag names and tag values can be provided as needed. A tag can be left without a

## Template references

- [Networkwatchers/Connectionmonitors](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/networkWatchers/connectionMonitors)
- [Networkwatchers/Connectionmonitors](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/networkWatchers/connectionMonitors)
4 changes: 2 additions & 2 deletions arm/Microsoft.Network/networkWatchers/flowLogs/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
params: {}
}

resource networkWatcher 'Microsoft.Network/networkWatchers@2021-03-01' existing = {
resource networkWatcher 'Microsoft.Network/networkWatchers@2021-05-01' existing = {
name: networkWatcherName
}

resource flowLog 'Microsoft.Network/networkWatchers/flowLogs@2021-03-01' = {
resource flowLog 'Microsoft.Network/networkWatchers/flowLogs@2021-05-01' = {
name: name
parent: networkWatcher
tags: tags
Expand Down
4 changes: 2 additions & 2 deletions arm/Microsoft.Network/networkWatchers/flowLogs/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This module controls the Network Security Group Flow Logs and analytics settings

| Resource Type | API Version |
| :-- | :-- |
| `Microsoft.Network/networkWatchers/flowLogs` | 2021-03-01 |
| `Microsoft.Network/networkWatchers/flowLogs` | 2021-05-01 |

## Parameters

Expand Down Expand Up @@ -53,4 +53,4 @@ Tag names and tag values can be provided as needed. A tag can be left without a

## Template references

- [Networkwatchers/Flowlogs](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/networkWatchers/flowLogs)
- [Networkwatchers/Flowlogs](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/networkWatchers/flowLogs)
8 changes: 4 additions & 4 deletions arm/Microsoft.Network/networkWatchers/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ This template deploys a network watcher.
| `Microsoft.Authorization/locks` | 2017-04-01 |
| `Microsoft.Authorization/roleAssignments` | 2021-04-01-preview |
| `Microsoft.Network/networkWatchers` | 2021-05-01 |
| `Microsoft.Network/networkWatchers/connectionMonitors` | 2021-03-01 |
| `Microsoft.Network/networkWatchers/flowLogs` | 2021-03-01 |
| `Microsoft.Network/networkWatchers/connectionMonitors` | 2021-05-01 |
| `Microsoft.Network/networkWatchers/flowLogs` | 2021-05-01 |

## Parameters

Expand Down Expand Up @@ -77,6 +77,6 @@ Tag names and tag values can be provided as needed. A tag can be left without a

- [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks)
- [Networkwatchers](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/networkWatchers)
- [Networkwatchers/Connectionmonitors](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/networkWatchers/connectionMonitors)
- [Networkwatchers/Flowlogs](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/networkWatchers/flowLogs)
- [Networkwatchers/Connectionmonitors](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/networkWatchers/connectionMonitors)
- [Networkwatchers/Flowlogs](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/networkWatchers/flowLogs)
- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments)
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var builtInRoleNames = {
'Virtual Machine User Login': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'fb879df8-f326-4884-b1cf-06f3ad86be52')
}

resource virtualNetwork 'Microsoft.Network/virtualNetworks@2021-03-01' existing = {
resource virtualNetwork 'Microsoft.Network/virtualNetworks@2021-05-01' existing = {
name: last(split(resourceId, '/'))
}

Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Network/virtualNetworks/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
params: {}
}

resource virtualNetwork 'Microsoft.Network/virtualNetworks@2021-03-01' = {
resource virtualNetwork 'Microsoft.Network/virtualNetworks@2021-05-01' = {
name: name
location: location
tags: tags
Expand Down
12 changes: 6 additions & 6 deletions arm/Microsoft.Network/virtualNetworks/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ This template deploys a virtual network (vNet).
| `Microsoft.Authorization/locks` | 2017-04-01 |
| `Microsoft.Authorization/roleAssignments` | 2021-04-01-preview |
| `Microsoft.Insights/diagnosticSettings` | 2021-05-01-preview |
| `Microsoft.Network/virtualNetworks` | 2021-03-01 |
| `Microsoft.Network/virtualNetworks/subnets` | 2021-03-01 |
| `Microsoft.Network/virtualNetworks/virtualNetworkPeerings` | 2021-02-01 |
| `Microsoft.Network/virtualNetworks` | 2021-05-01 |
| `Microsoft.Network/virtualNetworks/subnets` | 2021-05-01 |
| `Microsoft.Network/virtualNetworks/virtualNetworkPeerings` | 2021-05-01 |

## Parameters

Expand Down Expand Up @@ -122,6 +122,6 @@ The network security group and route table resources must reside in the same res
- [Diagnosticsettings](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings)
- [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks)
- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments)
- [Virtualnetworks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/virtualNetworks)
- [Virtualnetworks/Subnets](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/virtualNetworks/subnets)
- [Virtualnetworks/Virtualnetworkpeerings](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-02-01/virtualNetworks/virtualNetworkPeerings)
- [Virtualnetworks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/virtualNetworks)
- [Virtualnetworks/Subnets](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/virtualNetworks/subnets)
- [Virtualnetworks/Virtualnetworkpeerings](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/virtualNetworks/virtualNetworkPeerings)
10 changes: 5 additions & 5 deletions arm/Microsoft.Network/virtualNetworks/subnets/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -66,24 +66,24 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
params: {}
}

resource virtualNetwork 'Microsoft.Network/virtualNetworks@2021-03-01' existing = {
resource virtualNetwork 'Microsoft.Network/virtualNetworks@2021-05-01' existing = {
name: virtualNetworkName
}

resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-03-01' existing = if (!empty(networkSecurityGroupName)) {
resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-05-01' existing = if (!empty(networkSecurityGroupName)) {
name: networkSecurityGroupName
scope: resourceGroup(networkSecurityGroupNameResourceGroupName)
}

resource routeTable 'Microsoft.Network/routeTables@2021-03-01' existing = if (!empty(routeTableName)) {
resource routeTable 'Microsoft.Network/routeTables@2021-05-01' existing = if (!empty(routeTableName)) {
name: routeTableName
}

resource natGateway 'Microsoft.Network/natGateways@2021-03-01' existing = if (!empty(natGatewayName)) {
resource natGateway 'Microsoft.Network/natGateways@2021-05-01' existing = if (!empty(natGatewayName)) {
name: natGatewayName
}

resource subnet 'Microsoft.Network/virtualNetworks/subnets@2021-03-01' = {
resource subnet 'Microsoft.Network/virtualNetworks/subnets@2021-05-01' = {
name: name
parent: virtualNetwork
properties: {
Expand Down
4 changes: 2 additions & 2 deletions arm/Microsoft.Network/virtualNetworks/subnets/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This module deploys a virtual network subnet.

| Resource Type | API Version |
| :-- | :-- |
| `Microsoft.Network/virtualNetworks/subnets` | 2021-03-01 |
| `Microsoft.Network/virtualNetworks/subnets` | 2021-05-01 |

## Parameters

Expand Down Expand Up @@ -70,4 +70,4 @@ The `privateEndpointNetworkPolicies` property must be set to disabled for subnet

## Template references

- [Virtualnetworks/Subnets](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/virtualNetworks/subnets)
- [Virtualnetworks/Subnets](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/virtualNetworks/subnets)
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
params: {}
}

resource virtualNetwork 'Microsoft.Network/virtualNetworks@2021-03-01' existing = {
resource virtualNetwork 'Microsoft.Network/virtualNetworks@2021-05-01' existing = {
name: localVnetName
}

resource virtualNetworkPeering 'Microsoft.Network/virtualNetworks/virtualNetworkPeerings@2021-02-01' = {
resource virtualNetworkPeering 'Microsoft.Network/virtualNetworks/virtualNetworkPeerings@2021-05-01' = {
name: name
parent: virtualNetwork
properties: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This template deploys Virtual Network Peering.

| Resource Type | API Version |
| :-- | :-- |
| `Microsoft.Network/virtualNetworks/virtualNetworkPeerings` | 2021-02-01 |
| `Microsoft.Network/virtualNetworks/virtualNetworkPeerings` | 2021-05-01 |

### Resource dependency

Expand All @@ -20,14 +20,14 @@ The following resources are required to be able to deploy this resource.
| Parameter Name | Type | Default Value | Possible Values | Description |
| :-- | :-- | :-- | :-- | :-- |
| `allowForwardedTraffic` | bool | `True` | | Optional. Whether the forwarded traffic from the VMs in the local virtual network will be allowed/disallowed in remote virtual network. Default is true |
| `allowGatewayTransit` | bool | | | Optional. If gateway links can be used in remote virtual networking to link to this virtual network. Default is false |
| `allowGatewayTransit` | bool | `False` | | Optional. If gateway links can be used in remote virtual networking to link to this virtual network. Default is false |
| `allowVirtualNetworkAccess` | bool | `True` | | Optional. Whether the VMs in the local virtual network space would be able to access the VMs in remote virtual network space. Default is true |
| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered |
| `doNotVerifyRemoteGateways` | bool | `True` | | Optional. If we need to verify the provisioning state of the remote gateway. Default is true |
| `localVnetName` | string | | | Required. The Name of the Virtual Network to add the peering to. |
| `name` | string | `[format('{0}-{1}', parameters('localVnetName'), last(split(parameters('remoteVirtualNetworkId'), '/')))]` | | Optional. The Name of Vnet Peering resource. If not provided, default value will be localVnetName-remoteVnetName |
| `remoteVirtualNetworkId` | string | | | Required. The Resource ID of the VNet that is this Local VNet is being peered to. Should be in the format of a Resource ID |
| `useRemoteGateways` | bool | | | Optional. If remote gateways can be used on this virtual network. If the flag is set to true, and allowGatewayTransit on remote peering is also true, virtual network will use gateways of remote virtual network for transit. Only one peering can have this flag set to true. This flag cannot be set if virtual network already has a gateway. Default is false |
| `useRemoteGateways` | bool | `False` | | Optional. If remote gateways can be used on this virtual network. If the flag is set to true, and allowGatewayTransit on remote peering is also true, virtual network will use gateways of remote virtual network for transit. Only one peering can have this flag set to true. This flag cannot be set if virtual network already has a gateway. Default is false |

## Outputs

Expand All @@ -39,4 +39,4 @@ The following resources are required to be able to deploy this resource.

## Template references

- [Virtualnetworks/Virtualnetworkpeerings](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-02-01/virtualNetworks/virtualNetworkPeerings)
- [Virtualnetworks/Virtualnetworkpeerings](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/virtualNetworks/virtualNetworkPeerings)