diff --git a/CN_PREPROD/alerting/cd_private-charging-tariffs-composite-service_int.tf b/CN_PREPROD/alerting/cd_private-charging-tariffs-composite-service_int.tf index 2f4bab16..ff9c28e3 100644 --- a/CN_PREPROD/alerting/cd_private-charging-tariffs-composite-service_int.tf +++ b/CN_PREPROD/alerting/cd_private-charging-tariffs-composite-service_int.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_alerting.CD_private-charging-tariffs-composite-service_INT.id = vu9U3hXa3q0AAAABABhidWlsdGluOmFsZXJ0aW5nLnByb2ZpbGUABnRlbmFudAAGdGVuYW50ACQyNTg5MTdiOS05NDg5LTQ3NDgtOWJkMy1jYTRjOTFlYWRkMDa-71TeFdrerQ data "dynatrace_management_zone" "CD_private-charging-tariffs-composite-service_INT"{ name="CD_private-charging-tariffs-composite-service" } resource "dynatrace_alerting" "CD_private-charging-tariffs-composite-service_INT" { name = "CD_private-charging-tariffs-composite-service INT" @@ -8,31 +7,31 @@ resource "dynatrace_alerting" "CD_private-charging-tariffs-composite-service_INT delay_in_minutes = 0 include_mode = "INCLUDE_ALL" severity_level = "AVAILABILITY" - tags = [ "Environment:INT", "Component:private-charging-tariffs-composite-service" ] + tags = [ "Environment:INT" ] } rule { delay_in_minutes = 10 include_mode = "INCLUDE_ALL" severity_level = "CUSTOM_ALERT" - tags = [ "Environment:INT", "Component:private-charging-tariffs-composite-service" ] + tags = [ "Environment:INT" ] } rule { delay_in_minutes = 10 include_mode = "INCLUDE_ALL" severity_level = "ERRORS" - tags = [ "Environment:INT", "Component:private-charging-tariffs-composite-service" ] + tags = [ "Environment:INT" ] } rule { delay_in_minutes = 30 include_mode = "INCLUDE_ALL" severity_level = "PERFORMANCE" - tags = [ "Environment:INT", "Component:private-charging-tariffs-composite-service" ] + tags = [ "Environment:INT" ] } rule { delay_in_minutes = 30 include_mode = "INCLUDE_ALL" severity_level = "RESOURCE_CONTENTION" - tags = [ "Environment:INT", "Component:private-charging-tariffs-composite-service" ] + tags = [ "Environment:INT" ] } } -} \ No newline at end of file +} diff --git a/CN_PREPROD/alerting/cd_private-charging-tariffs-service_int.tf b/CN_PREPROD/alerting/cd_private-charging-tariffs-service_int.tf index b5a99b62..05d12e27 100644 --- a/CN_PREPROD/alerting/cd_private-charging-tariffs-service_int.tf +++ b/CN_PREPROD/alerting/cd_private-charging-tariffs-service_int.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_alerting.CD_private-charging-tariffs-service_INT.id = vu9U3hXa3q0AAAABABhidWlsdGluOmFsZXJ0aW5nLnByb2ZpbGUABnRlbmFudAAGdGVuYW50ACRjNjcyMjgyNS02NWE3LTQ5ZjAtYmJlMi0xYTY3MDNlYzU5ZTW-71TeFdrerQ data "dynatrace_management_zone" "CD_private-charging-tariffs-service_INT"{ name="CD_private-charging-tariffs-service" } resource "dynatrace_alerting" "CD_private-charging-tariffs-service_INT" { name = "CD_private-charging-tariffs-service INT" @@ -8,31 +7,31 @@ resource "dynatrace_alerting" "CD_private-charging-tariffs-service_INT" { delay_in_minutes = 0 include_mode = "INCLUDE_ALL" severity_level = "AVAILABILITY" - tags = [ "Component:private-charging-tariffs-service", "Environment:INT" ] + tags = [ "Environment:INT" ] } rule { delay_in_minutes = 10 include_mode = "INCLUDE_ALL" severity_level = "CUSTOM_ALERT" - tags = [ "Component:private-charging-tariffs-service", "Environment:INT" ] + tags = [ "Environment:INT" ] } rule { delay_in_minutes = 10 include_mode = "INCLUDE_ALL" severity_level = "ERRORS" - tags = [ "Component:private-charging-tariffs-service", "Environment:INT" ] + tags = [ "Environment:INT" ] } rule { delay_in_minutes = 30 include_mode = "INCLUDE_ALL" severity_level = "PERFORMANCE" - tags = [ "Component:private-charging-tariffs-service", "Environment:INT" ] + tags = [ "Environment:INT" ] } rule { delay_in_minutes = 30 include_mode = "INCLUDE_ALL" severity_level = "RESOURCE_CONTENTION" - tags = [ "Component:private-charging-tariffs-service", "Environment:INT" ] + tags = [ "Environment:INT" ] } } -} \ No newline at end of file +} diff --git a/CN_PREPROD/dashboard/cd_private-charging-tariffs-composite-service_int.tf b/CN_PREPROD/dashboard/cd_private-charging-tariffs-composite-service_int.tf index 8c2f952d..486b2db9 100644 --- a/CN_PREPROD/dashboard/cd_private-charging-tariffs-composite-service_int.tf +++ b/CN_PREPROD/dashboard/cd_private-charging-tariffs-composite-service_int.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_dashboard.CD_private-charging-tariffs-composite-service_INT.id = 3f770585-8298-4b90-9151-64e9616e76cd data "dynatrace_management_zone" "CD_private-charging-tariffs-composite-service_INT"{ name="CD_private-charging-tariffs-composite-service" } resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_INT" { dashboard_metadata { @@ -6,7 +5,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN owner = "Ignacio.Goldman@partner.bmwgroup.com" preset = true shared = true - tags = [ "private-charging-tariffs-composite-service" ] + tags = [ "CD_private-charging-tariffs-composite-service" ] filter { timeframe = "-24h to now" } @@ -21,6 +20,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN top = 228 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_INT.id + } + } filter_config { type = "MIXED" custom_name = "Failure rate (HTTP 4xx/5xx errors)" @@ -64,7 +69,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Environment:INT", "Component:private-charging-tariffs-composite-service" ] + values = [ "Environment:INT" ] } } } @@ -97,6 +102,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN top = 0 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_INT.id + } + } } tile { name = "Markdown" @@ -123,6 +134,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN top = 570 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_INT.id + } + } filter_config { type = "MIXED" custom_name = "Response time, Request Count and Number of Errors" @@ -180,7 +197,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Environment:INT", "Component:private-charging-tariffs-composite-service" ] + values = [ "Environment:INT" ] } } } @@ -212,6 +229,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_INT.id + } + } filter_config { type = "DATABASE" custom_name = "Databases" @@ -225,7 +248,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Environment:INT", "Component:private-charging-tariffs-composite-service" ] + values = [ "Environment:INT" ] } } } @@ -242,6 +265,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_INT.id + } + } filter_config { type = "SERVICE" custom_name = "Services" @@ -255,7 +284,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Environment:INT", "Component:private-charging-tariffs-composite-service" ] + values = [ "Environment:INT" ] } } } @@ -272,6 +301,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_INT.id + } + } filter_config { type = "HOST" custom_name = "Hosts" @@ -285,10 +320,10 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Environment:INT", "Component:private-charging-tariffs-composite-service" ] + values = [ "Environment:INT" ] } } } } } -} \ No newline at end of file +} diff --git a/CN_PREPROD/dashboard/cd_private-charging-tariffs-composite-service_test.tf b/CN_PREPROD/dashboard/cd_private-charging-tariffs-composite-service_test.tf index b99326cb..47132ade 100644 --- a/CN_PREPROD/dashboard/cd_private-charging-tariffs-composite-service_test.tf +++ b/CN_PREPROD/dashboard/cd_private-charging-tariffs-composite-service_test.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_dashboard.CD_private-charging-tariffs-composite-service_TEST.id = 8044aaad-ec27-4cb3-afb6-dd8bfdde0285 data "dynatrace_management_zone" "CD_private-charging-tariffs-composite-service_TEST"{ name="CD_private-charging-tariffs-composite-service" } resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TEST" { dashboard_metadata { @@ -6,7 +5,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE owner = "Ignacio.Goldman@partner.bmwgroup.com" preset = true shared = true - tags = [ "private-charging-tariffs-composite-service" ] + tags = [ "CD_private-charging-tariffs-composite-service" ] filter { timeframe = "-24h to now" } @@ -21,6 +20,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE top = 228 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_TEST.id + } + } filter_config { type = "MIXED" custom_name = "Failure rate (HTTP 4xx/5xx errors)" @@ -64,7 +69,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -97,6 +102,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE top = 0 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_TEST.id + } + } } tile { name = "Markdown" @@ -123,6 +134,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE top = 570 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_TEST.id + } + } filter_config { type = "MIXED" custom_name = "Response time, Request Count and Number of Errors" @@ -180,7 +197,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -212,6 +229,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_TEST.id + } + } filter_config { type = "DATABASE" custom_name = "Databases" @@ -225,7 +248,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -242,6 +265,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_TEST.id + } + } filter_config { type = "SERVICE" custom_name = "Services" @@ -255,7 +284,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -272,6 +301,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_TEST.id + } + } filter_config { type = "HOST" custom_name = "Hosts" @@ -285,10 +320,10 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } } } -} \ No newline at end of file +} diff --git a/CN_PREPROD/dashboard/cd_private-charging-tariffs-service_int.tf b/CN_PREPROD/dashboard/cd_private-charging-tariffs-service_int.tf index dd874bac..73598bcf 100644 --- a/CN_PREPROD/dashboard/cd_private-charging-tariffs-service_int.tf +++ b/CN_PREPROD/dashboard/cd_private-charging-tariffs-service_int.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_dashboard.CD_private-charging-tariffs-service_INT.id = 3ab417c7-afa5-4517-b9c5-eae35bc0d1e6 data "dynatrace_management_zone" "CD_private-charging-tariffs-service_INT"{ name="CD_private-charging-tariffs-service" } resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { dashboard_metadata { @@ -6,7 +5,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { owner = "Ignacio.Goldman@partner.bmwgroup.com" preset = true shared = true - tags = [ "private-charging-tariffs-service" ] + tags = [ "CD_private-charging-tariffs-service" ] filter { timeframe = "-24h to now" } @@ -21,6 +20,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { top = 228 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_INT.id + } + } filter_config { type = "MIXED" custom_name = "Failure rate (HTTP 4xx/5xx errors)" @@ -64,7 +69,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:INT" ] + values = [ "Environment:INT" ] } } } @@ -97,6 +102,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { top = 0 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_INT.id + } + } } tile { name = "Markdown" @@ -123,6 +134,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { top = 570 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_INT.id + } + } filter_config { type = "MIXED" custom_name = "Response time, Request Count and Number of Errors" @@ -180,7 +197,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:INT" ] + values = [ "Environment:INT" ] } } } @@ -212,6 +229,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_INT.id + } + } filter_config { type = "DATABASE" custom_name = "Databases" @@ -225,7 +248,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:INT" ] + values = [ "Environment:INT" ] } } } @@ -242,6 +265,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_INT.id + } + } filter_config { type = "SERVICE" custom_name = "Services" @@ -255,7 +284,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:INT" ] + values = [ "Environment:INT" ] } } } @@ -272,6 +301,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_INT.id + } + } filter_config { type = "HOST" custom_name = "Hosts" @@ -285,10 +320,10 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:INT" ] + values = [ "Environment:INT" ] } } } } } -} \ No newline at end of file +} diff --git a/CN_PREPROD/dashboard/cd_private-charging-tariffs-service_test.tf b/CN_PREPROD/dashboard/cd_private-charging-tariffs-service_test.tf index c8ff655a..0a038ae8 100644 --- a/CN_PREPROD/dashboard/cd_private-charging-tariffs-service_test.tf +++ b/CN_PREPROD/dashboard/cd_private-charging-tariffs-service_test.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_dashboard.CD_private-charging-tariffs-service_TEST.id = dd98011d-a488-4aa1-a504-d5e6301226cc data "dynatrace_management_zone" "CD_private-charging-tariffs-service_TEST"{ name="CD_private-charging-tariffs-service" } resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { dashboard_metadata { @@ -6,7 +5,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { owner = "Ignacio.Goldman@partner.bmwgroup.com" preset = true shared = true - tags = [ "private-charging-tariffs-service" ] + tags = [ "CD_private-charging-tariffs-service" ] filter { timeframe = "-24h to now" } @@ -21,6 +20,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { top = 228 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_TEST.id + } + } filter_config { type = "MIXED" custom_name = "Failure rate (HTTP 4xx/5xx errors)" @@ -64,7 +69,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -97,6 +102,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { top = 0 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_TEST.id + } + } } tile { name = "Markdown" @@ -123,6 +134,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { top = 570 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_TEST.id + } + } filter_config { type = "MIXED" custom_name = "Response time, Request Count and Number of Errors" @@ -180,7 +197,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -212,6 +229,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_TEST.id + } + } filter_config { type = "DATABASE" custom_name = "Databases" @@ -225,7 +248,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -242,6 +265,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_TEST.id + } + } filter_config { type = "SERVICE" custom_name = "Services" @@ -255,7 +284,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -272,6 +301,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_TEST.id + } + } filter_config { type = "HOST" custom_name = "Hosts" @@ -285,10 +320,10 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } } } -} \ No newline at end of file +} diff --git a/CN_PREPROD/management_zone/cd_private-charging-tariffs-composite-service.tf b/CN_PREPROD/management_zone/cd_private-charging-tariffs-composite-service.tf index 824ee53e..d9680509 100644 --- a/CN_PREPROD/management_zone/cd_private-charging-tariffs-composite-service.tf +++ b/CN_PREPROD/management_zone/cd_private-charging-tariffs-composite-service.tf @@ -1,95 +1,19 @@ -# DEFINE dynatrace_management_zone.CD_private-charging-tariffs-composite-service.id = 1335299488787872746 resource "dynatrace_management_zone" "CD_private-charging-tariffs-composite-service" { name = "CD_private-charging-tariffs-composite-service" - rules { - type = "CLOUD_APPLICATION" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "private-charging-tariffs-composite-service" - } - } + entity_selector_based_rule { + enabled = true + selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:mobile20-PCT\")" } - rules { - type = "CLOUD_APPLICATION_NAMESPACE" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAMESPACE_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "private-charging-tariffs-composite-service" - } - } + entity_selector_based_rule { + enabled = true + selector = "type(HOST),tag(\"compass-id:mobile20-PCT\")" } - rules { - type = "HOST" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "HOST_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-composite-service" - } - } - } + entity_selector_based_rule { + enabled = true + selector = "type(Service),tag(\"compass-id:mobile20-PCT\")" } - rules { - type = "PROCESS_GROUP" - enabled = true - propagation_types = [ "PROCESS_GROUP_TO_HOST" ] - conditions { - key { - type = "STATIC" - attribute = "PROCESS_GROUP_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-composite-service" - } - } - } + entity_selector_based_rule { + enabled = true + selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:mobile20-PCT\"))" } - rules { - type = "SERVICE" - enabled = true - propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ] - conditions { - key { - type = "STATIC" - attribute = "SERVICE_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-composite-service" - } - } - } - } -} +} \ No newline at end of file diff --git a/CN_PREPROD/management_zone/cd_private-charging-tariffs-service.tf b/CN_PREPROD/management_zone/cd_private-charging-tariffs-service.tf index 2737744f..e99b00e7 100644 --- a/CN_PREPROD/management_zone/cd_private-charging-tariffs-service.tf +++ b/CN_PREPROD/management_zone/cd_private-charging-tariffs-service.tf @@ -1,95 +1,19 @@ -# DEFINE dynatrace_management_zone.CD_private-charging-tariffs-service.id = 6887922861287941290 resource "dynatrace_management_zone" "CD_private-charging-tariffs-service" { name = "CD_private-charging-tariffs-service" - rules { - type = "CLOUD_APPLICATION" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "private-charging-tariffs-service" - } - } + entity_selector_based_rule { + enabled = true + selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:eMob-PCT\")" } - rules { - type = "CLOUD_APPLICATION_NAMESPACE" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAMESPACE_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "private-charging-tariffs-service" - } - } + entity_selector_based_rule { + enabled = true + selector = "type(HOST),tag(\"compass-id:eMob-PCT\")" } - rules { - type = "HOST" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "HOST_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-service" - } - } - } + entity_selector_based_rule { + enabled = true + selector = "type(Service),tag(\"compass-id:eMob-PCT\")" } - rules { - type = "PROCESS_GROUP" - enabled = true - propagation_types = [ "PROCESS_GROUP_TO_HOST" ] - conditions { - key { - type = "STATIC" - attribute = "PROCESS_GROUP_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-service" - } - } - } + entity_selector_based_rule { + enabled = true + selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:eMob-PCT\"))" } - rules { - type = "SERVICE" - enabled = true - propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ] - conditions { - key { - type = "STATIC" - attribute = "SERVICE_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-service" - } - } - } - } -} +} \ No newline at end of file diff --git a/CN_PROD/alerting/cd_private-charging-tariffs-composite-service_e2e.tf b/CN_PROD/alerting/cd_private-charging-tariffs-composite-service_e2e.tf index 8b9fd50d..9dc87240 100644 --- a/CN_PROD/alerting/cd_private-charging-tariffs-composite-service_e2e.tf +++ b/CN_PROD/alerting/cd_private-charging-tariffs-composite-service_e2e.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_alerting.CD_private-charging-tariffs-composite-service_E2E.id = vu9U3hXa3q0AAAABABhidWlsdGluOmFsZXJ0aW5nLnByb2ZpbGUABnRlbmFudAAGdGVuYW50ACRhYjUxNDc0Mi1lNjVhLTQ4NWYtYmZiZC0xZTlkOGU3NjI5OGK-71TeFdrerQ data "dynatrace_management_zone" "CD_private-charging-tariffs-composite-service_E2E"{ name="CD_private-charging-tariffs-composite-service" } resource "dynatrace_alerting" "CD_private-charging-tariffs-composite-service_E2E" { name = "CD_private-charging-tariffs-composite-service E2E" @@ -8,31 +7,31 @@ resource "dynatrace_alerting" "CD_private-charging-tariffs-composite-service_E2E delay_in_minutes = 0 include_mode = "INCLUDE_ALL" severity_level = "AVAILABILITY" - tags = [ "Environment:E2E", "Component:private-charging-tariffs-composite-service" ] + tags = [ "Environment:E2E" ] } rule { delay_in_minutes = 10 include_mode = "INCLUDE_ALL" severity_level = "CUSTOM_ALERT" - tags = [ "Environment:E2E", "Component:private-charging-tariffs-composite-service" ] + tags = [ "Environment:E2E" ] } rule { delay_in_minutes = 10 include_mode = "INCLUDE_ALL" severity_level = "ERRORS" - tags = [ "Environment:E2E", "Component:private-charging-tariffs-composite-service" ] + tags = [ "Environment:E2E" ] } rule { delay_in_minutes = 30 include_mode = "INCLUDE_ALL" severity_level = "PERFORMANCE" - tags = [ "Environment:E2E", "Component:private-charging-tariffs-composite-service" ] + tags = [ "Environment:E2E" ] } rule { delay_in_minutes = 30 include_mode = "INCLUDE_ALL" severity_level = "RESOURCE_CONTENTION" - tags = [ "Environment:E2E", "Component:private-charging-tariffs-composite-service" ] + tags = [ "Environment:E2E" ] } } -} \ No newline at end of file +} diff --git a/CN_PROD/alerting/cd_private-charging-tariffs-composite-service_prod.tf b/CN_PROD/alerting/cd_private-charging-tariffs-composite-service_prod.tf index c5895627..4358607b 100644 --- a/CN_PROD/alerting/cd_private-charging-tariffs-composite-service_prod.tf +++ b/CN_PROD/alerting/cd_private-charging-tariffs-composite-service_prod.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_alerting.CD_private-charging-tariffs-composite-service_PROD.id = vu9U3hXa3q0AAAABABhidWlsdGluOmFsZXJ0aW5nLnByb2ZpbGUABnRlbmFudAAGdGVuYW50ACRlYWUyOWJiZC1kOWUxLTRhNmUtOGQ0Ni05NTkwNzVkYmJlM2a-71TeFdrerQ data "dynatrace_management_zone" "CD_private-charging-tariffs-composite-service_PROD"{ name="CD_private-charging-tariffs-composite-service" } resource "dynatrace_alerting" "CD_private-charging-tariffs-composite-service_PROD" { name = "CD_private-charging-tariffs-composite-service PROD" @@ -8,31 +7,31 @@ resource "dynatrace_alerting" "CD_private-charging-tariffs-composite-service_PRO delay_in_minutes = 0 include_mode = "INCLUDE_ALL" severity_level = "AVAILABILITY" - tags = [ "Component:private-charging-tariffs-composite-service", "Environment:PROD" ] + tags = [ "Environment:PROD" ] } rule { delay_in_minutes = 10 include_mode = "INCLUDE_ALL" severity_level = "CUSTOM_ALERT" - tags = [ "Component:private-charging-tariffs-composite-service", "Environment:PROD" ] + tags = [ "Environment:PROD" ] } rule { delay_in_minutes = 10 include_mode = "INCLUDE_ALL" severity_level = "ERRORS" - tags = [ "Component:private-charging-tariffs-composite-service", "Environment:PROD" ] + tags = [ "Environment:PROD" ] } rule { delay_in_minutes = 30 include_mode = "INCLUDE_ALL" severity_level = "PERFORMANCE" - tags = [ "Component:private-charging-tariffs-composite-service", "Environment:PROD" ] + tags = [ "Environment:PROD" ] } rule { delay_in_minutes = 30 include_mode = "INCLUDE_ALL" severity_level = "RESOURCE_CONTENTION" - tags = [ "Component:private-charging-tariffs-composite-service", "Environment:PROD" ] + tags = [ "Environment:PROD" ] } } -} \ No newline at end of file +} diff --git a/CN_PROD/alerting/cd_private-charging-tariffs-service_e2e.tf b/CN_PROD/alerting/cd_private-charging-tariffs-service_e2e.tf index 8d5f4b0a..829e2477 100644 --- a/CN_PROD/alerting/cd_private-charging-tariffs-service_e2e.tf +++ b/CN_PROD/alerting/cd_private-charging-tariffs-service_e2e.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_alerting.CD_private-charging-tariffs-service_E2E.id = vu9U3hXa3q0AAAABABhidWlsdGluOmFsZXJ0aW5nLnByb2ZpbGUABnRlbmFudAAGdGVuYW50ACRjMTU3ZDRmZi0yNjdhLTQwYTItOTRiYy1iYTdhYjRlNzRkYjS-71TeFdrerQ data "dynatrace_management_zone" "CD_private-charging-tariffs-service_E2E"{ name="CD_private-charging-tariffs-service" } resource "dynatrace_alerting" "CD_private-charging-tariffs-service_E2E" { name = "CD_private-charging-tariffs-service E2E" @@ -8,31 +7,31 @@ resource "dynatrace_alerting" "CD_private-charging-tariffs-service_E2E" { delay_in_minutes = 0 include_mode = "INCLUDE_ALL" severity_level = "AVAILABILITY" - tags = [ "Environment:E2E", "Component:private-charging-tariffs-service" ] + tags = [ "Environment:E2E" ] } rule { delay_in_minutes = 10 include_mode = "INCLUDE_ALL" severity_level = "CUSTOM_ALERT" - tags = [ "Environment:E2E", "Component:private-charging-tariffs-service" ] + tags = [ "Environment:E2E" ] } rule { delay_in_minutes = 10 include_mode = "INCLUDE_ALL" severity_level = "ERRORS" - tags = [ "Environment:E2E", "Component:private-charging-tariffs-service" ] + tags = [ "Environment:E2E" ] } rule { delay_in_minutes = 30 include_mode = "INCLUDE_ALL" severity_level = "PERFORMANCE" - tags = [ "Environment:E2E", "Component:private-charging-tariffs-service" ] + tags = [ "Environment:E2E" ] } rule { delay_in_minutes = 30 include_mode = "INCLUDE_ALL" severity_level = "RESOURCE_CONTENTION" - tags = [ "Environment:E2E", "Component:private-charging-tariffs-service" ] + tags = [ "Environment:E2E" ] } } -} \ No newline at end of file +} diff --git a/CN_PROD/alerting/cd_private-charging-tariffs-service_prod.tf b/CN_PROD/alerting/cd_private-charging-tariffs-service_prod.tf index faf3fcc7..b4ad8e0c 100644 --- a/CN_PROD/alerting/cd_private-charging-tariffs-service_prod.tf +++ b/CN_PROD/alerting/cd_private-charging-tariffs-service_prod.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_alerting.CD_private-charging-tariffs-service_PROD.id = vu9U3hXa3q0AAAABABhidWlsdGluOmFsZXJ0aW5nLnByb2ZpbGUABnRlbmFudAAGdGVuYW50ACRhNjdmNDM2MC1jYWEwLTQxMDMtYWRlYi1jMjhlODlhOTM3MjO-71TeFdrerQ data "dynatrace_management_zone" "CD_private-charging-tariffs-service_PROD"{ name="CD_private-charging-tariffs-service" } resource "dynatrace_alerting" "CD_private-charging-tariffs-service_PROD" { name = "CD_private-charging-tariffs-service PROD" @@ -8,31 +7,31 @@ resource "dynatrace_alerting" "CD_private-charging-tariffs-service_PROD" { delay_in_minutes = 0 include_mode = "INCLUDE_ALL" severity_level = "AVAILABILITY" - tags = [ "Component:private-charging-tariffs-service", "Environment:PROD" ] + tags = [ "Environment:PROD" ] } rule { delay_in_minutes = 10 include_mode = "INCLUDE_ALL" severity_level = "CUSTOM_ALERT" - tags = [ "Component:private-charging-tariffs-service", "Environment:PROD" ] + tags = [ "Environment:PROD" ] } rule { delay_in_minutes = 10 include_mode = "INCLUDE_ALL" severity_level = "ERRORS" - tags = [ "Component:private-charging-tariffs-service", "Environment:PROD" ] + tags = [ "Environment:PROD" ] } rule { delay_in_minutes = 30 include_mode = "INCLUDE_ALL" severity_level = "PERFORMANCE" - tags = [ "Component:private-charging-tariffs-service", "Environment:PROD" ] + tags = [ "Environment:PROD" ] } rule { delay_in_minutes = 30 include_mode = "INCLUDE_ALL" severity_level = "RESOURCE_CONTENTION" - tags = [ "Component:private-charging-tariffs-service", "Environment:PROD" ] + tags = [ "Environment:PROD" ] } } -} \ No newline at end of file +} diff --git a/CN_PROD/dashboard/cd_private-charging-tariffs-composite-service_prod.tf b/CN_PROD/dashboard/cd_private-charging-tariffs-composite-service_prod.tf index df9ade5c..7589fe18 100644 --- a/CN_PROD/dashboard/cd_private-charging-tariffs-composite-service_prod.tf +++ b/CN_PROD/dashboard/cd_private-charging-tariffs-composite-service_prod.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_dashboard.CD_private-charging-tariffs-composite-service_PROD.id = 2d0414fa-d7d0-4494-b7d4-e9165a8b33d5 data "dynatrace_management_zone" "CD_private-charging-tariffs-composite-service_PROD"{ name="CD_private-charging-tariffs-composite-service" } resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PROD" { dashboard_metadata { @@ -6,7 +5,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR owner = "Ignacio.Goldman@partner.bmwgroup.com" preset = true shared = true - tags = [ "private-charging-tariffs-composite-service" ] + tags = [ "CD_private-charging-tariffs-composite-service" ] filter { timeframe = "-24h to now" } @@ -21,6 +20,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR top = 228 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_PROD.id + } + } filter_config { type = "MIXED" custom_name = "Failure rate (HTTP 4xx/5xx errors)" @@ -64,7 +69,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -97,6 +102,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR top = 0 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_PROD.id + } + } } tile { name = "Markdown" @@ -123,6 +134,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR top = 570 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_PROD.id + } + } filter_config { type = "MIXED" custom_name = "Response time, Request Count and Number of Errors" @@ -180,7 +197,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -212,6 +229,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_PROD.id + } + } filter_config { type = "DATABASE" custom_name = "Databases" @@ -225,7 +248,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -242,6 +265,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_PROD.id + } + } filter_config { type = "SERVICE" custom_name = "Services" @@ -255,7 +284,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -272,6 +301,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_PROD.id + } + } filter_config { type = "HOST" custom_name = "Hosts" @@ -285,10 +320,10 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } } } -} \ No newline at end of file +} diff --git a/CN_PROD/dashboard/cd_private-charging-tariffs-service_prod.tf b/CN_PROD/dashboard/cd_private-charging-tariffs-service_prod.tf index 9f1f4af9..37ab10f8 100644 --- a/CN_PROD/dashboard/cd_private-charging-tariffs-service_prod.tf +++ b/CN_PROD/dashboard/cd_private-charging-tariffs-service_prod.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_dashboard.CD_private-charging-tariffs-service_PROD.id = b53a3d17-e61e-478e-b733-ebe9c09e0cf8 data "dynatrace_management_zone" "CD_private-charging-tariffs-service_PROD"{ name="CD_private-charging-tariffs-service" } resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { dashboard_metadata { @@ -6,7 +5,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { owner = "Ignacio.Goldman@partner.bmwgroup.com" preset = true shared = true - tags = [ "private-charging-tariffs-service" ] + tags = [ "CD_private-charging-tariffs-service" ] filter { timeframe = "-24h to now" } @@ -21,6 +20,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { top = 228 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_PROD.id + } + } filter_config { type = "MIXED" custom_name = "Failure rate (HTTP 4xx/5xx errors)" @@ -64,7 +69,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -97,6 +102,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { top = 0 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_PROD.id + } + } } tile { name = "Markdown" @@ -123,6 +134,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { top = 570 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_PROD.id + } + } filter_config { type = "MIXED" custom_name = "Response time, Request Count and Number of Errors" @@ -180,7 +197,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -212,6 +229,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_PROD.id + } + } filter_config { type = "DATABASE" custom_name = "Databases" @@ -225,7 +248,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -242,6 +265,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_PROD.id + } + } filter_config { type = "SERVICE" custom_name = "Services" @@ -255,7 +284,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -272,6 +301,12 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_PROD.id + } + } filter_config { type = "HOST" custom_name = "Hosts" @@ -285,10 +320,10 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } } } -} \ No newline at end of file +} diff --git a/CN_PROD/management_zone/cd_private-charging-tariffs-composite-service.tf b/CN_PROD/management_zone/cd_private-charging-tariffs-composite-service.tf index e10f1681..d9680509 100644 --- a/CN_PROD/management_zone/cd_private-charging-tariffs-composite-service.tf +++ b/CN_PROD/management_zone/cd_private-charging-tariffs-composite-service.tf @@ -1,95 +1,19 @@ -# DEFINE dynatrace_management_zone.CD_private-charging-tariffs-composite-service.id = -223448368676376782 resource "dynatrace_management_zone" "CD_private-charging-tariffs-composite-service" { name = "CD_private-charging-tariffs-composite-service" - rules { - type = "CLOUD_APPLICATION" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "private-charging-tariffs-composite-service" - } - } + entity_selector_based_rule { + enabled = true + selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:mobile20-PCT\")" } - rules { - type = "CLOUD_APPLICATION_NAMESPACE" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAMESPACE_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "private-charging-tariffs-composite-service" - } - } + entity_selector_based_rule { + enabled = true + selector = "type(HOST),tag(\"compass-id:mobile20-PCT\")" } - rules { - type = "HOST" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "HOST_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-composite-service" - } - } - } + entity_selector_based_rule { + enabled = true + selector = "type(Service),tag(\"compass-id:mobile20-PCT\")" } - rules { - type = "PROCESS_GROUP" - enabled = true - propagation_types = [ "PROCESS_GROUP_TO_HOST" ] - conditions { - key { - type = "STATIC" - attribute = "PROCESS_GROUP_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-composite-service" - } - } - } + entity_selector_based_rule { + enabled = true + selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:mobile20-PCT\"))" } - rules { - type = "SERVICE" - enabled = true - propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ] - conditions { - key { - type = "STATIC" - attribute = "SERVICE_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-composite-service" - } - } - } - } -} +} \ No newline at end of file diff --git a/CN_PROD/management_zone/cd_private-charging-tariffs-service.tf b/CN_PROD/management_zone/cd_private-charging-tariffs-service.tf index b10ea28d..e99b00e7 100644 --- a/CN_PROD/management_zone/cd_private-charging-tariffs-service.tf +++ b/CN_PROD/management_zone/cd_private-charging-tariffs-service.tf @@ -1,95 +1,19 @@ -# DEFINE dynatrace_management_zone.CD_private-charging-tariffs-service.id = -2733793950735758038 resource "dynatrace_management_zone" "CD_private-charging-tariffs-service" { name = "CD_private-charging-tariffs-service" - rules { - type = "CLOUD_APPLICATION" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "private-charging-tariffs-service" - } - } + entity_selector_based_rule { + enabled = true + selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:eMob-PCT\")" } - rules { - type = "CLOUD_APPLICATION_NAMESPACE" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAMESPACE_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "private-charging-tariffs-service" - } - } + entity_selector_based_rule { + enabled = true + selector = "type(HOST),tag(\"compass-id:eMob-PCT\")" } - rules { - type = "HOST" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "HOST_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-service" - } - } - } + entity_selector_based_rule { + enabled = true + selector = "type(Service),tag(\"compass-id:eMob-PCT\")" } - rules { - type = "PROCESS_GROUP" - enabled = true - propagation_types = [ "PROCESS_GROUP_TO_HOST" ] - conditions { - key { - type = "STATIC" - attribute = "PROCESS_GROUP_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-service" - } - } - } + entity_selector_based_rule { + enabled = true + selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:eMob-PCT\"))" } - rules { - type = "SERVICE" - enabled = true - propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ] - conditions { - key { - type = "STATIC" - attribute = "SERVICE_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-service" - } - } - } - } -} +} \ No newline at end of file diff --git a/EMEA_PREPROD/dashboard/cd_private-charging-tariffs-composite-service_int.tf b/EMEA_PREPROD/dashboard/cd_private-charging-tariffs-composite-service_int.tf index ba056b5a..486b2db9 100644 --- a/EMEA_PREPROD/dashboard/cd_private-charging-tariffs-composite-service_int.tf +++ b/EMEA_PREPROD/dashboard/cd_private-charging-tariffs-composite-service_int.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_dashboard.CD_private-charging-tariffs-composite-service_INT.id = 8f6d6915-d192-4827-bba4-a3e1becd8890 data "dynatrace_management_zone" "CD_private-charging-tariffs-composite-service_INT"{ name="CD_private-charging-tariffs-composite-service" } resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_INT" { dashboard_metadata { @@ -15,9 +14,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 @@ -83,9 +79,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN name = "Problems" configured = true tile_type = "OPEN_PROBLEMS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 950 @@ -103,9 +96,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN name = "Overall Health" configured = true tile_type = "HEADER" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -127,9 +117,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -141,9 +128,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 @@ -227,9 +211,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -242,9 +223,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN chart_visible = true configured = true tile_type = "DATABASES_OVERVIEW" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 646 @@ -281,9 +259,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN chart_visible = true configured = true tile_type = "SERVICES" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 342 @@ -320,9 +295,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN chart_visible = true configured = true tile_type = "HOSTS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 38 @@ -354,4 +326,4 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN } } } -} \ No newline at end of file +} diff --git a/EMEA_PREPROD/dashboard/cd_private-charging-tariffs-composite-service_test.tf b/EMEA_PREPROD/dashboard/cd_private-charging-tariffs-composite-service_test.tf index 4c82060b..47132ade 100644 --- a/EMEA_PREPROD/dashboard/cd_private-charging-tariffs-composite-service_test.tf +++ b/EMEA_PREPROD/dashboard/cd_private-charging-tariffs-composite-service_test.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_dashboard.CD_private-charging-tariffs-composite-service_TEST.id = 07258f1c-5bfd-49ae-a524-40506dbdbea7 data "dynatrace_management_zone" "CD_private-charging-tariffs-composite-service_TEST"{ name="CD_private-charging-tariffs-composite-service" } resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TEST" { dashboard_metadata { @@ -15,9 +14,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 @@ -83,9 +79,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE name = "Problems" configured = true tile_type = "OPEN_PROBLEMS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 950 @@ -103,9 +96,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE name = "Overall Health" configured = true tile_type = "HEADER" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -127,9 +117,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -141,9 +128,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 @@ -227,9 +211,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -242,9 +223,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE chart_visible = true configured = true tile_type = "DATABASES_OVERVIEW" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 646 @@ -281,9 +259,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE chart_visible = true configured = true tile_type = "SERVICES" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 342 @@ -320,9 +295,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE chart_visible = true configured = true tile_type = "HOSTS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 38 @@ -354,4 +326,4 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE } } } -} \ No newline at end of file +} diff --git a/EMEA_PREPROD/dashboard/cd_private-charging-tariffs-service_int.tf b/EMEA_PREPROD/dashboard/cd_private-charging-tariffs-service_int.tf index b1720387..73598bcf 100644 --- a/EMEA_PREPROD/dashboard/cd_private-charging-tariffs-service_int.tf +++ b/EMEA_PREPROD/dashboard/cd_private-charging-tariffs-service_int.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_dashboard.CD_private-charging-tariffs-service_INT.id = bea38673-1909-43f1-ae66-f1076d1362bc data "dynatrace_management_zone" "CD_private-charging-tariffs-service_INT"{ name="CD_private-charging-tariffs-service" } resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { dashboard_metadata { @@ -15,9 +14,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 @@ -83,9 +79,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { name = "Problems" configured = true tile_type = "OPEN_PROBLEMS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 950 @@ -103,9 +96,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { name = "Overall Health" configured = true tile_type = "HEADER" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -127,9 +117,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -141,9 +128,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 @@ -227,9 +211,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -242,9 +223,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { chart_visible = true configured = true tile_type = "DATABASES_OVERVIEW" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 646 @@ -281,9 +259,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { chart_visible = true configured = true tile_type = "SERVICES" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 342 @@ -320,9 +295,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { chart_visible = true configured = true tile_type = "HOSTS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 38 @@ -354,4 +326,4 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { } } } -} \ No newline at end of file +} diff --git a/EMEA_PREPROD/dashboard/cd_private-charging-tariffs-service_test.tf b/EMEA_PREPROD/dashboard/cd_private-charging-tariffs-service_test.tf index 2cb67f7c..0a038ae8 100644 --- a/EMEA_PREPROD/dashboard/cd_private-charging-tariffs-service_test.tf +++ b/EMEA_PREPROD/dashboard/cd_private-charging-tariffs-service_test.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_dashboard.CD_private-charging-tariffs-service_TEST.id = f61362d0-0bb0-4c5d-81b1-bcc7661c8395 data "dynatrace_management_zone" "CD_private-charging-tariffs-service_TEST"{ name="CD_private-charging-tariffs-service" } resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { dashboard_metadata { @@ -15,9 +14,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 @@ -83,9 +79,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { name = "Problems" configured = true tile_type = "OPEN_PROBLEMS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 950 @@ -103,9 +96,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { name = "Overall Health" configured = true tile_type = "HEADER" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -127,9 +117,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -141,9 +128,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 @@ -227,9 +211,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -242,9 +223,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { chart_visible = true configured = true tile_type = "DATABASES_OVERVIEW" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 646 @@ -281,9 +259,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { chart_visible = true configured = true tile_type = "SERVICES" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 342 @@ -320,9 +295,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { chart_visible = true configured = true tile_type = "HOSTS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 38 @@ -354,4 +326,4 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { } } } -} \ No newline at end of file +} diff --git a/EMEA_PREPROD/management_zone/cd_private-charging-tariffs-composite-service.tf b/EMEA_PREPROD/management_zone/cd_private-charging-tariffs-composite-service.tf index 86d6c771..d9680509 100644 --- a/EMEA_PREPROD/management_zone/cd_private-charging-tariffs-composite-service.tf +++ b/EMEA_PREPROD/management_zone/cd_private-charging-tariffs-composite-service.tf @@ -1,143 +1,19 @@ -# DEFINE dynatrace_management_zone.CD_private-charging-tariffs-composite-service.id = 4641292342767985696 resource "dynatrace_management_zone" "CD_private-charging-tariffs-composite-service" { name = "CD_private-charging-tariffs-composite-service" entity_selector_based_rule { enabled = true - selector = "type(PROCESS_GROUP_INSTANCE),tag(\"ms-id:mobile20-PCT\")" - } - entity_selector_based_rule { - # enabled = false - selector = "type(Service),tag('ms-id:mobile20-PCT')" + selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:mobile20-PCT\")" } entity_selector_based_rule { enabled = true - selector = "type(HOST),tag(\"ms-id:mobile20-PCT\")" - } - entity_selector_based_rule { - # enabled = false - selector = "type(PROCESS_GROUP_INSTANCE),tag('msid:mobile20-PCT')" + selector = "type(HOST),tag(\"compass-id:mobile20-PCT\")" } entity_selector_based_rule { enabled = true - selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"ms-id:mobile20-PCT\"))" + selector = "type(Service),tag(\"compass-id:mobile20-PCT\")" } entity_selector_based_rule { enabled = true - selector = "type(Service),tag(\"ms-id:mobile20-PCT\")" + selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:mobile20-PCT\"))" } - entity_selector_based_rule { - # enabled = false - selector = "type(PROCESS_GROUP_INSTANCE),tag('ms-id:mobile20-PCT')" - } - entity_selector_based_rule { - # enabled = false - selector = "type(Service),tag('msid:mobile20-PCT')" - } - entity_selector_based_rule { - # enabled = false - selector = "type(HOST),tag('msid:mobile20-PCT')" - } - entity_selector_based_rule { - # enabled = false - selector = "type(HOST),tag('ms-id:mobile20-PCT')" - } - entity_selector_based_rule { - # enabled = false - selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag('msid:mobile20-PCT'))" - } - entity_selector_based_rule { - # enabled = false - selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag('ms-id:mobile20-PCT'))" - } - rules { - type = "CLOUD_APPLICATION" - # enabled = false - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "private-charging-tariffs-composite-service" - } - } - } - rules { - type = "CLOUD_APPLICATION_NAMESPACE" - # enabled = false - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAMESPACE_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "private-charging-tariffs-composite-service" - } - } - } - rules { - type = "HOST" - # enabled = false - conditions { - key { - type = "STATIC" - attribute = "HOST_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-composite-service" - } - } - } - } - rules { - type = "PROCESS_GROUP" - # enabled = false - propagation_types = [ "PROCESS_GROUP_TO_HOST" ] - conditions { - key { - type = "STATIC" - attribute = "PROCESS_GROUP_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-composite-service" - } - } - } - } - rules { - type = "SERVICE" - # enabled = false - propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ] - conditions { - key { - type = "STATIC" - attribute = "SERVICE_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-composite-service" - } - } - } - } -} +} \ No newline at end of file diff --git a/EMEA_PREPROD/management_zone/cd_private-charging-tariffs-service.tf b/EMEA_PREPROD/management_zone/cd_private-charging-tariffs-service.tf index 0d133877..e99b00e7 100644 --- a/EMEA_PREPROD/management_zone/cd_private-charging-tariffs-service.tf +++ b/EMEA_PREPROD/management_zone/cd_private-charging-tariffs-service.tf @@ -1,143 +1,19 @@ -# DEFINE dynatrace_management_zone.CD_private-charging-tariffs-service.id = -4602727418526470808 resource "dynatrace_management_zone" "CD_private-charging-tariffs-service" { name = "CD_private-charging-tariffs-service" entity_selector_based_rule { - # enabled = false - selector = "type(HOST),tag('msid:eMob-PCT')" + enabled = true + selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:eMob-PCT\")" } entity_selector_based_rule { enabled = true - selector = "type(HOST),tag(\"ms-id:eMob-PCT\")" - } - entity_selector_based_rule { - # enabled = false - selector = "type(PROCESS_GROUP_INSTANCE),tag('msid:eMob-PCT')" - } - entity_selector_based_rule { - # enabled = false - selector = "type(PROCESS_GROUP_INSTANCE),tag('ms-id:eMob-PCT')" + selector = "type(HOST),tag(\"compass-id:eMob-PCT\")" } entity_selector_based_rule { enabled = true - selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"ms-id:eMob-PCT\"))" - } - entity_selector_based_rule { - # enabled = false - selector = "type(Service),tag('ms-id:eMob-PCT')" + selector = "type(Service),tag(\"compass-id:eMob-PCT\")" } entity_selector_based_rule { enabled = true - selector = "type(Service),tag(\"ms-id:eMob-PCT\")" + selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:eMob-PCT\"))" } - entity_selector_based_rule { - # enabled = false - selector = "type(Service),tag('msid:eMob-PCT')" - } - entity_selector_based_rule { - # enabled = false - selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag('ms-id:eMob-PCT'))" - } - entity_selector_based_rule { - enabled = true - selector = "type(PROCESS_GROUP_INSTANCE),tag(\"ms-id:eMob-PCT\")" - } - entity_selector_based_rule { - # enabled = false - selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag('msid:eMob-PCT'))" - } - entity_selector_based_rule { - # enabled = false - selector = "type(HOST),tag('ms-id:eMob-PCT')" - } - rules { - type = "CLOUD_APPLICATION" - # enabled = false - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "private-charging-tariffs-service" - } - } - } - rules { - type = "CLOUD_APPLICATION_NAMESPACE" - # enabled = false - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAMESPACE_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "private-charging-tariffs-service" - } - } - } - rules { - type = "HOST" - # enabled = false - conditions { - key { - type = "STATIC" - attribute = "HOST_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-service" - } - } - } - } - rules { - type = "PROCESS_GROUP" - # enabled = false - propagation_types = [ "PROCESS_GROUP_TO_HOST" ] - conditions { - key { - type = "STATIC" - attribute = "PROCESS_GROUP_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-service" - } - } - } - } - rules { - type = "SERVICE" - # enabled = false - propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ] - conditions { - key { - type = "STATIC" - attribute = "SERVICE_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-service" - } - } - } - } -} +} \ No newline at end of file diff --git a/EMEA_PROD/dashboard/cd_private-charging-tariffs-composite-service_e2e.tf b/EMEA_PROD/dashboard/cd_private-charging-tariffs-composite-service_e2e.tf index 82495359..57306642 100644 --- a/EMEA_PROD/dashboard/cd_private-charging-tariffs-composite-service_e2e.tf +++ b/EMEA_PROD/dashboard/cd_private-charging-tariffs-composite-service_e2e.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_dashboard.CD_private-charging-tariffs-composite-service_E2E.id = 0d3fd879-bef7-4216-b622-44d9b775b400 data "dynatrace_management_zone" "CD_private-charging-tariffs-composite-service_E2E"{ name="CD_private-charging-tariffs-composite-service" } resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_E2E" { dashboard_metadata { @@ -6,7 +5,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_E2 owner = "Ignacio.Goldman@partner.bmwgroup.com" preset = true shared = true - tags = [ "private-charging-tariffs-composite-service" ] + tags = [ "CD_private-charging-tariffs-composite-service" ] filter { timeframe = "-24h to now" } @@ -15,15 +14,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_E2 name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 top = 228 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_E2E.id + } + } filter_config { type = "MIXED" custom_name = "Failure rate (HTTP 4xx/5xx errors)" @@ -67,7 +69,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_E2 entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Environment:E2E", "Component:private-charging-tariffs-composite-service" ] + values = [ "Environment:E2E" ] } } } @@ -77,9 +79,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_E2 name = "Problems" configured = true tile_type = "OPEN_PROBLEMS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 950 @@ -97,15 +96,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_E2 name = "Overall Health" configured = true tile_type = "HEADER" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 top = 0 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_E2E.id + } + } } tile { name = "Markdown" @@ -115,9 +117,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_E2 EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -129,15 +128,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_E2 name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 top = 570 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_E2E.id + } + } filter_config { type = "MIXED" custom_name = "Response time, Request Count and Number of Errors" @@ -195,7 +197,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_E2 entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Environment:E2E", "Component:private-charging-tariffs-composite-service" ] + values = [ "Environment:E2E" ] } } } @@ -209,9 +211,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_E2 EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -224,15 +223,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_E2 chart_visible = true configured = true tile_type = "DATABASES_OVERVIEW" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 646 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_E2E.id + } + } filter_config { type = "DATABASE" custom_name = "Databases" @@ -246,7 +248,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_E2 entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Environment:E2E", "Component:private-charging-tariffs-composite-service" ] + values = [ "Environment:E2E" ] } } } @@ -257,15 +259,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_E2 chart_visible = true configured = true tile_type = "SERVICES" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 342 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_E2E.id + } + } filter_config { type = "SERVICE" custom_name = "Services" @@ -279,7 +284,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_E2 entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Environment:E2E", "Component:private-charging-tariffs-composite-service" ] + values = [ "Environment:E2E" ] } } } @@ -290,15 +295,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_E2 chart_visible = true configured = true tile_type = "HOSTS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 38 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_E2E.id + } + } filter_config { type = "HOST" custom_name = "Hosts" @@ -312,10 +320,10 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_E2 entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Environment:E2E", "Component:private-charging-tariffs-composite-service" ] + values = [ "Environment:E2E" ] } } } } } -} \ No newline at end of file +} diff --git a/EMEA_PROD/dashboard/cd_private-charging-tariffs-composite-service_prod.tf b/EMEA_PROD/dashboard/cd_private-charging-tariffs-composite-service_prod.tf index 60e6cde0..7589fe18 100644 --- a/EMEA_PROD/dashboard/cd_private-charging-tariffs-composite-service_prod.tf +++ b/EMEA_PROD/dashboard/cd_private-charging-tariffs-composite-service_prod.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_dashboard.CD_private-charging-tariffs-composite-service_PROD.id = 1584f809-9848-46e6-aa3f-500831e118fc data "dynatrace_management_zone" "CD_private-charging-tariffs-composite-service_PROD"{ name="CD_private-charging-tariffs-composite-service" } resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PROD" { dashboard_metadata { @@ -6,7 +5,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR owner = "Ignacio.Goldman@partner.bmwgroup.com" preset = true shared = true - tags = [ "private-charging-tariffs-composite-service" ] + tags = [ "CD_private-charging-tariffs-composite-service" ] filter { timeframe = "-24h to now" } @@ -15,15 +14,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 top = 228 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_PROD.id + } + } filter_config { type = "MIXED" custom_name = "Failure rate (HTTP 4xx/5xx errors)" @@ -67,7 +69,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -77,9 +79,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR name = "Problems" configured = true tile_type = "OPEN_PROBLEMS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 950 @@ -97,15 +96,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR name = "Overall Health" configured = true tile_type = "HEADER" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 top = 0 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_PROD.id + } + } } tile { name = "Markdown" @@ -115,9 +117,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -129,15 +128,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 top = 570 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_PROD.id + } + } filter_config { type = "MIXED" custom_name = "Response time, Request Count and Number of Errors" @@ -195,7 +197,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -209,9 +211,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -224,15 +223,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR chart_visible = true configured = true tile_type = "DATABASES_OVERVIEW" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 646 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_PROD.id + } + } filter_config { type = "DATABASE" custom_name = "Databases" @@ -246,7 +248,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -257,15 +259,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR chart_visible = true configured = true tile_type = "SERVICES" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 342 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_PROD.id + } + } filter_config { type = "SERVICE" custom_name = "Services" @@ -279,7 +284,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -290,15 +295,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR chart_visible = true configured = true tile_type = "HOSTS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 38 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_PROD.id + } + } filter_config { type = "HOST" custom_name = "Hosts" @@ -312,10 +320,10 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } } } -} \ No newline at end of file +} diff --git a/EMEA_PROD/dashboard/cd_private-charging-tariffs-service_e2e.tf b/EMEA_PROD/dashboard/cd_private-charging-tariffs-service_e2e.tf index 050051c6..31f1a723 100644 --- a/EMEA_PROD/dashboard/cd_private-charging-tariffs-service_e2e.tf +++ b/EMEA_PROD/dashboard/cd_private-charging-tariffs-service_e2e.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_dashboard.CD_private-charging-tariffs-service_E2E.id = 9872a8ee-2aaf-4394-9647-0599d12bb0a0 data "dynatrace_management_zone" "CD_private-charging-tariffs-service_E2E"{ name="CD_private-charging-tariffs-service" } resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_E2E" { dashboard_metadata { @@ -6,7 +5,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_E2E" { owner = "Ignacio.Goldman@partner.bmwgroup.com" preset = true shared = true - tags = [ "private-charging-tariffs-service" ] + tags = [ "CD_private-charging-tariffs-service" ] filter { timeframe = "-24h to now" } @@ -15,15 +14,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_E2E" { name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 top = 228 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_E2E.id + } + } filter_config { type = "MIXED" custom_name = "Failure rate (HTTP 4xx/5xx errors)" @@ -67,7 +69,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_E2E" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:E2E" ] + values = [ "Environment:E2E" ] } } } @@ -77,9 +79,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_E2E" { name = "Problems" configured = true tile_type = "OPEN_PROBLEMS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 950 @@ -97,15 +96,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_E2E" { name = "Overall Health" configured = true tile_type = "HEADER" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 top = 0 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_E2E.id + } + } } tile { name = "Markdown" @@ -115,9 +117,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_E2E" { EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -129,15 +128,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_E2E" { name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 top = 570 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_E2E.id + } + } filter_config { type = "MIXED" custom_name = "Response time, Request Count and Number of Errors" @@ -195,7 +197,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_E2E" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:E2E" ] + values = [ "Environment:E2E" ] } } } @@ -209,9 +211,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_E2E" { EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -224,15 +223,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_E2E" { chart_visible = true configured = true tile_type = "DATABASES_OVERVIEW" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 646 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_E2E.id + } + } filter_config { type = "DATABASE" custom_name = "Databases" @@ -246,7 +248,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_E2E" { entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:E2E" ] + values = [ "Environment:E2E" ] } } } @@ -257,15 +259,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_E2E" { chart_visible = true configured = true tile_type = "SERVICES" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 342 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_E2E.id + } + } filter_config { type = "SERVICE" custom_name = "Services" @@ -279,7 +284,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_E2E" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:E2E" ] + values = [ "Environment:E2E" ] } } } @@ -290,15 +295,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_E2E" { chart_visible = true configured = true tile_type = "HOSTS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 38 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_E2E.id + } + } filter_config { type = "HOST" custom_name = "Hosts" @@ -312,10 +320,10 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_E2E" { entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:E2E" ] + values = [ "Environment:E2E" ] } } } } } -} \ No newline at end of file +} diff --git a/EMEA_PROD/dashboard/cd_private-charging-tariffs-service_prod.tf b/EMEA_PROD/dashboard/cd_private-charging-tariffs-service_prod.tf index 52dcb0c0..37ab10f8 100644 --- a/EMEA_PROD/dashboard/cd_private-charging-tariffs-service_prod.tf +++ b/EMEA_PROD/dashboard/cd_private-charging-tariffs-service_prod.tf @@ -1,15 +1,11 @@ -# DEFINE dynatrace_dashboard.CD_private-charging-tariffs-service_PROD.id = 27645aa0-841c-4b63-bf19-835d651c0ba9 data "dynatrace_management_zone" "CD_private-charging-tariffs-service_PROD"{ name="CD_private-charging-tariffs-service" } resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { dashboard_metadata { - name = "CD_private-charging-tariffs-service PROD" - owner = "Ignacio.Goldman@partner.bmwgroup.com" - preset = true - shared = true - tags = [ "private-charging-tariffs-service" ] - unknowns = jsonencode({ - "popularity": 1 - }) + name = "CD_private-charging-tariffs-service PROD" + owner = "Ignacio.Goldman@partner.bmwgroup.com" + preset = true + shared = true + tags = [ "CD_private-charging-tariffs-service" ] filter { timeframe = "-24h to now" } @@ -18,15 +14,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 top = 228 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_PROD.id + } + } filter_config { type = "MIXED" custom_name = "Failure rate (HTTP 4xx/5xx errors)" @@ -70,7 +69,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -80,9 +79,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { name = "Problems" configured = true tile_type = "OPEN_PROBLEMS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 950 @@ -100,15 +96,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { name = "Overall Health" configured = true tile_type = "HEADER" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 top = 0 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_PROD.id + } + } } tile { name = "Markdown" @@ -118,9 +117,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -132,15 +128,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 top = 570 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_PROD.id + } + } filter_config { type = "MIXED" custom_name = "Response time, Request Count and Number of Errors" @@ -198,7 +197,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -212,9 +211,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -227,15 +223,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { chart_visible = true configured = true tile_type = "DATABASES_OVERVIEW" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 646 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_PROD.id + } + } filter_config { type = "DATABASE" custom_name = "Databases" @@ -249,7 +248,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -260,15 +259,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { chart_visible = true configured = true tile_type = "SERVICES" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 342 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_PROD.id + } + } filter_config { type = "SERVICE" custom_name = "Services" @@ -282,7 +284,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -293,15 +295,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { chart_visible = true configured = true tile_type = "HOSTS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 38 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_PROD.id + } + } filter_config { type = "HOST" custom_name = "Hosts" @@ -315,10 +320,10 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } } } -} \ No newline at end of file +} diff --git a/EMEA_PROD/management_zone/cd_private-charging-tariffs-composite-service.tf b/EMEA_PROD/management_zone/cd_private-charging-tariffs-composite-service.tf index cbaa7f16..d9680509 100644 --- a/EMEA_PROD/management_zone/cd_private-charging-tariffs-composite-service.tf +++ b/EMEA_PROD/management_zone/cd_private-charging-tariffs-composite-service.tf @@ -1,95 +1,19 @@ -# DEFINE dynatrace_management_zone.CD_private-charging-tariffs-composite-service.id = -5211583510761118238 resource "dynatrace_management_zone" "CD_private-charging-tariffs-composite-service" { name = "CD_private-charging-tariffs-composite-service" - rules { - type = "CLOUD_APPLICATION" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "private-charging-tariffs-composite-service" - } - } + entity_selector_based_rule { + enabled = true + selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:mobile20-PCT\")" } - rules { - type = "CLOUD_APPLICATION_NAMESPACE" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAMESPACE_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "private-charging-tariffs-composite-service" - } - } + entity_selector_based_rule { + enabled = true + selector = "type(HOST),tag(\"compass-id:mobile20-PCT\")" } - rules { - type = "HOST" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "HOST_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-composite-service" - } - } - } + entity_selector_based_rule { + enabled = true + selector = "type(Service),tag(\"compass-id:mobile20-PCT\")" } - rules { - type = "PROCESS_GROUP" - enabled = true - propagation_types = [ "PROCESS_GROUP_TO_HOST" ] - conditions { - key { - type = "STATIC" - attribute = "PROCESS_GROUP_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-composite-service" - } - } - } + entity_selector_based_rule { + enabled = true + selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:mobile20-PCT\"))" } - rules { - type = "SERVICE" - enabled = true - propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ] - conditions { - key { - type = "STATIC" - attribute = "SERVICE_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-composite-service" - } - } - } - } -} +} \ No newline at end of file diff --git a/EMEA_PROD/management_zone/cd_private-charging-tariffs-service.tf b/EMEA_PROD/management_zone/cd_private-charging-tariffs-service.tf index ac263c5d..e99b00e7 100644 --- a/EMEA_PROD/management_zone/cd_private-charging-tariffs-service.tf +++ b/EMEA_PROD/management_zone/cd_private-charging-tariffs-service.tf @@ -1,95 +1,19 @@ -# DEFINE dynatrace_management_zone.CD_private-charging-tariffs-service.id = 2486877234173158832 resource "dynatrace_management_zone" "CD_private-charging-tariffs-service" { name = "CD_private-charging-tariffs-service" - rules { - type = "CLOUD_APPLICATION" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "private-charging-tariffs-service" - } - } + entity_selector_based_rule { + enabled = true + selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:eMob-PCT\")" } - rules { - type = "CLOUD_APPLICATION_NAMESPACE" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAMESPACE_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "private-charging-tariffs-service" - } - } + entity_selector_based_rule { + enabled = true + selector = "type(HOST),tag(\"compass-id:eMob-PCT\")" } - rules { - type = "HOST" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "HOST_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-service" - } - } - } + entity_selector_based_rule { + enabled = true + selector = "type(Service),tag(\"compass-id:eMob-PCT\")" } - rules { - type = "PROCESS_GROUP" - enabled = true - propagation_types = [ "PROCESS_GROUP_TO_HOST" ] - conditions { - key { - type = "STATIC" - attribute = "PROCESS_GROUP_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-service" - } - } - } + entity_selector_based_rule { + enabled = true + selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:eMob-PCT\"))" } - rules { - type = "SERVICE" - enabled = true - propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ] - conditions { - key { - type = "STATIC" - attribute = "SERVICE_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-service" - } - } - } - } -} +} \ No newline at end of file diff --git a/NA_PREPROD/dashboard/cd_private-charging-tariffs-composite-service_int.tf b/NA_PREPROD/dashboard/cd_private-charging-tariffs-composite-service_int.tf index b7fd8d27..486b2db9 100644 --- a/NA_PREPROD/dashboard/cd_private-charging-tariffs-composite-service_int.tf +++ b/NA_PREPROD/dashboard/cd_private-charging-tariffs-composite-service_int.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_dashboard.CD_private-charging-tariffs-composite-service_INT.id = cfe45f79-bfb2-47ac-9c41-3cfaa3c19800 data "dynatrace_management_zone" "CD_private-charging-tariffs-composite-service_INT"{ name="CD_private-charging-tariffs-composite-service" } resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_INT" { dashboard_metadata { @@ -6,7 +5,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN owner = "Ignacio.Goldman@partner.bmwgroup.com" preset = true shared = true - tags = [ "private-charging-tariffs-composite-service" ] + tags = [ "CD_private-charging-tariffs-composite-service" ] filter { timeframe = "-24h to now" } @@ -15,15 +14,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 top = 228 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_INT.id + } + } filter_config { type = "MIXED" custom_name = "Failure rate (HTTP 4xx/5xx errors)" @@ -67,7 +69,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Environment:INT", "Component:private-charging-tariffs-composite-service" ] + values = [ "Environment:INT" ] } } } @@ -77,9 +79,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN name = "Problems" configured = true tile_type = "OPEN_PROBLEMS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 950 @@ -97,15 +96,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN name = "Overall Health" configured = true tile_type = "HEADER" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 top = 0 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_INT.id + } + } } tile { name = "Markdown" @@ -115,9 +117,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -129,15 +128,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 top = 570 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_INT.id + } + } filter_config { type = "MIXED" custom_name = "Response time, Request Count and Number of Errors" @@ -195,7 +197,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Environment:INT", "Component:private-charging-tariffs-composite-service" ] + values = [ "Environment:INT" ] } } } @@ -209,9 +211,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -224,15 +223,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN chart_visible = true configured = true tile_type = "DATABASES_OVERVIEW" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 646 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_INT.id + } + } filter_config { type = "DATABASE" custom_name = "Databases" @@ -246,7 +248,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Environment:INT", "Component:private-charging-tariffs-composite-service" ] + values = [ "Environment:INT" ] } } } @@ -257,15 +259,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN chart_visible = true configured = true tile_type = "SERVICES" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 342 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_INT.id + } + } filter_config { type = "SERVICE" custom_name = "Services" @@ -279,7 +284,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Environment:INT", "Component:private-charging-tariffs-composite-service" ] + values = [ "Environment:INT" ] } } } @@ -290,15 +295,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN chart_visible = true configured = true tile_type = "HOSTS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 38 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_INT.id + } + } filter_config { type = "HOST" custom_name = "Hosts" @@ -312,10 +320,10 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_IN entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Environment:INT", "Component:private-charging-tariffs-composite-service" ] + values = [ "Environment:INT" ] } } } } } -} \ No newline at end of file +} diff --git a/NA_PREPROD/dashboard/cd_private-charging-tariffs-composite-service_test.tf b/NA_PREPROD/dashboard/cd_private-charging-tariffs-composite-service_test.tf index c39e5091..47132ade 100644 --- a/NA_PREPROD/dashboard/cd_private-charging-tariffs-composite-service_test.tf +++ b/NA_PREPROD/dashboard/cd_private-charging-tariffs-composite-service_test.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_dashboard.CD_private-charging-tariffs-composite-service_TEST.id = 2ec5aca7-ce17-483f-af52-a0a79600ecb4 data "dynatrace_management_zone" "CD_private-charging-tariffs-composite-service_TEST"{ name="CD_private-charging-tariffs-composite-service" } resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TEST" { dashboard_metadata { @@ -6,7 +5,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE owner = "Ignacio.Goldman@partner.bmwgroup.com" preset = true shared = true - tags = [ "private-charging-tariffs-composite-service" ] + tags = [ "CD_private-charging-tariffs-composite-service" ] filter { timeframe = "-24h to now" } @@ -15,15 +14,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 top = 228 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_TEST.id + } + } filter_config { type = "MIXED" custom_name = "Failure rate (HTTP 4xx/5xx errors)" @@ -67,7 +69,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -77,9 +79,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE name = "Problems" configured = true tile_type = "OPEN_PROBLEMS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 950 @@ -97,15 +96,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE name = "Overall Health" configured = true tile_type = "HEADER" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 top = 0 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_TEST.id + } + } } tile { name = "Markdown" @@ -115,9 +117,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -129,15 +128,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 top = 570 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_TEST.id + } + } filter_config { type = "MIXED" custom_name = "Response time, Request Count and Number of Errors" @@ -195,7 +197,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -209,9 +211,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -224,15 +223,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE chart_visible = true configured = true tile_type = "DATABASES_OVERVIEW" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 646 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_TEST.id + } + } filter_config { type = "DATABASE" custom_name = "Databases" @@ -246,7 +248,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -257,15 +259,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE chart_visible = true configured = true tile_type = "SERVICES" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 342 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_TEST.id + } + } filter_config { type = "SERVICE" custom_name = "Services" @@ -279,7 +284,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -290,15 +295,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE chart_visible = true configured = true tile_type = "HOSTS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 38 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_TEST.id + } + } filter_config { type = "HOST" custom_name = "Hosts" @@ -312,10 +320,10 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_TE entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } } } -} \ No newline at end of file +} diff --git a/NA_PREPROD/dashboard/cd_private-charging-tariffs-service_int.tf b/NA_PREPROD/dashboard/cd_private-charging-tariffs-service_int.tf index 4944c39a..73598bcf 100644 --- a/NA_PREPROD/dashboard/cd_private-charging-tariffs-service_int.tf +++ b/NA_PREPROD/dashboard/cd_private-charging-tariffs-service_int.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_dashboard.CD_private-charging-tariffs-service_INT.id = f627c12c-a392-4ff9-a4ce-1a386fbdf316 data "dynatrace_management_zone" "CD_private-charging-tariffs-service_INT"{ name="CD_private-charging-tariffs-service" } resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { dashboard_metadata { @@ -6,7 +5,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { owner = "Ignacio.Goldman@partner.bmwgroup.com" preset = true shared = true - tags = [ "private-charging-tariffs-service" ] + tags = [ "CD_private-charging-tariffs-service" ] filter { timeframe = "-24h to now" } @@ -15,15 +14,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 top = 228 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_INT.id + } + } filter_config { type = "MIXED" custom_name = "Failure rate (HTTP 4xx/5xx errors)" @@ -67,7 +69,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:INT" ] + values = [ "Environment:INT" ] } } } @@ -77,9 +79,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { name = "Problems" configured = true tile_type = "OPEN_PROBLEMS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 950 @@ -97,15 +96,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { name = "Overall Health" configured = true tile_type = "HEADER" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 top = 0 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_INT.id + } + } } tile { name = "Markdown" @@ -115,9 +117,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -129,15 +128,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 top = 570 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_INT.id + } + } filter_config { type = "MIXED" custom_name = "Response time, Request Count and Number of Errors" @@ -195,7 +197,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:INT" ] + values = [ "Environment:INT" ] } } } @@ -209,9 +211,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -224,15 +223,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { chart_visible = true configured = true tile_type = "DATABASES_OVERVIEW" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 646 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_INT.id + } + } filter_config { type = "DATABASE" custom_name = "Databases" @@ -246,7 +248,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:INT" ] + values = [ "Environment:INT" ] } } } @@ -257,15 +259,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { chart_visible = true configured = true tile_type = "SERVICES" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 342 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_INT.id + } + } filter_config { type = "SERVICE" custom_name = "Services" @@ -279,7 +284,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:INT" ] + values = [ "Environment:INT" ] } } } @@ -290,15 +295,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { chart_visible = true configured = true tile_type = "HOSTS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 38 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_INT.id + } + } filter_config { type = "HOST" custom_name = "Hosts" @@ -312,10 +320,10 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_INT" { entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:INT" ] + values = [ "Environment:INT" ] } } } } } -} \ No newline at end of file +} diff --git a/NA_PREPROD/dashboard/cd_private-charging-tariffs-service_test.tf b/NA_PREPROD/dashboard/cd_private-charging-tariffs-service_test.tf index 053e981f..0a038ae8 100644 --- a/NA_PREPROD/dashboard/cd_private-charging-tariffs-service_test.tf +++ b/NA_PREPROD/dashboard/cd_private-charging-tariffs-service_test.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_dashboard.CD_private-charging-tariffs-service_TEST.id = 1d563988-6676-4410-a718-699bf0f89ab1 data "dynatrace_management_zone" "CD_private-charging-tariffs-service_TEST"{ name="CD_private-charging-tariffs-service" } resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { dashboard_metadata { @@ -6,7 +5,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { owner = "Ignacio.Goldman@partner.bmwgroup.com" preset = true shared = true - tags = [ "private-charging-tariffs-service" ] + tags = [ "CD_private-charging-tariffs-service" ] filter { timeframe = "-24h to now" } @@ -15,15 +14,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 top = 228 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_TEST.id + } + } filter_config { type = "MIXED" custom_name = "Failure rate (HTTP 4xx/5xx errors)" @@ -67,7 +69,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -77,9 +79,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { name = "Problems" configured = true tile_type = "OPEN_PROBLEMS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 950 @@ -97,15 +96,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { name = "Overall Health" configured = true tile_type = "HEADER" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 top = 0 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_TEST.id + } + } } tile { name = "Markdown" @@ -115,9 +117,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -129,15 +128,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 top = 570 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_TEST.id + } + } filter_config { type = "MIXED" custom_name = "Response time, Request Count and Number of Errors" @@ -195,7 +197,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -209,9 +211,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -224,15 +223,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { chart_visible = true configured = true tile_type = "DATABASES_OVERVIEW" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 646 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_TEST.id + } + } filter_config { type = "DATABASE" custom_name = "Databases" @@ -246,7 +248,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -257,15 +259,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { chart_visible = true configured = true tile_type = "SERVICES" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 342 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_TEST.id + } + } filter_config { type = "SERVICE" custom_name = "Services" @@ -279,7 +284,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -290,15 +295,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { chart_visible = true configured = true tile_type = "HOSTS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 38 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_TEST.id + } + } filter_config { type = "HOST" custom_name = "Hosts" @@ -312,10 +320,10 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_TEST" { entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } } } -} \ No newline at end of file +} diff --git a/NA_PREPROD/management_zone/cd_private-charging-tariffs-composite-service.tf b/NA_PREPROD/management_zone/cd_private-charging-tariffs-composite-service.tf index 20f49d78..d9680509 100644 --- a/NA_PREPROD/management_zone/cd_private-charging-tariffs-composite-service.tf +++ b/NA_PREPROD/management_zone/cd_private-charging-tariffs-composite-service.tf @@ -1,95 +1,19 @@ -# DEFINE dynatrace_management_zone.CD_private-charging-tariffs-composite-service.id = -7259009876935687144 resource "dynatrace_management_zone" "CD_private-charging-tariffs-composite-service" { name = "CD_private-charging-tariffs-composite-service" - rules { - type = "CLOUD_APPLICATION" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "private-charging-tariffs-composite-service" - } - } + entity_selector_based_rule { + enabled = true + selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:mobile20-PCT\")" } - rules { - type = "CLOUD_APPLICATION_NAMESPACE" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAMESPACE_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "private-charging-tariffs-composite-service" - } - } + entity_selector_based_rule { + enabled = true + selector = "type(HOST),tag(\"compass-id:mobile20-PCT\")" } - rules { - type = "HOST" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "HOST_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-composite-service" - } - } - } + entity_selector_based_rule { + enabled = true + selector = "type(Service),tag(\"compass-id:mobile20-PCT\")" } - rules { - type = "PROCESS_GROUP" - enabled = true - propagation_types = [ "PROCESS_GROUP_TO_HOST" ] - conditions { - key { - type = "STATIC" - attribute = "PROCESS_GROUP_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-composite-service" - } - } - } + entity_selector_based_rule { + enabled = true + selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:mobile20-PCT\"))" } - rules { - type = "SERVICE" - enabled = true - propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ] - conditions { - key { - type = "STATIC" - attribute = "SERVICE_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-composite-service" - } - } - } - } -} +} \ No newline at end of file diff --git a/NA_PREPROD/management_zone/cd_private-charging-tariffs-service.tf b/NA_PREPROD/management_zone/cd_private-charging-tariffs-service.tf index d6ff455c..e99b00e7 100644 --- a/NA_PREPROD/management_zone/cd_private-charging-tariffs-service.tf +++ b/NA_PREPROD/management_zone/cd_private-charging-tariffs-service.tf @@ -1,95 +1,19 @@ -# DEFINE dynatrace_management_zone.CD_private-charging-tariffs-service.id = 4502346088283078598 resource "dynatrace_management_zone" "CD_private-charging-tariffs-service" { name = "CD_private-charging-tariffs-service" - rules { - type = "CLOUD_APPLICATION" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "private-charging-tariffs-service" - } - } + entity_selector_based_rule { + enabled = true + selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:eMob-PCT\")" } - rules { - type = "CLOUD_APPLICATION_NAMESPACE" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAMESPACE_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "private-charging-tariffs-service" - } - } + entity_selector_based_rule { + enabled = true + selector = "type(HOST),tag(\"compass-id:eMob-PCT\")" } - rules { - type = "HOST" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "HOST_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-service" - } - } - } + entity_selector_based_rule { + enabled = true + selector = "type(Service),tag(\"compass-id:eMob-PCT\")" } - rules { - type = "PROCESS_GROUP" - enabled = true - propagation_types = [ "PROCESS_GROUP_TO_HOST" ] - conditions { - key { - type = "STATIC" - attribute = "PROCESS_GROUP_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-service" - } - } - } + entity_selector_based_rule { + enabled = true + selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:eMob-PCT\"))" } - rules { - type = "SERVICE" - enabled = true - propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ] - conditions { - key { - type = "STATIC" - attribute = "SERVICE_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-service" - } - } - } - } -} +} \ No newline at end of file diff --git a/NA_PROD/dashboard/cd_private-charging-tariffs-composite-service_prod.tf b/NA_PROD/dashboard/cd_private-charging-tariffs-composite-service_prod.tf index cfe32ab4..7589fe18 100644 --- a/NA_PROD/dashboard/cd_private-charging-tariffs-composite-service_prod.tf +++ b/NA_PROD/dashboard/cd_private-charging-tariffs-composite-service_prod.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_dashboard.CD_private-charging-tariffs-composite-service_PROD.id = be65e3bd-f732-4ab2-b5b0-53927e60c621 data "dynatrace_management_zone" "CD_private-charging-tariffs-composite-service_PROD"{ name="CD_private-charging-tariffs-composite-service" } resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PROD" { dashboard_metadata { @@ -6,7 +5,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR owner = "Ignacio.Goldman@partner.bmwgroup.com" preset = true shared = true - tags = [ "private-charging-tariffs-composite-service" ] + tags = [ "CD_private-charging-tariffs-composite-service" ] filter { timeframe = "-24h to now" } @@ -15,15 +14,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 top = 228 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_PROD.id + } + } filter_config { type = "MIXED" custom_name = "Failure rate (HTTP 4xx/5xx errors)" @@ -67,7 +69,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -77,9 +79,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR name = "Problems" configured = true tile_type = "OPEN_PROBLEMS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 950 @@ -97,15 +96,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR name = "Overall Health" configured = true tile_type = "HEADER" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 top = 0 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_PROD.id + } + } } tile { name = "Markdown" @@ -115,9 +117,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -129,15 +128,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 top = 570 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_PROD.id + } + } filter_config { type = "MIXED" custom_name = "Response time, Request Count and Number of Errors" @@ -195,7 +197,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -209,9 +211,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -224,15 +223,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR chart_visible = true configured = true tile_type = "DATABASES_OVERVIEW" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 646 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_PROD.id + } + } filter_config { type = "DATABASE" custom_name = "Databases" @@ -246,7 +248,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -257,15 +259,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR chart_visible = true configured = true tile_type = "SERVICES" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 342 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_PROD.id + } + } filter_config { type = "SERVICE" custom_name = "Services" @@ -279,7 +284,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -290,15 +295,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR chart_visible = true configured = true tile_type = "HOSTS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 38 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-composite-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-composite-service_PROD.id + } + } filter_config { type = "HOST" custom_name = "Hosts" @@ -312,10 +320,10 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-composite-service_PR entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-composite-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } } } -} \ No newline at end of file +} diff --git a/NA_PROD/dashboard/cd_private-charging-tariffs-service_prod.tf b/NA_PROD/dashboard/cd_private-charging-tariffs-service_prod.tf index 9c0ecf27..37ab10f8 100644 --- a/NA_PROD/dashboard/cd_private-charging-tariffs-service_prod.tf +++ b/NA_PROD/dashboard/cd_private-charging-tariffs-service_prod.tf @@ -1,4 +1,3 @@ -# DEFINE dynatrace_dashboard.CD_private-charging-tariffs-service_PROD.id = 02447108-a408-4a52-b1fb-6dd426f2ebb4 data "dynatrace_management_zone" "CD_private-charging-tariffs-service_PROD"{ name="CD_private-charging-tariffs-service" } resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { dashboard_metadata { @@ -6,7 +5,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { owner = "Ignacio.Goldman@partner.bmwgroup.com" preset = true shared = true - tags = [ "private-charging-tariffs-service" ] + tags = [ "CD_private-charging-tariffs-service" ] filter { timeframe = "-24h to now" } @@ -15,15 +14,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 top = 228 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_PROD.id + } + } filter_config { type = "MIXED" custom_name = "Failure rate (HTTP 4xx/5xx errors)" @@ -67,7 +69,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -77,9 +79,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { name = "Problems" configured = true tile_type = "OPEN_PROBLEMS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 950 @@ -97,15 +96,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { name = "Overall Health" configured = true tile_type = "HEADER" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 top = 0 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_PROD.id + } + } } tile { name = "Markdown" @@ -115,9 +117,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -129,15 +128,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { name = "Custom chart" configured = true tile_type = "CUSTOM_CHARTING" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 304 left = 38 top = 570 width = 1064 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_PROD.id + } + } filter_config { type = "MIXED" custom_name = "Response time, Request Count and Number of Errors" @@ -195,7 +197,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -209,9 +211,6 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { EOT tile_type = "MARKDOWN" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 38 left = 38 @@ -224,15 +223,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { chart_visible = true configured = true tile_type = "DATABASES_OVERVIEW" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 646 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_PROD.id + } + } filter_config { type = "DATABASE" custom_name = "Databases" @@ -246,7 +248,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -257,15 +259,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { chart_visible = true configured = true tile_type = "SERVICES" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 342 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_PROD.id + } + } filter_config { type = "SERVICE" custom_name = "Services" @@ -279,7 +284,7 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -290,15 +295,18 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { chart_visible = true configured = true tile_type = "HOSTS" - unknowns = jsonencode({ - "isAutoRefreshDisabled": false - }) bounds { height = 152 left = 38 top = 38 width = 190 } + filter { + management_zone { + name = "CD_private-charging-tariffs-service" + id = data.dynatrace_management_zone.CD_private-charging-tariffs-service_PROD.id + } + } filter_config { type = "HOST" custom_name = "Hosts" @@ -312,10 +320,10 @@ resource "dynatrace_dashboard" "CD_private-charging-tariffs-service_PROD" { entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Component:private-charging-tariffs-service", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } } } -} \ No newline at end of file +} diff --git a/NA_PROD/management_zone/cd_private-charging-tariffs-composite-service.tf b/NA_PROD/management_zone/cd_private-charging-tariffs-composite-service.tf index 18b47bbe..d9680509 100644 --- a/NA_PROD/management_zone/cd_private-charging-tariffs-composite-service.tf +++ b/NA_PROD/management_zone/cd_private-charging-tariffs-composite-service.tf @@ -1,95 +1,19 @@ -# DEFINE dynatrace_management_zone.CD_private-charging-tariffs-composite-service.id = 3955044631029894394 resource "dynatrace_management_zone" "CD_private-charging-tariffs-composite-service" { name = "CD_private-charging-tariffs-composite-service" - rules { - type = "CLOUD_APPLICATION" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "private-charging-tariffs-composite-service" - } - } + entity_selector_based_rule { + enabled = true + selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:mobile20-PCT\")" } - rules { - type = "CLOUD_APPLICATION_NAMESPACE" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAMESPACE_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "private-charging-tariffs-composite-service" - } - } + entity_selector_based_rule { + enabled = true + selector = "type(HOST),tag(\"compass-id:mobile20-PCT\")" } - rules { - type = "HOST" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "HOST_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-composite-service" - } - } - } + entity_selector_based_rule { + enabled = true + selector = "type(Service),tag(\"compass-id:mobile20-PCT\")" } - rules { - type = "PROCESS_GROUP" - enabled = true - propagation_types = [ "PROCESS_GROUP_TO_HOST" ] - conditions { - key { - type = "STATIC" - attribute = "PROCESS_GROUP_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-composite-service" - } - } - } + entity_selector_based_rule { + enabled = true + selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:mobile20-PCT\"))" } - rules { - type = "SERVICE" - enabled = true - propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ] - conditions { - key { - type = "STATIC" - attribute = "SERVICE_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-composite-service" - } - } - } - } -} +} \ No newline at end of file diff --git a/NA_PROD/management_zone/cd_private-charging-tariffs-service.tf b/NA_PROD/management_zone/cd_private-charging-tariffs-service.tf index a990a750..e99b00e7 100644 --- a/NA_PROD/management_zone/cd_private-charging-tariffs-service.tf +++ b/NA_PROD/management_zone/cd_private-charging-tariffs-service.tf @@ -1,95 +1,19 @@ -# DEFINE dynatrace_management_zone.CD_private-charging-tariffs-service.id = 2669633522385844387 resource "dynatrace_management_zone" "CD_private-charging-tariffs-service" { name = "CD_private-charging-tariffs-service" - rules { - type = "CLOUD_APPLICATION" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "private-charging-tariffs-service" - } - } + entity_selector_based_rule { + enabled = true + selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:eMob-PCT\")" } - rules { - type = "CLOUD_APPLICATION_NAMESPACE" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAMESPACE_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "private-charging-tariffs-service" - } - } + entity_selector_based_rule { + enabled = true + selector = "type(HOST),tag(\"compass-id:eMob-PCT\")" } - rules { - type = "HOST" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "HOST_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-service" - } - } - } + entity_selector_based_rule { + enabled = true + selector = "type(Service),tag(\"compass-id:eMob-PCT\")" } - rules { - type = "PROCESS_GROUP" - enabled = true - propagation_types = [ "PROCESS_GROUP_TO_HOST" ] - conditions { - key { - type = "STATIC" - attribute = "PROCESS_GROUP_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-service" - } - } - } + entity_selector_based_rule { + enabled = true + selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:eMob-PCT\"))" } - rules { - type = "SERVICE" - enabled = true - propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ] - conditions { - key { - type = "STATIC" - attribute = "SERVICE_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "private-charging-tariffs-service" - } - } - } - } -} +} \ No newline at end of file