diff --git a/docs/wiki/media/ALZ Policy Assignments v2.xlsx b/docs/wiki/media/ALZ Policy Assignments v2.xlsx
index 977f4aba41..d42d6faf18 100644
Binary files a/docs/wiki/media/ALZ Policy Assignments v2.xlsx and b/docs/wiki/media/ALZ Policy Assignments v2.xlsx differ
diff --git a/eslzArm/eslz-portal.json b/eslzArm/eslz-portal.json
index 40d885676e..44e62fe28f 100644
--- a/eslzArm/eslz-portal.json
+++ b/eslzArm/eslz-portal.json
@@ -5392,7 +5392,7 @@
"type": "Microsoft.Common.InfoBox",
"visible": true,
"options": {
- "text": "Please carefully review each of the initiatives and the controls they enforce to ensure they align with your organization's compliance requirements. You can hover over the workload name to show the tooltip, which includes a link to the initiative definition.",
+ "text": "Please carefully review each of the initiatives and the controls they enforce to ensure they align with your organization's compliance requirements. You can hover over the workload name to show the tooltip, which includes a link to the initiative definition.
Enforce = The policy is active and will block non-compliant actions
Audit only = The policy logs non-compliant actions but does not block them
Disabled = The policy is inactive and does not track or enforce compliance",
"uri": "https://aka.ms/alz/policies",
"style": "Info"
}
@@ -5406,13 +5406,13 @@
"name": "enableWsCMKInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "Customer Managed Keys",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected management groups to apply Customer Managed Keys initiative to. This applies to all services that support CMK if enabled. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply the Customer Managed Keys initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -5420,7 +5420,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -5513,13 +5513,13 @@
"name": "enableWsBotServiceInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "AI Bot Service",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -5527,7 +5527,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -5612,13 +5612,13 @@
"name": "enableWsCognitiveServicesInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "AI Search",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -5626,7 +5626,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -5711,13 +5711,13 @@
"name": "enableWsMachineLearningInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "Machine Learning",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -5725,7 +5725,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -5810,13 +5810,13 @@
"name": "enableWsOpenAIInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "Azure OpenAI",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -5824,7 +5824,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -5918,13 +5918,13 @@
"name": "enableWsDataExplorerInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "Data Explorer",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -5932,7 +5932,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -6017,13 +6017,13 @@
"name": "enableWsDataFactoryInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "Data Factory",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -6031,7 +6031,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -6116,13 +6116,13 @@
"name": "enableWsSynapseInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "Synapse",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -6130,7 +6130,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -6221,13 +6221,13 @@
"name": "enableWsComputeInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "Compute",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -6235,7 +6235,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -6320,13 +6320,13 @@
"name": "enableWsVirtualDesktopInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "Virtual Desktop",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -6334,7 +6334,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -6425,13 +6425,13 @@
"name": "enableWsContainerAppsInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "Container Apps",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -6439,7 +6439,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -6524,13 +6524,13 @@
"name": "enableWsContainerInstanceInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "Container Instance",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -6538,7 +6538,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -6623,13 +6623,13 @@
"name": "enableWsContainerRegistryInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "Container Registry",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -6637,7 +6637,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -6722,13 +6722,13 @@
"name": "enableWsKubernetesInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "Kubernetes",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -6736,7 +6736,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -6827,13 +6827,13 @@
"name": "enableWsCosmosDbInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "Cosmos DB",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -6841,7 +6841,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -6926,13 +6926,13 @@
"name": "enableWsMySQLInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "MySQL",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -6940,7 +6940,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -7025,13 +7025,13 @@
"name": "enableWsPostgreSQLInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "PostgreSQL",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -7039,7 +7039,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -7124,13 +7124,13 @@
"name": "enableWsSQLInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "SQL",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -7138,7 +7138,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -7229,13 +7229,13 @@
"name": "enableWsEventGridInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "Event Grid",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -7243,7 +7243,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -7328,13 +7328,13 @@
"name": "enableWsEventHubInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "Event Hub",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -7342,7 +7342,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -7427,13 +7427,13 @@
"name": "enableWsServiceBusInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "Service Bus",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -7441,7 +7441,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -7532,13 +7532,13 @@
"name": "enableWsAutomationInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "Automation Accounts",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -7546,7 +7546,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -7638,13 +7638,13 @@
"name": "enableWsNetworkInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "Network and Networking services",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": "[equals(steps('connectivity').enableDdoS, 'Yes')]",
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -7652,7 +7652,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -7743,13 +7743,13 @@
"name": "enableWsKeyVaultSupInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "Key Vault - Supplementary",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -7757,7 +7757,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -7848,13 +7848,13 @@
"name": "enableWsStorageInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "Storage",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -7862,7 +7862,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -7953,13 +7953,13 @@
"name": "enableWsAPIMInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "API Management",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for API Management. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -7967,7 +7967,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]
@@ -8052,13 +8052,13 @@
"name": "enableWsAppServicesInitiatives",
"type": "Microsoft.Common.OptionsGroup",
"label": "App Services",
- "defaultValue": "No",
+ "defaultValue": "Audit only",
"visible": true,
- "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative here.",
+ "toolTip": "If 'Enforce' or 'Audit only' is selected you will have the option to select management groups to apply this initiative to. Check initiative here.",
"constraints": {
"allowedValues": [
{
- "label": "Yes",
+ "label": "Enforce",
"value": "Yes"
},
{
@@ -8066,7 +8066,7 @@
"value": "Audit"
},
{
- "label": "No",
+ "label": "Disabled",
"value": "No"
}
]