Skip to content

Commit

Permalink
Include all fix to a workable version for mooncake (Azure China) (#1759)
Browse files Browse the repository at this point in the history 
Co-authored-by: Sacha Narinx <[email protected]>
  • Loading branch information
@yuanzhang9 @Springstone
yuanzhang9 and Springstone authored Oct 29, 2024
1 parent 13adec3 commit 947cdfa
Show file tree
Hide file tree
Showing 45 changed files with 9,557 additions and 187 deletions.
Binary file modified docs/wiki/media/ALZ Policy Assignments v2.xlsx
View file
Binary file not shown.
Binary file modified docs/wiki/media/Enterprise Scale - PolicyDefinitionAssignments.xlsx
View file
Binary file not shown.
Binary file modified docs/wiki/media/North Star process visuals.pptx
View file
Binary file not shown.
Binary file modified docs/wiki/media/NorthStar Networking images.pptx
View file
Binary file not shown.
40 changes: 20 additions & 20 deletions eslzArm/eslz-portal.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@
{
"name": "cuaSettingsInfo",
"type": "Microsoft.Common.InfoBox",
"visible": "[equals(steps('basics').cloudEnvironment.selection, 'AzureCloud')]",
"visible": true,
"options": {
"text": "Microsoft can identify the deployments of the Azure Resource Manager templates with the deployed Azure resources. Microsoft collects this information to provide the best experiences with their products and to operate their business. The telemetry is collected through customer usage attribution. The data is collected and governed by Microsoft's privacy policies, located at the trust center. Visit this link to find out more.",
"uri": "https://github.com/Azure/Enterprise-Scale/wiki/Deploying-Enterprise-Scale-CustomerUsage",
Expand All @@ -288,9 +288,9 @@
{
"name": "telemetryOptOut",
"type": "Microsoft.Common.OptionsGroup",
"visible": "[equals(steps('basics').cloudEnvironment.selection, 'AzureCloud')]",
"visible": true,
"label": "Customer Usage Selection Options",
"defaultValue": "[if(equals(steps('basics').cloudEnvironment.selection, 'AzureCloud'), 'Enabled', 'Disabled')]",
"defaultValue": "['Enabled']",
"constraints": {
"allowedValues": [
{
Expand All @@ -306,7 +306,7 @@
}
}
],
"visible": "[equals(steps('basics').cloudEnvironment.selection, 'AzureCloud')]"
"visible": true
}
]
},
Expand Down Expand Up @@ -524,7 +524,7 @@
}
]
},
"visible": "[equals(steps('management').enableLogAnalytics,'Yes')]"
"visible": "[and(equals(steps('management').enableLogAnalytics,'Yes'), equals(steps('basics').cloudEnvironment.selection, 'AzureCloud'))]"
},
{
"name": "enableUpdateMgmt",
Expand Down Expand Up @@ -1495,7 +1495,7 @@
"type": "Microsoft.Common.OptionsGroup",
"label": "Enable DDoS Network Protection",
"defaultValue": "Yes (recommended)",
"visible": "[not(equals(steps('connectivity').enableHub, 'No'))]",
"visible": "[and(not(equals(steps('connectivity').enableHub, 'No')), not(equals(steps('basics').cloudEnvironment.selection, 'AzureChinaCloud')))]",
"toolTip": "If 'Yes' is selected when also adding a connectivity subscription, DDoS Network Protection will be enabled on the connectivity virtual network. Please note that DDoS Network Protection does incur additional costs that need to be considered, for more information: <a href=\"https://azure.microsoft.com/en-us/pricing/details/ddos-protection/#pricing\">DDoS Network Protection pricing</a>.",
"constraints": {
"allowedValues": [
Expand Down Expand Up @@ -2757,7 +2757,7 @@
"type": "Microsoft.Common.OptionsGroup",
"label": "Enable vWAN Routing Intent",
"defaultValue": "No",
"visible": "[and(not(equals(steps('connectivity').enableHub, 'No')), not(equals(steps('connectivity').enableHub, 'nva')), not(equals(steps('connectivity').enableHub, 'vhub')), equals(steps('connectivity').enableAzFw, 'Yes'))]",
"visible": "[and(not(equals(steps('connectivity').enableHub, 'No')), not(equals(steps('connectivity').enableHub, 'nva')), not(equals(steps('connectivity').enableHub, 'vhub')), equals(steps('connectivity').enableAzFw, 'Yes'), not(equals(steps('basics').cloudEnvironment.selection, 'AzureChinaCloud')))]",
"toolTip": "Enable vWan Routing Intent and set Azure Firewall as the next hop either for Internet Traffic, Private Traffic or both",
"constraints": {
"allowedValues": [
Expand Down Expand Up @@ -3872,7 +3872,7 @@
"type": "Microsoft.Common.OptionsGroup",
"label": "Enable vWAN Routing Intent in your second",
"defaultValue": "No",
"visible": "[and(not(equals(steps('connectivity').enableHub, 'No')), not(equals(steps('connectivity').enableHub, 'nva')), not(equals(steps('connectivity').enableHub, 'vhub')), equals(steps('connectivity').esNetworkSecondarySubSection.enableAzFwSecondary, 'Yes'))]",
"visible": "[and(not(equals(steps('connectivity').enableHub, 'No')), not(equals(steps('connectivity').enableHub, 'nva')), not(equals(steps('connectivity').enableHub, 'vhub')), equals(steps('connectivity').esNetworkSecondarySubSection.enableAzFwSecondary, 'Yes'), not(equals(steps('basics').cloudEnvironment.selection, 'AzureChinaCloud')))]",
"toolTip": "Enable vWan Routing Intent and set Azure Firewall as the next hop either for Internet Traffic, Private Traffic or both",
"constraints": {
"allowedValues": [
Expand Down Expand Up @@ -4526,7 +4526,7 @@
"type": "Microsoft.Common.OptionsGroup",
"label": "Enable DDoS Network Protection",
"defaultValue": "Yes (recommended)",
"visible": "[and(not(equals(steps('connectivity').enableHub,'No')),equals(steps('connectivity').enableDdoS,'Yes'))]",
"visible": "[and(not(equals(steps('connectivity').enableHub,'No')),equals(steps('connectivity').enableDdoS,'Yes'), not(equals(steps('basics').cloudEnvironment.selection, 'AzureChinaCloud')))]",
"toolTip": "If 'Yes' is selected when also adding a connectivity subscription earlier, DDoS Network Protection will be enabled.<br>Uses the policy <a href=\"https://www.azadvertizer.net/azpolicyadvertizer/94de2ad3-e0c1-4caf-ad78-5d47bbc83d3d.html\">Virtual networks should be protected by Azure DDoS Protection Standard</a>.",
"constraints": {
"allowedValues": [
Expand Down Expand Up @@ -4615,7 +4615,7 @@
}
]
},
"visible": "[equals(steps('management').enableLogAnalytics,'Yes')]"
"visible": "[and(equals(steps('management').enableLogAnalytics,'Yes'), equals(steps('basics').cloudEnvironment.selection, 'AzureCloud'))]"
},
{
"name": "enableVmssMonitoring",
Expand All @@ -4639,7 +4639,7 @@
}
]
},
"visible": "[equals(steps('management').enableLogAnalytics,'Yes')]"
"visible": "[and(equals(steps('management').enableLogAnalytics,'Yes'), equals(steps('basics').cloudEnvironment.selection, 'AzureCloud'))]"
},
{
"name": "enableVmHybridMonitoring",
Expand All @@ -4663,7 +4663,7 @@
}
]
},
"visible": "[equals(steps('management').enableLogAnalytics,'Yes')]"
"visible": "[and(equals(steps('management').enableLogAnalytics,'Yes'), equals(steps('basics').cloudEnvironment.selection, 'AzureCloud'))]"
},
{
"name": "enableAksPolicy",
Expand Down Expand Up @@ -5047,10 +5047,10 @@
}
]
},
"visible": true
"visible": "[equals(steps('basics').cloudEnvironment.selection, 'AzureCloud')]"
}
],
"visible": "[equals(steps('basics').cloudEnvironment.selection, 'AzureCloud')]"
"visible": true
},
{
"name": "corpOnlineSettingsInfo",
Expand Down Expand Up @@ -5266,7 +5266,7 @@
"visible": true
}
],
"visible": "[equals(steps('basics').cloudEnvironment.selection, 'AzureCloud')]"
"visible": true
},
{
"name": "onlineSection",
Expand Down Expand Up @@ -5312,7 +5312,7 @@
}
}
],
"visible": "[equals(steps('basics').cloudEnvironment.selection, 'AzureCloud')]"
"visible": true
}
]
},
Expand Down Expand Up @@ -7671,7 +7671,7 @@
{
"name": "decommSettingsInfo",
"type": "Microsoft.Common.InfoBox",
"visible": "[equals(steps('basics').cloudEnvironment.selection, 'AzureCloud')]",
"visible": true,
"options": {
"text": "The following policies will be enabled: <ul><li>Deny the deployment of new resources<li>Deploy an auto VM shutdown policy at UTC 00:00</ul>",
"uri": "https://aka.ms/alz/policies",
Expand Down Expand Up @@ -7703,7 +7703,7 @@
"visible": true
}
],
"visible": "[equals(steps('basics').cloudEnvironment.selection, 'AzureCloud')]"
"visible": true
},
{
"name": "sandboxSection",
Expand All @@ -7713,7 +7713,7 @@
{
"name": "sandboxSettingsInfo",
"type": "Microsoft.Common.InfoBox",
"visible": "[equals(steps('basics').cloudEnvironment.selection, 'AzureCloud')]",
"visible": true,
"options": {
"text": "The following policies will be enabled: <ul><li>Deny vNET peering across subscriptions<li>Deny the deployment of vWAN/ER/VPN gateways</ul>",
"uri": "https://aka.ms/alz/policies",
Expand Down Expand Up @@ -7745,7 +7745,7 @@
"visible": true
}
],
"visible": "[equals(steps('basics').cloudEnvironment.selection, 'AzureCloud')]"
"visible": true
}
]
},
Expand Down
Loading

0 comments on commit 947cdfa

Please sign in to comment.