From 9518961bd16890c5bad71bebdafaf3ac539f5435 Mon Sep 17 00:00:00 2001 From: Brunoga-MS Date: Mon, 9 Dec 2024 19:17:59 +0100 Subject: [PATCH 1/5] Updated template and wiki to align with latest release of AMBA --- docs/wiki/Whats-new.md | 5 +++++ eslzArm/eslzArm.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/wiki/Whats-new.md b/docs/wiki/Whats-new.md index ec6f901b5..c9e22db57 100644 --- a/docs/wiki/Whats-new.md +++ b/docs/wiki/Whats-new.md @@ -1,6 +1,7 @@ ## In this Section - [Updates](#updates) + - [December 2024](#december-2024) - [November 2024](#november-2024) - [🔃 Policy Refresh Q1 FY25](#-policy-refresh-q1-fy25) - [October 2024](#october-2024) @@ -49,6 +50,10 @@ This article will be updated as and when changes are made to the above and anyth Here's what's changed in Enterprise Scale/Azure Landing Zones: +### December 2024 + +- Updated the ***Baseline alerts and monitoring*** integration section in the portal accelerator to deploy the latest release of AMBA (2024-12-10). To read more on the changes, see the [What's new](https://aka.ms/amba/alz/whatsnew) page in the AMBA documentation. + ### November 2024 #### Tooling diff --git a/eslzArm/eslzArm.json b/eslzArm/eslzArm.json index 0c3ed6760..f135ef831 100644 --- a/eslzArm/eslzArm.json +++ b/eslzArm/eslzArm.json @@ -1675,7 +1675,7 @@ }, // Declaring root uris for external dependency repositories. "rootUris": { - "monitorRepo": "https://raw.githubusercontent.com/Azure/azure-monitor-baseline-alerts/2024-11-01/" + "monitorRepo": "https://raw.githubusercontent.com/Azure/azure-monitor-baseline-alerts/2024-12-10/" }, // Declaring all required deployment uri's used for deployments of composite ARM templates for ESLZ "azPrivateDnsPolicyAssignmentMapping": { From c791c732cc7ff50a22d549bfa022c3b2ea0f70ee Mon Sep 17 00:00:00 2001 From: Brunoga-MS Date: Mon, 9 Dec 2024 19:41:28 +0100 Subject: [PATCH 2/5] removed delayCount from AMBA-ALZ section --- eslzArm/eslzArm.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/eslzArm/eslzArm.json b/eslzArm/eslzArm.json index f135ef831..3e987a1dc 100644 --- a/eslzArm/eslzArm.json +++ b/eslzArm/eslzArm.json @@ -2378,9 +2378,6 @@ "ALZArmRoleId": { "value": "[array(parameters('ambaAgArmRole'))]" }, - "delayCount": { - "value": "[parameters('delayCount')]" - }, "ALZMonitorResourceGroupName": { "value": "[parameters('monitorAlertsResourceGroup')]" }, From 6190067454162e27cfe854f4e4ff56c2d6eec585 Mon Sep 17 00:00:00 2001 From: Brunoga-MS Date: Mon, 9 Dec 2024 19:53:33 +0100 Subject: [PATCH 3/5] Removed unused delayCount param in the template for AMBA-ALZ deployment --- eslzArm/eslzArm.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/eslzArm/eslzArm.json b/eslzArm/eslzArm.json index 3e987a1dc..2936b17f7 100644 --- a/eslzArm/eslzArm.json +++ b/eslzArm/eslzArm.json @@ -2273,9 +2273,6 @@ "ALZArmRoleId": { "value": "[array(parameters('ambaAgArmRole'))]" }, - "delayCount": { - "value": "[parameters('delayCount')]" - }, "ALZMonitorResourceGroupName": { "value": "[parameters('monitorAlertsResourceGroup')]" }, From 0b01e1d56385470907bda30241c7c0e3f8632cb7 Mon Sep 17 00:00:00 2001 From: Brunoga-MS Date: Mon, 9 Dec 2024 20:44:22 +0100 Subject: [PATCH 4/5] reordered template section for AMBA-ALZ --- eslzArm/eslzArm.json | 91 ++++++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 42 deletions(-) diff --git a/eslzArm/eslzArm.json b/eslzArm/eslzArm.json index 2936b17f7..23c19d82e 100644 --- a/eslzArm/eslzArm.json +++ b/eslzArm/eslzArm.json @@ -2264,6 +2264,30 @@ "enableAMBAServiceHealth": { "value": "[parameters('enableServiceHealth')]" }, + "enableAMBAHybridVM": { + "value": "[parameters('enableAMBAHybridVM')]" + }, + "enableAMBAKeyManagement": { + "value": "[parameters('enableAMBAKeyManagement')]" + }, + "enableAMBALoadBalancing": { + "value": "[parameters('enableAMBALoadBalancing')]" + }, + "enableAMBANetworkChanges": { + "value": "[parameters('enableAMBANetworkChanges')]" + }, + "enableAMBARecoveryServices": { + "value": "[parameters('enableAMBARecoveryServices')]" + }, + "enableAMBAStorage": { + "value": "[parameters('enableAMBAStorage')]" + }, + "enableAMBAVM": { + "value": "[parameters('enableAMBAVM')]" + }, + "enableAMBAWeb": { + "value": "[parameters('enableAMBAWeb')]" + }, "userAssignedManagedIdentityName": { "value": "[parameters('userAssignedManagedIdentityName')]" }, @@ -2285,30 +2309,6 @@ "managementSubscriptionId": { "value": "[parameters('managementSubscriptionId')]" }, - "enableAMBAHybridVM": { - "value": "[parameters('enableAMBAHybridVM')]" - }, - "enableAMBAKeyManagement": { - "value": "[parameters('enableAMBAKeyManagement')]" - }, - "enableAMBALoadBalancing": { - "value": "[parameters('enableAMBALoadBalancing')]" - }, - "enableAMBANetworkChanges": { - "value": "[parameters('enableAMBANetworkChanges')]" - }, - "enableAMBARecoveryServices": { - "value": "[parameters('enableAMBARecoveryServices')]" - }, - "enableAMBAStorage": { - "value": "[parameters('enableAMBAStorage')]" - }, - "enableAMBAVM": { - "value": "[parameters('enableAMBAVM')]" - }, - "enableAMBAWeb": { - "value": "[parameters('enableAMBAWeb')]" - }, "deployALZPortalAccelerator": { "value": "Yes" } @@ -2366,6 +2366,30 @@ "enableAMBAServiceHealth": { "value": "[parameters('enableServiceHealth')]" }, + "enableAMBAHybridVM": { + "value": "[parameters('enableAMBAHybridVM')]" + }, + "enableAMBAKeyManagement": { + "value": "[parameters('enableAMBAKeyManagement')]" + }, + "enableAMBALoadBalancing": { + "value": "[parameters('enableAMBALoadBalancing')]" + }, + "enableAMBANetworkChanges": { + "value": "[parameters('enableAMBANetworkChanges')]" + }, + "enableAMBARecoveryServices": { + "value": "[parameters('enableAMBARecoveryServices')]" + }, + "enableAMBAStorage": { + "value": "[parameters('enableAMBAStorage')]" + }, + "enableAMBAVM": { + "value": "[parameters('enableAMBAVM')]" + }, + "enableAMBAWeb": { + "value": "[parameters('enableAMBAWeb')]" + }, "userAssignedManagedIdentityName": { "value": "[parameters('userAssignedManagedIdentityName')]" }, @@ -2387,24 +2411,7 @@ "managementSubscriptionId": { "value": "[parameters('singlePlatformSubscriptionId')]" }, - "enableAMBALoadBalancing": { - "value": "[parameters('enableAMBALoadBalancing')]" - }, - "enableAMBANetworkChanges": { - "value": "[parameters('enableAMBANetworkChanges')]" - }, - "enableAMBARecoveryServices": { - "value": "[parameters('enableAMBARecoveryServices')]" - }, - "enableAMBAStorage": { - "value": "[parameters('enableAMBAStorage')]" - }, - "enableAMBAVM": { - "value": "[parameters('enableAMBAVM')]" - }, - "enableAMBAWeb": { - "value": "[parameters('enableAMBAWeb')]" - }, + "deployALZPortalAccelerator": { "value": "Yes" } From b9ba7112034597a4752077860f1d77ff25804a12 Mon Sep 17 00:00:00 2001 From: Brunoga-MS Date: Mon, 9 Dec 2024 22:32:53 +0100 Subject: [PATCH 5/5] Adding header to what's new December section --- docs/wiki/Whats-new.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/wiki/Whats-new.md b/docs/wiki/Whats-new.md index c9e22db57..d88d9b5bb 100644 --- a/docs/wiki/Whats-new.md +++ b/docs/wiki/Whats-new.md @@ -52,6 +52,8 @@ Here's what's changed in Enterprise Scale/Azure Landing Zones: ### December 2024 +#### Tooling + - Updated the ***Baseline alerts and monitoring*** integration section in the portal accelerator to deploy the latest release of AMBA (2024-12-10). To read more on the changes, see the [What's new](https://aka.ms/amba/alz/whatsnew) page in the AMBA documentation. ### November 2024