COMFY-1087: Fix dashboard module names

CN_PREPROD/alerting/cd_tol-tssb_int.tf

@@ -1,38 +0,0 @@
-# DEFINE dynatrace_alerting.CD_tol-tssb_INT.id = vu9U3hXa3q0AAAABABhidWlsdGluOmFsZXJ0aW5nLnByb2ZpbGUABnRlbmFudAAGdGVuYW50ACQ1NjliZmRiOS03ODk1LTQ1MWQtOTg4OS0xMTczNjRiNDZkZWW-71TeFdrerQ
-data "dynatrace_management_zone" "CD_tol-tssb_INT"{ name="CD_tol-tssb" }
-resource "dynatrace_alerting" "CD_tol-tssb_INT" {
-  name            = "CD_tol-tssb INT"
-  management_zone = data.dynatrace_management_zone.CD_tol-tssb_INT.id
-  rules {
-    rule {
-      delay_in_minutes = 0
-      include_mode     = "INCLUDE_ALL"
-      severity_level   = "AVAILABILITY"
-      tags             = [ "Component:tol-tssb", "Environment:INT" ]
-    }
-    rule {
-      delay_in_minutes = 10
-      include_mode     = "INCLUDE_ALL"
-      severity_level   = "CUSTOM_ALERT"
-      tags             = [ "Component:tol-tssb", "Environment:INT" ]
-    }
-    rule {
-      delay_in_minutes = 10
-      include_mode     = "INCLUDE_ALL"
-      severity_level   = "ERRORS"
-      tags             = [ "Component:tol-tssb", "Environment:INT" ]
-    }
-    rule {
-      delay_in_minutes = 30
-      include_mode     = "INCLUDE_ALL"
-      severity_level   = "PERFORMANCE"
-      tags             = [ "Component:tol-tssb", "Environment:INT" ]
-    }
-    rule {
-      delay_in_minutes = 30
-      include_mode     = "INCLUDE_ALL"
-      severity_level   = "RESOURCE_CONTENTION"
-      tags             = [ "Component:tol-tssb", "Environment:INT" ]
-    }
-  }
-}

CN_PREPROD/alerting/cd_vdm_sfa_int.tf

