From 5c30a931fb651152317551d2ae1701106258550a Mon Sep 17 00:00:00 2001 From: "Thomas Neumann (ext.)" Date: Thu, 6 Apr 2023 17:08:25 +0200 Subject: [PATCH] add management-zone as global filter for svms dashboards, remove component tag from dashboard elements --- EMEA_PREPROD/dashboard/cd_am-svms_int.tf | 6 +++++- EMEA_PREPROD/dashboard/cd_am-svms_test.tf | 6 +++++- EMEA_PROD/dashboard/cd_am-svms_e2e.tf | 2 +- NA_PREPROD/dashboard/cd_am-svms_int.tf | 16 ++++++++++------ NA_PREPROD/dashboard/cd_am-svms_test.tf | 16 ++++++++++------ NA_PROD/dashboard/cd_am-svms_e2e.tf | 2 +- 6 files changed, 32 insertions(+), 16 deletions(-) diff --git a/EMEA_PREPROD/dashboard/cd_am-svms_int.tf b/EMEA_PREPROD/dashboard/cd_am-svms_int.tf index 879265e8..18ad6d4c 100644 --- a/EMEA_PREPROD/dashboard/cd_am-svms_int.tf +++ b/EMEA_PREPROD/dashboard/cd_am-svms_int.tf @@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-svms_INT" { tags = [ "CD_am-svms" ] filter { timeframe = "-24h to now" + management_zone { + name = "CD_am-svms" + id = data.dynatrace_management_zone.CD_am-svms_INT.id + } } } tile { @@ -354,4 +358,4 @@ resource "dynatrace_dashboard" "CD_am-svms_INT" { } } } -} \ No newline at end of file +} diff --git a/EMEA_PREPROD/dashboard/cd_am-svms_test.tf b/EMEA_PREPROD/dashboard/cd_am-svms_test.tf index c272da5f..abe3075f 100644 --- a/EMEA_PREPROD/dashboard/cd_am-svms_test.tf +++ b/EMEA_PREPROD/dashboard/cd_am-svms_test.tf @@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-svms_TEST" { tags = [ "CD_am-svms" ] filter { timeframe = "-24h to now" + management_zone { + name = "CD_am-svms" + id = data.dynatrace_management_zone.CD_am-svms_TEST.id + } } } tile { @@ -354,4 +358,4 @@ resource "dynatrace_dashboard" "CD_am-svms_TEST" { } } } -} \ No newline at end of file +} diff --git a/EMEA_PROD/dashboard/cd_am-svms_e2e.tf b/EMEA_PROD/dashboard/cd_am-svms_e2e.tf index 96019b9d..17c08fac 100644 --- a/EMEA_PROD/dashboard/cd_am-svms_e2e.tf +++ b/EMEA_PROD/dashboard/cd_am-svms_e2e.tf @@ -14,7 +14,7 @@ resource "dynatrace_dashboard" "CD_am-svms_E2E" { timeframe = "-24h to now" management_zone { name = "CD_am-svms" - id = data.dynatrace_management_zone.CD_am-svms_PROD.id + id = data.dynatrace_management_zone.CD_am-svms_E2E.id } } } diff --git a/NA_PREPROD/dashboard/cd_am-svms_int.tf b/NA_PREPROD/dashboard/cd_am-svms_int.tf index 9f22a3c2..693c19ae 100644 --- a/NA_PREPROD/dashboard/cd_am-svms_int.tf +++ b/NA_PREPROD/dashboard/cd_am-svms_int.tf @@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-svms_INT" { tags = [ "am-svms" ] filter { timeframe = "-24h to now" + management_zone { + name = "CD_am-svms" + id = data.dynatrace_management_zone.CD_am-svms_INT.id + } } } tile { @@ -67,7 +71,7 @@ resource "dynatrace_dashboard" "CD_am-svms_INT" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-svms", "Environment:INT" ] + values = [ "Environment:INT" ] } } } @@ -195,7 +199,7 @@ resource "dynatrace_dashboard" "CD_am-svms_INT" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-svms", "Environment:INT" ] + values = [ "Environment:INT" ] } } } @@ -246,7 +250,7 @@ resource "dynatrace_dashboard" "CD_am-svms_INT" { entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Component:am-svms", "Environment:INT" ] + values = [ "Environment:INT" ] } } } @@ -279,7 +283,7 @@ resource "dynatrace_dashboard" "CD_am-svms_INT" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-svms", "Environment:INT" ] + values = [ "Environment:INT" ] } } } @@ -312,10 +316,10 @@ resource "dynatrace_dashboard" "CD_am-svms_INT" { entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Component:am-svms", "Environment:INT" ] + values = [ "Environment:INT" ] } } } } } -} \ No newline at end of file +} diff --git a/NA_PREPROD/dashboard/cd_am-svms_test.tf b/NA_PREPROD/dashboard/cd_am-svms_test.tf index 4631a06e..5d8f93e1 100644 --- a/NA_PREPROD/dashboard/cd_am-svms_test.tf +++ b/NA_PREPROD/dashboard/cd_am-svms_test.tf @@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-svms_TEST" { tags = [ "am-svms" ] filter { timeframe = "-24h to now" + management_zone { + name = "CD_am-svms" + id = data.dynatrace_management_zone.CD_am-svms_TEST.id + } } } tile { @@ -67,7 +71,7 @@ resource "dynatrace_dashboard" "CD_am-svms_TEST" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-svms", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -195,7 +199,7 @@ resource "dynatrace_dashboard" "CD_am-svms_TEST" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-svms", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -246,7 +250,7 @@ resource "dynatrace_dashboard" "CD_am-svms_TEST" { entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Component:am-svms", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -279,7 +283,7 @@ resource "dynatrace_dashboard" "CD_am-svms_TEST" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-svms", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -312,10 +316,10 @@ resource "dynatrace_dashboard" "CD_am-svms_TEST" { entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Component:am-svms", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } } } -} \ No newline at end of file +} diff --git a/NA_PROD/dashboard/cd_am-svms_e2e.tf b/NA_PROD/dashboard/cd_am-svms_e2e.tf index 60770910..e4c1c579 100644 --- a/NA_PROD/dashboard/cd_am-svms_e2e.tf +++ b/NA_PROD/dashboard/cd_am-svms_e2e.tf @@ -14,7 +14,7 @@ resource "dynatrace_dashboard" "CD_am-svms_E2E" { timeframe = "-24h to now" management_zone { name = "CD_am-svms" - id = data.dynatrace_management_zone.CD_am-svms_PROD.id + id = data.dynatrace_management_zone.CD_am-svms_E2E.id } } }