"Migrating from Monaco to Terraform for management zone: CD_SWLSEC2-Checker"

2023-03-01 19:13:04 +01:00 · 2023-03-01 19:09:59 +01:00 · 2023-03-01 19:06:41 +01:00 · 2023-03-01 18:57:48 +01:00 · 2023-03-01 18:53:15 +01:00 · 2023-03-01 18:47:40 +01:00
36 changed files with 2064 additions and 2598 deletions
--- a/CN_PREPROD/alerting/cd_swlsec2-checker_int.tf
+++ b/CN_PREPROD/alerting/cd_swlsec2-checker_int.tf
@ -0,0 +1,38 @@
+# DEFINE dynatrace_alerting.CD_SWLSEC2-Checker_INT.id = vu9U3hXa3q0AAAABABhidWlsdGluOmFsZXJ0aW5nLnByb2ZpbGUABnRlbmFudAAGdGVuYW50ACQwYWQyNzgxOC1jMzA2LTM5MjUtODcxMS04NTk1ZWI1MGEyZjK-71TeFdrerQ
+data "dynatrace_management_zone" "CD_SWLSEC2-Checker_INT"{ name="CD_SWLSEC2-Checker" }
+resource "dynatrace_alerting" "CD_SWLSEC2-Checker_INT" {
+  name            = "CD_SWLSEC2-Checker INT"
+  management_zone = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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" ]
+    }
+  }
+}
--- a/CN_PREPROD/alerting/cd_tol-tssb_int.tf
+++ b/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" ]
-    }
-  }
-}
--- a/CN_PREPROD/dashboard/cd_swlsec2-checker_int.tf
+++ b/CN_PREPROD/dashboard/cd_swlsec2-checker_int.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_SWLSEC2-Checker_INT.id = feab9b83-d40c-4be6-9736-3b891d407ada
+data "dynatrace_management_zone" "CD_SWLSEC2-Checker_INT"{ name="CD_SWLSEC2-Checker" }
+resource "dynatrace_dashboard" "CD_SWLSEC2-Checker_INT" {
  dashboard_metadata {
-    name   = "CD_tol-tssb PROD"
+    name   = "CD_SWLSEC2-Checker INT"
    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
    preset = true
    shared = true
-    tags   = [ "tol-tssb" ]
+    tags   = [ "CD_SWLSEC2-Checker" ]
    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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_INT.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:INT" ]
          }
        }
      }
@ -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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_INT.id
      }
    }
  }
@ -97,6 +103,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
      top    = 0
      width  = 1064
    }
+    filter {
+      management_zone {
+        name = "CD_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_INT.id
+      }
+    }
  }
  tile {
    name       = "Markdown"
@ -123,6 +135,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
      top    = 570
      width  = 1064
    }
+    filter {
+      management_zone {
+        name = "CD_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_PROD" {
          entity_type = "SERVICE"
          match {
            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:PROD" ]
+            values = [ "Environment:INT" ]
          }
        }
      }
@ -212,6 +230,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
      top    = 38
      width  = 190
    }
+    filter {
+      management_zone {
+        name = "CD_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_INT.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:INT" ]
          }
        }
      }
@ -242,6 +266,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
      top    = 38
      width  = 190
    }
+    filter {
+      management_zone {
+        name = "CD_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_INT.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:INT" ]
          }
        }
      }
@ -272,6 +302,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
      top    = 38
      width  = 190
    }
+    filter {
+      management_zone {
+        name = "CD_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_INT.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:INT" ]
          }
        }
      }
--- a/CN_PREPROD/dashboard/cd_swlsec2-checker_test.tf
+++ b/CN_PREPROD/dashboard/cd_swlsec2-checker_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_SWLSEC2-Checker_TEST.id = 1da1dd53-9b5d-4d38-908c-325f0d819e83
+data "dynatrace_management_zone" "CD_SWLSEC2-Checker_TEST"{ name="CD_SWLSEC2-Checker" }
+resource "dynatrace_dashboard" "CD_SWLSEC2-Checker_TEST" {
  dashboard_metadata {
-    name   = "CD_tol-tssb INT"
+    name   = "CD_SWLSEC2-Checker TEST"
    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
    preset = true
    shared = true
-    tags   = [ "tol-tssb" ]
+    tags   = [ "CD_SWLSEC2-Checker" ]
    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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_TEST.id
      }
    }
  }