@@ -0,0 +1,38 @@
+# DEFINE dynatrace_alerting.CD_vdm_sfa_INT.id = vu9U3hXa3q0AAAABABhidWlsdGluOmFsZXJ0aW5nLnByb2ZpbGUABnRlbmFudAAGdGVuYW50ACQ3M2JlNGQ2ZS1mMzIwLTNkMzMtOGQyZS0xYjViYmZhNjVkMTm-71TeFdrerQ
+data "dynatrace_management_zone" "CD_vdm_sfa_INT"{ name="CD_vdm_sfa" }
+resource "dynatrace_alerting" "CD_vdm_sfa_INT" {
+  name            = "CD_vdm_sfa INT"
+  management_zone = data.dynatrace_management_zone.CD_vdm_sfa_INT.id
+  rules {
+    rule {
+      delay_in_minutes = 0
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "AVAILABILITY"
+      tags             = [ "Environment:INT" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "CUSTOM_ALERT"
+      tags             = [ "Environment:INT" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "ERRORS"
+      tags             = [ "Environment:INT" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "PERFORMANCE"
+      tags             = [ "Environment:INT" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "RESOURCE_CONTENTION"
+      tags             = [ "Environment:INT" ]
+    }
+  }
+}

CN_PREPROD/dashboard/cd_tol-tssb_int-test.tf

@@ -1,558 +0,0 @@
-# DEFINE dynatrace_dashboard.CD_tol-tssb_INT-TEST.id = 36dc59d8-006b-4beb-9973-84be761130bb
-data "dynatrace_management_zone" "CD_tol-tssb_INT-TEST"{ name="CD_tol-tssb" }
-resource "dynatrace_dashboard" "CD_tol-tssb_INT-TEST" {
-  dashboard_metadata {
-    name   = "CD_tol-tssb INT-TEST"
-    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
-    preset = true
-    shared = true
-    tags   = [ "CD_tol-tssb" ]
-    filter {
-      management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_INT-TEST.id
-      }
-    }
-  }
-  tile {
-    name       = "Custom chart"
-    configured = true
-    tile_type  = "CUSTOM_CHARTING"
-    bounds {
-      height = 266
-      left   = 38
-      top    = 380
-      width  = 760
-    }
-    filter_config {
-      type         = "MIXED"
-      custom_name  = "Failure rate (HTTP 4xx/5xx  errors)"
-      default_name = "Custom chart"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-        result_metadata {
-          config {
-            custom_color  = "#ef651f"
-            key           = "nullbuiltin:service.errors.fivexx.rate|AVG|TOTAL|BAR|SERVICE"
-            last_modified = 1595276148986
-          }
-        }
-        series {
-          type             = "BAR"
-          aggregation      = "AVG"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.errors.fourxx.rate"
-          # sort_ascending = false
-          # sort_column    = false
-        }
-        series {
-          type             = "BAR"
-          aggregation      = "AVG"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.errors.fivexx.rate"
-          # sort_ascending = false
-          sort_column      = true
-        }
-      }
-      filters {
-        filter {
-          entity_type = "SERVICE"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Environment:INT" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name       = "Problems"
-    configured = true
-    tile_type  = "OPEN_PROBLEMS"
-    bounds {
-      height = 152
-      left   = 1596
-      top    = 114
-      width  = 152
-    }
-  }
-  tile {
-    name          = ""
-    chart_visible = true
-    configured    = true
-    tile_type     = "SERVICES"
-    bounds {
-      height = 190
-      left   = 1064
-      top    = 76
-      width  = 228
-    }
-    filter_config {
-      type         = "SERVICE"
-      custom_name  = "Services"
-      default_name = "Services"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-      }
-      filters {
-        filter {
-          entity_type = "SERVICE"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:TEST" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name       = "Overall Health - INT"
-    configured = true
-    tile_type  = "HEADER"
-    bounds {
-      height = 38
-      left   = 38
-      top    = 38
-      width  = 760
-    }
-  }
-  tile {
-    name       = "Markdown"
-    configured = true
-    markdown   =<<-EOT
-      ---
-      
-    EOT
-    tile_type  = "MARKDOWN"
-    bounds {
-      height = 38
-      left   = 38
-      top    = 684
-      width  = 1520
-    }
-  }
-  tile {
-    name       = "Service1 - TEST"
-    configured = true
-    tile_type  = "HEADER"
-    bounds {
-      height = 38
-      left   = 798
-      top    = 722
-      width  = 760
-    }
-  }
-  tile {
-    name       = "Custom chart"
-    configured = true
-    tile_type  = "CUSTOM_CHARTING"
-    bounds {
-      height = 304
-      left   = 798
-      top    = 760
-      width  = 760
-    }
-    filter_config {
-      type         = "MIXED"
-      custom_name  = "Response time, Throughput and Number of Errors"
-      default_name = "Custom chart"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-        result_metadata {
-          config {
-            custom_color  = "#008cdb"
-            key           = "nullbuiltin:service.requestCount.total|NONE|TOTAL|BAR|SERVICE"
-            last_modified = 1595275720776
-          }
-          config {
-            custom_color  = "#b4e5f9"
-            key           = "nullbuiltin:service.response.time|AVG|TOTAL|LINE|SERVICE"
-            last_modified = 1595275686773
-          }
-          config {
-            custom_color  = "#ef651f"
-            key           = "nullbuiltin:service.errors.total.count|NONE|TOTAL|BAR|SERVICE"
-            last_modified = 1595275955999
-          }
-        }
-        series {
-          type             = "LINE"
-          aggregation      = "AVG"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.response.time"
-          # sort_ascending = false
-          # sort_column    = false
-        }
-        series {
-          type             = "BAR"
-          aggregation      = "NONE"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.requestCount.total"
-          # sort_ascending = false
-          # sort_column    = false
-        }
-        series {
-          type             = "BAR"
-          aggregation      = "NONE"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.errors.total.count"
-          # sort_ascending = false
-          sort_column      = true
-        }
-      }
-      filters {
-        filter {
-          entity_type = "SERVICE"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Environment:TEST" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name       = "Service1 - INT"
-    configured = true
-    tile_type  = "HEADER"
-    bounds {
-      height = 38
-      left   = 38
-      top    = 722
-      width  = 760
-    }
-  }
-  tile {
-    name       = "Custom chart"
-    configured = true
-    tile_type  = "CUSTOM_CHARTING"
-    bounds {
-      height = 304
-      left   = 38
-      top    = 760
-      width  = 760
-    }
-    filter_config {
-      type         = "MIXED"
-      custom_name  = "Response time, Throughput and Number of Errors"
-      default_name = "Custom chart"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-        result_metadata {
-          config {
-            custom_color  = "#008cdb"
-            key           = "nullbuiltin:service.requestCount.total|NONE|TOTAL|BAR|SERVICE"
-            last_modified = 1595275720776
-          }
-          config {
-            custom_color  = "#b4e5f9"
-            key           = "nullbuiltin:service.response.time|AVG|TOTAL|LINE|SERVICE"
-            last_modified = 1595275686773
-          }
-          config {
-            custom_color  = "#ef651f"
-            key           = "nullbuiltin:service.errors.total.count|NONE|TOTAL|BAR|SERVICE"
-            last_modified = 1595275955999
-          }
-        }
-        series {
-          type             = "LINE"
-          aggregation      = "AVG"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.response.time"
-          # sort_ascending = false
-          # sort_column    = false
-        }
-        series {
-          type             = "BAR"
-          aggregation      = "NONE"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.requestCount.total"
-          # sort_ascending = false
-          # sort_column    = false
-        }
-        series {
-          type             = "BAR"
-          aggregation      = "NONE"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.errors.total.count"
-          # sort_ascending = false
-          sort_column      = true
-        }
-      }
-      filters {
-        filter {
-          entity_type = "SERVICE"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Environment:INT" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name       = "Custom chart"
-    configured = true
-    tile_type  = "CUSTOM_CHARTING"
-    bounds {
-      height = 266
-      left   = 798
-      top    = 380
-      width  = 760
-    }
-    filter_config {
-      type         = "MIXED"
-      custom_name  = "Failure rate (HTTP 4xx/5xx  errors)"
-      default_name = "Custom chart"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-        result_metadata {
-          config {
-            custom_color  = "#ef651f"
-            key           = "nullbuiltin:service.errors.fivexx.rate|AVG|TOTAL|BAR|SERVICE"
-            last_modified = 1595276148986
-          }
-        }
-        series {
-          type             = "BAR"
-          aggregation      = "AVG"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.errors.fourxx.rate"
-          # sort_ascending = false
-          # sort_column    = false
-        }
-        series {
-          type             = "BAR"
-          aggregation      = "AVG"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.errors.fivexx.rate"
-          # sort_ascending = false
-          sort_column      = true
-        }
-      }
-      filters {
-        filter {
-          entity_type = "SERVICE"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Environment:TEST" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name       = "Markdown"
-    configured = true
-    markdown   =<<-EOT
-      ---
-      
-    EOT
-    tile_type  = "MARKDOWN"
-    bounds {
-      height = 38
-      left   = 38
-      top    = 304
-      width  = 1520
-    }
-  }
-  tile {
-    name       = "Failure rate - TEST (HTTP 4xx/5xx errors)"
-    configured = true
-    tile_type  = "HEADER"
-    bounds {
-      height = 38
-      left   = 798
-      top    = 342
-      width  = 760
-    }
-  }
-  tile {
-    name       = "Failure rate - INT (HTTP 4xx/5xx errors)"
-    configured = true
-    tile_type  = "HEADER"
-    bounds {
-      height = 38
-      left   = 38
-      top    = 342
-      width  = 760
-    }
-  }
-  tile {
-    name          = ""
-    chart_visible = true
-    configured    = true
-    tile_type     = "DATABASES_OVERVIEW"
-    bounds {
-      height = 190
-      left   = 570
-      top    = 76
-      width  = 228
-    }
-    filter_config {
-      type         = "DATABASE"
-      custom_name  = "Databases"
-      default_name = "Databases"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-      }
-      filters {
-        filter {
-          entity_type = "DATABASE"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:INT" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name       = "Overall Health - TEST"
-    configured = true
-    tile_type  = "HEADER"
-    bounds {
-      height = 38
-      left   = 798
-      top    = 38
-      width  = 760
-    }
-  }
-  tile {
-    name          = ""
-    chart_visible = true
-    configured    = true
-    tile_type     = "DATABASES_OVERVIEW"
-    bounds {
-      height = 190
-      left   = 1330
-      top    = 76
-      width  = 228
-    }
-    filter_config {
-      type         = "DATABASE"
-      custom_name  = "Databases"
-      default_name = "Databases"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-      }
-      filters {
-        filter {
-          entity_type = "DATABASE"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:TEST" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name          = ""
-    chart_visible = true
-    configured    = true
-    tile_type     = "SERVICES"
-    bounds {
-      height = 190
-      left   = 304
-      top    = 76
-      width  = 228
-    }
-    filter_config {
-      type         = "SERVICE"
-      custom_name  = "Services"
-      default_name = "Services"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-      }
-      filters {
-        filter {
-          entity_type = "SERVICE"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:INT" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name          = ""
-    chart_visible = true
-    configured    = true
-    tile_type     = "HOSTS"
-    bounds {
-      height = 190
-      left   = 798
-      top    = 76
-      width  = 228
-    }
-    filter_config {
-      type         = "HOST"
-      custom_name  = "Hosts"
-      default_name = "Hosts"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-      }
-      filters {
-        filter {
-          entity_type = "HOST"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:TEST" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name          = ""
-    chart_visible = true
-    configured    = true
-    tile_type     = "HOSTS"
-    bounds {
-      height = 190
-      left   = 38
-      top    = 76
-      width  = 228
-    }
-    filter_config {
-      type         = "HOST"
-      custom_name  = "Hosts"
-      default_name = "Hosts"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-      }
-      filters {
-        filter {
-          entity_type = "HOST"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:INT" ]
-          }
-        }
-      }
-    }
-  }
-}

CN_PREPROD/dashboard/cd_tol-tssb_test.tf

@@ -1,294 +0,0 @@
-# DEFINE dynatrace_dashboard.CD_tol-tssb_TEST.id = fdebc0cc-912f-4af8-9871-e9076d0265c9
-data "dynatrace_management_zone" "CD_tol-tssb_TEST"{ name="CD_tol-tssb" }
-resource "dynatrace_dashboard" "CD_tol-tssb_TEST" {
-  dashboard_metadata {
-    name   = "CD_tol-tssb TEST"
-    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
-    preset = true
-    shared = true
-    tags   = [ "tol-tssb" ]
-    filter {
-      timeframe = "-24h to now"
-    }
-  }
-  tile {
-    name       = "Custom chart"
-    configured = true
-    tile_type  = "CUSTOM_CHARTING"
-    bounds {
-      height = 304
-      left   = 38
-      top    = 228
-      width  = 1064
-    }
-    filter_config {
-      type         = "MIXED"
-      custom_name  = "Failure rate (HTTP 4xx/5xx  errors)"
-      default_name = "Custom chart"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-        result_metadata {
-          config {
-            custom_color  = "#ff0000"
-            key           = "nullbuiltin:service.errors.fivexx.rate|AVG|TOTAL|BAR|SERVICE"
-            last_modified = 1617956393463
-          }
-          config {
-            custom_color  = "#fff29a"
-            key           = "nullbuiltin:service.errors.fourxx.rate|AVG|TOTAL|BAR|SERVICE"
-            last_modified = 1617956441725
-          }
-        }
-        series {
-          type             = "BAR"
-          aggregation      = "AVG"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.errors.fourxx.rate"
-          # sort_ascending = false
-          # sort_column    = false
-        }
-        series {
-          type             = "BAR"
-          aggregation      = "AVG"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.errors.fivexx.rate"
-          # sort_ascending = false
-          sort_column      = true
-        }
-      }
-      filters {
-        filter {
-          entity_type = "SERVICE"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:TEST" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name       = "Problems"
-    configured = true
-    tile_type  = "OPEN_PROBLEMS"
-    bounds {
-      height = 152
-      left   = 950
-      top    = 38
-      width  = 152
-    }
-    filter {
-      management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_TEST.id
-      }
-    }
-  }
-  tile {
-    name       = "Overall Health"
-    configured = true
-    tile_type  = "HEADER"
-    bounds {
-      height = 38
-      left   = 38
-      top    = 0
-      width  = 1064
-    }
-  }
-  tile {
-    name       = "Markdown"
-    configured = true
-    markdown   =<<-EOT
-      ---
-      
-    EOT
-    tile_type  = "MARKDOWN"
-    bounds {
-      height = 38
-      left   = 38
-      top    = 532
-      width  = 1064
-    }
-  }
-  tile {
-    name       = "Custom chart"
-    configured = true
-    tile_type  = "CUSTOM_CHARTING"
-    bounds {
-      height = 304
-      left   = 38
-      top    = 570
-      width  = 1064
-    }
-    filter_config {
-      type         = "MIXED"
-      custom_name  = "Response time, Request Count and Number of Errors"
-      default_name = "Custom chart"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-        result_metadata {
-          config {
-            custom_color  = "#008cdb"
-            key           = "nullbuiltin:service.requestCount.total|NONE|TOTAL|BAR|SERVICE"
-            last_modified = 1595275720776
-          }
-          config {
-            custom_color  = "#b4e5f9"
-            key           = "nullbuiltin:service.response.time|AVG|TOTAL|LINE|SERVICE"
-            last_modified = 1595275686773
-          }
-          config {
-            custom_color  = "#ef651f"
-            key           = "nullbuiltin:service.errors.total.count|NONE|TOTAL|BAR|SERVICE"
-            last_modified = 1595275955999
-          }
-        }
-        series {
-          type             = "LINE"
-          aggregation      = "AVG"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.response.time"
-          # sort_ascending = false
-          # sort_column    = false
-        }
-        series {
-          type             = "BAR"
-          aggregation      = "NONE"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.requestCount.total"
-          # sort_ascending = false
-          # sort_column    = false
-        }
-        series {
-          type             = "BAR"
-          aggregation      = "NONE"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.errors.total.count"
-          # sort_ascending = false
-          sort_column      = true
-        }
-      }
-      filters {
-        filter {
-          entity_type = "SERVICE"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:TEST" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name       = "Markdown"
-    configured = true
-    markdown   =<<-EOT
-      ---
-      
-    EOT
-    tile_type  = "MARKDOWN"
-    bounds {
-      height = 38
-      left   = 38
-      top    = 190
-      width  = 1064
-    }
-  }
-  tile {
-    name          = ""
-    chart_visible = true
-    configured    = true
-    tile_type     = "DATABASES_OVERVIEW"
-    bounds {
-      height = 152
-      left   = 646
-      top    = 38
-      width  = 190
-    }
-    filter_config {
-      type         = "DATABASE"
-      custom_name  = "Databases"
-      default_name = "Databases"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-      }
-      filters {
-        filter {
-          entity_type = "DATABASE"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:TEST" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name          = ""
-    chart_visible = true
-    configured    = true
-    tile_type     = "SERVICES"
-    bounds {
-      height = 152
-      left   = 342
-      top    = 38
-      width  = 190
-    }
-    filter_config {
-      type         = "SERVICE"
-      custom_name  = "Services"
-      default_name = "Services"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-      }
-      filters {
-        filter {
-          entity_type = "SERVICE"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:TEST" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name          = ""
-    chart_visible = true
-    configured    = true
-    tile_type     = "HOSTS"
-    bounds {
-      height = 152
-      left   = 38
-      top    = 38
-      width  = 190
-    }
-    filter_config {
-      type         = "HOST"
-      custom_name  = "Hosts"
-      default_name = "Hosts"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-      }
-      filters {
-        filter {
-          entity_type = "HOST"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:TEST" ]
-          }
-        }
-      }
-    }
-  }
-}

CN_PREPROD/dashboard/cd_vdm_sfa_int.tf

@@ -1,12 +1,12 @@
-# DEFINE dynatrace_dashboard.CD_tol-tssb_E2E.id = c4a7a14f-9417-4046-b6ad-331dde25ac87
-data "dynatrace_management_zone" "CD_tol-tssb_E2E"{ name="CD_tol-tssb" }
-resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
+# DEFINE dynatrace_dashboard.CD_vdm_sfa_INT.id = b2fccb3f-d26c-4e5f-a1f7-bb5defd59a77
+data "dynatrace_management_zone" "CD_vdm_sfa_INT"{ name="CD_vdm_sfa" }
+resource "dynatrace_dashboard" "CD_vdm_sfa_INT" {
   dashboard_metadata {
-    name   = "CD_tol-tssb E2E"
+    name   = "CD_vdm_sfa INT"
     owner  = "Ignacio.Goldman@partner.bmwgroup.com"
     preset = true
     shared = true
-    tags   = [ "tol-tssb" ]
+    tags   = [ "CD_vdm_sfa" ]
     filter {
       timeframe = "-24h to now"
     }
@@ -21,6 +21,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
       top    = 228
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_INT.id
+      }
+    }
     filter_config {
       type         = "MIXED"
       custom_name  = "Failure rate (HTTP 4xx/5xx  errors)"
@@ -64,7 +70,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:tol-tssb" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -82,8 +88,8 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
     }
     filter {
       management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_E2E.id
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_INT.id
       }
     }
   }
@@ -97,6 +103,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
       top    = 0
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_INT.id
+      }
+    }
   }
   tile {
     name       = "Markdown"
@@ -123,6 +135,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
       top    = 570
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_INT.id
+      }
+    }
     filter_config {
       type         = "MIXED"
       custom_name  = "Response time, Request Count and Number of Errors"
@@ -180,7 +198,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:tol-tssb" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -212,6 +230,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_INT.id
+      }
+    }
     filter_config {
       type         = "DATABASE"
       custom_name  = "Databases"
@@ -225,7 +249,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:tol-tssb" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -242,6 +266,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_INT.id
+      }
+    }
     filter_config {
       type         = "SERVICE"
       custom_name  = "Services"
@@ -255,7 +285,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:tol-tssb" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -272,6 +302,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_INT.id
+      }
+    }
     filter_config {
       type         = "HOST"
       custom_name  = "Hosts"
@@ -285,7 +321,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:tol-tssb" ]
+            values = [ "Environment:INT" ]
           }
         }
       }

CN_PREPROD/dashboard/cd_vdm_sfa_test.tf

@@ -1,12 +1,12 @@
-# DEFINE dynatrace_dashboard.CD_tol-tssb_INT.id = 5beeedb9-c383-4d64-b3d2-828ea5351bf1
-data "dynatrace_management_zone" "CD_tol-tssb_INT"{ name="CD_tol-tssb" }
-resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
+# DEFINE dynatrace_dashboard.CD_vdm_sfa_TEST.id = 684d1b20-d6fa-4531-9a33-07bf9ba10b81
+data "dynatrace_management_zone" "CD_vdm_sfa_TEST"{ name="CD_vdm_sfa" }
+resource "dynatrace_dashboard" "CD_vdm_sfa_TEST" {
   dashboard_metadata {
-    name   = "CD_tol-tssb INT"
+    name   = "CD_vdm_sfa TEST"
     owner  = "Ignacio.Goldman@partner.bmwgroup.com"
     preset = true
     shared = true
-    tags   = [ "tol-tssb" ]
+    tags   = [ "CD_vdm_sfa" ]
     filter {
       timeframe = "-24h to now"
     }
@@ -21,6 +21,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
       top    = 228
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_TEST.id
+      }
+    }
     filter_config {
       type         = "MIXED"
       custom_name  = "Failure rate (HTTP 4xx/5xx  errors)"
@@ -64,7 +70,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:INT" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
@@ -82,8 +88,8 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
     }
     filter {
       management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_INT.id
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_TEST.id
       }
     }
   }
@@ -97,6 +103,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
       top    = 0
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_TEST.id
+      }
+    }
   }
   tile {
     name       = "Markdown"
@@ -123,6 +135,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
       top    = 570
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_TEST.id
+      }
+    }
     filter_config {
       type         = "MIXED"
       custom_name  = "Response time, Request Count and Number of Errors"
@@ -180,7 +198,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:INT" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
@@ -212,6 +230,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_TEST.id
+      }
+    }
     filter_config {
       type         = "DATABASE"
       custom_name  = "Databases"
@@ -225,7 +249,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:INT" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
@@ -242,6 +266,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_TEST.id
+      }
+    }
     filter_config {
       type         = "SERVICE"
       custom_name  = "Services"
@@ -255,7 +285,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:INT" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
@@ -272,6 +302,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_TEST.id
+      }
+    }
     filter_config {
       type         = "HOST"
       custom_name  = "Hosts"
@@ -285,7 +321,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:INT" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }

CN_PREPROD/management_zone/cd_tol-tssb.tf

@@ -1,95 +0,0 @@
-# DEFINE dynatrace_management_zone.CD_tol-tssb.id = -1465750590167206984
-resource "dynatrace_management_zone" "CD_tol-tssb" {
-  name = "CD_tol-tssb"
-  rules {
-    type    = "CLOUD_APPLICATION"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "CLOUD_APPLICATION_NAME"
-      }
-      string {
-        case_sensitive = true
-        # negate       = false
-        operator       = "CONTAINS"
-        value          = "tol-tssb"
-      }
-    }
-  }
-  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          = "tol-tssb"
-      }
-    }
-  }
-  rules {
-    type    = "HOST"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "HOST_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "tol-tssb"
-        }
-      }
-    }
-  }
-  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   = "tol-tssb"
-        }
-      }
-    }
-  }
-  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   = "tol-tssb"
-        }
-      }
-    }
-  }
-}

