diff --git a/internal/services/monitor/monitor_activity_log_alert_resource.go b/internal/services/monitor/monitor_activity_log_alert_resource.go index 29fd6d328380..74db2346d11f 100644 --- a/internal/services/monitor/monitor_activity_log_alert_resource.go +++ b/internal/services/monitor/monitor_activity_log_alert_resource.go @@ -215,7 +215,7 @@ func resourceMonitorActivityLogAlert() *pluginsdk.Resource { }, }, }, - ConflictsWith: []string{"criteria.0.recommendation_category", "criteria.0.recommendation_impact", "criteria.0.status", "criteria.0.sub_status", "criteria.0.recommendation_impact", "criteria.0.resource_provider", "criteria.0.resource_type", "criteria.0.operation_name", "criteria.0.caller", "criteria.0.operation_name", "criteria.0.service_health"}, + ConflictsWith: []string{"criteria.0.caller", "criteria.0.service_health"}, }, // lintignore:XS003 "service_health": { @@ -261,7 +261,7 @@ func resourceMonitorActivityLogAlert() *pluginsdk.Resource { }, }, }, - ConflictsWith: []string{"criteria.0.recommendation_category", "criteria.0.recommendation_impact", "criteria.0.status", "criteria.0.sub_status", "criteria.0.recommendation_impact", "criteria.0.resource_provider", "criteria.0.resource_type", "criteria.0.operation_name", "criteria.0.caller", "criteria.0.operation_name", "criteria.0.resource_health"}, + ConflictsWith: []string{"criteria.0.caller", "criteria.0.resource_health"}, }, }, }, diff --git a/internal/services/monitor/monitor_activity_log_alert_resource_test.go b/internal/services/monitor/monitor_activity_log_alert_resource_test.go index fdd459d027d1..df3ae3620187 100644 --- a/internal/services/monitor/monitor_activity_log_alert_resource_test.go +++ b/internal/services/monitor/monitor_activity_log_alert_resource_test.go @@ -755,7 +755,17 @@ resource "azurerm_monitor_activity_log_alert" "test" { ] criteria { - category = "ServiceHealth" + category = "ServiceHealth" + operation_name = "Microsoft.Storage/storageAccounts/write" + resource_provider = "Microsoft.Storage" + resource_type = "Microsoft.Storage/storageAccounts" + resource_group = azurerm_resource_group.test.name + resource_id = azurerm_storage_account.test.id + recommendation_category = "OperationalExcellence" + recommendation_impact = "High" + level = "Critical" + status = "Succeeded" + sub_status = "Succeeded" service_health { events = ["Incident", "Maintenance", "ActionRequired", "Security"] services = ["Action Groups"] @@ -951,7 +961,17 @@ resource "azurerm_monitor_activity_log_alert" "test" { ] criteria { - category = "ResourceHealth" + category = "ResourceHealth" + operation_name = "Microsoft.Storage/storageAccounts/write" + resource_provider = "Microsoft.Storage" + resource_type = "Microsoft.Storage/storageAccounts" + resource_group = azurerm_resource_group.test.name + resource_id = azurerm_storage_account.test.id + recommendation_category = "OperationalExcellence" + recommendation_impact = "High" + level = "Critical" + status = "Updated" + sub_status = "Updated" resource_health { current = ["Degraded", "Unavailable", "Unknown"] previous = ["Available"] diff --git a/website/allowed-subcategories b/website/allowed-subcategories index a941db7908e7..5f3045dd5c31 100644 --- a/website/allowed-subcategories +++ b/website/allowed-subcategories @@ -91,4 +91,5 @@ Synapse Template Time Series Insights VMware (AVS) -Video Analyzer \ No newline at end of file +Video Analyzer +Web PubSub \ No newline at end of file