From a787404f65fdb59b0306f7ef0e02c5259502ea4c Mon Sep 17 00:00:00 2001 From: "Thomas Neumann (ext.)" Date: Thu, 6 Apr 2023 17:01:05 +0200 Subject: [PATCH] add management-zone as global filter for lmcs dashboards, remove Component tag from dashboard elements --- CN_PREPROD/dashboard/cd_am-lmcs_int.tf | 16 ++++++++++------ CN_PREPROD/dashboard/cd_am-lmcs_test.tf | 16 ++++++++++------ CN_PROD/dashboard/cd_am-lmcs_e2e.tf | 16 ++++++++++------ CN_PROD/dashboard/cd_am-lmcs_prod.tf | 16 ++++++++++------ EMEA_PREPROD/dashboard/cd_am-lmcs_int.tf | 6 +++++- EMEA_PREPROD/dashboard/cd_am-lmcs_test.tf | 6 +++++- EMEA_PROD/dashboard/cd_am-lmcs_e2e.tf | 16 ++++++++++------ EMEA_PROD/dashboard/cd_am-lmcs_prod.tf | 16 ++++++++++------ NA_PREPROD/dashboard/cd_am-lmcs_int.tf | 16 ++++++++++------ NA_PREPROD/dashboard/cd_am-lmcs_test.tf | 16 ++++++++++------ NA_PROD/dashboard/cd_am-lmcs_e2e.tf | 16 ++++++++++------ NA_PROD/dashboard/cd_am-lmcs_prod.tf | 16 ++++++++++------ 12 files changed, 110 insertions(+), 62 deletions(-) diff --git a/CN_PREPROD/dashboard/cd_am-lmcs_int.tf b/CN_PREPROD/dashboard/cd_am-lmcs_int.tf index b3b225ea..fbe77ede 100644 --- a/CN_PREPROD/dashboard/cd_am-lmcs_int.tf +++ b/CN_PREPROD/dashboard/cd_am-lmcs_int.tf @@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_INT" { tags = [ "am-lmcs" ] filter { timeframe = "-24h to now" + management_zone { + name = "CD_am-lmcs" + id = data.dynatrace_management_zone.CD_am-lmcs_INT.id + } } } tile { @@ -64,7 +68,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_INT" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:INT" ] + values = [ "Environment:INT" ] } } } @@ -180,7 +184,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_INT" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:INT" ] + values = [ "Environment:INT" ] } } } @@ -225,7 +229,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_INT" { entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:INT" ] + values = [ "Environment:INT" ] } } } @@ -255,7 +259,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_INT" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:INT" ] + values = [ "Environment:INT" ] } } } @@ -285,10 +289,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_INT" { entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:INT" ] + values = [ "Environment:INT" ] } } } } } -} \ No newline at end of file +} diff --git a/CN_PREPROD/dashboard/cd_am-lmcs_test.tf b/CN_PREPROD/dashboard/cd_am-lmcs_test.tf index aa1d47c6..2d50e8f5 100644 --- a/CN_PREPROD/dashboard/cd_am-lmcs_test.tf +++ b/CN_PREPROD/dashboard/cd_am-lmcs_test.tf @@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_TEST" { tags = [ "am-lmcs" ] filter { timeframe = "-24h to now" + management_zone { + name = "CD_am-lmcs" + id = data.dynatrace_management_zone.CD_am-lmcs_TEST.id + } } } tile { @@ -64,7 +68,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_TEST" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -180,7 +184,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_TEST" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -225,7 +229,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_TEST" { entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -255,7 +259,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_TEST" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -285,10 +289,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_TEST" { entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } } } -} \ No newline at end of file +} diff --git a/CN_PROD/dashboard/cd_am-lmcs_e2e.tf b/CN_PROD/dashboard/cd_am-lmcs_e2e.tf index 10e61bc1..82b8e3cc 100644 --- a/CN_PROD/dashboard/cd_am-lmcs_e2e.tf +++ b/CN_PROD/dashboard/cd_am-lmcs_e2e.tf @@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_E2E" { tags = [ "am-lmcs" ] filter { timeframe = "-24h to now" + management_zone { + name = "CD_am-lmcs" + id = data.dynatrace_management_zone.CD_am-lmcs_E2E.id + } } } tile { @@ -64,7 +68,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_E2E" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Environment:E2E", "Component:am-lmcs" ] + values = [ "Environment:E2E" ] } } } @@ -180,7 +184,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_E2E" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Environment:E2E", "Component:am-lmcs" ] + values = [ "Environment:E2E" ] } } } @@ -225,7 +229,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_E2E" { entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Environment:E2E", "Component:am-lmcs" ] + values = [ "Environment:E2E" ] } } } @@ -255,7 +259,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_E2E" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Environment:E2E", "Component:am-lmcs" ] + values = [ "Environment:E2E" ] } } } @@ -285,10 +289,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_E2E" { entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Environment:E2E", "Component:am-lmcs" ] + values = [ "Environment:E2E" ] } } } } } -} \ No newline at end of file +} diff --git a/CN_PROD/dashboard/cd_am-lmcs_prod.tf b/CN_PROD/dashboard/cd_am-lmcs_prod.tf index a85af0e8..06febec0 100644 --- a/CN_PROD/dashboard/cd_am-lmcs_prod.tf +++ b/CN_PROD/dashboard/cd_am-lmcs_prod.tf @@ -12,6 +12,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_PROD" { }) filter { timeframe = "-24h to now" + management_zone { + name = "CD_am-lmcs" + id = data.dynatrace_management_zone.CD_am-lmcs_PROD.id + } } } tile { @@ -67,7 +71,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_PROD" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -183,7 +187,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_PROD" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -228,7 +232,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_PROD" { entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -258,7 +262,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_PROD" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -288,10 +292,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_PROD" { entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } } } -} \ No newline at end of file +} diff --git a/EMEA_PREPROD/dashboard/cd_am-lmcs_int.tf b/EMEA_PREPROD/dashboard/cd_am-lmcs_int.tf index 51adfea4..4e5a55c2 100644 --- a/EMEA_PREPROD/dashboard/cd_am-lmcs_int.tf +++ b/EMEA_PREPROD/dashboard/cd_am-lmcs_int.tf @@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_INT" { tags = [ "CD_am-lmcs" ] filter { timeframe = "-24h to now" + management_zone { + name = "CD_am-lmcs" + id = data.dynatrace_management_zone.CD_am-lmcs_INT.id + } } } tile { @@ -354,4 +358,4 @@ resource "dynatrace_dashboard" "CD_am-lmcs_INT" { } } } -} \ No newline at end of file +} diff --git a/EMEA_PREPROD/dashboard/cd_am-lmcs_test.tf b/EMEA_PREPROD/dashboard/cd_am-lmcs_test.tf index b2b93d2c..72ed009f 100644 --- a/EMEA_PREPROD/dashboard/cd_am-lmcs_test.tf +++ b/EMEA_PREPROD/dashboard/cd_am-lmcs_test.tf @@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_TEST" { tags = [ "CD_am-lmcs" ] filter { timeframe = "-24h to now" + management_zone { + name = "CD_am-lmcs" + id = data.dynatrace_management_zone.CD_am-lmcs_TEST.id + } } } tile { @@ -354,4 +358,4 @@ resource "dynatrace_dashboard" "CD_am-lmcs_TEST" { } } } -} \ No newline at end of file +} diff --git a/EMEA_PROD/dashboard/cd_am-lmcs_e2e.tf b/EMEA_PROD/dashboard/cd_am-lmcs_e2e.tf index 49efc706..2680f487 100644 --- a/EMEA_PROD/dashboard/cd_am-lmcs_e2e.tf +++ b/EMEA_PROD/dashboard/cd_am-lmcs_e2e.tf @@ -12,6 +12,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_E2E" { }) filter { timeframe = "-24h to now" + management_zone { + name = "CD_am-lmcs" + id = data.dynatrace_management_zone.CD_am-lmcs_E2E.id + } } } tile { @@ -70,7 +74,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_E2E" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Environment:E2E", "Component:am-lmcs" ] + values = [ "Environment:E2E" ] } } } @@ -198,7 +202,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_E2E" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Environment:E2E", "Component:am-lmcs" ] + values = [ "Environment:E2E" ] } } } @@ -249,7 +253,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_E2E" { entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Environment:E2E", "Component:am-lmcs" ] + values = [ "Environment:E2E" ] } } } @@ -282,7 +286,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_E2E" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Environment:E2E", "Component:am-lmcs" ] + values = [ "Environment:E2E" ] } } } @@ -315,10 +319,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_E2E" { entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Environment:E2E", "Component:am-lmcs" ] + values = [ "Environment:E2E" ] } } } } } -} \ No newline at end of file +} diff --git a/EMEA_PROD/dashboard/cd_am-lmcs_prod.tf b/EMEA_PROD/dashboard/cd_am-lmcs_prod.tf index 2a19397c..4f5aff14 100644 --- a/EMEA_PROD/dashboard/cd_am-lmcs_prod.tf +++ b/EMEA_PROD/dashboard/cd_am-lmcs_prod.tf @@ -12,6 +12,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_PROD" { }) filter { timeframe = "-24h to now" + management_zone { + name = "CD_am-lmcs" + id = data.dynatrace_management_zone.CD_am-lmcs_PROD.id + } } } tile { @@ -70,7 +74,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_PROD" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -198,7 +202,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_PROD" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -249,7 +253,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_PROD" { entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -282,7 +286,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_PROD" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -315,10 +319,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_PROD" { entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } } } -} \ No newline at end of file +} diff --git a/NA_PREPROD/dashboard/cd_am-lmcs_int.tf b/NA_PREPROD/dashboard/cd_am-lmcs_int.tf index 0130d559..3e7dfcc0 100644 --- a/NA_PREPROD/dashboard/cd_am-lmcs_int.tf +++ b/NA_PREPROD/dashboard/cd_am-lmcs_int.tf @@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_INT" { tags = [ "am-lmcs" ] filter { timeframe = "-24h to now" + management_zone { + name = "CD_am-lmcs" + id = data.dynatrace_management_zone.CD_am-lmcs_INT.id + } } } tile { @@ -67,7 +71,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_INT" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:INT" ] + values = [ "Environment:INT" ] } } } @@ -195,7 +199,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_INT" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:INT" ] + values = [ "Environment:INT" ] } } } @@ -246,7 +250,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_INT" { entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:INT" ] + values = [ "Environment:INT" ] } } } @@ -279,7 +283,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_INT" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:INT" ] + values = [ "Environment:INT" ] } } } @@ -312,10 +316,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_INT" { entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:INT" ] + values = [ "Environment:INT" ] } } } } } -} \ No newline at end of file +} diff --git a/NA_PREPROD/dashboard/cd_am-lmcs_test.tf b/NA_PREPROD/dashboard/cd_am-lmcs_test.tf index a8644ba4..f21726b4 100644 --- a/NA_PREPROD/dashboard/cd_am-lmcs_test.tf +++ b/NA_PREPROD/dashboard/cd_am-lmcs_test.tf @@ -9,6 +9,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_TEST" { tags = [ "am-lmcs" ] filter { timeframe = "-24h to now" + management_zone { + name = "CD_am-lmcs" + id = data.dynatrace_management_zone.CD_am-lmcs_TEST.id + } } } tile { @@ -67,7 +71,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_TEST" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -195,7 +199,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_TEST" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -246,7 +250,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_TEST" { entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -279,7 +283,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_TEST" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } @@ -312,10 +316,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_TEST" { entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:TEST" ] + values = [ "Environment:TEST" ] } } } } } -} \ No newline at end of file +} diff --git a/NA_PROD/dashboard/cd_am-lmcs_e2e.tf b/NA_PROD/dashboard/cd_am-lmcs_e2e.tf index c674d3e2..841f9d3a 100644 --- a/NA_PROD/dashboard/cd_am-lmcs_e2e.tf +++ b/NA_PROD/dashboard/cd_am-lmcs_e2e.tf @@ -12,6 +12,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_E2E" { }) filter { timeframe = "-24h to now" + management_zone { + name = "CD_am-lmcs" + id = data.dynatrace_management_zone.CD_am-lmcs_E2E.id + } } } tile { @@ -70,7 +74,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_E2E" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Environment:E2E", "Component:am-lmcs" ] + values = [ "Environment:E2E" ] } } } @@ -198,7 +202,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_E2E" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Environment:E2E", "Component:am-lmcs" ] + values = [ "Environment:E2E" ] } } } @@ -249,7 +253,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_E2E" { entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Environment:E2E", "Component:am-lmcs" ] + values = [ "Environment:E2E" ] } } } @@ -282,7 +286,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_E2E" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Environment:E2E", "Component:am-lmcs" ] + values = [ "Environment:E2E" ] } } } @@ -315,10 +319,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_E2E" { entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Environment:E2E", "Component:am-lmcs" ] + values = [ "Environment:E2E" ] } } } } } -} \ No newline at end of file +} diff --git a/NA_PROD/dashboard/cd_am-lmcs_prod.tf b/NA_PROD/dashboard/cd_am-lmcs_prod.tf index e904474e..52e2c85e 100644 --- a/NA_PROD/dashboard/cd_am-lmcs_prod.tf +++ b/NA_PROD/dashboard/cd_am-lmcs_prod.tf @@ -12,6 +12,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_PROD" { }) filter { timeframe = "-24h to now" + management_zone { + name = "CD_am-lmcs" + id = data.dynatrace_management_zone.CD_am-lmcs_PROD.id + } } } tile { @@ -70,7 +74,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_PROD" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -198,7 +202,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_PROD" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -249,7 +253,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_PROD" { entity_type = "DATABASE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -282,7 +286,7 @@ resource "dynatrace_dashboard" "CD_am-lmcs_PROD" { entity_type = "SERVICE" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } @@ -315,10 +319,10 @@ resource "dynatrace_dashboard" "CD_am-lmcs_PROD" { entity_type = "HOST" match { key = "AUTO_TAGS" - values = [ "Component:am-lmcs", "Environment:PROD" ] + values = [ "Environment:PROD" ] } } } } } -} \ No newline at end of file +}