CN_PREPROD/management_zone/cd_vdm_sfa.tf

@@ -0,0 +1,28 @@
+# DEFINE dynatrace_management_zone.CD_vdm_sfa.id = -1200668658999417029
+resource "dynatrace_management_zone" "CD_vdm_sfa" {
+  name = "CD_vdm_sfa"
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(PROCESS_GROUP_INSTANCE),tag("Namespace:sfa")
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("Namespace:sfa"))
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(HOST),tag("Namespace:sfa")
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(Service),tag("Namespace:sfa")
+    EOT
+  }
+}

CN_PROD/alerting/cd_tol-tssb_prod.tf

@@ -1,38 +0,0 @@
-# DEFINE dynatrace_alerting.CD_tol-tssb_PROD.id = vu9U3hXa3q0AAAABABhidWlsdGluOmFsZXJ0aW5nLnByb2ZpbGUABnRlbmFudAAGdGVuYW50ACRmNWViODUzOC1mOWYzLTQ2MzYtYmY3OS1kYmI5Y2VjZGU5ZWK-71TeFdrerQ
-data "dynatrace_management_zone" "CD_tol-tssb_PROD"{ name="CD_tol-tssb" }
-resource "dynatrace_alerting" "CD_tol-tssb_PROD" {
-  name            = "CD_tol-tssb PROD"
-  management_zone = data.dynatrace_management_zone.CD_tol-tssb_PROD.id
-  rules {
-    rule {
-      delay_in_minutes = 0
-      include_mode     = "INCLUDE_ALL"
-      severity_level   = "AVAILABILITY"
-      tags             = [ "Component:tol-tssb", "Environment:PROD" ]
-    }
-    rule {
-      delay_in_minutes = 10
-      include_mode     = "INCLUDE_ALL"
-      severity_level   = "CUSTOM_ALERT"
-      tags             = [ "Component:tol-tssb", "Environment:PROD" ]
-    }
-    rule {
-      delay_in_minutes = 10
-      include_mode     = "INCLUDE_ALL"
-      severity_level   = "ERRORS"
-      tags             = [ "Component:tol-tssb", "Environment:PROD" ]
-    }
-    rule {
-      delay_in_minutes = 30
-      include_mode     = "INCLUDE_ALL"
-      severity_level   = "PERFORMANCE"
-      tags             = [ "Component:tol-tssb", "Environment:PROD" ]
-    }
-    rule {
-      delay_in_minutes = 30
-      include_mode     = "INCLUDE_ALL"
-      severity_level   = "RESOURCE_CONTENTION"
-      tags             = [ "Component:tol-tssb", "Environment:PROD" ]
-    }
-  }
-}

CN_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf

@@ -0,0 +1,12 @@
+# ID d347d638-f86b-4ccf-8b9e-2dd608a013ca
+module CD_sfa_vdm_standard_E2E {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_SFA - CN E2E - VDM Standard Dashboard"
+  tag                = "sfa"
+  environment        = "E2E"
+  managementZoneName = "CD_vdm_sfa"
+  appId              = "APP-19383"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-SecureFeatureActivation(SFA)"
+}

CN_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf

@@ -0,0 +1,33 @@
+# ID ca6a4174-87f4-43d4-8d6e-7a7acfa70bb4
+module CD_sfa_vdm_standard_PROD {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_SFA - CN PROD - VDM Standard Dashboard"
+  tag                = "sfa"
+  environment        = "PROD"
+  managementZoneName = "CD_vdm_sfa"
+  sloName            = "VDM - SFA - CN PROD"
+  appId              = "APP-19383"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-SecureFeatureActivation(SFA)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"PsdzResource - sfa - prod~",
+                                    ~"OrderHandlerResource - sfa - prod~",
+                                    ~"MQSession$FacadeMessageListener - sfa - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"generateTokenPackage~",
+                            ~"getPackageForOrder~",
+                            ~"generateTokenPackageForOrder~",
+                            ~"transferTokenStatusToEMEA~",
+                            ~"Queue: B2VCNSEC_P.BMW.LOGISTIK.SFA.W71.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VCNSEC_P.BMW.LOGISTIK.SFA.W72.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VCNSEC_P.BMW.LOGISTIK.SFA.W52.SFA_TOKEN_REQUEST_PROD~"
+                        )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(7))
+  EOT
+}

CN_PROD/dashboard/cd_vdm_sfa_e2e.tf

@@ -1,12 +1,12 @@
-# DEFINE dynatrace_dashboard.CD_tol-tssb_PROD.id = 357121b1-20ff-42b7-981a-c82f333aefd2
-data "dynatrace_management_zone" "CD_tol-tssb_PROD"{ name="CD_tol-tssb" }
-resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
+# DEFINE dynatrace_dashboard.CD_vdm_sfa_E2E.id = 0c7be657-afea-4f97-ab42-4c77ee620739
+data "dynatrace_management_zone" "CD_vdm_sfa_E2E"{ name="CD_vdm_sfa" }
+resource "dynatrace_dashboard" "CD_vdm_sfa_E2E" {
   dashboard_metadata {
-    name   = "CD_tol-tssb PROD"
+    name   = "CD_vdm_sfa E2E"
     owner  = "Ignacio.Goldman@partner.bmwgroup.com"
     preset = true
     shared = true
-    tags   = [ "tol-tssb" ]
+    tags   = [ "CD_vdm_sfa" ]
     filter {
       timeframe = "-24h to now"
     }
@@ -21,6 +21,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
       top    = 228
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_E2E.id
+      }
+    }
     filter_config {
       type         = "MIXED"
       custom_name  = "Failure rate (HTTP 4xx/5xx  errors)"
@@ -64,7 +70,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:PROD" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -82,8 +88,8 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
     }
     filter {
       management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_PROD.id
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_E2E.id
       }
     }
   }
@@ -97,6 +103,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
       top    = 0
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_E2E.id
+      }
+    }
   }
   tile {
     name       = "Markdown"
@@ -123,6 +135,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
       top    = 570
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_E2E.id
+      }
+    }
     filter_config {
       type         = "MIXED"
       custom_name  = "Response time, Request Count and Number of Errors"
@@ -180,7 +198,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:PROD" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -212,6 +230,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_E2E.id
+      }
+    }
     filter_config {
       type         = "DATABASE"
       custom_name  = "Databases"
@@ -225,7 +249,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:PROD" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -242,6 +266,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_E2E.id
+      }
+    }
     filter_config {
       type         = "SERVICE"
       custom_name  = "Services"
@@ -255,7 +285,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:PROD" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -272,6 +302,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_E2E.id
+      }
+    }
     filter_config {
       type         = "HOST"
       custom_name  = "Hosts"
@@ -285,7 +321,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:PROD" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }

CN_PROD/dashboard/cd_vdm_sfa_prod.tf

@@ -0,0 +1,330 @@
+# DEFINE dynatrace_dashboard.CD_vdm_sfa_PROD.id = a8853205-50e8-4776-a60d-3b37b2946f7c
+data "dynatrace_management_zone" "CD_vdm_sfa_PROD"{ name="CD_vdm_sfa" }
+resource "dynatrace_dashboard" "CD_vdm_sfa_PROD" {
+  dashboard_metadata {
+    name   = "CD_vdm_sfa PROD"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "CD_vdm_sfa" ]
+    filter {
+      timeframe = "-24h to now"
+    }
+  }
+  tile {
+    name       = "Custom chart"
+    configured = true
+    tile_type  = "CUSTOM_CHARTING"
+    bounds {
+      height = 304
+      left   = 38
+      top    = 228
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_PROD.id
+      }
+    }
+    filter_config {
+      type         = "MIXED"
+      custom_name  = "Failure rate (HTTP 4xx/5xx  errors)"
+      default_name = "Custom chart"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+        result_metadata {
+          config {
+            custom_color  = "#ff0000"
+            key           = "nullbuiltin:service.errors.fivexx.rate|AVG|TOTAL|BAR|SERVICE"
+            last_modified = 1617956393463
+          }
+          config {
+            custom_color  = "#fff29a"
+            key           = "nullbuiltin:service.errors.fourxx.rate|AVG|TOTAL|BAR|SERVICE"
+            last_modified = 1617956441725
+          }
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "AVG"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.errors.fourxx.rate"
+          # sort_ascending = false
+          # sort_column    = false
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "AVG"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.errors.fivexx.rate"
+          # sort_ascending = false
+          sort_column      = true
+        }
+      }
+      filters {
+        filter {
+          entity_type = "SERVICE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name       = "Problems"
+    configured = true
+    tile_type  = "OPEN_PROBLEMS"
+    bounds {
+      height = 152
+      left   = 950
+      top    = 38
+      width  = 152
+    }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_PROD.id
+      }
+    }
+  }
+  tile {
+    name       = "Overall Health"
+    configured = true
+    tile_type  = "HEADER"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 0
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_PROD.id
+      }
+    }
+  }
+  tile {
+    name       = "Markdown"
+    configured = true
+    markdown   =<<-EOT
+      ---
+      
+    EOT
+    tile_type  = "MARKDOWN"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 532
+      width  = 1064
+    }
+  }
+  tile {
+    name       = "Custom chart"
+    configured = true
+    tile_type  = "CUSTOM_CHARTING"
+    bounds {
+      height = 304
+      left   = 38
+      top    = 570
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_PROD.id
+      }
+    }
+    filter_config {
+      type         = "MIXED"
+      custom_name  = "Response time, Request Count and Number of Errors"
+      default_name = "Custom chart"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+        result_metadata {
+          config {
+            custom_color  = "#008cdb"
+            key           = "nullbuiltin:service.requestCount.total|NONE|TOTAL|BAR|SERVICE"
+            last_modified = 1595275720776
+          }
+          config {
+            custom_color  = "#b4e5f9"
+            key           = "nullbuiltin:service.response.time|AVG|TOTAL|LINE|SERVICE"
+            last_modified = 1595275686773
+          }
+          config {
+            custom_color  = "#ef651f"
+            key           = "nullbuiltin:service.errors.total.count|NONE|TOTAL|BAR|SERVICE"
+            last_modified = 1595275955999
+          }
+        }
+        series {
+          type             = "LINE"
+          aggregation      = "AVG"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.response.time"
+          # sort_ascending = false
+          # sort_column    = false
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "NONE"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.requestCount.total"
+          # sort_ascending = false
+          # sort_column    = false
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "NONE"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.errors.total.count"
+          # sort_ascending = false
+          sort_column      = true
+        }
+      }
+      filters {
+        filter {
+          entity_type = "SERVICE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name       = "Markdown"
+    configured = true
+    markdown   =<<-EOT
+      ---
+      
+    EOT
+    tile_type  = "MARKDOWN"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 190
+      width  = 1064
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "DATABASES_OVERVIEW"
+    bounds {
+      height = 152
+      left   = 646
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_PROD.id
+      }
+    }
+    filter_config {
+      type         = "DATABASE"
+      custom_name  = "Databases"
+      default_name = "Databases"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "DATABASE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "SERVICES"
+    bounds {
+      height = 152
+      left   = 342
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_PROD.id
+      }
+    }
+    filter_config {
+      type         = "SERVICE"
+      custom_name  = "Services"
+      default_name = "Services"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "SERVICE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "HOSTS"
+    bounds {
+      height = 152
+      left   = 38
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_PROD.id
+      }
+    }
+    filter_config {
+      type         = "HOST"
+      custom_name  = "Hosts"
+      default_name = "Hosts"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "HOST"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+}

CN_PROD/management_zone/cd_tol-tssb.tf

@@ -1,95 +0,0 @@
-# DEFINE dynatrace_management_zone.CD_tol-tssb.id = -3606919109579921371
-resource "dynatrace_management_zone" "CD_tol-tssb" {
-  name = "CD_tol-tssb"
-  rules {
-    type    = "CLOUD_APPLICATION"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "CLOUD_APPLICATION_NAME"
-      }
-      string {
-        case_sensitive = true
-        # negate       = false
-        operator       = "CONTAINS"
-        value          = "tol-tssb"
-      }
-    }
-  }
-  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          = "tol-tssb"
-      }
-    }
-  }
-  rules {
-    type    = "HOST"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "HOST_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "tol-tssb"
-        }
-      }
-    }
-  }
-  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   = "tol-tssb"
-        }
-      }
-    }
-  }
-  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   = "tol-tssb"
-        }
-      }
-    }
-  }
-}

