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
40 changes: 24 additions & 16 deletions eslzArm/eslzArm.json
Original file line number Diff line number Diff line change
Expand Up @@ -2230,31 +2230,40 @@
"austriaeast": "aue",
"belgiumcentral": "bec",
"brazilsouth": "brs",
"brazilsoutheast": "bse",
"brazilsoutheast": "bse",
"canadacentral": "cnc",
"canadaeast": "cne",
"centralindia": "inc",
"centralindia": "inc",
"centralus": "cus",
"centraluseuap": "ccy",
"chilecentral": "clc",
"denmarkeast": "dke",
"eastasia": "ea",
"eastus": "eus",
"eastus2": "eus2",
"eastus2euap": "ecy",
"eastus3": "eus3",
"francecentral": "frc",
"francesouth": "frs",
"germanynorth": "gn",
"germanywestcentral": "gwc",
"indiasouthcentral": "insc",
"indonesiacentral": "idc",
"israelcentral": "ilc",
"israelnorthwest": "iln",
"italynorth": "itn",
"japaneast": "jpe",
"japanwest": "jpw",
"jioindiacentral": "jic",
"jioindiawest": "jiw",
"koreacentral": "krc",
"koreasouth": "krs",
"malaysiasouth": "mys",
"malaysiawest": "myw",
"mexicocentral": "mxc",
"newzealandnorth": "nzn",
"northcentralus": "ncus",
"northeastus5": "ne5s",
"northeurope": "ne",
"norwayeast": "nwe",
"norwaywest": "nww",
Expand All @@ -2263,10 +2272,16 @@
"southafricanorth": "san",
"southafricawest": "saw",
"southcentralus": "scus",
"southindia": "ins",
"southcentralus2": "usc2",
"southeastasia": "sea",
"southeastus": "use",
"southeastus3": "use3",
"southeastus5": "use5",
"southindia": "ins",
"southwestus": "swus",
"spaincentral": "spc",
"swedencentral": "sdc",
"swedensouth": "sds",
"switzerlandnorth": "szn",
"switzerlandwest": "szw",
"taiwannorth": "twn",
Expand All @@ -2277,7 +2292,7 @@
"ukwest": "ukw",
"westcentralus": "wcus",
"westeurope": "we",
"westindia": "inw",
"westindia": "inw",
"westus": "wus",
"westus2": "wus2",
"westus3": "wus3",
Expand All @@ -2296,13 +2311,7 @@
"chinanorth3": "bjb3",
"chinaeast": "sha",
"chinaeast2": "sha2",
"chinaeast3": "sha3",
"germanycentral": "gec",
"germanynortheast": "gne",
"centraluseuap": "ccy",
"eastus2euap": "ecy",
"jioindiacentral": "jic",
"jioindiawest": "jiw"
"chinaeast3": "sha3"
},
"privateDnsZonesMerge": "[if(and(contains(variables('azBackupGeoCodes'), parameters('connectivityLocation')), contains(variables('privateDnsZones'), 'privatelink.regionGeoShortCode.backup.windowsazure.com')), union(createArray(replace(variables('privateDnsZones')[0], '.regionGeoShortCode.', concat('.', variables('azBackupGeoCodes')[toLower(parameters('connectivityLocation'))], '.'))), variables('privateDnsZones')), variables('privateDnsZones'))]",
"privateDnsZonesMergedWithBackupPlaceholderRemoved": "[filter(variables('privateDnsZonesMerge'), lambda('i', not(equals(lambdaVariables('i'), 'privatelink.regionGeoShortCode.backup.windowsazure.com'))))]",
Expand Down Expand Up @@ -2822,7 +2831,6 @@
}
}
},