@ -97,6 +103,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
      top    = 0
      width  = 1064
    }
+    filter {
+      management_zone {
+        name = "CD_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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" ]
          }
        }
      }
--- a/CN_PREPROD/dashboard/cd_tol-tssb_int-test.tf
+++ b/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" ]
-          }
-        }
-      }
-    }
-  }
-}
--- a/CN_PREPROD/management_zone/cd_swlsec2-checker.tf
+++ b/CN_PREPROD/management_zone/cd_swlsec2-checker.tf
@ -0,0 +1,20 @@
+# DEFINE dynatrace_management_zone.CD_SWLSEC2-Checker.id = 9176175587251194796
+resource "dynatrace_management_zone" "CD_SWLSEC2-Checker" {
+  name = "CD_SWLSEC2-Checker"
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:swlsec2checker\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"compass-id:swlsec2checker\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:swlsec2checker\"))"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"compass-id:swlsec2checker\")"
+  }
+}
--- a/CN_PREPROD/management_zone/cd_tol-tssb.tf
+++ b/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"
-        }
-      }
-    }
-  }
-}
--- a/CN_PROD/alerting/cd_swlsec2-checker_prod.tf
+++ b/CN_PROD/alerting/cd_swlsec2-checker_prod.tf
@ -0,0 +1,38 @@
+# DEFINE dynatrace_alerting.CD_SWLSEC2-Checker_PROD.id = vu9U3hXa3q0AAAABABhidWlsdGluOmFsZXJ0aW5nLnByb2ZpbGUABnRlbmFudAAGdGVuYW50ACQ4YWE3ZDhjZC1iNzVjLTNhZjAtOTNlNy00NjQxNDFjNzQzMjO-71TeFdrerQ
+data "dynatrace_management_zone" "CD_SWLSEC2-Checker_PROD"{ name="CD_SWLSEC2-Checker" }
+resource "dynatrace_alerting" "CD_SWLSEC2-Checker_PROD" {
+  name            = "CD_SWLSEC2-Checker PROD"
+  management_zone = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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" ]
+    }
+  }
+}
--- a/CN_PROD/alerting/cd_tol-tssb_prod.tf
+++ b/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" ]
-    }
-  }
-}
--- a/CN_PROD/dashboard/cd_swlsec2-checker_e2e.tf
+++ b/CN_PROD/dashboard/cd_swlsec2-checker_e2e.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_SWLSEC2-Checker_E2E.id = 879b8191-cf2a-4bd7-b1c5-db93f38ba6d2
+data "dynatrace_management_zone" "CD_SWLSEC2-Checker_E2E"{ name="CD_SWLSEC2-Checker" }
+resource "dynatrace_dashboard" "CD_SWLSEC2-Checker_E2E" {
  dashboard_metadata {
-    name   = "CD_tol-tssb E2E"
+    name   = "CD_SWLSEC2-Checker E2E"
    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
    preset = true
    shared = true
-    tags   = [ "tol-tssb" ]
+    tags   = [ "CD_SWLSEC2-Checker" ]
    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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_E2E.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:E2E" ]
          }
        }
      }
@ -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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_E2E.id
      }
    }
  }
@ -97,6 +103,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
      top    = 0
      width  = 1064
    }
+    filter {
+      management_zone {
+        name = "CD_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_E2E.id
+      }
+    }
  }
  tile {
    name       = "Markdown"
@ -123,6 +135,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
      top    = 570
      width  = 1064
    }
+    filter {
+      management_zone {
+        name = "CD_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_E2E" {
          entity_type = "SERVICE"
          match {
            key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:tol-tssb" ]
+            values = [ "Environment:E2E" ]
          }
        }
      }
@ -212,6 +230,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
      top    = 38
      width  = 190
    }