CN_PROD/management_zone/cd_vdm_sfa.tf

@@ -0,0 +1,28 @@
+# DEFINE dynatrace_management_zone.CD_vdm_sfa.id = -969483423836083220
+resource "dynatrace_management_zone" "CD_vdm_sfa" {
+  name = "CD_vdm_sfa"
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(PROCESS_GROUP_INSTANCE),tag("Namespace:sfa")
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("Namespace:sfa"))
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(HOST),tag("Namespace:sfa")
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(Service),tag("Namespace:sfa")
+    EOT
+  }
+}

EMEA_PREPROD/dashboard/cd_vdm_sfa_int.tf

@@ -1,12 +1,12 @@
-# DEFINE dynatrace_dashboard.CD_tol-tssb_INT.id = 00fd7636-1c6b-423f-8e21-677642ac3be6
-data "dynatrace_management_zone" "CD_tol-tssb_INT"{ name="CD_tol-tssb" }
-resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
+# DEFINE dynatrace_dashboard.CD_vdm_sfa_INT.id = f12ef02d-4cc8-420f-911b-1bc98cd58ddb
+data "dynatrace_management_zone" "CD_vdm_sfa_INT"{ name="CD_vdm_sfa" }
+resource "dynatrace_dashboard" "CD_vdm_sfa_INT" {
   dashboard_metadata {
-    name   = "CD_tol-tssb INT"
+    name   = "CD_vdm_sfa INT"
     owner  = "Ignacio.Goldman@partner.bmwgroup.com"
     preset = true
     shared = true
-    tags   = [ "CD_tol-tssb" ]
+    tags   = [ "CD_vdm_sfa" ]
     filter {
       timeframe = "-24h to now"
     }
@@ -26,8 +26,8 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
     }
     filter {
       management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_INT.id
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_INT.id
       }
     }
     filter_config {
@@ -94,8 +94,8 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
     }
     filter {
       management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_INT.id
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_INT.id
       }
     }
   }
@@ -114,8 +114,8 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
     }
     filter {
       management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_INT.id
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_INT.id
       }
     }
   }
@@ -152,8 +152,8 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
     }
     filter {
       management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_INT.id
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_INT.id
       }
     }
     filter_config {
@@ -253,8 +253,8 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
     }
     filter {
       management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_INT.id
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_INT.id
       }
     }
     filter_config {
@@ -292,8 +292,8 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
     }
     filter {
       management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_INT.id
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_INT.id
       }
     }
     filter_config {
@@ -331,8 +331,8 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
     }
     filter {
       management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_INT.id
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_INT.id
       }
     }
     filter_config {

EMEA_PREPROD/dashboard/cd_vdm_sfa_test.tf

@@ -1,12 +1,12 @@
-# DEFINE dynatrace_dashboard.CD_tol-tssb_TEST.id = cb7cb5d4-772a-4ad3-8eed-cf56efc832da
-data "dynatrace_management_zone" "CD_tol-tssb_TEST"{ name="CD_tol-tssb" }
-resource "dynatrace_dashboard" "CD_tol-tssb_TEST" {
+# DEFINE dynatrace_dashboard.CD_vdm_sfa_TEST.id = 25898416-ab48-4f42-b091-f5c307471e31
+data "dynatrace_management_zone" "CD_vdm_sfa_TEST"{ name="CD_vdm_sfa" }
+resource "dynatrace_dashboard" "CD_vdm_sfa_TEST" {
   dashboard_metadata {
-    name   = "CD_tol-tssb TEST"
+    name   = "CD_vdm_sfa TEST"
     owner  = "Ignacio.Goldman@partner.bmwgroup.com"
     preset = true
     shared = true
-    tags   = [ "CD_tol-tssb" ]
+    tags   = [ "CD_vdm_sfa" ]
     filter {
       timeframe = "-24h to now"
     }
@@ -26,8 +26,8 @@ resource "dynatrace_dashboard" "CD_tol-tssb_TEST" {
     }
     filter {
       management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_TEST.id
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_TEST.id
       }
     }
     filter_config {
@@ -94,8 +94,8 @@ resource "dynatrace_dashboard" "CD_tol-tssb_TEST" {
     }
     filter {
       management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_TEST.id
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_TEST.id
       }
     }
   }
@@ -114,8 +114,8 @@ resource "dynatrace_dashboard" "CD_tol-tssb_TEST" {
     }
     filter {
       management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_TEST.id
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_TEST.id
       }
     }
   }
@@ -152,8 +152,8 @@ resource "dynatrace_dashboard" "CD_tol-tssb_TEST" {
     }
     filter {
       management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_TEST.id
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_TEST.id
       }
     }
     filter_config {
@@ -253,8 +253,8 @@ resource "dynatrace_dashboard" "CD_tol-tssb_TEST" {
     }
     filter {
       management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_TEST.id
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_TEST.id
       }
     }
     filter_config {
@@ -292,8 +292,8 @@ resource "dynatrace_dashboard" "CD_tol-tssb_TEST" {
     }
     filter {
       management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_TEST.id
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_TEST.id
       }
     }
     filter_config {
@@ -331,8 +331,8 @@ resource "dynatrace_dashboard" "CD_tol-tssb_TEST" {
     }
     filter {
       management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_TEST.id
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_TEST.id
       }
     }
     filter_config {

EMEA_PREPROD/management_zone/cd_tol-tssb.tf

@@ -1,95 +0,0 @@
-# DEFINE dynatrace_management_zone.CD_tol-tssb.id = -2479801801971642988
-resource "dynatrace_management_zone" "CD_tol-tssb" {
-  name = "CD_tol-tssb"
-  rules {
-    type    = "CLOUD_APPLICATION"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "CLOUD_APPLICATION_NAME"
-      }
-      string {
-        case_sensitive = true
-        # negate       = false
-        operator       = "CONTAINS"
-        value          = "tol-tssb"
-      }
-    }
-  }
-  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          = "tol-tssb"
-      }
-    }
-  }
-  rules {
-    type    = "HOST"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "HOST_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "tol-tssb"
-        }
-      }
-    }
-  }
-  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   = "tol-tssb"
-        }
-      }
-    }
-  }
-  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   = "tol-tssb"
-        }
-      }
-    }
-  }
-}

EMEA_PREPROD/management_zone/cd_vdm_sfa.tf

@@ -0,0 +1,28 @@
+# DEFINE dynatrace_management_zone.CD_vdm_sfa.id = -2816509842938398943
+resource "dynatrace_management_zone" "CD_vdm_sfa" {
+  name = "CD_vdm_sfa"
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("Namespace:sfa"))
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(HOST),tag("Namespace:sfa")
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(Service),tag("Namespace:sfa")
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(PROCESS_GROUP_INSTANCE),tag("Namespace:sfa")
+    EOT
+  }
+}

EMEA_PROD/alerting/cd_vdm_sfa_prod.tf

@@ -0,0 +1,38 @@
+# DEFINE dynatrace_alerting.CD_vdm_sfa_PROD.id = vu9U3hXa3q0AAAABABhidWlsdGluOmFsZXJ0aW5nLnByb2ZpbGUABnRlbmFudAAGdGVuYW50ACRjY2VlNmFkMS1hMzYwLTNhMmYtYTk1Yi00OTc5NmI2ZjFkMmO-71TeFdrerQ
+data "dynatrace_management_zone" "CD_vdm_sfa_PROD"{ name="CD_vdm_sfa" }
+resource "dynatrace_alerting" "CD_vdm_sfa_PROD" {
+  name            = "CD_vdm_sfa PROD"
+  management_zone = data.dynatrace_management_zone.CD_vdm_sfa_PROD.id
+  rules {
+    rule {
+      delay_in_minutes = 0
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "AVAILABILITY"
+      tags             = [ "Environment:PROD" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "CUSTOM_ALERT"
+      tags             = [ "Environment:PROD" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "ERRORS"
+      tags             = [ "Environment:PROD" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "PERFORMANCE"
+      tags             = [ "Environment:PROD" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "RESOURCE_CONTENTION"
+      tags             = [ "Environment:PROD" ]
+    }
+  }
+}

EMEA_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf

@@ -0,0 +1,12 @@
+# ID 36014662-d637-448b-bd7d-5a3711bbeb26
+module CD_sfa_vdm_standard_E2E {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_SFA - EMEA E2E - VDM Standard Dashboard"
+  tag                = "sfa"
+  environment        = "E2E"
+  managementZoneName = "CD_vdm_sfa"
+  appId              = "APP-19383"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-SecureFeatureActivation(SFA)"
+}

EMEA_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf

@@ -0,0 +1,44 @@
+# ID 2427aba1-07d9-4ae4-baf4-34a7320686a3
+module CD_sfa_vdm_standard_PROD {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_SFA - EMEA PROD - VDM Standard Dashboard"
+  tag                = "sfa"
+  environment        = "PROD"
+  managementZoneName = "CD_vdm_sfa"
+  sloName            = "VDM - SFA - EMEA PROD"
+  appId              = "APP-19383"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-SecureFeatureActivation(SFA)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"PsdzResource - sfa - prod~",
+                                    ~"OrderHandlerResource - sfa - prod~",
+                                    ~"SfaOtaResource - sfa - prod~",
+                                    ~"RuleSynchronizationResource - sfa - prod~",
+                                    ~"MQSession$FacadeMessageListener - sfa - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"generateTokenPackage~",
+                            ~"getPackageForOrder~",
+                            ~"getNewestPackageForVehicle~",
+                            ~"generateTokenPackageForOrder~",
+                            ~"transferTokenStatusToEMEA~",
+                            ~"updateTokenStatus~",
+                            ~"generateTokenPackage~",
+                            ~"syncRules~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.RW61.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.LW71.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.DW24.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.MW11.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.MW15.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.BW31.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.PW18.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: temporary queue~"
+                        )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(16))
+  EOT
+}

EMEA_PROD/dashboard/cd_vdm_sfa_e2e.tf

@@ -1,12 +1,12 @@
-# DEFINE dynatrace_dashboard.CD_tol-tssb_E2E.id = a83a2c5f-012b-44d8-b5d4-201a4271868e
-data "dynatrace_management_zone" "CD_tol-tssb_E2E"{ name="CD_tol-tssb" }
-resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
+# DEFINE dynatrace_dashboard.CD_vdm_sfa_E2E.id = 963f898a-d2da-40c3-bb40-d7704fd3063e
+data "dynatrace_management_zone" "CD_vdm_sfa_E2E"{ name="CD_vdm_sfa" }
+resource "dynatrace_dashboard" "CD_vdm_sfa_E2E" {
   dashboard_metadata {
-    name   = "CD_tol-tssb E2E"
+    name   = "CD_vdm_sfa E2E"
     owner  = "Ignacio.Goldman@partner.bmwgroup.com"
     preset = true
     shared = true
-    tags   = [ "tol-tssb" ]
+    tags   = [ "CD_vdm_sfa" ]
     filter {
       timeframe = "-24h to now"
     }
@@ -24,6 +24,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
       top    = 228
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_E2E.id
+      }
+    }
     filter_config {
       type         = "MIXED"
       custom_name  = "Failure rate (HTTP 4xx/5xx  errors)"
@@ -67,7 +73,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:tol-tssb" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -88,8 +94,8 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
     }
     filter {
       management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_E2E.id
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_E2E.id
       }
     }
   }
