diff --git a/ops/services/30-monitors/api_synthetics.tf b/ops/services/30-monitors/api_synthetics.tf index 52139092d..fab00390e 100644 --- a/ops/services/30-monitors/api_synthetics.tf +++ b/ops/services/30-monitors/api_synthetics.tf @@ -318,11 +318,11 @@ resource "datadog_synthetics_test" "insurance_card_endpoints" { } locals { - all_endpoint_tests = merge( + all_endpoint_tests = [for test in merge( datadog_synthetics_test.fhir_endpoints, datadog_synthetics_test.userinfo_endpoints, datadog_synthetics_test.insurance_card_endpoints, - ) + ) : { monitor_id = test.monitor_id, name = test.name }] composite_groups = [ for version in local.versions : { diff --git a/ops/services/30-monitors/on_call.tf b/ops/services/30-monitors/on_call.tf index 1dbdbb757..aabebe265 100644 --- a/ops/services/30-monitors/on_call.tf +++ b/ops/services/30-monitors/on_call.tf @@ -3,7 +3,7 @@ locals { } resource "datadog_monitor" "on_call_health" { - for_each = local.env == "test" ? {} : datadog_synthetics_test.health + for_each = local.env == "test" ? {} : { for k, v in datadog_synthetics_test.health : k => { id = v.id, name = v.name } } name = "[${upper(local.env)}] [${local.app}] On Call — Synthetics ${each.key}" type = "query alert" @@ -31,7 +31,7 @@ resource "datadog_monitor" "on_call_health" { } resource "datadog_monitor" "on_call_fhir_endpoints" { - for_each = local.env == "test" ? {} : datadog_synthetics_test.fhir_endpoints + for_each = local.env == "test" ? {} : { for k, v in datadog_synthetics_test.fhir_endpoints : k => { id = v.id, name = v.name } } name = "[${upper(local.env)}] [${local.app}] On Call — Synthetics ${each.key}" type = "query alert" @@ -56,7 +56,7 @@ resource "datadog_monitor" "on_call_fhir_endpoints" { } resource "datadog_monitor" "on_call_userinfo_endpoints" { - for_each = local.env == "test" ? {} : datadog_synthetics_test.userinfo_endpoints + for_each = local.env == "test" ? {} : { for k, v in datadog_synthetics_test.userinfo_endpoints : k => { id = v.id, name = v.name } } name = "[${upper(local.env)}] [${local.app}] On Call — Synthetics ${each.key}" type = "query alert" @@ -81,7 +81,7 @@ resource "datadog_monitor" "on_call_userinfo_endpoints" { } resource "datadog_monitor" "on_call_insurance_card_endpoints" { - for_each = local.env == "test" ? {} : datadog_synthetics_test.insurance_card_endpoints + for_each = local.env == "test" ? {} : { for k, v in datadog_synthetics_test.insurance_card_endpoints : k => { id = v.id, name = v.name } } name = "[${upper(local.env)}] [${local.app}] On Call — Synthetics ${each.key}" type = "query alert" @@ -106,11 +106,11 @@ resource "datadog_monitor" "on_call_insurance_card_endpoints" { } locals { - on_call_all_endpoint_monitors = merge( + on_call_all_endpoint_monitors = [for monitor in merge( datadog_monitor.on_call_fhir_endpoints, datadog_monitor.on_call_userinfo_endpoints, datadog_monitor.on_call_insurance_card_endpoints, - ) + ) : { id = monitor.id, name = monitor.name }] on_call_composite_groups = [ for version in local.versions : {