+    filter {
+      management_zone {
+        name = "CD_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_E2E.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:E2E" ]
          }
        }
      }
@ -242,6 +266,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
      top    = 38
      width  = 190
    }
+    filter {
+      management_zone {
+        name = "CD_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_E2E.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:E2E" ]
          }
        }
      }
@ -272,6 +302,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
      top    = 38
      width  = 190
    }
+    filter {
+      management_zone {
+        name = "CD_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_E2E.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:E2E" ]
          }
        }
      }
--- a/CN_PROD/dashboard/cd_swlsec2-checker_prod.tf
+++ b/CN_PROD/dashboard/cd_swlsec2-checker_prod.tf
@ -1,12 +1,12 @@
-# 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" {
+# DEFINE dynatrace_dashboard.CD_SWLSEC2-Checker_PROD.id = a2031257-fb40-4580-954d-5409c802eb8c
+data "dynatrace_management_zone" "CD_SWLSEC2-Checker_PROD"{ name="CD_SWLSEC2-Checker" }
+resource "dynatrace_dashboard" "CD_SWLSEC2-Checker_PROD" {
  dashboard_metadata {
-    name   = "CD_tol-tssb TEST"
+    name   = "CD_SWLSEC2-Checker PROD"
    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
    preset = true
    shared = true
-    tags   = [ "tol-tssb" ]
+    tags   = [ "CD_SWLSEC2-Checker" ]
    filter {
      timeframe = "-24h to now"
    }
@ -21,6 +21,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_TEST" {
      top    = 228
      width  = 1064
    }
+    filter {
+      management_zone {
+        name = "CD_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_PROD.id
+      }
+    }
    filter_config {
      type         = "MIXED"
      custom_name  = "Failure rate (HTTP 4xx/5xx  errors)"
@ -64,7 +70,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_TEST" {
          entity_type = "SERVICE"
          match {
            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:TEST" ]
+            values = [ "Environment:PROD" ]
          }
        }
      }
@ -82,8 +88,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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_PROD.id
      }
    }
  }
@ -97,6 +103,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_TEST" {
      top    = 0
      width  = 1064
    }
+    filter {
+      management_zone {
+        name = "CD_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_PROD.id
+      }
+    }
  }
  tile {
    name       = "Markdown"
@ -123,6 +135,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_TEST" {
      top    = 570
      width  = 1064
    }
+    filter {
+      management_zone {
+        name = "CD_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_PROD.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_TEST" {
          entity_type = "SERVICE"
          match {
            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:TEST" ]
+            values = [ "Environment:PROD" ]
          }
        }
      }
@ -212,6 +230,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_TEST" {
      top    = 38
      width  = 190
    }
+    filter {
+      management_zone {
+        name = "CD_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_PROD.id
+      }
+    }
    filter_config {
      type         = "DATABASE"
      custom_name  = "Databases"
@ -225,7 +249,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_TEST" {
          entity_type = "DATABASE"
          match {
            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:TEST" ]
+            values = [ "Environment:PROD" ]
          }
        }
      }
@ -242,6 +266,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_TEST" {
      top    = 38
      width  = 190
    }
+    filter {
+      management_zone {
+        name = "CD_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_PROD.id
+      }
+    }
    filter_config {
      type         = "SERVICE"
      custom_name  = "Services"
@ -255,7 +285,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_TEST" {
          entity_type = "SERVICE"
          match {
            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:TEST" ]
+            values = [ "Environment:PROD" ]
          }
        }
      }
@ -272,6 +302,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_TEST" {
      top    = 38
      width  = 190
    }
+    filter {
+      management_zone {
+        name = "CD_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_PROD.id
+      }
+    }
    filter_config {
      type         = "HOST"
      custom_name  = "Hosts"
@ -285,7 +321,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_TEST" {
          entity_type = "HOST"
          match {
            key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:TEST" ]
+            values = [ "Environment:PROD" ]
          }
        }
      }