@@ -106,6 +112,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
       top    = 0
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_E2E.id
+      }
+    }
   }
   tile {
     name       = "Markdown"
@@ -138,6 +150,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
       top    = 570
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_E2E.id
+      }
+    }
     filter_config {
       type         = "MIXED"
       custom_name  = "Response time, Request Count and Number of Errors"
@@ -195,7 +213,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:tol-tssb" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -233,6 +251,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_E2E.id
+      }
+    }
     filter_config {
       type         = "DATABASE"
       custom_name  = "Databases"
@@ -246,7 +270,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:tol-tssb" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -266,6 +290,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_E2E.id
+      }
+    }
     filter_config {
       type         = "SERVICE"
       custom_name  = "Services"
@@ -279,7 +309,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:tol-tssb" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -299,6 +329,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_E2E.id
+      }
+    }
     filter_config {
       type         = "HOST"
       custom_name  = "Hosts"
@@ -312,7 +348,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:tol-tssb" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }

EMEA_PROD/dashboard/cd_vdm_sfa_prod.tf

@@ -1,12 +1,12 @@
-# DEFINE dynatrace_dashboard.CD_tol-tssb_INT.id = 2742371a-b24a-4ea9-ade3-2296c9265d70
-data "dynatrace_management_zone" "CD_tol-tssb_INT"{ name="CD_tol-tssb" }
-resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
+# DEFINE dynatrace_dashboard.CD_vdm_sfa_PROD.id = f52ba7ec-9a70-452d-9b39-f55db7979607
+data "dynatrace_management_zone" "CD_vdm_sfa_PROD"{ name="CD_vdm_sfa" }
+resource "dynatrace_dashboard" "CD_vdm_sfa_PROD" {
   dashboard_metadata {
-    name   = "CD_tol-tssb INT"
+    name   = "CD_vdm_sfa PROD"
     owner  = "Ignacio.Goldman@partner.bmwgroup.com"
     preset = true
     shared = true
-    tags   = [ "tol-tssb" ]
+    tags   = [ "CD_vdm_sfa" ]
     filter {
       timeframe = "-24h to now"
     }
@@ -24,6 +24,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
       top    = 228
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_PROD.id
+      }
+    }
     filter_config {
       type         = "MIXED"
       custom_name  = "Failure rate (HTTP 4xx/5xx  errors)"
@@ -67,7 +73,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:INT" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -88,8 +94,8 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
     }
     filter {
       management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_INT.id
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_PROD.id
       }
     }
   }
@@ -106,6 +112,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
       top    = 0
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_PROD.id
+      }
+    }
   }
   tile {
     name       = "Markdown"
@@ -138,6 +150,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
       top    = 570
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_PROD.id
+      }
+    }
     filter_config {
       type         = "MIXED"
       custom_name  = "Response time, Request Count and Number of Errors"
@@ -195,7 +213,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:INT" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -233,6 +251,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_PROD.id
+      }
+    }
     filter_config {
       type         = "DATABASE"
       custom_name  = "Databases"
@@ -246,7 +270,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:INT" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -266,6 +290,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_PROD.id
+      }
+    }
     filter_config {
       type         = "SERVICE"
       custom_name  = "Services"
@@ -279,7 +309,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:INT" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -299,6 +329,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_PROD.id
+      }
+    }
     filter_config {
       type         = "HOST"
       custom_name  = "Hosts"
@@ -312,7 +348,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:INT" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }

EMEA_PROD/management_zone/cd_tol-tssb.tf

@@ -1,95 +0,0 @@
-# DEFINE dynatrace_management_zone.CD_tol-tssb.id = -7512073509502205738
-resource "dynatrace_management_zone" "CD_tol-tssb" {
-  name = "CD_tol-tssb"
-  rules {
-    type    = "CLOUD_APPLICATION"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "CLOUD_APPLICATION_NAME"
-      }
-      string {
-        case_sensitive = true
-        # negate       = false
-        operator       = "CONTAINS"
-        value          = "tol-tssb"
-      }
-    }
-  }
-  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          = "tol-tssb"
-      }
-    }
-  }
-  rules {
-    type    = "HOST"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "HOST_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "tol-tssb"
-        }
-      }
-    }
-  }
-  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   = "tol-tssb"
-        }
-      }
-    }
-  }
-  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   = "tol-tssb"
-        }
-      }
-    }
-  }
-}

EMEA_PROD/management_zone/cd_vdm_sfa.tf

@@ -0,0 +1,28 @@
+# DEFINE dynatrace_management_zone.CD_vdm_sfa.id = 922486075467879281
+resource "dynatrace_management_zone" "CD_vdm_sfa" {
+  name = "CD_vdm_sfa"
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("Namespace:sfa"))
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(HOST),tag("Namespace:sfa")
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(Service),tag("Namespace:sfa")
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(PROCESS_GROUP_INSTANCE),tag("Namespace:sfa")
+    EOT
+  }
+}

NA_PREPROD/alerting/cd_vdm_sfa_int.tf

@@ -0,0 +1,38 @@
+# DEFINE dynatrace_alerting.CD_vdm_sfa_INT.id = vu9U3hXa3q0AAAABABhidWlsdGluOmFsZXJ0aW5nLnByb2ZpbGUABnRlbmFudAAGdGVuYW50ACRhMTRlMGQ2OS1jZTZjLTM3NWEtYTMzMS03M2E3OTZmZDE2OGa-71TeFdrerQ
+data "dynatrace_management_zone" "CD_vdm_sfa_INT"{ name="CD_vdm_sfa" }
+resource "dynatrace_alerting" "CD_vdm_sfa_INT" {
+  name            = "CD_vdm_sfa INT"
+  management_zone = data.dynatrace_management_zone.CD_vdm_sfa_INT.id
+  rules {
+    rule {
+      delay_in_minutes = 0
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "AVAILABILITY"
+      tags             = [ "Environment:INT" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "CUSTOM_ALERT"
+      tags             = [ "Environment:INT" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "ERRORS"
+      tags             = [ "Environment:INT" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "PERFORMANCE"
+      tags             = [ "Environment:INT" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "RESOURCE_CONTENTION"
+      tags             = [ "Environment:INT" ]
+    }
+  }
+}

NA_PREPROD/dashboard/cd_tol-tssb_test.tf

@@ -1,321 +0,0 @@
-# DEFINE dynatrace_dashboard.CD_tol-tssb_TEST.id = b58f4316-9d1e-4552-b74a-f53a7e1131b2
-data "dynatrace_management_zone" "CD_tol-tssb_TEST"{ name="CD_tol-tssb" }
-resource "dynatrace_dashboard" "CD_tol-tssb_TEST" {
-  dashboard_metadata {
-    name   = "CD_tol-tssb TEST"
-    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
-    preset = true
-    shared = true
-    tags   = [ "tol-tssb" ]
-    filter {
-      timeframe = "-24h to now"
-    }
-  }
-  tile {
-    name       = "Custom chart"
-    configured = true
-    tile_type  = "CUSTOM_CHARTING"
-    unknowns   = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 304
-      left   = 38
-      top    = 228
-      width  = 1064
-    }
-    filter_config {
-      type         = "MIXED"
-      custom_name  = "Failure rate (HTTP 4xx/5xx  errors)"
-      default_name = "Custom chart"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-        result_metadata {
-          config {
-            custom_color  = "#ff0000"
-            key           = "nullbuiltin:service.errors.fivexx.rate|AVG|TOTAL|BAR|SERVICE"
-            last_modified = 1617956393463
-          }
-          config {
-            custom_color  = "#fff29a"
-            key           = "nullbuiltin:service.errors.fourxx.rate|AVG|TOTAL|BAR|SERVICE"
-            last_modified = 1617956441725
-          }
-        }
-        series {
-          type             = "BAR"
-          aggregation      = "AVG"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.errors.fourxx.rate"
-          # sort_ascending = false
-          # sort_column    = false
-        }
-        series {
-          type             = "BAR"
-          aggregation      = "AVG"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.errors.fivexx.rate"
-          # sort_ascending = false
-          sort_column      = true
-        }
-      }
-      filters {
-        filter {
-          entity_type = "SERVICE"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:TEST" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name       = "Problems"
-    configured = true
-    tile_type  = "OPEN_PROBLEMS"
-    unknowns   = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 152
-      left   = 950
-      top    = 38
-      width  = 152
-    }
-    filter {
-      management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_TEST.id
-      }
-    }
-  }
-  tile {
-    name       = "Overall Health"
-    configured = true
-    tile_type  = "HEADER"
-    unknowns   = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 38
-      left   = 38
-      top    = 0
-      width  = 1064
-    }
-  }
-  tile {
-    name       = "Markdown"
-    configured = true
-    markdown   =<<-EOT
-      ---
-      
-    EOT
-    tile_type  = "MARKDOWN"
-    unknowns   = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 38
-      left   = 38
-      top    = 532
-      width  = 1064
-    }
-  }
-  tile {
-    name       = "Custom chart"
-    configured = true
-    tile_type  = "CUSTOM_CHARTING"
-    unknowns   = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 304
-      left   = 38
-      top    = 570
-      width  = 1064
-    }
-    filter_config {
-      type         = "MIXED"
-      custom_name  = "Response time, Request Count and Number of Errors"
-      default_name = "Custom chart"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-        result_metadata {
-          config {
-            custom_color  = "#008cdb"
-            key           = "nullbuiltin:service.requestCount.total|NONE|TOTAL|BAR|SERVICE"
-            last_modified = 1595275720776
-          }
-          config {
-            custom_color  = "#b4e5f9"
-            key           = "nullbuiltin:service.response.time|AVG|TOTAL|LINE|SERVICE"
-            last_modified = 1595275686773
-          }
-          config {
-            custom_color  = "#ef651f"
-            key           = "nullbuiltin:service.errors.total.count|NONE|TOTAL|BAR|SERVICE"
-            last_modified = 1595275955999
-          }
-        }
-        series {
-          type             = "LINE"
-          aggregation      = "AVG"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.response.time"
-          # sort_ascending = false
-          # sort_column    = false
-        }
-        series {
-          type             = "BAR"
-          aggregation      = "NONE"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.requestCount.total"
-          # sort_ascending = false
-          # sort_column    = false
-        }
-        series {
-          type             = "BAR"
-          aggregation      = "NONE"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.errors.total.count"
-          # sort_ascending = false
-          sort_column      = true
-        }
-      }
-      filters {
-        filter {
-          entity_type = "SERVICE"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:TEST" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name       = "Markdown"
-    configured = true
-    markdown   =<<-EOT
-      ---
-      
-    EOT
-    tile_type  = "MARKDOWN"
-    unknowns   = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 38
-      left   = 38
-      top    = 190
-      width  = 1064
-    }
-  }
-  tile {
-    name          = ""
-    chart_visible = true
-    configured    = true
-    tile_type     = "DATABASES_OVERVIEW"
-    unknowns      = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 152
-      left   = 646
-      top    = 38
-      width  = 190
-    }
-    filter_config {
-      type         = "DATABASE"
-      custom_name  = "Databases"
-      default_name = "Databases"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-      }
-      filters {
-        filter {
-          entity_type = "DATABASE"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:TEST" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name          = ""
-    chart_visible = true
-    configured    = true
-    tile_type     = "SERVICES"
-    unknowns      = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 152
-      left   = 342
-      top    = 38
-      width  = 190
-    }
-    filter_config {
-      type         = "SERVICE"
-      custom_name  = "Services"
-      default_name = "Services"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-      }
-      filters {
-        filter {
-          entity_type = "SERVICE"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:TEST" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name          = ""
-    chart_visible = true
-    configured    = true
-    tile_type     = "HOSTS"
-    unknowns      = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 152
-      left   = 38
-      top    = 38
-      width  = 190
-    }
-    filter_config {
-      type         = "HOST"
-      custom_name  = "Hosts"
-      default_name = "Hosts"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-      }
-      filters {
-        filter {
-          entity_type = "HOST"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:TEST" ]
-          }
-        }
-      }
-    }
-  }
-}

