Skip to content

Commit 35c0127

Browse files
arjenhuitemajtracey93
arjenhuitema
and
jtracey93
authored
Fix AMBA Service Health deployment conditions (#1876)
Co-authored-by: Jack Tracey <41163455+jtracey93@users.noreply.github.com>
1 parent 6ad4d8b commit 35c0127

File tree

2 files changed

+27
-27
lines changed

2 files changed

+27
-27
lines changed

‎docs/wiki/Whats-new.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ Here's what's changed in Enterprise Scale/Azure Landing Zones:
5858

5959
- Updated the ***Baseline alerts and monitoring*** integration section in the portal accelerator to deploy the latest release of AMBA (2025-01-10). To read more on the changes, see the [What's new](https://aka.ms/amba/alz/whatsnew) page in the AMBA documentation.
6060
- Added SQL Advanced Threat Protection status log to [dataCollectionRule-DefenderSQL.json](Enterprise-Scale/eslzArm/resourceGroupTemplates/dataCollectionRule-DefenderSQL.json) data collection rule. The logs allows identifying machines connected to the workspace with SQL ATP and the protection status on each instance on those machines and is used by MDfC Defender for SQL.
61+
- Resolved deployment issues related to Service Health alerts. Previously, Service Health was not deployed when selected unless Azure Monitor Baseline Alerts were also selected.
6162

6263
### 🔃 Policy Refresh Q2 FY25
6364

‎eslzArm/eslzArm.json

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2252,7 +2252,7 @@
22522252
},
22532253
{
22542254
// 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
2255-
"condition": "[and(empty(parameters('singlePlatformSubscriptionId')), equals(parameters('enableMonitorBaselines'), 'Yes'))]",
2255+
"condition": "[and(empty(parameters('singlePlatformSubscriptionId')), or(equals(parameters('enableMonitorBaselines'), 'Yes'), equals(parameters('enableServiceHealth'), 'Yes')))]",
22562256
"type": "Microsoft.Resources/deployments",
22572257
"apiVersion": "2019-10-01",
22582258
"name": "[variables('deploymentNames').monitorPolicyDeploymentName]",
@@ -2292,40 +2292,40 @@
22922292
"value": "[variables('mgmtGroups').lzs]"
22932293
},
22942294
"enableAMBAConnectivity": {
2295-
"value": "[parameters('enableMonitorConnectivity')]"
2295+
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableMonitorConnectivity'))]"
22962296
},
22972297
"enableAMBAIdentity": {
2298-
"value": "[parameters('enableMonitorIdentity')]"
2298+
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableMonitorIdentity'))]"
22992299
},
23002300
"enableAMBAManagement": {
2301-
"value": "[parameters('enableMonitorManagement')]"
2301+
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableMonitorManagement'))]"
23022302
},
23032303
"enableAMBAServiceHealth": {
23042304
"value": "[parameters('enableServiceHealth')]"
23052305
},
23062306
"enableAMBAHybridVM": {
2307-
"value": "[parameters('enableAMBAHybridVM')]"
2307+
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBAHybridVM'))]"
23082308
},
23092309
"enableAMBAKeyManagement": {
2310-
"value": "[parameters('enableAMBAKeyManagement')]"
2310+
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBAKeyManagement'))]"
23112311
},
23122312
"enableAMBALoadBalancing": {
2313-
"value": "[parameters('enableAMBALoadBalancing')]"
2313+
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBALoadBalancing'))]"
23142314
},
23152315
"enableAMBANetworkChanges": {
2316-
"value": "[parameters('enableAMBANetworkChanges')]"
2316+
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBANetworkChanges'))]"
23172317
},
23182318
"enableAMBARecoveryServices": {
2319-
"value": "[parameters('enableAMBARecoveryServices')]"
2319+
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBARecoveryServices'))]"
23202320
},
23212321
"enableAMBAStorage": {
2322-
"value": "[parameters('enableAMBAStorage')]"
2322+
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBAStorage'))]"
23232323
},
23242324
"enableAMBAVM": {
2325-
"value": "[parameters('enableAMBAVM')]"
2325+
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBAVM'))]"
23262326
},
23272327
"enableAMBAWeb": {
2328-
"value": "[parameters('enableAMBAWeb')]"
2328+
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBAWeb'))]"
23292329
},
23302330
"userAssignedManagedIdentityName": {
23312331
"value": "[parameters('userAssignedManagedIdentityName')]"
@@ -2356,7 +2356,7 @@
23562356
},
23572357
{
23582358
/// 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
2359-
"condition": "[and(not(empty(parameters('singlePlatformSubscriptionId'))), equals(parameters('enableMonitorBaselines'), 'Yes'))]",
2359+
"condition": "[and(not(empty(parameters('singlePlatformSubscriptionId'))), or(equals(parameters('enableMonitorBaselines'), 'Yes'), equals(parameters('enableServiceHealth'), 'Yes')))]",
23602360
"type": "Microsoft.Resources/deployments",
23612361
"apiVersion": "2019-10-01",
23622362
"name": "[variables('esLiteDeploymentNames').monitorPolicyLiteDeploymentName]",
@@ -2395,46 +2395,46 @@
23952395
"value": "[variables('mgmtGroups').lzs]"
23962396
},
23972397
"enableAMBAConnectivity": {
2398-
"value": "[parameters('enableMonitorConnectivity')]"
2398+
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableMonitorConnectivity'))]"
23992399
},
24002400
"enableAMBAIdentity": {
2401-
"value": "[parameters('enableMonitorIdentity')]"
2401+
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableMonitorIdentity'))]"
24022402
},
24032403
"enableAMBAManagement": {
2404-
"value": "[parameters('enableMonitorManagement')]"
2404+
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableMonitorManagement'))]"
24052405
},
24062406
"enableAMBAServiceHealth": {
24072407
"value": "[parameters('enableServiceHealth')]"
24082408
},
24092409
"enableAMBAHybridVM": {
2410-
"value": "[parameters('enableAMBAHybridVM')]"
2410+
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBAHybridVM'))]"
24112411
},
24122412
"enableAMBAKeyManagement": {
2413-
"value": "[parameters('enableAMBAKeyManagement')]"
2413+
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBAKeyManagement'))]"
24142414
},
24152415
"enableAMBALoadBalancing": {
2416-
"value": "[parameters('enableAMBALoadBalancing')]"
2416+
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBALoadBalancing'))]"
24172417
},
24182418
"enableAMBANetworkChanges": {
2419-
"value": "[parameters('enableAMBANetworkChanges')]"
2419+
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBANetworkChanges'))]"
24202420
},
24212421
"enableAMBARecoveryServices": {
2422-
"value": "[parameters('enableAMBARecoveryServices')]"
2422+
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBARecoveryServices'))]"
24232423
},
24242424
"enableAMBAStorage": {
2425-
"value": "[parameters('enableAMBAStorage')]"
2425+
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBAStorage'))]"
24262426
},
24272427
"enableAMBAVM": {
2428-
"value": "[parameters('enableAMBAVM')]"
2428+
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBAVM'))]"
24292429
},
24302430
"enableAMBAWeb": {
2431-
"value": "[parameters('enableAMBAWeb')]"
2431+
"value": "[if(and(equals(parameters('enableMonitorBaselines'), 'No'), equals(parameters('enableServiceHealth'), 'Yes')), 'No', parameters('enableAMBAWeb'))]"
24322432
},
24332433
"userAssignedManagedIdentityName": {
24342434
"value": "[parameters('userAssignedManagedIdentityName')]"
24352435
},
24362436
"ALZWebhookServiceUri": {
2437-
"value": "[array(parameters('ambaAgServiceHook'))]"
2437+
"value": "[if(empty(parameters('ambaAgServiceHook')), null(), array(parameters('ambaAgServiceHook')))]"
24382438
},
24392439
"ALZArmRoleId": {
24402440
"value": "[array(parameters('ambaAgArmRole'))]"
@@ -2446,12 +2446,11 @@
24462446
"value": "[deployment().location]"
24472447
},
24482448
"ALZMonitorActionGroupEmail": {
2449-
"value": "[array(parameters('ambaAgEmailContact'))]"
2449+
"value": "[if(empty(parameters('ambaAgEmailContact')), null(), array(parameters('ambaAgEmailContact')))]"
24502450
},
24512451
"managementSubscriptionId": {
24522452
"value": "[parameters('singlePlatformSubscriptionId')]"
24532453
},
2454-
24552454
"deployALZPortalAccelerator": {
24562455
"value": "Yes"
24572456
}

0 commit comments

Comments
 (0)