--- a/CN_PROD/management_zone/cd_swlsec2-checker.tf
+++ b/CN_PROD/management_zone/cd_swlsec2-checker.tf
@ -0,0 +1,20 @@
+# DEFINE dynatrace_management_zone.CD_SWLSEC2-Checker.id = 4595971793411556891
+resource "dynatrace_management_zone" "CD_SWLSEC2-Checker" {
+  name = "CD_SWLSEC2-Checker"
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:swlsec2checker\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"compass-id:swlsec2checker\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:swlsec2checker\"))"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"compass-id:swlsec2checker\")"
+  }
+}
--- a/CN_PROD/management_zone/cd_tol-tssb.tf
+++ b/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"
-        }
-      }
-    }
-  }
-}
--- a/EMEA_PREPROD/dashboard/cd_swlsec2-checker_int.tf
+++ b/EMEA_PREPROD/dashboard/cd_swlsec2-checker_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_SWLSEC2-Checker_INT.id = 12ae56f2-4db7-45c9-81cb-a1358bdb1f9c
+data "dynatrace_management_zone" "CD_SWLSEC2-Checker_INT"{ name="CD_SWLSEC2-Checker" }
+resource "dynatrace_dashboard" "CD_SWLSEC2-Checker_INT" {
  dashboard_metadata {
-    name   = "CD_tol-tssb INT"
+    name   = "CD_SWLSEC2-Checker INT"
    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
    preset = true
    shared = true
-    tags   = [ "CD_tol-tssb" ]
+    tags   = [ "CD_SWLSEC2-Checker" ]
    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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_INT.id
      }
    }
    filter_config {
--- a/EMEA_PREPROD/dashboard/cd_swlsec2-checker_test.tf
+++ b/EMEA_PREPROD/dashboard/cd_swlsec2-checker_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_SWLSEC2-Checker_TEST.id = bacffdaf-ad63-453e-b5c9-8b2b32a1a6ad
+data "dynatrace_management_zone" "CD_SWLSEC2-Checker_TEST"{ name="CD_SWLSEC2-Checker" }
+resource "dynatrace_dashboard" "CD_SWLSEC2-Checker_TEST" {
  dashboard_metadata {
-    name   = "CD_tol-tssb TEST"
+    name   = "CD_SWLSEC2-Checker TEST"
    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
    preset = true
    shared = true
-    tags   = [ "CD_tol-tssb" ]
+    tags   = [ "CD_SWLSEC2-Checker" ]
    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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_TEST.id
      }
    }
    filter_config {
--- a/EMEA_PREPROD/management_zone/cd_swlsec2-checker.tf
+++ b/EMEA_PREPROD/management_zone/cd_swlsec2-checker.tf
@ -0,0 +1,20 @@
+# DEFINE dynatrace_management_zone.CD_SWLSEC2-Checker.id = 7551381650925119254
+resource "dynatrace_management_zone" "CD_SWLSEC2-Checker" {
+  name = "CD_SWLSEC2-Checker"
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"compass-id:swlsec2checker\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"compass-id:swlsec2checker\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:swlsec2checker\"))"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:swlsec2checker\")"
+  }
+}
--- a/EMEA_PREPROD/management_zone/cd_tol-tssb.tf
+++ b/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"
-        }
-      }
-    }
-  }
-}
--- a/EMEA_PROD/alerting/cd_swlsec2-checker_prod.tf
+++ b/EMEA_PROD/alerting/cd_swlsec2-checker_prod.tf
@ -0,0 +1,38 @@
+# DEFINE dynatrace_alerting.CD_SWLSEC2-Checker_PROD.id = vu9U3hXa3q0AAAABABhidWlsdGluOmFsZXJ0aW5nLnByb2ZpbGUABnRlbmFudAAGdGVuYW50ACQ4ZDgzYWQ5YS1mNTNlLTNmYjQtOWU2Yy1mY2E2NTdkYWZhNjS-71TeFdrerQ
+data "dynatrace_management_zone" "CD_SWLSEC2-Checker_PROD"{ name="CD_SWLSEC2-Checker" }
+resource "dynatrace_alerting" "CD_SWLSEC2-Checker_PROD" {
+  name            = "CD_SWLSEC2-Checker PROD"
+  management_zone = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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" ]
+    }
+  }
+}
--- a/EMEA_PROD/dashboard/cd_swlsec2-checker_e2e.tf
+++ b/EMEA_PROD/dashboard/cd_swlsec2-checker_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_SWLSEC2-Checker_E2E.id = a635a3c1-79bd-4120-bc5e-03b743dfba82
+data "dynatrace_management_zone" "CD_SWLSEC2-Checker_E2E"{ name="CD_SWLSEC2-Checker" }
+resource "dynatrace_dashboard" "CD_SWLSEC2-Checker_E2E" {
  dashboard_metadata {
-    name   = "CD_tol-tssb E2E"
+    name   = "CD_SWLSEC2-Checker E2E"
    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
    preset = true
    shared = true
-    tags   = [ "tol-tssb" ]
+    tags   = [ "CD_SWLSEC2-Checker" ]
    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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_E2E.id
      }
    }
  }