NA_PREPROD/dashboard/cd_vdm_sfa_int.tf

@@ -1,12 +1,12 @@
-# DEFINE dynatrace_dashboard.CD_tol-tssb_PROD.id = 34352b16-e75f-4ba0-94fd-1274a5227904
-data "dynatrace_management_zone" "CD_tol-tssb_PROD"{ name="CD_tol-tssb" }
-resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
+# DEFINE dynatrace_dashboard.CD_vdm_sfa_INT.id = 0cb37519-7de3-4083-bb16-246861bc53b8
+data "dynatrace_management_zone" "CD_vdm_sfa_INT"{ name="CD_vdm_sfa" }
+resource "dynatrace_dashboard" "CD_vdm_sfa_INT" {
   dashboard_metadata {
-    name   = "CD_tol-tssb PROD"
+    name   = "CD_vdm_sfa INT"
     owner  = "Ignacio.Goldman@partner.bmwgroup.com"
     preset = true
     shared = true
-    tags   = [ "tol-tssb" ]
+    tags   = [ "CD_vdm_sfa" ]
     filter {
       timeframe = "-24h to now"
     }
@@ -24,6 +24,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
       top    = 228
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_INT.id
+      }
+    }
     filter_config {
       type         = "MIXED"
       custom_name  = "Failure rate (HTTP 4xx/5xx  errors)"
@@ -67,7 +73,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:PROD" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -88,8 +94,8 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
     }
     filter {
       management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_PROD.id
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_INT.id
       }
     }
   }
@@ -106,6 +112,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
       top    = 0
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_INT.id
+      }
+    }
   }
   tile {
     name       = "Markdown"
@@ -138,6 +150,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
       top    = 570
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_INT.id
+      }
+    }
     filter_config {
       type         = "MIXED"
       custom_name  = "Response time, Request Count and Number of Errors"
@@ -195,7 +213,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:PROD" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -233,6 +251,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_INT.id
+      }
+    }
     filter_config {
       type         = "DATABASE"
       custom_name  = "Databases"
@@ -246,7 +270,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:PROD" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -266,6 +290,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_INT.id
+      }
+    }
     filter_config {
       type         = "SERVICE"
       custom_name  = "Services"
@@ -279,7 +309,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:PROD" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -299,6 +329,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_INT.id
+      }
+    }
     filter_config {
       type         = "HOST"
       custom_name  = "Hosts"
@@ -312,7 +348,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:PROD" ]
+            values = [ "Environment:INT" ]
           }
         }
       }

NA_PREPROD/dashboard/cd_vdm_sfa_test.tf

@@ -0,0 +1,357 @@
+# DEFINE dynatrace_dashboard.CD_vdm_sfa_TEST.id = c9ff6b88-ff83-4206-af71-ff04d11617e7
+data "dynatrace_management_zone" "CD_vdm_sfa_TEST"{ name="CD_vdm_sfa" }
+resource "dynatrace_dashboard" "CD_vdm_sfa_TEST" {
+  dashboard_metadata {
+    name   = "CD_vdm_sfa TEST"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "CD_vdm_sfa" ]
+    filter {
+      timeframe = "-24h to now"
+    }
+  }
+  tile {
+    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_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_TEST.id
+      }
+    }
+    filter_config {
+      type         = "MIXED"
+      custom_name  = "Failure rate (HTTP 4xx/5xx  errors)"
+      default_name = "Custom chart"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+        result_metadata {
+          config {
+            custom_color  = "#ff0000"
+            key           = "nullbuiltin:service.errors.fivexx.rate|AVG|TOTAL|BAR|SERVICE"
+            last_modified = 1617956393463
+          }
+          config {
+            custom_color  = "#fff29a"
+            key           = "nullbuiltin:service.errors.fourxx.rate|AVG|TOTAL|BAR|SERVICE"
+            last_modified = 1617956441725
+          }
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "AVG"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.errors.fourxx.rate"
+          # sort_ascending = false
+          # sort_column    = false
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "AVG"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.errors.fivexx.rate"
+          # sort_ascending = false
+          sort_column      = true
+        }
+      }
+      filters {
+        filter {
+          entity_type = "SERVICE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:TEST" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name       = "Problems"
+    configured = true
+    tile_type  = "OPEN_PROBLEMS"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 152
+      left   = 950
+      top    = 38
+      width  = 152
+    }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_TEST.id
+      }
+    }
+  }
+  tile {
+    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_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_TEST.id
+      }
+    }
+  }
+  tile {
+    name       = "Markdown"
+    configured = true
+    markdown   =<<-EOT
+      ---
+      
+    EOT
+    tile_type  = "MARKDOWN"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 38
+      left   = 38
+      top    = 532
+      width  = 1064
+    }
+  }
+  tile {
+    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_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_TEST.id
+      }
+    }
+    filter_config {
+      type         = "MIXED"
+      custom_name  = "Response time, Request Count and Number of Errors"
+      default_name = "Custom chart"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+        result_metadata {
+          config {
+            custom_color  = "#008cdb"
+            key           = "nullbuiltin:service.requestCount.total|NONE|TOTAL|BAR|SERVICE"
+            last_modified = 1595275720776
+          }
+          config {
+            custom_color  = "#b4e5f9"
+            key           = "nullbuiltin:service.response.time|AVG|TOTAL|LINE|SERVICE"
+            last_modified = 1595275686773
+          }
+          config {
+            custom_color  = "#ef651f"
+            key           = "nullbuiltin:service.errors.total.count|NONE|TOTAL|BAR|SERVICE"
+            last_modified = 1595275955999
+          }
+        }
+        series {
+          type             = "LINE"
+          aggregation      = "AVG"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.response.time"
+          # sort_ascending = false
+          # sort_column    = false
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "NONE"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.requestCount.total"
+          # sort_ascending = false
+          # sort_column    = false
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "NONE"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.errors.total.count"
+          # sort_ascending = false
+          sort_column      = true
+        }
+      }
+      filters {
+        filter {
+          entity_type = "SERVICE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:TEST" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name       = "Markdown"
+    configured = true
+    markdown   =<<-EOT
+      ---
+      
+    EOT
+    tile_type  = "MARKDOWN"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 38
+      left   = 38
+      top    = 190
+      width  = 1064
+    }
+  }
+  tile {
+    name          = ""
+    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_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_TEST.id
+      }
+    }
+    filter_config {
+      type         = "DATABASE"
+      custom_name  = "Databases"
+      default_name = "Databases"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "DATABASE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:TEST" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    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_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_TEST.id
+      }
+    }
+    filter_config {
+      type         = "SERVICE"
+      custom_name  = "Services"
+      default_name = "Services"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "SERVICE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:TEST" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    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_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_TEST.id
+      }
+    }
+    filter_config {
+      type         = "HOST"
+      custom_name  = "Hosts"
+      default_name = "Hosts"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "HOST"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:TEST" ]
+          }
+        }
+      }
+    }
+  }
+}

NA_PREPROD/management_zone/cd_tol-tssb.tf

@@ -1,95 +0,0 @@
-# DEFINE dynatrace_management_zone.CD_tol-tssb.id = 7963368354883748043
-resource "dynatrace_management_zone" "CD_tol-tssb" {
-  name = "CD_tol-tssb"
-  rules {
-    type    = "CLOUD_APPLICATION"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "CLOUD_APPLICATION_NAME"
-      }
-      string {
-        case_sensitive = true
-        # negate       = false
-        operator       = "CONTAINS"
-        value          = "tol-tssb"
-      }
-    }
-  }
-  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          = "tol-tssb"
-      }
-    }
-  }
-  rules {
-    type    = "HOST"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "HOST_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "tol-tssb"
-        }
-      }
-    }
-  }
-  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   = "tol-tssb"
-        }
-      }
-    }
-  }
-  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   = "tol-tssb"
-        }
-      }
-    }
-  }
-}

NA_PREPROD/management_zone/cd_vdm_sfa.tf

@@ -0,0 +1,28 @@
+# DEFINE dynatrace_management_zone.CD_vdm_sfa.id = 8140747044611873789
+resource "dynatrace_management_zone" "CD_vdm_sfa" {
+  name = "CD_vdm_sfa"
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("Namespace:sfa"))
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(HOST),tag("Namespace:sfa")
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(Service),tag("Namespace:sfa")
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(PROCESS_GROUP_INSTANCE),tag("Namespace:sfa")
+    EOT
+  }
+}

NA_PROD/alerting/cd_vdm_sfa_prod.tf

