Skip to content

Commit

Permalink
Revise subnet configuration for Generic Subscription archetype (Azure…
Browse files Browse the repository at this point in the history 
…#252)
  • Loading branch information
@SenthuranSivananthan
SenthuranSivananthan authored Apr 20, 2022
1 parent 3d9c60d commit 7083377
Show file tree
Hide file tree
Showing 19 changed files with 461 additions and 758 deletions.
48 changes: 23 additions & 25 deletions ...ones/DevTest/4f9f8765-911a-4a6d-af60-4bc0473268c0_generic-subscription_canadacentral.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@
"addressPrefixes": [
"10.2.0.0/16"
],
"subnets": {
"oz": {
"subnets": [
{
"comments": "App Management Zone (OZ)",
"name": "oz",
"name": "appManagement",
"addressPrefix": "10.2.1.0/25",
"nsg": {
"enabled": true
Expand All @@ -117,9 +117,9 @@
"enabled": true
}
},
"paz": {
{
"comments": "Presentation Zone (PAZ)",
"name": "paz",
"name": "web",
"addressPrefix": "10.2.2.0/25",
"nsg": {
"enabled": true
Expand All @@ -128,9 +128,9 @@
"enabled": true
}
},
"rz": {
{
"comments": "Application Zone (RZ)",
"name": "rz",
"name": "app",
"addressPrefix": "10.2.3.0/25",
"nsg": {
"enabled": true
Expand All @@ -139,9 +139,9 @@
"enabled": true
}
},
"hrz": {
{
"comments": "Data Zone (HRZ)",
"name": "hrz",
"name": "data",
"addressPrefix": "10.2.4.0/25",
"nsg": {
"enabled": true
Expand All @@ -150,23 +150,21 @@
"enabled": true
}
},
"optional": [
{
"comments": "App Service",
"name": "appservice",
"addressPrefix": "10.2.5.0/25",
"nsg": {
"enabled": false
},
"udr": {
"enabled": false
},
"delegations": {
"serviceName": "Microsoft.Web/serverFarms"
}
{
"comments": "App Service",
"name": "appservice",
"addressPrefix": "10.2.5.0/25",
"nsg": {
"enabled": false
},
"udr": {
"enabled": false
},
"delegations": {
"serviceName": "Microsoft.Web/serverFarms"
}
]
}
}
]
}
}
}
Expand Down
81 changes: 50 additions & 31 deletions ...ones/DevTest/248e2ceb-23b4-41e7-bd3f-3d28594ca842_generic-subscription_canadacentral.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,34 @@
"serviceHealthAlerts": {
"value": {
"resourceGroupName": "pubsec-service-health",
"incidentTypes": [ "Incident", "Security" ],
"regions": [ "Global", "Canada East", "Canada Central" ],
"incidentTypes": [
"Incident",
"Security"
],
"regions": [
"Global",
"Canada East",
"Canada Central"
],
"receivers": {
"app": [ "skeeler@m365incanada.onmicrosoft.com" ],
"email": [ "skeeler@m365incanada.onmicrosoft.com" ],
"sms": [ { "countryCode": "1", "phoneNumber": "5555555555" } ],
"voice": [ { "countryCode": "1", "phoneNumber": "5555555555" } ]
"app": [
"skeeler@m365incanada.onmicrosoft.com"
],
"email": [
"skeeler@m365incanada.onmicrosoft.com"
],
"sms": [
{
"countryCode": "1",
"phoneNumber": "5555555555"
}
],
"voice": [
{
"countryCode": "1",
"phoneNumber": "5555555555"
}
]
},
"actionGroupName": "Sub2 ALZ action group",
"actionGroupShortName": "sub2-alert",
Expand Down Expand Up @@ -68,18 +89,18 @@
"automation": "rgAutomation",
"networking": "rgVnet",
"networkWatcher": "NetworkWatcherRG",
"backupRecoveryVault":"rgRecoveryVault"
"backupRecoveryVault": "rgRecoveryVault"
}
},
"automation": {
"value": {
"name": "automation"
}
},
"backupRecoveryVault":{
"backupRecoveryVault": {
"value": {
"enabled":true,
"name":"bkupvault"
"enabled": true,
"name": "bkupvault"
}
},
"hubNetwork": {
Expand All @@ -102,8 +123,8 @@
"addressPrefixes": [
"10.11.0.0/16"
],
"subnets": {
"oz": {
"subnets": [
{
"comments": "App Management Zone (OZ)",
"name": "oz",
"addressPrefix": "10.11.1.0/25",
Expand All @@ -114,7 +135,7 @@
"enabled": true
}
},
"paz": {
{
"comments": "Presentation Zone (PAZ)",
"name": "paz",
"addressPrefix": "10.11.2.0/25",
Expand All @@ -125,7 +146,7 @@
"enabled": true
}
},
"rz": {
{
"comments": "Application Zone (RZ)",
"name": "rz",
"addressPrefix": "10.11.3.0/25",
Expand All @@ -136,7 +157,7 @@
"enabled": true
}
},
"hrz": {
{
"comments": "Data Zone (HRZ)",
"name": "hrz",
"addressPrefix": "10.11.4.0/25",
Expand All @@ -147,23 +168,21 @@
"enabled": true
}
},
"optional": [
{
"comments": "App Service",
"name": "appservice",
"addressPrefix": "10.11.5.0/25",
"nsg": {
"enabled": false
},
"udr": {
"enabled": false
},
"delegations": {
"serviceName": "Microsoft.Web/serverFarms"
}
{
"comments": "App Service",
"name": "appservice",
"addressPrefix": "10.11.5.0/25",
"nsg": {
"enabled": false
},
"udr": {
"enabled": false
},
"delegations": {
"serviceName": "Microsoft.Web/serverFarms"
}
]
}
}
]
}
}
}
Expand Down
82 changes: 50 additions & 32 deletions ...ones/DevTest/802e608f-f31b-4a10-86da-7fbb8f660a10_generic-subscription_canadacentral.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,34 @@
"serviceHealthAlerts": {
"value": {
"resourceGroupName": "pubsec-service-health",
"incidentTypes": [ "Incident", "Security" ],
"regions": [ "Global", "Canada East", "Canada Central" ],
"incidentTypes": [
"Incident",
"Security"
],
"regions": [
"Global",
"Canada East",
"Canada Central"
],
"receivers": {
"app": [ "skeeler@m365incanada.onmicrosoft.com" ],
"email": [ "skeeler@m365incanada.onmicrosoft.com" ],
"sms": [ { "countryCode": "1", "phoneNumber": "5555555555" } ],
"voice": [ { "countryCode": "1", "phoneNumber": "5555555555" } ]
"app": [
"skeeler@m365incanada.onmicrosoft.com"
],
"email": [
"skeeler@m365incanada.onmicrosoft.com"
],
"sms": [
{
"countryCode": "1",
"phoneNumber": "5555555555"
}
],
"voice": [
{
"countryCode": "1",
"phoneNumber": "5555555555"
}
]
},
"actionGroupName": "Sub1 ALZ action group",
"actionGroupShortName": "sub1-alert",
Expand Down Expand Up @@ -68,21 +89,20 @@
"automation": "rgAutomation",
"networking": "rgVnet",
"networkWatcher": "NetworkWatcherRG",
"backupRecoveryVault":"rgRecoveryVault"
"backupRecoveryVault": "rgRecoveryVault"
}
},
"automation": {
"value": {
"name": "automation"
}
},
"backupRecoveryVault":{
"backupRecoveryVault": {
"value": {
"enabled":true,
"name":"bkupvault"
"enabled": true,
"name": "bkupvault"
}
},

"hubNetwork": {
"value": {
"virtualNetworkId": "/subscriptions/1a7025c7-f492-4eb9-9cf6-12c7889e4dfd/resourceGroups/pubsec-hub-networking-rg/providers/Microsoft.Network/virtualNetworks/hub-vnet",
Expand All @@ -103,8 +123,8 @@
"addressPrefixes": [
"10.10.0.0/16"
],
"subnets": {
"oz": {
"subnets": [
{
"comments": "App Management Zone (OZ)",
"name": "oz",
"addressPrefix": "10.10.1.0/25",
Expand All @@ -115,7 +135,7 @@
"enabled": true
}
},
"paz": {
{
"comments": "Presentation Zone (PAZ)",
"name": "paz",
"addressPrefix": "10.10.2.0/25",
Expand All @@ -126,7 +146,7 @@
"enabled": true
}
},
"rz": {
{
"comments": "Application Zone (RZ)",
"name": "rz",
"addressPrefix": "10.10.3.0/25",
Expand All @@ -137,7 +157,7 @@
"enabled": true
}
},
"hrz": {
{
"comments": "Data Zone (HRZ)",
"name": "hrz",
"addressPrefix": "10.10.4.0/25",
Expand All @@ -148,23 +168,21 @@
"enabled": true
}
},
"optional": [
{
"comments": "App Service",
"name": "appservice",
"addressPrefix": "10.10.5.0/25",
"nsg": {
"enabled": false
},
"udr": {
"enabled": false
},
"delegations": {
"serviceName": "Microsoft.Web/serverFarms"
}
{
"comments": "App Service",
"name": "appservice",
"addressPrefix": "10.10.5.0/25",
"nsg": {
"enabled": false
},
"udr": {
"enabled": false
},
"delegations": {
"serviceName": "Microsoft.Web/serverFarms"
}
]
}
}
]
}
}
}
Expand Down
Loading

0 comments on commit 7083377

Please sign in to comment.