/*
The following deployments will optionally configure the governance, security, and monitoring for the Azure platform and landing zones
*/
Expand Down Expand Up @@ -5497,7 +5505,7 @@
"outboundAddressPrefix": {
"value": "[parameters('subnetMaskForDnsResolverOutboundPrimary')]"
},
"vnetRg":{
"vnetRg": {
"value": "[parameters('resourceNames').connectivityRg]"
},
"dnsResolverName": {
Expand Down Expand Up @@ -5931,7 +5939,7 @@
"outboundAddressPrefix": {
"value": "[parameters('subnetMaskForDnsResolverOutboundPrimary')]"
},
"vnetRg":{
"vnetRg": {
"value": "[parameters('resourceNames').connectivityRg]"
},
"dnsResolverName": {
Expand Down Expand Up @@ -6109,7 +6117,7 @@
"outboundAddressPrefix": {
"value": "[parameters('subnetMaskForDnsResolverOutboundSecondary')]"
},
"vnetRg":{
"vnetRg": {
"value": "[parameters('resourceNames').connectivityRgSecondary]"
},
"dnsResolverName": {
Expand Down Expand Up @@ -6706,7 +6714,7 @@
"outboundAddressPrefix": {
"value": "[parameters('subnetMaskForDnsResolverOutboundSecondary')]"
},
"vnetRg":{
"vnetRg": {
"value": "[parameters('resourceNames').connectivityRgSecondary]"
},
"dnsResolverName": {
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"displayName": "Configure Azure PaaS services to use private DNS zones",
"description": "This policy initiative is a group of policies that ensures private endpoints to Azure PaaS services are integrated with Azure Private DNS zones",
"metadata": {
"version": "2.4.0",
"version": "2.5.0",
"category": "Network",
"source": "https://github.com/Azure/Enterprise-Scale/",
"alzCloudEnvironments": [
Expand Down Expand Up @@ -52,63 +52,84 @@
"type": "object",
"defaultValue": {
"changeme": "changeme",
"australiacentral" : "acl",
"australiacentral2" : "acl2",
"australiaeast" : "ae",
"australiasoutheast" : "ase",
"brazilsoutheast" : "bse",
"brazilsouth" : "brs",
"canadacentral" : "cnc",
"canadaeast" : "cne",
"centralindia" : "inc",
"centralus" : "cus",
"centraluseuap" : "ccy",
"chilecentral" : "clc",
"eastasia" : "ea",
"eastus" : "eus",
"eastus2" : "eus2",
"eastus2euap" : "ecy",
"francecentral" : "frc",
"francesouth" : "frs",
"germanynorth" : "gn",
"germanywestcentral" : "gwc",
"israelcentral" : "ilc",
"italynorth" : "itn",
"japaneast" : "jpe",
"japanwest" : "jpw",
"koreacentral" : "krc",
"koreasouth" : "krs",
"malaysiasouth" : "mys",
"malaysiawest" : "myw",
"mexicocentral" : "mxc",
"newzealandnorth" : "nzn",
"northcentralus" : "ncus",
"northeurope" : "ne",
"norwayeast" : "nwe",
"norwaywest" : "nww",
"polandcentral" : "plc",
"qatarcentral" : "qac",
"southafricanorth" : "san",
"southafricawest" : "saw",
"southcentralus" : "scus",
"southeastasia" : "sea",
"southindia" : "ins",
"spaincentral" : "spc",
"swedencentral" : "sdc",
"swedensouth" : "sds",
"switzerlandnorth" : "szn",
"switzerlandwest" : "szw",
"taiwannorth" : "twn",
"uaecentral" : "uac",
"uaenorth" : "uan",
"uksouth" : "uks",
"ukwest" : "ukw",
"westcentralus" : "wcus",
"westeurope" : "we",
"westindia" : "inw",
"westus" : "wus",
"westus2" : "wus2",
"westus3" : "wus3"
"australiacentral": "acl",
"australiacentral2": "acl2",
"australiaeast": "ae",
"australiasoutheast": "ase",
"austriaeast": "aue",
"belgiumcentral": "bec",
"brazilsouth": "brs",
"brazilsoutheast": "bse",
"canadacentral": "cnc",
"canadaeast": "cne",
"centralindia": "inc",
"centralus": "cus",
"centraluseuap": "ccy",
"chilecentral": "clc",
"denmarkeast": "dke",
"eastasia": "ea",
"eastus": "eus",
"eastus2": "eus2",
"eastus2euap": "ecy",
"eastus3": "eus3",
"francecentral": "frc",
"francesouth": "frs",
"germanynorth": "gn",
"germanywestcentral": "gwc",
"indiasouthcentral": "insc",
"indonesiacentral": "idc",
"israelcentral": "ilc",
"israelnorthwest": "iln",
"italynorth": "itn",
"japaneast": "jpe",
"japanwest": "jpw",
"jioindiacentral": "jic",
"jioindiawest": "jiw",
"koreacentral": "krc",
"koreasouth": "krs",
"malaysiasouth": "mys",
"malaysiawest": "myw",
"mexicocentral": "mxc",
"newzealandnorth": "nzn",
"northcentralus": "ncus",
"northeastus5": "ne5s",
"northeurope": "ne",
"norwayeast": "nwe",
"norwaywest": "nww",
"polandcentral": "plc",
"qatarcentral": "qac",
"southafricanorth": "san",
"southafricawest": "saw",
"southcentralus": "scus",
"southcentralus2": "usc2",
"southeastasia": "sea",
"southeastus": "use",
"southeastus3": "use3",
"southeastus5": "use5",
"southindia": "ins",
"southwestus": "swus",
"spaincentral": "spc",
"swedencentral": "sdc",
"swedensouth": "sds",
"switzerlandnorth": "szn",
"switzerlandwest": "szw",
"taiwannorth": "twn",
"taiwannorthwest": "tnw",
"uaecentral": "uac",
"uaenorth": "uan",
"uksouth": "uks",
"ukwest": "ukw",
"westcentralus": "wcus",
"westeurope": "we",
"westindia": "inw",
"westus": "wus",
"westus2": "wus2",
"westus3": "wus3",
"usgovvirginia": "ugv",
"usgovtexas": "ugt",
"usgovarizona": "uga",
"usdodeast": "ude",
"usdodcentral": "udc"
},
"metadata": {
"displayName": "Region Short Name Mapping",
Expand Down Expand Up @@ -1657,7 +1678,7 @@
"policyDefinitionReferenceId": "DINE-Private-DNS-Azure-Arc",
"policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/55c4db33-97b0-437b-8469-c4f4498f5df9",
"definitionVersion": "1.*.*",
"parameters":{
"parameters": {
"privateDnsZoneIDForGuestConfiguration": {
"value": "[[if(equals(parameters('dnsZoneSubscriptionId'), ''), parameters('azureArcGuestconfigurationPrivateDnsZoneId'), format('/subscriptions/{0}/resourceGroups/{1}/providers/{2}/{3}', parameters('dnsZoneSubscriptionId'), toLower(parameters('dnsZoneResourceGroupName')), parameters('dnsZoneResourceType'), replace(replace(parameters('dnsZoneNames').azureArcGuestconfigurationPrivateDnsZoneId, '{regionName}', parameters('dnsZoneRegion')), '{regionCode}', parameters('dnzZoneRegionShortNames')[parameters('dnsZoneRegion')])))]"
},
Expand All @@ -1676,7 +1697,7 @@
"policyDefinitionReferenceId": "DINE-Private-DNS-Azure-IoTCentral",
"policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/d627d7c6-ded5-481a-8f2e-7e16b1e6faf6",
"definitionVersion": "1.*.*",
"parameters":{
"parameters": {
"privateDnsZoneId": {
"value": "[[if(equals(parameters('dnsZoneSubscriptionId'), ''), parameters('azureIotCentralPrivateDnsZoneId'), format('/subscriptions/{0}/resourceGroups/{1}/providers/{2}/{3}', parameters('dnsZoneSubscriptionId'), toLower(parameters('dnsZoneResourceGroupName')), parameters('dnsZoneResourceType'), replace(replace(parameters('dnsZoneNames').azureIotCentralPrivateDnsZoneId, '{regionName}', parameters('dnsZoneRegion')), '{regionCode}', parameters('dnzZoneRegionShortNames')[parameters('dnsZoneRegion')])))]"
},
Expand All @@ -1689,7 +1710,7 @@
"policyDefinitionReferenceId": "DINE-Private-DNS-Azure-Storage-Table",
"policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/028bbd88-e9b5-461f-9424-a1b63a7bee1a",
"definitionVersion": "1.*.*",
"parameters":{
"parameters": {
"privateDnsZoneId": {
"value": "[[if(equals(parameters('dnsZoneSubscriptionId'), ''), parameters('azureStorageTablePrivateDnsZoneId'), format('/subscriptions/{0}/resourceGroups/{1}/providers/{2}/{3}', parameters('dnsZoneSubscriptionId'), toLower(parameters('dnsZoneResourceGroupName')), parameters('dnsZoneResourceType'), replace(replace(parameters('dnsZoneNames').azureStorageTablePrivateDnsZoneId, '{regionName}', parameters('dnsZoneRegion')), '{regionCode}', parameters('dnzZoneRegionShortNames')[parameters('dnsZoneRegion')])))]"
},
Expand All @@ -1702,7 +1723,7 @@
"policyDefinitionReferenceId": "DINE-Private-DNS-Azure-Storage-Table-Secondary",
"policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/c1d634a5-f73d-4cdd-889f-2cc7006eb47f",
"definitionVersion": "1.*.*",
"parameters":{
"parameters": {
"privateDnsZoneId": {
"value": "[[if(equals(parameters('dnsZoneSubscriptionId'), ''), parameters('azureStorageTableSecondaryPrivateDnsZoneId'), format('/subscriptions/{0}/resourceGroups/{1}/providers/{2}/{3}', parameters('dnsZoneSubscriptionId'), toLower(parameters('dnsZoneResourceGroupName')), parameters('dnsZoneResourceType'), replace(replace(parameters('dnsZoneNames').azureStorageTableSecondaryPrivateDnsZoneId, '{regionName}', parameters('dnsZoneRegion')), '{regionCode}', parameters('dnzZoneRegionShortNames')[parameters('dnsZoneRegion')])))]"
},
Expand All @@ -1713,9 +1734,9 @@
},
{
"policyDefinitionReferenceId": "DINE-Private-DNS-Azure-Site-Recovery-Backup",
"policyDefinitionId":"/providers/Microsoft.Authorization/policyDefinitions/af783da1-4ad1-42be-800d-d19c70038820",
"policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/af783da1-4ad1-42be-800d-d19c70038820",
"definitionVersion": "1.*.*-preview",
"parameters":{
"parameters": {
"privateDnsZone-Backup": {
"value": "[[if(equals(parameters('dnsZoneSubscriptionId'), ''), parameters('azureSiteRecoveryBackupPrivateDnsZoneId'), format('/subscriptions/{0}/resourceGroups/{1}/providers/{2}/{3}', parameters('dnsZoneSubscriptionId'), toLower(parameters('dnsZoneResourceGroupName')), parameters('dnsZoneResourceType'), replace(replace(parameters('dnsZoneNames').azureSiteRecoveryBackupPrivateDnsZoneId, '{regionName}', parameters('dnsZoneRegion')), '{regionCode}', parameters('dnzZoneRegionShortNames')[parameters('dnsZoneRegion')])))]"
},
Expand All @@ -1733,4 +1754,4 @@
],
"policyDefinitionGroups": null
}
}
}
Loading