From 9f9f629ac078dcd6899a9ad6033eedb292e0c583 Mon Sep 17 00:00:00 2001 From: Antoine Date: Thu, 20 May 2021 12:52:03 +0200 Subject: [PATCH 1/4] feat: add support for security event type for Azure Service Health alerts --- .../services/monitor/monitor_activity_log_alert_resource.go | 1 + 1 file changed, 1 insertion(+) diff --git a/azurerm/internal/services/monitor/monitor_activity_log_alert_resource.go b/azurerm/internal/services/monitor/monitor_activity_log_alert_resource.go index a8dc68829518..2d72b10aeced 100644 --- a/azurerm/internal/services/monitor/monitor_activity_log_alert_resource.go +++ b/azurerm/internal/services/monitor/monitor_activity_log_alert_resource.go @@ -168,6 +168,7 @@ func resourceMonitorActivityLogAlert() *schema.Resource { "Maintenance", "Informational", "ActionRequired", + "Security" }, false, ), From 55ef7deffe5609cbceb9d189960e69d39b7ad705 Mon Sep 17 00:00:00 2001 From: Antoine Date: Thu, 20 May 2021 12:54:27 +0200 Subject: [PATCH 2/4] docs: add "Security" in allowed event types for service_health --- website/docs/r/monitor_activity_log_alert.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/monitor_activity_log_alert.html.markdown b/website/docs/r/monitor_activity_log_alert.html.markdown index 239208e16530..22e8baf7f931 100644 --- a/website/docs/r/monitor_activity_log_alert.html.markdown +++ b/website/docs/r/monitor_activity_log_alert.html.markdown @@ -102,7 +102,7 @@ A `criteria` block supports the following: A `service_health` block supports the following: -* `events` (Optional) Events this alert will monitor Possible values are `Incident`, `Maintenance`, `Informational`, and `ActionRequired`. +* `events` (Optional) Events this alert will monitor Possible values are `Incident`, `Maintenance`, `Informational`, `ActionRequired` and `Security`. * `locations` (Optional) Locations this alert will monitor. For example, `West Europe`. Defaults to `Global`. * `services` (Optional) Services this alert will monitor. For example, `Activity Logs & Alerts`, `Action Groups`. Defaults to all Services. From 6e6be9c4661ba0d35916835a09ad9928c8503cf7 Mon Sep 17 00:00:00 2001 From: Antoine Date: Thu, 20 May 2021 12:59:32 +0200 Subject: [PATCH 3/4] test: update test case with Security event type --- .../monitor/monitor_activity_log_alert_resource_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/monitor/monitor_activity_log_alert_resource_test.go b/azurerm/internal/services/monitor/monitor_activity_log_alert_resource_test.go index 3a71ee520f24..a47c3bcc5d19 100644 --- a/azurerm/internal/services/monitor/monitor_activity_log_alert_resource_test.go +++ b/azurerm/internal/services/monitor/monitor_activity_log_alert_resource_test.go @@ -474,7 +474,7 @@ resource "azurerm_monitor_activity_log_alert" "test" { criteria { category = "ServiceHealth" service_health { - events = ["Incident", "Maintenance", "ActionRequired"] + events = ["Incident", "Maintenance", "ActionRequired", "Security"] services = ["Action Groups"] locations = ["Global", "West Europe", "East US"] } From 3e7982dd2a314a721866ee549a74e5372a450cd5 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Thu, 20 May 2021 09:38:40 -0700 Subject: [PATCH 4/4] Update monitor_activity_log_alert_resource.go --- .../services/monitor/monitor_activity_log_alert_resource.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/monitor/monitor_activity_log_alert_resource.go b/azurerm/internal/services/monitor/monitor_activity_log_alert_resource.go index 2d72b10aeced..534f74dfa3e1 100644 --- a/azurerm/internal/services/monitor/monitor_activity_log_alert_resource.go +++ b/azurerm/internal/services/monitor/monitor_activity_log_alert_resource.go @@ -168,7 +168,7 @@ func resourceMonitorActivityLogAlert() *schema.Resource { "Maintenance", "Informational", "ActionRequired", - "Security" + "Security", }, false, ),