Skip to content

Commit bfc54ce

Browse files
matt-FFFFFFoZakarijtracey93
authored
fix: update Enforce-Encryption-CMK.json (#1926)
Co-authored-by: Zach Trocinski <[email protected]> Co-authored-by: Zach Trocinski <[email protected]> Co-authored-by: Jack Tracey <[email protected]>
1 parent b724975 commit bfc54ce

File tree

8 files changed

+717
-26
lines changed

8 files changed

+717
-26
lines changed

docs/wiki/ALZ-Deprecated-Services.md

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ Policies being deprecated:
4444
| Configure Arc-enabled SQL Servers with DCR Association to Microsoft Defender for SQL user-defined DCR<br>ID: `Deploy-MDFC-Arc-SQL-DCR-Association` | [`2227e1f1-23dd-4c3a-85a9-7024a401d8b2`](https://www.azadvertizer.net/azpolicyadvertizer/2227e1f1-23dd-4c3a-85a9-7024a401d8b2.html) | Custom policy replaced by built-in requires less administration overhead |
4545
| Deploy User Assigned Managed Identity for VM Insights<br>ID: `Deploy-UserAssignedManagedIdentity-VMInsights` | Deprecating as it's no longer required | User-Assigned Management Identity is now centralized and deployed by Azure Landing Zones to the Management Subscription. |
4646
| Deploy Azure Monitor Baseline Alerts for Landing Zone<br>ID: `Alerting-LandingZone` | [`Alerting-KeyManagement`](https://www.azadvertizer.net/azpolicyinitiativesadvertizer/Alerting-KeyManagement)<br>[`Alerting-LoadBalancing`](https://www.azadvertizer.net/azpolicyinitiativesadvertizer/Alerting-LoadBalancing)<br>[`Alerting-NetworkChanges`](https://www.azadvertizer.net/azpolicyinitiativesadvertizer/Alerting-NetworkChanges)<br>[`Alerting-RecoveryServices`](https://www.azadvertizer.net/azpolicyinitiativesadvertizer/Alerting-RecoveryServices)<br>[`Alerting-Storage`](https://www.azadvertizer.net/azpolicyinitiativesadvertizer/Alerting-Storage)<br>[`Alerting-VM`](https://www.azadvertizer.net/azpolicyinitiativesadvertizer/Alerting-VM)<br>[`Alerting-Web`](https://www.azadvertizer.net/azpolicyinitiativesadvertizer/Alerting-Web) | To provide more flexibility for future growth we are transitioning from a single Landing Zone policy initiative and instead we are adopting a modular approach by splitting the Landing Zone initiative into distinct components (initiatives) |
47+
| Deny or Audit resources without Encryption with a customer-managed key (CMK)<br>ID: `Enforce-Encryption-CMK` | [`Enforce-Encryption-CMK_20250218`](https://www.azadvertizer.net/azpolicyinitiativesadvertizer/Enforce-Encryption-CMK_20250218.html) | The policy definition [Azure AI Search services should use customer-managed keys to encrypt data at rest](https://www.azadvertizer.net/azpolicyadvertizer/76a56461-9dc0-40f0-82f5-2453283afa2f.html) has been updated to version 2.0.0. This changes the default effect value from "Deny" to "AuditIfNotExists" while removing "Deny" from allowedValues, therefore we needed to adopt this change in our initiative. |
4748

4849
>IMPORTANT: note that we have deprecated ALL ALZ custom Diagnostic Setting features as part of Azure Landing Zones, which includes the initiatives and all 53 policies. These are being deprecated in favor of using (and assigning) the built-in initiative [Enable allLogs category group resource logging for supported resources to Log Analytics](https://www.azadvertizer.net/azpolicyinitiativesadvertizer/0884adba-2312-4468-abeb-5422caed1038.html)
4950

docs/wiki/Whats-new.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## In this Section
22

33
- [Updates](#updates)
4+
- [February 2025](#february-2025)
45
- [January 2025](#january-2025)
56
- [🔃 Policy Refresh Q2 FY25](#-policy-refresh-q2-fy25)
67
- [December 2024](#december-2024)
@@ -58,6 +59,10 @@ Here's what's changed in Enterprise Scale/Azure Landing Zones:
5859

5960
- Updated the ***Baseline alerts and monitoring*** integration section in the portal accelerator to deploy the latest release of AMBA (2025-02-05). To read more on the changes, see the [What's new](https://aka.ms/amba/alz/whatsnew) page in the AMBA documentation.
6061

62+
#### Breaking Changes
63+
64+
- The policy definition [Azure AI Search services should use customer-managed keys to encrypt data at rest](https://www.azadvertizer.net/azpolicyadvertizer/76a56461-9dc0-40f0-82f5-2453283afa2f.html) has been updated to version 2.0.0. This changes the default effect value from "Deny" to "AuditIfNotExists" while removing "Deny" from allowedValues, therefore we needed to adopt this change in our initiative.
65+
6166
### January 2025
6267

6368
#### Tooling

eslzArm/eslz-portal.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5408,7 +5408,7 @@
54085408
"label": "Customer Managed Keys",
54095409
"defaultValue": "No",
54105410
"visible": true,
5411-
"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 <a href=\"https://www.azadvertizer.net/azpolicyinitiativesadvertizer/Enforce-Encryption-CMK.html\">here</a>.",
5411+
"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 <a href=\"https://www.azadvertizer.net/azpolicyinitiativesadvertizer/Enforce-Encryption-CMK_20250218.html\">here</a>.",
54125412
"constraints": {
54135413
"allowedValues": [
54145414
{

eslzArm/managementGroupTemplates/policyAssignments/ENFORCE-EncryptionCMKPolicyAssignment.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"variables": {
2929
"policyDefinitions": {
30-
"enforceGuardrailsCMK": "[concat('/providers/Microsoft.Management/managementGroups/', parameters('topLevelManagementGroupPrefix'), '/providers/Microsoft.Authorization/policySetDefinitions/Enforce-Encryption-CMK')]"
30+
"enforceGuardrailsCMK": "[concat('/providers/Microsoft.Management/managementGroups/', parameters('topLevelManagementGroupPrefix'), '/providers/Microsoft.Authorization/policySetDefinitions/Enforce-Encryption-CMK_20250218')]"
3131
},
3232
"policyAssignmentNames": {
3333
"enforceGuardrailsCMK": "[concat('Enforce-Encrypt-CMK', parameters('assignmentIndex'))]",

eslzArm/managementGroupTemplates/policyDefinitions/initiatives.json

+23-21
Large diffs are not rendered by default.

src/resources/Microsoft.Authorization/policySetDefinitions/Enforce-Encryption-CMK.json

+5-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
"scope": null,
66
"properties": {
77
"policyType": "Custom",
8-
"displayName": "Deny or Audit resources without Encryption with a customer-managed key (CMK)",
9-
"description": "Deny or Audit resources without Encryption with a customer-managed key (CMK)",
8+
"displayName": "[Deprecated]: Deny or Audit resources without Encryption with a customer-managed key (CMK)",
9+
"description": "Deny or Audit resources without Encryption with a customer-managed key (CMK). Superseded by https://www.azadvertizer.net/azpolicyinitiativesadvertizer/Enforce-Encryption-CMK_20250218.html",
1010
"metadata": {
11-
"version": "3.2.0",
11+
"version": "3.2.0-deprecated",
12+
"deprecated": true,
13+
"supersededBy": "Enforce-Encryption-CMK_202502189",
1214
"category": "Encryption",
1315
"source": "https://github.com/Azure/Enterprise-Scale/",
1416
"alzCloudEnvironments": [

0 commit comments

Comments
 (0)