@ -106,6 +112,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
      top    = 0
      width  = 1064
    }
+    filter {
+      management_zone {
+        name = "CD_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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" ]
          }
        }
      }
--- a/EMEA_PROD/dashboard/cd_swlsec2-checker_prod.tf
+++ b/EMEA_PROD/dashboard/cd_swlsec2-checker_prod.tf
@ -0,0 +1,357 @@
+# DEFINE dynatrace_dashboard.CD_SWLSEC2-Checker_PROD.id = 26f733c0-f98c-4d31-925d-f5f1cd3de617
+data "dynatrace_management_zone" "CD_SWLSEC2-Checker_PROD"{ name="CD_SWLSEC2-Checker" }
+resource "dynatrace_dashboard" "CD_SWLSEC2-Checker_PROD" {
+  dashboard_metadata {
+    name   = "CD_SWLSEC2-Checker PROD"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "CD_SWLSEC2-Checker" ]
+    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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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" ]
+          }
+        }
+      }
+    }
+  }
+}
--- a/EMEA_PROD/management_zone/cd_swlsec2-checker.tf
+++ b/EMEA_PROD/management_zone/cd_swlsec2-checker.tf
@ -0,0 +1,20 @@
+# DEFINE dynatrace_management_zone.CD_SWLSEC2-Checker.id = 739588863038338383
+resource "dynatrace_management_zone" "CD_SWLSEC2-Checker" {
+  name = "CD_SWLSEC2-Checker"
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"compass-id:swlsec2checker\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"compass-id:swlsec2checker\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:swlsec2checker\"))"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:swlsec2checker\")"
+  }
+}
--- a/EMEA_PROD/management_zone/cd_tol-tssb.tf
+++ b/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"
-        }
-      }
-    }
-  }
-}
--- a/NA_PREPROD/alerting/cd_swlsec2-checker_int.tf
+++ b/NA_PREPROD/alerting/cd_swlsec2-checker_int.tf
@ -0,0 +1,38 @@
+# DEFINE dynatrace_alerting.CD_SWLSEC2-Checker_INT.id = vu9U3hXa3q0AAAABABhidWlsdGluOmFsZXJ0aW5nLnByb2ZpbGUABnRlbmFudAAGdGVuYW50ACQwMDVkOTc0Yi00YWQ2LTM2ODEtYmZjYi04MDcxMzYzNzY4Zje-71TeFdrerQ
+data "dynatrace_management_zone" "CD_SWLSEC2-Checker_INT"{ name="CD_SWLSEC2-Checker" }
+resource "dynatrace_alerting" "CD_SWLSEC2-Checker_INT" {
+  name            = "CD_SWLSEC2-Checker INT"
+  management_zone = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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" ]
+    }
+  }
+}
--- a/NA_PREPROD/dashboard/cd_swlsec2-checker_int.tf
+++ b/NA_PREPROD/dashboard/cd_swlsec2-checker_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_SWLSEC2-Checker_INT.id = 691b05c4-5026-4057-b254-94cb2f74c223
+data "dynatrace_management_zone" "CD_SWLSEC2-Checker_INT"{ name="CD_SWLSEC2-Checker" }
+resource "dynatrace_dashboard" "CD_SWLSEC2-Checker_INT" {
  dashboard_metadata {
-    name   = "CD_tol-tssb PROD"
+    name   = "CD_SWLSEC2-Checker INT"
    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
    preset = true
    shared = true
-    tags   = [ "tol-tssb" ]
+    tags   = [ "CD_SWLSEC2-Checker" ]
    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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_INT.id
      }
    }
  }
