Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix AMBA Service Health deployment conditions #1876

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix AMBA Service Health deployment conditions #1876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3374651
fix: Update conditions for AMBA
arjenhuitema Dec 24, 2024
599a8b7
Update whats new
arjenhuitema Dec 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/wiki/Whats-new.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ Here's what's changed in Enterprise Scale/Azure Landing Zones:
#### 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.
- Resolved deployment issues related to Service Health alerts. Previously, Service Health was not deployed when selected unless Azure Monitor Baseline Alerts were also selected.

### November 2024

Expand Down
53 changes: 26 additions & 27 deletions eslzArm/eslzArm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2214,7 +2214,7 @@
},
{
// Deploying AMBA custom policies. Note: These policies are pulled from AMBA remote repo (https://www.github.com/Azure/azure-monitor-baseline-alerts). See definition of deploymentUris.monitorPolicyDefinitions for more details
"condition": "[and(empty(parameters('singlePlatformSubscriptionId')), equals(parameters('enableMonitorBaselines'), 'Yes'))]",
"condition": "[and(empty(parameters('singlePlatformSubscriptionId')), or(equals(parameters('enableMonitorBaselines'), 'Yes'), equals(parameters('enableServiceHealth'), 'Yes')))]",
"type": "Microsoft.Resources/deployments",
"apiVersion": "2019-10-01",
"name": "[variables('deploymentNames').monitorPolicyDeploymentName]",
Expand Down Expand Up @@ -2253,40 +2253,40 @@
"value": "[variables('mgmtGroups').lzs]"
},
"enableAMBAConnectivity": {
"value": "[parameters('enableMonitorConnectivity')]"
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableMonitorConnectivity'))]"
},
"enableAMBAIdentity": {
"value": "[parameters('enableMonitorIdentity')]"
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableMonitorIdentity'))]"
},
"enableAMBAManagement": {
"value": "[parameters('enableMonitorManagement')]"
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableMonitorManagement'))]"
},
"enableAMBAServiceHealth": {
"value": "[parameters('enableServiceHealth')]"
},
"enableAMBAHybridVM": {
"value": "[parameters('enableAMBAHybridVM')]"
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBAHybridVM'))]"
},
"enableAMBAKeyManagement": {
"value": "[parameters('enableAMBAKeyManagement')]"
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBAKeyManagement'))]"
},
"enableAMBALoadBalancing": {
"value": "[parameters('enableAMBALoadBalancing')]"
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBALoadBalancing'))]"
},
"enableAMBANetworkChanges": {
"value": "[parameters('enableAMBANetworkChanges')]"
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBANetworkChanges'))]"
},
"enableAMBARecoveryServices": {
"value": "[parameters('enableAMBARecoveryServices')]"
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBARecoveryServices'))]"
},
"enableAMBAStorage": {
"value": "[parameters('enableAMBAStorage')]"
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBAStorage'))]"
},
"enableAMBAVM": {
"value": "[parameters('enableAMBAVM')]"
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBAVM'))]"
},
"enableAMBAWeb": {
"value": "[parameters('enableAMBAWeb')]"
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBAWeb'))]"
},
"userAssignedManagedIdentityName": {
"value": "[parameters('userAssignedManagedIdentityName')]"
Expand Down Expand Up @@ -2317,7 +2317,7 @@
},
{
/// Deploying AMBA custom policies. Note: These policies are pulled from AMBA remote repo (https://www.github.com/Azure/azure-monitor-baseline-alerts). See definition of deploymentUris.monitorPolicyDefinitions for more details
"condition": "[and(not(empty(parameters('singlePlatformSubscriptionId'))), equals(parameters('enableMonitorBaselines'), 'Yes'))]",
"condition": "[and(not(empty(parameters('singlePlatformSubscriptionId'))), or(equals(parameters('enableMonitorBaselines'), 'Yes'), equals(parameters('enableServiceHealth'), 'Yes')))]",
"type": "Microsoft.Resources/deployments",
"apiVersion": "2019-10-01",
"name": "[variables('esLiteDeploymentNames').monitorPolicyLiteDeploymentName]",
Expand Down Expand Up @@ -2355,46 +2355,46 @@
"value": "[variables('mgmtGroups').lzs]"
},
"enableAMBAConnectivity": {
"value": "[parameters('enableMonitorConnectivity')]"
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableMonitorConnectivity'))]"
},
"enableAMBAIdentity": {
"value": "[parameters('enableMonitorIdentity')]"
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableMonitorIdentity'))]"
},
"enableAMBAManagement": {
"value": "[parameters('enableMonitorManagement')]"
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableMonitorManagement'))]"
},
"enableAMBAServiceHealth": {
"value": "[parameters('enableServiceHealth')]"
},
"enableAMBAHybridVM": {
"value": "[parameters('enableAMBAHybridVM')]"
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBAHybridVM'))]"
},
"enableAMBAKeyManagement": {
"value": "[parameters('enableAMBAKeyManagement')]"
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBAKeyManagement'))]"
},
"enableAMBALoadBalancing": {
"value": "[parameters('enableAMBALoadBalancing')]"
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBALoadBalancing'))]"
},
"enableAMBANetworkChanges": {
"value": "[parameters('enableAMBANetworkChanges')]"
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBANetworkChanges'))]"
},
"enableAMBARecoveryServices": {
"value": "[parameters('enableAMBARecoveryServices')]"
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBARecoveryServices'))]"
},
"enableAMBAStorage": {
"value": "[parameters('enableAMBAStorage')]"
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBAStorage'))]"
},
"enableAMBAVM": {
"value": "[parameters('enableAMBAVM')]"
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBAVM'))]"
},
"enableAMBAWeb": {
"value": "[parameters('enableAMBAWeb')]"
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBAWeb'))]"
},
"userAssignedManagedIdentityName": {
"value": "[parameters('userAssignedManagedIdentityName')]"
},
"ALZWebhookServiceUri": {
"value": "[array(parameters('ambaAgServiceHook'))]"
"value": "[if(empty(parameters('ambaAgServiceHook')), null(), array(parameters('ambaAgServiceHook')))]"
},
"ALZArmRoleId": {
"value": "[array(parameters('ambaAgArmRole'))]"
Expand All @@ -2406,12 +2406,11 @@
"value": "[deployment().location]"
},
"ALZMonitorActionGroupEmail": {
"value": "[array(parameters('ambaAgEmailContact'))]"
"value": "[if(empty(parameters('ambaAgEmailContact')), null(), array(parameters('ambaAgEmailContact')))]"
},
"managementSubscriptionId": {
"value": "[parameters('singlePlatformSubscriptionId')]"
},

"deployALZPortalAccelerator": {
"value": "Yes"
}
Expand Down
Loading