@@ -0,0 +1,38 @@
+# DEFINE dynatrace_alerting.CD_vdm_sfa_PROD.id = vu9U3hXa3q0AAAABABhidWlsdGluOmFsZXJ0aW5nLnByb2ZpbGUABnRlbmFudAAGdGVuYW50ACRlMDdhNWQ1NS0xNmQ1LTM4YjctYjE5Mi1mMWUzMTBlZGUxNzG-71TeFdrerQ
+data "dynatrace_management_zone" "CD_vdm_sfa_PROD"{ name="CD_vdm_sfa" }
+resource "dynatrace_alerting" "CD_vdm_sfa_PROD" {
+  name            = "CD_vdm_sfa PROD"
+  management_zone = data.dynatrace_management_zone.CD_vdm_sfa_PROD.id
+  rules {
+    rule {
+      delay_in_minutes = 0
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "AVAILABILITY"
+      tags             = [ "Environment:PROD" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "CUSTOM_ALERT"
+      tags             = [ "Environment:PROD" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "ERRORS"
+      tags             = [ "Environment:PROD" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "PERFORMANCE"
+      tags             = [ "Environment:PROD" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "RESOURCE_CONTENTION"
+      tags             = [ "Environment:PROD" ]
+    }
+  }
+}

NA_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf

@@ -0,0 +1,12 @@
+# ID 06417140-4430-493b-86c3-ab25f2f384dc
+module CD_sfa_vdm_standard_E2E {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_SFA - US E2E - VDM Standard Dashboard"
+  tag                = "sfa"
+  environment        = "E2E"
+  managementZoneName = "CD_vdm_sfa"
+  appId              = "APP-19383"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-SecureFeatureActivation(SFA)"
+}

NA_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf

@@ -0,0 +1,31 @@
+# ID 5470fb1d-fd12-4a6a-9efd-cde26aeaf986
+module CD_sfa_vdm_standard_PROD {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_SFA - US PROD - VDM Standard Dashboard"
+  tag                = "sfa"
+  environment        = "PROD"
+  managementZoneName = "CD_vdm_sfa"
+  sloName            = "VDM - SFA - US PROD"
+  appId              = "APP-19383"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-SecureFeatureActivation(SFA)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"PsdzResource - sfa - prod~",
+                                    ~"OrderHandlerResource - sfa - prod~",
+                                    ~"MQSession$FacadeMessageListener - sfa - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"generateTokenPackage~",
+                            ~"getPackageForOrder~",
+                            ~"generateTokenPackageForOrder~",
+                            ~"transferTokenStatusToEMEA~",
+                            ~"Queue: temporary queue~"
+                        )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(5))
+  EOT
+}

NA_PROD/dashboard/cd_tol-tssb_e2e.tf

@@ -1,321 +0,0 @@
-# DEFINE dynatrace_dashboard.CD_tol-tssb_E2E.id = 43b738f8-a9ad-4116-a35f-98432b9ad36b
-data "dynatrace_management_zone" "CD_tol-tssb_E2E"{ name="CD_tol-tssb" }
-resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
-  dashboard_metadata {
-    name   = "CD_tol-tssb E2E"
-    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
-    preset = true
-    shared = true
-    tags   = [ "tol-tssb" ]
-    filter {
-      timeframe = "-24h to now"
-    }
-  }
-  tile {
-    name       = "Custom chart"
-    configured = true
-    tile_type  = "CUSTOM_CHARTING"
-    unknowns   = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 304
-      left   = 38
-      top    = 228
-      width  = 1064
-    }
-    filter_config {
-      type         = "MIXED"
-      custom_name  = "Failure rate (HTTP 4xx/5xx  errors)"
-      default_name = "Custom chart"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-        result_metadata {
-          config {
-            custom_color  = "#ff0000"
-            key           = "nullbuiltin:service.errors.fivexx.rate|AVG|TOTAL|BAR|SERVICE"
-            last_modified = 1617956393463
-          }
-          config {
-            custom_color  = "#fff29a"
-            key           = "nullbuiltin:service.errors.fourxx.rate|AVG|TOTAL|BAR|SERVICE"
-            last_modified = 1617956441725
-          }
-        }
-        series {
-          type             = "BAR"
-          aggregation      = "AVG"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.errors.fourxx.rate"
-          # sort_ascending = false
-          # sort_column    = false
-        }
-        series {
-          type             = "BAR"
-          aggregation      = "AVG"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.errors.fivexx.rate"
-          # sort_ascending = false
-          sort_column      = true
-        }
-      }
-      filters {
-        filter {
-          entity_type = "SERVICE"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:tol-tssb" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name       = "Problems"
-    configured = true
-    tile_type  = "OPEN_PROBLEMS"
-    unknowns   = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 152
-      left   = 950
-      top    = 38
-      width  = 152
-    }
-    filter {
-      management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_E2E.id
-      }
-    }
-  }
-  tile {
-    name       = "Overall Health"
-    configured = true
-    tile_type  = "HEADER"
-    unknowns   = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 38
-      left   = 38
-      top    = 0
-      width  = 1064
-    }
-  }
-  tile {
-    name       = "Markdown"
-    configured = true
-    markdown   =<<-EOT
-      ---
-      
-    EOT
-    tile_type  = "MARKDOWN"
-    unknowns   = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 38
-      left   = 38
-      top    = 532
-      width  = 1064
-    }
-  }
-  tile {
-    name       = "Custom chart"
-    configured = true
-    tile_type  = "CUSTOM_CHARTING"
-    unknowns   = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 304
-      left   = 38
-      top    = 570
-      width  = 1064
-    }
-    filter_config {
-      type         = "MIXED"
-      custom_name  = "Response time, Request Count and Number of Errors"
-      default_name = "Custom chart"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-        result_metadata {
-          config {
-            custom_color  = "#008cdb"
-            key           = "nullbuiltin:service.requestCount.total|NONE|TOTAL|BAR|SERVICE"
-            last_modified = 1595275720776
-          }
-          config {
-            custom_color  = "#b4e5f9"
-            key           = "nullbuiltin:service.response.time|AVG|TOTAL|LINE|SERVICE"
-            last_modified = 1595275686773
-          }
-          config {
-            custom_color  = "#ef651f"
-            key           = "nullbuiltin:service.errors.total.count|NONE|TOTAL|BAR|SERVICE"
-            last_modified = 1595275955999
-          }
-        }
-        series {
-          type             = "LINE"
-          aggregation      = "AVG"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.response.time"
-          # sort_ascending = false
-          # sort_column    = false
-        }
-        series {
-          type             = "BAR"
-          aggregation      = "NONE"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.requestCount.total"
-          # sort_ascending = false
-          # sort_column    = false
-        }
-        series {
-          type             = "BAR"
-          aggregation      = "NONE"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.errors.total.count"
-          # sort_ascending = false
-          sort_column      = true
-        }
-      }
-      filters {
-        filter {
-          entity_type = "SERVICE"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:tol-tssb" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name       = "Markdown"
-    configured = true
-    markdown   =<<-EOT
-      ---
-      
-    EOT
-    tile_type  = "MARKDOWN"
-    unknowns   = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 38
-      left   = 38
-      top    = 190
-      width  = 1064
-    }
-  }
-  tile {
-    name          = ""
-    chart_visible = true
-    configured    = true
-    tile_type     = "DATABASES_OVERVIEW"
-    unknowns      = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 152
-      left   = 646
-      top    = 38
-      width  = 190
-    }
-    filter_config {
-      type         = "DATABASE"
-      custom_name  = "Databases"
-      default_name = "Databases"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-      }
-      filters {
-        filter {
-          entity_type = "DATABASE"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:tol-tssb" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name          = ""
-    chart_visible = true
-    configured    = true
-    tile_type     = "SERVICES"
-    unknowns      = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 152
-      left   = 342
-      top    = 38
-      width  = 190
-    }
-    filter_config {
-      type         = "SERVICE"
-      custom_name  = "Services"
-      default_name = "Services"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-      }
-      filters {
-        filter {
-          entity_type = "SERVICE"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:tol-tssb" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name          = ""
-    chart_visible = true
-    configured    = true
-    tile_type     = "HOSTS"
-    unknowns      = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 152
-      left   = 38
-      top    = 38
-      width  = 190
-    }
-    filter_config {
-      type         = "HOST"
-      custom_name  = "Hosts"
-      default_name = "Hosts"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-      }
-      filters {
-        filter {
-          entity_type = "HOST"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:tol-tssb" ]
-          }
-        }
-      }
-    }
-  }
-}

NA_PROD/dashboard/cd_tol-tssb_prod.tf

@@ -1,321 +0,0 @@
-# DEFINE dynatrace_dashboard.CD_tol-tssb_PROD.id = ac060af1-76dd-4e9e-8f34-2c2b3e158955
-data "dynatrace_management_zone" "CD_tol-tssb_PROD"{ name="CD_tol-tssb" }
-resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
-  dashboard_metadata {
-    name   = "CD_tol-tssb PROD"
-    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
-    preset = true
-    shared = true
-    tags   = [ "tol-tssb" ]
-    filter {
-      timeframe = "-24h to now"
-    }
-  }
-  tile {
-    name       = "Custom chart"
-    configured = true
-    tile_type  = "CUSTOM_CHARTING"
-    unknowns   = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 304
-      left   = 38
-      top    = 228
-      width  = 1064
-    }
-    filter_config {
-      type         = "MIXED"
-      custom_name  = "Failure rate (HTTP 4xx/5xx  errors)"
-      default_name = "Custom chart"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-        result_metadata {
-          config {
-            custom_color  = "#ff0000"
-            key           = "nullbuiltin:service.errors.fivexx.rate|AVG|TOTAL|BAR|SERVICE"
-            last_modified = 1617956393463
-          }
-          config {
-            custom_color  = "#fff29a"
-            key           = "nullbuiltin:service.errors.fourxx.rate|AVG|TOTAL|BAR|SERVICE"
-            last_modified = 1617956441725
-          }
-        }
-        series {
-          type             = "BAR"
-          aggregation      = "AVG"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.errors.fourxx.rate"
-          # sort_ascending = false
-          # sort_column    = false
-        }
-        series {
-          type             = "BAR"
-          aggregation      = "AVG"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.errors.fivexx.rate"
-          # sort_ascending = false
-          sort_column      = true
-        }
-      }
-      filters {
-        filter {
-          entity_type = "SERVICE"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:PROD" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name       = "Problems"
-    configured = true
-    tile_type  = "OPEN_PROBLEMS"
-    unknowns   = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 152
-      left   = 950
-      top    = 38
-      width  = 152
-    }
-    filter {
-      management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_PROD.id
-      }
-    }
-  }
-  tile {
-    name       = "Overall Health"
-    configured = true
-    tile_type  = "HEADER"
-    unknowns   = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 38
-      left   = 38
-      top    = 0
-      width  = 1064
-    }
-  }
-  tile {
-    name       = "Markdown"
-    configured = true
-    markdown   =<<-EOT
-      ---
-      
-    EOT
-    tile_type  = "MARKDOWN"
-    unknowns   = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 38
-      left   = 38
-      top    = 532
-      width  = 1064
-    }
-  }
-  tile {
-    name       = "Custom chart"
-    configured = true
-    tile_type  = "CUSTOM_CHARTING"
-    unknowns   = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 304
-      left   = 38
-      top    = 570
-      width  = 1064
-    }
-    filter_config {
-      type         = "MIXED"
-      custom_name  = "Response time, Request Count and Number of Errors"
-      default_name = "Custom chart"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-        result_metadata {
-          config {
-            custom_color  = "#008cdb"
-            key           = "nullbuiltin:service.requestCount.total|NONE|TOTAL|BAR|SERVICE"
-            last_modified = 1595275720776
-          }
-          config {
-            custom_color  = "#b4e5f9"
-            key           = "nullbuiltin:service.response.time|AVG|TOTAL|LINE|SERVICE"
-            last_modified = 1595275686773
-          }
-          config {
-            custom_color  = "#ef651f"
-            key           = "nullbuiltin:service.errors.total.count|NONE|TOTAL|BAR|SERVICE"
-            last_modified = 1595275955999
-          }
-        }
-        series {
-          type             = "LINE"
-          aggregation      = "AVG"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.response.time"
-          # sort_ascending = false
-          # sort_column    = false
-        }
-        series {
-          type             = "BAR"
-          aggregation      = "NONE"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.requestCount.total"
-          # sort_ascending = false
-          # sort_column    = false
-        }
-        series {
-          type             = "BAR"
-          aggregation      = "NONE"
-          aggregation_rate = "TOTAL"
-          entity_type      = "SERVICE"
-          metric           = "builtin:service.errors.total.count"
-          # sort_ascending = false
-          sort_column      = true
-        }
-      }
-      filters {
-        filter {
-          entity_type = "SERVICE"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:PROD" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name       = "Markdown"
-    configured = true
-    markdown   =<<-EOT
-      ---
-      
-    EOT
-    tile_type  = "MARKDOWN"
-    unknowns   = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 38
-      left   = 38
-      top    = 190
-      width  = 1064
-    }
-  }
-  tile {
-    name          = ""
-    chart_visible = true
-    configured    = true
-    tile_type     = "DATABASES_OVERVIEW"
-    unknowns      = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 152
-      left   = 646
-      top    = 38
-      width  = 190
-    }
-    filter_config {
-      type         = "DATABASE"
-      custom_name  = "Databases"
-      default_name = "Databases"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-      }
-      filters {
-        filter {
-          entity_type = "DATABASE"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:PROD" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name          = ""
-    chart_visible = true
-    configured    = true
-    tile_type     = "SERVICES"
-    unknowns      = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 152
-      left   = 342
-      top    = 38
-      width  = 190
-    }
-    filter_config {
-      type         = "SERVICE"
-      custom_name  = "Services"
-      default_name = "Services"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-      }
-      filters {
-        filter {
-          entity_type = "SERVICE"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:PROD" ]
-          }
-        }
-      }
-    }
-  }
-  tile {
-    name          = ""
-    chart_visible = true
-    configured    = true
-    tile_type     = "HOSTS"
-    unknowns      = jsonencode({
-          "isAutoRefreshDisabled": false
-      })
-    bounds {
-      height = 152
-      left   = 38
-      top    = 38
-      width  = 190
-    }
-    filter_config {
-      type         = "HOST"
-      custom_name  = "Hosts"
-      default_name = "Hosts"
-      chart_config {
-        type   = "TIMESERIES"
-        legend = true
-      }
-      filters {
-        filter {
-          entity_type = "HOST"
-          match {
-            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:PROD" ]
-          }
-        }
-      }
-    }
-  }
-}