@ -106,6 +112,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
      top    = 0
      width  = 1064
    }
+    filter {
+      management_zone {
+        name = "CD_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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" ]
          }
        }
      }
--- a/NA_PREPROD/dashboard/cd_swlsec2-checker_test.tf
+++ b/NA_PREPROD/dashboard/cd_swlsec2-checker_test.tf
@ -0,0 +1,357 @@
+# DEFINE dynatrace_dashboard.CD_SWLSEC2-Checker_TEST.id = 284f3234-addc-4811-b0b8-2583aaa4d683
+data "dynatrace_management_zone" "CD_SWLSEC2-Checker_TEST"{ name="CD_SWLSEC2-Checker" }
+resource "dynatrace_dashboard" "CD_SWLSEC2-Checker_TEST" {
+  dashboard_metadata {
+    name   = "CD_SWLSEC2-Checker TEST"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "CD_SWLSEC2-Checker" ]
+    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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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" ]
+          }
+        }
+      }
+    }
+  }
+}
--- a/NA_PREPROD/dashboard/cd_tol-tssb_int.tf
+++ b/NA_PREPROD/dashboard/cd_tol-tssb_int.tf
@ -1,321 +0,0 @@
-# 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" {
-  dashboard_metadata {
-    name   = "CD_tol-tssb INT"
-    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:INT" ]
-          }
-        }
-      }
-    }
-  }
-  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_INT.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:INT" ]
-          }
-        }
-      }
-    }
-  }
-  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:INT" ]
-          }
-        }
-      }
-    }
-  }
-  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:INT" ]
-          }
-        }
-      }
-    }
-  }
-  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:INT" ]
-          }
-        }
-      }
-    }
-  }
-}
--- a/NA_PREPROD/dashboard/cd_tol-tssb_test.tf
+++ b/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" ]
-          }
-        }
-      }
-    }
-  }
-}
--- a/NA_PREPROD/management_zone/cd_swlsec2-checker.tf
+++ b/NA_PREPROD/management_zone/cd_swlsec2-checker.tf
@ -0,0 +1,20 @@
+# DEFINE dynatrace_management_zone.CD_SWLSEC2-Checker.id = -7397281195842375550
+resource "dynatrace_management_zone" "CD_SWLSEC2-Checker" {
+  name = "CD_SWLSEC2-Checker"
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"compass-id:swlsec2checker\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"compass-id:swlsec2checker\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:swlsec2checker\"))"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:swlsec2checker\")"
+  }
+}
--- a/NA_PREPROD/management_zone/cd_tol-tssb.tf
+++ b/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"
-        }
-      }
-    }
-  }
-}
--- a/NA_PROD/alerting/cd_swlsec2-checker_prod.tf
+++ b/NA_PROD/alerting/cd_swlsec2-checker_prod.tf
@ -0,0 +1,38 @@
+# DEFINE dynatrace_alerting.CD_SWLSEC2-Checker_PROD.id = vu9U3hXa3q0AAAABABhidWlsdGluOmFsZXJ0aW5nLnByb2ZpbGUABnRlbmFudAAGdGVuYW50ACQyMTNjZGJmYS1mYTRmLTMxN2MtYWU3OS1hMzg5MmJlMGMyZmO-71TeFdrerQ
+data "dynatrace_management_zone" "CD_SWLSEC2-Checker_PROD"{ name="CD_SWLSEC2-Checker" }
+resource "dynatrace_alerting" "CD_SWLSEC2-Checker_PROD" {
+  name            = "CD_SWLSEC2-Checker PROD"
+  management_zone = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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" ]
+    }
+  }
+}
--- a/NA_PROD/dashboard/cd_swlsec2-checker_e2e.tf
+++ b/NA_PROD/dashboard/cd_swlsec2-checker_e2e.tf
@ -0,0 +1,357 @@
+# DEFINE dynatrace_dashboard.CD_SWLSEC2-Checker_E2E.id = 7140e12d-eb05-4ddc-aa98-1b93f757bc5c
+data "dynatrace_management_zone" "CD_SWLSEC2-Checker_E2E"{ name="CD_SWLSEC2-Checker" }
+resource "dynatrace_dashboard" "CD_SWLSEC2-Checker_E2E" {
+  dashboard_metadata {
+    name   = "CD_SWLSEC2-Checker E2E"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "CD_SWLSEC2-Checker" ]
+    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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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" ]
+          }
+        }
+      }
+    }
+  }
+}
--- a/NA_PROD/dashboard/cd_swlsec2-checker_prod.tf
+++ b/NA_PROD/dashboard/cd_swlsec2-checker_prod.tf
@ -0,0 +1,357 @@
+# DEFINE dynatrace_dashboard.CD_SWLSEC2-Checker_PROD.id = 97abfe73-9a4e-4a32-b264-978ad4f36d40
+data "dynatrace_management_zone" "CD_SWLSEC2-Checker_PROD"{ name="CD_SWLSEC2-Checker" }
+resource "dynatrace_dashboard" "CD_SWLSEC2-Checker_PROD" {
+  dashboard_metadata {
+    name   = "CD_SWLSEC2-Checker PROD"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "CD_SWLSEC2-Checker" ]
+    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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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_SWLSEC2-Checker"
+        id   = data.dynatrace_management_zone.CD_SWLSEC2-Checker_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" ]
+          }
+        }
+      }
+    }
+  }
+}
--- a/NA_PROD/dashboard/cd_tol-tssb_e2e.tf
+++ b/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" ]
-          }
-        }
-      }
-    }
-  }
-}
--- a/NA_PROD/dashboard/cd_tol-tssb_prod.tf
+++ b/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" ]
-          }
-        }
-      }
-    }
-  }
-}
--- a/NA_PROD/management_zone/cd_swlsec2-checker.tf
+++ b/NA_PROD/management_zone/cd_swlsec2-checker.tf
@ -0,0 +1,20 @@
+# DEFINE dynatrace_management_zone.CD_SWLSEC2-Checker.id = -7337902639389742818
+resource "dynatrace_management_zone" "CD_SWLSEC2-Checker" {
+  name = "CD_SWLSEC2-Checker"
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"compass-id:swlsec2checker\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"compass-id:swlsec2checker\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:swlsec2checker\"))"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:swlsec2checker\")"
+  }
+}
--- a/NA_PROD/management_zone/cd_tol-tssb.tf
+++ b/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"
-        }
-      }
-    }
-  }
-}
Author	SHA1	Message	Date
Patryk Gudalewicz	6f87ca4321	"Migrating from Monaco to Terraform for management zone: CD_SWLSEC2-Checker"	2023-03-01 19:13:04 +01:00
Patryk Gudalewicz	0cb36ddc82	"Migrating from Monaco to Terraform for management zone: CD_SWLSEC2-Checker"	2023-03-01 19:09:59 +01:00
Patryk Gudalewicz	bfa06ff9a9	"Migrating from Monaco to Terraform for management zone: CD_SWLSEC2-Checker"	2023-03-01 19:06:41 +01:00
Patryk Gudalewicz	e70ade9a4b	"Migrating from Monaco to Terraform for management zone: CD_SWLSEC2-Checker"	2023-03-01 18:57:48 +01:00
Patryk Gudalewicz	691ba01c4c	"Migrating from Monaco to Terraform for management zone: CD_SWLSEC2-Checker"	2023-03-01 18:53:15 +01:00
Patryk Gudalewicz	ee97286793	"Migrating from Monaco to Terraform for management zone: CD_SWLSEC2-Checker"	2023-03-01 18:47:40 +01:00