NA_PROD/dashboard/cd_vdm_sfa_e2e.tf

@@ -0,0 +1,357 @@
+# DEFINE dynatrace_dashboard.CD_vdm_sfa_E2E.id = 2caf04b2-fb65-4073-b1b5-86706bffb50a
+data "dynatrace_management_zone" "CD_vdm_sfa_E2E"{ name="CD_vdm_sfa" }
+resource "dynatrace_dashboard" "CD_vdm_sfa_E2E" {
+  dashboard_metadata {
+    name   = "CD_vdm_sfa E2E"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "CD_vdm_sfa" ]
+    filter {
+      timeframe = "-24h to now"
+    }
+  }
+  tile {
+    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_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_E2E.id
+      }
+    }
+    filter_config {
+      type         = "MIXED"
+      custom_name  = "Failure rate (HTTP 4xx/5xx  errors)"
+      default_name = "Custom chart"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+        result_metadata {
+          config {
+            custom_color  = "#ff0000"
+            key           = "nullbuiltin:service.errors.fivexx.rate|AVG|TOTAL|BAR|SERVICE"
+            last_modified = 1617956393463
+          }
+          config {
+            custom_color  = "#fff29a"
+            key           = "nullbuiltin:service.errors.fourxx.rate|AVG|TOTAL|BAR|SERVICE"
+            last_modified = 1617956441725
+          }
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "AVG"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.errors.fourxx.rate"
+          # sort_ascending = false
+          # sort_column    = false
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "AVG"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.errors.fivexx.rate"
+          # sort_ascending = false
+          sort_column      = true
+        }
+      }
+      filters {
+        filter {
+          entity_type = "SERVICE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:E2E" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name       = "Problems"
+    configured = true
+    tile_type  = "OPEN_PROBLEMS"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 152
+      left   = 950
+      top    = 38
+      width  = 152
+    }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_E2E.id
+      }
+    }
+  }
+  tile {
+    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_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_E2E.id
+      }
+    }
+  }
+  tile {
+    name       = "Markdown"
+    configured = true
+    markdown   =<<-EOT
+      ---
+      
+    EOT
+    tile_type  = "MARKDOWN"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 38
+      left   = 38
+      top    = 532
+      width  = 1064
+    }
+  }
+  tile {
+    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_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_E2E.id
+      }
+    }
+    filter_config {
+      type         = "MIXED"
+      custom_name  = "Response time, Request Count and Number of Errors"
+      default_name = "Custom chart"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+        result_metadata {
+          config {
+            custom_color  = "#008cdb"
+            key           = "nullbuiltin:service.requestCount.total|NONE|TOTAL|BAR|SERVICE"
+            last_modified = 1595275720776
+          }
+          config {
+            custom_color  = "#b4e5f9"
+            key           = "nullbuiltin:service.response.time|AVG|TOTAL|LINE|SERVICE"
+            last_modified = 1595275686773
+          }
+          config {
+            custom_color  = "#ef651f"
+            key           = "nullbuiltin:service.errors.total.count|NONE|TOTAL|BAR|SERVICE"
+            last_modified = 1595275955999
+          }
+        }
+        series {
+          type             = "LINE"
+          aggregation      = "AVG"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.response.time"
+          # sort_ascending = false
+          # sort_column    = false
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "NONE"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.requestCount.total"
+          # sort_ascending = false
+          # sort_column    = false
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "NONE"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.errors.total.count"
+          # sort_ascending = false
+          sort_column      = true
+        }
+      }
+      filters {
+        filter {
+          entity_type = "SERVICE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:E2E" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name       = "Markdown"
+    configured = true
+    markdown   =<<-EOT
+      ---
+      
+    EOT
+    tile_type  = "MARKDOWN"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 38
+      left   = 38
+      top    = 190
+      width  = 1064
+    }
+  }
+  tile {
+    name          = ""
+    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_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_E2E.id
+      }
+    }
+    filter_config {
+      type         = "DATABASE"
+      custom_name  = "Databases"
+      default_name = "Databases"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "DATABASE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:E2E" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    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_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_E2E.id
+      }
+    }
+    filter_config {
+      type         = "SERVICE"
+      custom_name  = "Services"
+      default_name = "Services"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "SERVICE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:E2E" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    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_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_E2E.id
+      }
+    }
+    filter_config {
+      type         = "HOST"
+      custom_name  = "Hosts"
+      default_name = "Hosts"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "HOST"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:E2E" ]
+          }
+        }
+      }
+    }
+  }
+}

NA_PROD/dashboard/cd_vdm_sfa_prod.tf

@@ -0,0 +1,357 @@
+# DEFINE dynatrace_dashboard.CD_vdm_sfa_PROD.id = e19e83a3-846a-42ca-90ac-e72eb5d5531a
+data "dynatrace_management_zone" "CD_vdm_sfa_PROD"{ name="CD_vdm_sfa" }
+resource "dynatrace_dashboard" "CD_vdm_sfa_PROD" {
+  dashboard_metadata {
+    name   = "CD_vdm_sfa PROD"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "CD_vdm_sfa" ]
+    filter {
+      timeframe = "-24h to now"
+    }
+  }
+  tile {
+    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_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_PROD.id
+      }
+    }
+    filter_config {
+      type         = "MIXED"
+      custom_name  = "Failure rate (HTTP 4xx/5xx  errors)"
+      default_name = "Custom chart"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+        result_metadata {
+          config {
+            custom_color  = "#ff0000"
+            key           = "nullbuiltin:service.errors.fivexx.rate|AVG|TOTAL|BAR|SERVICE"
+            last_modified = 1617956393463
+          }
+          config {
+            custom_color  = "#fff29a"
+            key           = "nullbuiltin:service.errors.fourxx.rate|AVG|TOTAL|BAR|SERVICE"
+            last_modified = 1617956441725
+          }
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "AVG"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.errors.fourxx.rate"
+          # sort_ascending = false
+          # sort_column    = false
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "AVG"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.errors.fivexx.rate"
+          # sort_ascending = false
+          sort_column      = true
+        }
+      }
+      filters {
+        filter {
+          entity_type = "SERVICE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name       = "Problems"
+    configured = true
+    tile_type  = "OPEN_PROBLEMS"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 152
+      left   = 950
+      top    = 38
+      width  = 152
+    }
+    filter {
+      management_zone {
+        name = "CD_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_PROD.id
+      }
+    }
+  }
+  tile {
+    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_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_PROD.id
+      }
+    }
+  }
+  tile {
+    name       = "Markdown"
+    configured = true
+    markdown   =<<-EOT
+      ---
+      
+    EOT
+    tile_type  = "MARKDOWN"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 38
+      left   = 38
+      top    = 532
+      width  = 1064
+    }
+  }
+  tile {
+    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_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_PROD.id
+      }
+    }
+    filter_config {
+      type         = "MIXED"
+      custom_name  = "Response time, Request Count and Number of Errors"
+      default_name = "Custom chart"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+        result_metadata {
+          config {
+            custom_color  = "#008cdb"
+            key           = "nullbuiltin:service.requestCount.total|NONE|TOTAL|BAR|SERVICE"
+            last_modified = 1595275720776
+          }
+          config {
+            custom_color  = "#b4e5f9"
+            key           = "nullbuiltin:service.response.time|AVG|TOTAL|LINE|SERVICE"
+            last_modified = 1595275686773
+          }
+          config {
+            custom_color  = "#ef651f"
+            key           = "nullbuiltin:service.errors.total.count|NONE|TOTAL|BAR|SERVICE"
+            last_modified = 1595275955999
+          }
+        }
+        series {
+          type             = "LINE"
+          aggregation      = "AVG"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.response.time"
+          # sort_ascending = false
+          # sort_column    = false
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "NONE"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.requestCount.total"
+          # sort_ascending = false
+          # sort_column    = false
+        }
+        series {
+          type             = "BAR"
+          aggregation      = "NONE"
+          aggregation_rate = "TOTAL"
+          entity_type      = "SERVICE"
+          metric           = "builtin:service.errors.total.count"
+          # sort_ascending = false
+          sort_column      = true
+        }
+      }
+      filters {
+        filter {
+          entity_type = "SERVICE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name       = "Markdown"
+    configured = true
+    markdown   =<<-EOT
+      ---
+      
+    EOT
+    tile_type  = "MARKDOWN"
+    unknowns   = jsonencode({
+          "isAutoRefreshDisabled": false
+      })
+    bounds {
+      height = 38
+      left   = 38
+      top    = 190
+      width  = 1064
+    }
+  }
+  tile {
+    name          = ""
+    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_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_PROD.id
+      }
+    }
+    filter_config {
+      type         = "DATABASE"
+      custom_name  = "Databases"
+      default_name = "Databases"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "DATABASE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    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_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_PROD.id
+      }
+    }
+    filter_config {
+      type         = "SERVICE"
+      custom_name  = "Services"
+      default_name = "Services"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "SERVICE"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    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_vdm_sfa"
+        id   = data.dynatrace_management_zone.CD_vdm_sfa_PROD.id
+      }
+    }
+    filter_config {
+      type         = "HOST"
+      custom_name  = "Hosts"
+      default_name = "Hosts"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "HOST"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+}

NA_PROD/management_zone/cd_tol-tssb.tf

@@ -1,95 +0,0 @@
-# DEFINE dynatrace_management_zone.CD_tol-tssb.id = -5505687220442320658
-resource "dynatrace_management_zone" "CD_tol-tssb" {
-  name = "CD_tol-tssb"
-  rules {
-    type    = "CLOUD_APPLICATION"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "CLOUD_APPLICATION_NAME"
-      }
-      string {
-        case_sensitive = true
-        # negate       = false
-        operator       = "CONTAINS"
-        value          = "tol-tssb"
-      }
-    }
-  }
-  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          = "tol-tssb"
-      }
-    }
-  }
-  rules {
-    type    = "HOST"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "HOST_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "tol-tssb"
-        }
-      }
-    }
-  }
-  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   = "tol-tssb"
-        }
-      }
-    }
-  }
-  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   = "tol-tssb"
-        }
-      }
-    }
-  }
-}

NA_PROD/management_zone/cd_vdm_sfa.tf

@@ -0,0 +1,28 @@
+# DEFINE dynatrace_management_zone.CD_vdm_sfa.id = -5459339840088730451
+resource "dynatrace_management_zone" "CD_vdm_sfa" {
+  name = "CD_vdm_sfa"
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("Namespace:sfa"))
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(HOST),tag("Namespace:sfa")
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(Service),tag("Namespace:sfa")
+    EOT
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector =<<-EOT
+      type(PROCESS_GROUP_INSTANCE),tag("Namespace:sfa")
+    EOT
+  }
+}