"Migrating from Monaco to Terraform for management zone: CD_CICD"

CN_PREPROD/alerting/cd_cicd_int.tf

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

CN_PREPROD/alerting/cd_tol-tssb_int.tf

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

CN_PREPROD/dashboard/cd_cicd_int.tf

@@ -1,12 +1,12 @@
-# DEFINE dynatrace_dashboard.CD_tol-tssb_E2E.id = c4a7a14f-9417-4046-b6ad-331dde25ac87
-data "dynatrace_management_zone" "CD_tol-tssb_E2E"{ name="CD_tol-tssb" }
-resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
+# DEFINE dynatrace_dashboard.CD_CICD_INT.id = 7302b2c5-74cb-414d-86b5-9f4433f9b9cb
+data "dynatrace_management_zone" "CD_CICD_INT"{ name="CD_CICD" }
+resource "dynatrace_dashboard" "CD_CICD_INT" {
   dashboard_metadata {
-    name   = "CD_tol-tssb E2E"
+    name   = "CD_CICD INT"
     owner  = "Ignacio.Goldman@partner.bmwgroup.com"
     preset = true
     shared = true
-    tags   = [ "tol-tssb" ]
+    tags   = [ "CD_CICD" ]
     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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_INT.id
+      }
+    }
     filter_config {
       type         = "MIXED"
       custom_name  = "Failure rate (HTTP 4xx/5xx  errors)"
@@ -64,7 +70,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:tol-tssb" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -82,8 +88,8 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
     }
     filter {
       management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_E2E.id
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_INT.id
       }
     }
   }
@@ -97,6 +103,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
       top    = 0
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_INT.id
+      }
+    }
   }
   tile {
     name       = "Markdown"
@@ -123,6 +135,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
       top    = 570
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_INT.id
+      }
+    }
     filter_config {
       type         = "MIXED"
       custom_name  = "Response time, Request Count and Number of Errors"
@@ -180,7 +198,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:tol-tssb" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -212,6 +230,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_INT.id
+      }
+    }
     filter_config {
       type         = "DATABASE"
       custom_name  = "Databases"
@@ -225,7 +249,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:tol-tssb" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -242,6 +266,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_INT.id
+      }
+    }
     filter_config {
       type         = "SERVICE"
       custom_name  = "Services"
@@ -255,7 +285,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:tol-tssb" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -272,6 +302,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_INT.id
+      }
+    }
     filter_config {
       type         = "HOST"
       custom_name  = "Hosts"
@@ -285,7 +321,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:tol-tssb" ]
+            values = [ "Environment:INT" ]
           }
         }
       }

CN_PREPROD/dashboard/cd_cicd_test.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_CICD_TEST.id = 4ee6ec07-2803-4937-bbc0-19cbfe2105a6
+data "dynatrace_management_zone" "CD_CICD_TEST"{ name="CD_CICD" }
+resource "dynatrace_dashboard" "CD_CICD_TEST" {
   dashboard_metadata {
-    name   = "CD_tol-tssb PROD"
+    name   = "CD_CICD TEST"
     owner  = "Ignacio.Goldman@partner.bmwgroup.com"
     preset = true
     shared = true
-    tags   = [ "tol-tssb" ]
+    tags   = [ "CD_CICD" ]
     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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_TEST.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:TEST" ]
           }
         }
       }
@@ -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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_TEST.id
       }
     }
   }
@@ -97,6 +103,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
       top    = 0
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_TEST.id
+      }
+    }
   }
   tile {
     name       = "Markdown"
@@ -123,6 +135,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
       top    = 570
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:PROD" ]
+            values = [ "Environment:TEST" ]
           }
         }
       }
@@ -212,6 +230,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_TEST.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:TEST" ]
           }
         }
       }
@@ -242,6 +266,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_TEST.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:TEST" ]
           }
         }
       }
@@ -272,6 +302,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_TEST.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:TEST" ]
           }
         }
       }

CN_PREPROD/dashboard/cd_tol-tssb_int-test.tf

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

CN_PREPROD/management_zone/cd_cicd.tf

@@ -0,0 +1,20 @@
+# DEFINE dynatrace_management_zone.CD_CICD.id = 8457842676162194044
+resource "dynatrace_management_zone" "CD_CICD" {
+  name = "CD_CICD"
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"compass-id:CICD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"compass-id:CICD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:CICD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:CICD\"))"
+  }
+}

CN_PREPROD/management_zone/cd_tol-tssb.tf

@@ -1,95 +0,0 @@
-# DEFINE dynatrace_management_zone.CD_tol-tssb.id = -1465750590167206984
-resource "dynatrace_management_zone" "CD_tol-tssb" {
-  name = "CD_tol-tssb"
-  rules {
-    type    = "CLOUD_APPLICATION"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "CLOUD_APPLICATION_NAME"
-      }
-      string {
-        case_sensitive = true
-        # negate       = false
-        operator       = "CONTAINS"
-        value          = "tol-tssb"
-      }
-    }
-  }
-  rules {
-    type    = "CLOUD_APPLICATION_NAMESPACE"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "CLOUD_APPLICATION_NAMESPACE_NAME"
-      }
-      string {
-        case_sensitive = true
-        # negate       = false
-        operator       = "CONTAINS"
-        value          = "tol-tssb"
-      }
-    }
-  }
-  rules {
-    type    = "HOST"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "HOST_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "tol-tssb"
-        }
-      }
-    }
-  }
-  rules {
-    type              = "PROCESS_GROUP"
-    enabled           = true
-    propagation_types = [ "PROCESS_GROUP_TO_HOST" ]
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "PROCESS_GROUP_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "tol-tssb"
-        }
-      }
-    }
-  }
-  rules {
-    type              = "SERVICE"
-    enabled           = true
-    propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ]
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "SERVICE_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "tol-tssb"
-        }
-      }
-    }
-  }
-}

CN_PROD/alerting/cd_tol-tssb_prod.tf

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

CN_PROD/dashboard/cd_cicd_e2e.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_CICD_E2E.id = a0cd53e8-3282-4d26-911b-23b6ba71e7cb
+data "dynatrace_management_zone" "CD_CICD_E2E"{ name="CD_CICD" }
+resource "dynatrace_dashboard" "CD_CICD_E2E" {
   dashboard_metadata {
-    name   = "CD_tol-tssb INT"
+    name   = "CD_CICD E2E"
     owner  = "Ignacio.Goldman@partner.bmwgroup.com"
     preset = true
     shared = true
-    tags   = [ "tol-tssb" ]
+    tags   = [ "CD_CICD" ]
     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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_E2E.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:E2E" ]
           }
         }
       }
@@ -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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_E2E.id
       }
     }
   }
@@ -97,6 +103,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
       top    = 0
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_E2E.id
+      }
+    }
   }
   tile {
     name       = "Markdown"
@@ -123,6 +135,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
       top    = 570
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:INT" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -212,6 +230,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_E2E.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:E2E" ]
           }
         }
       }
@@ -242,6 +266,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_E2E.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:E2E" ]
           }
         }
       }
@@ -272,6 +302,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_E2E.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:E2E" ]
           }
         }
       }

CN_PROD/dashboard/cd_cicd_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_CICD_PROD.id = 539f0570-a632-40d0-b78c-e27e6705a8cf
+data "dynatrace_management_zone" "CD_CICD_PROD"{ name="CD_CICD" }
+resource "dynatrace_dashboard" "CD_CICD_PROD" {
   dashboard_metadata {
-    name   = "CD_tol-tssb TEST"
+    name   = "CD_CICD PROD"
     owner  = "Ignacio.Goldman@partner.bmwgroup.com"
     preset = true
     shared = true
-    tags   = [ "tol-tssb" ]
+    tags   = [ "CD_CICD" ]
     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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_PROD.id
       }
     }
   }
@@ -97,6 +103,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_TEST" {
       top    = 0
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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" ]
           }
         }
       }

CN_PROD/management_zone/cd_cicd.tf

@@ -0,0 +1,20 @@
+# DEFINE dynatrace_management_zone.CD_CICD.id = 2890338867939860963
+resource "dynatrace_management_zone" "CD_CICD" {
+  name = "CD_CICD"
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"compass-id:CICD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"compass-id:CICD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:CICD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:CICD\"))"
+  }
+}

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"
-        }
-      }
-    }
-  }
-}

EMEA_PREPROD/dashboard/cd_cicd_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_CICD_INT.id = 7db3e89d-94e0-4393-90af-c244815f1ae2
+data "dynatrace_management_zone" "CD_CICD_INT"{ name="CD_CICD" }
+resource "dynatrace_dashboard" "CD_CICD_INT" {
   dashboard_metadata {
-    name   = "CD_tol-tssb INT"
+    name   = "CD_CICD INT"
     owner  = "Ignacio.Goldman@partner.bmwgroup.com"
     preset = true
     shared = true
-    tags   = [ "CD_tol-tssb" ]
+    tags   = [ "CD_CICD" ]
     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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_INT.id
       }
     }
     filter_config {

EMEA_PREPROD/dashboard/cd_cicd_test.tf

@@ -0,0 +1,545 @@
+# DEFINE dynatrace_dashboard.CD_CICD_TEST.id = d43bf538-2cfe-4b17-a233-e3c9e9ed8365
+data "dynatrace_management_zone" "CD_CICD_TEST"{ name="CD_CICD" }
+resource "dynatrace_dashboard" "CD_CICD_TEST" {
+  dashboard_metadata {
+    name   = "CD_CICD TEST"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "CD_CICD" ]
+    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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name        = "Disk Througuput"
+    configured  = true
+    custom_name = "Data explorer results"
+    tile_type   = "DATA_EXPLORER"
+    unknowns    = jsonencode({
+          "isAutoRefreshDisabled": false,
+          "metricExpressions": [
+              "resolution=null\u0026(builtin:host.disk.throughput.write:splitBy(\"dt.entity.host\"):avg:auto:sort(value(avg,descending)):limit(20)):limit(100):names"
+          ],
+          "queries": [
+              {
+                  "enabled": true,
+                  "filterBy": {
+                      "criteria": [],
+                      "nestedFilters": []
+                  },
+                  "id": "A",
+                  "metric": "builtin:host.disk.throughput.write",
+                  "rate": "NONE",
+                  "spaceAggregation": "AVG",
+                  "splitBy": [
+                      "dt.entity.host"
+                  ],
+                  "timeAggregation": "DEFAULT"
+              }
+          ],
+          "visualConfig": {
+              "axes": {
+                  "xAxis": {
+                      "displayName": "",
+                      "visible": true
+                  },
+                  "yAxes": [
+                      {
+                          "defaultAxis": true,
+                          "displayName": "",
+                          "max": "AUTO",
+                          "min": "AUTO",
+                          "position": "LEFT",
+                          "queryIds": [
+                              "A"
+                          ],
+                          "visible": true
+                      }
+                  ]
+              },
+              "global": {
+                  "hideLegend": false
+              },
+              "graphChartSettings": {
+                  "connectNulls": false
+              },
+              "heatmapSettings": {
+                  "yAxis": "VALUE"
+              },
+              "rules": [
+                  {
+                      "matcher": "A:",
+                      "properties": {
+                          "color": "DEFAULT",
+                          "seriesType": "LINE"
+                      },
+                      "seriesOverrides": []
+                  }
+              ],
+              "tableSettings": {},
+              "thresholds": [
+                  {
+                      "axisTarget": "LEFT",
+                      "queryId": "",
+                      "rules": [
+                          {
+                              "color": "#7dc540"
+                          },
+                          {
+                              "color": "#f5d30f"
+                          },
+                          {
+                              "color": "#dc172a"
+                          }
+                      ],
+                      "visible": true
+                  }
+              ],
+              "type": "GRAPH_CHART"
+          }
+      })
+    bounds {
+      height = 304
+      left   = 76
+      top    = 912
+      width  = 1026
+    }
+  }
+  tile {
+    name        = "Graph"
+    configured  = true
+    custom_name = "Data explorer results"
+    tile_type   = "DATA_EXPLORER"
+    unknowns    = jsonencode({
+          "isAutoRefreshDisabled": false,
+          "metricExpressions": [
+              "resolution=null\u0026(builtin:host.mem.used:splitBy():avg:auto:sort(value(avg,descending)):limit(20)):limit(100):names"
+          ],
+          "queries": [
+              {
+                  "enabled": true,
+                  "filterBy": {
+                      "criteria": [],
+                      "nestedFilters": []
+                  },
+                  "id": "A",
+                  "metric": "builtin:host.mem.used",
+                  "rate": "NONE",
+                  "spaceAggregation": "AVG",
+                  "splitBy": [],
+                  "timeAggregation": "DEFAULT"
+              }
+          ],
+          "visualConfig": {
+              "axes": {
+                  "xAxis": {
+                      "displayName": "",
+                      "visible": true
+                  },
+                  "yAxes": [
+                      {
+                          "defaultAxis": true,
+                          "displayName": "",
+                          "max": "AUTO",
+                          "min": "AUTO",
+                          "position": "LEFT",
+                          "queryIds": [
+                              "A"
+                          ],
+                          "visible": true
+                      }
+                  ]
+              },
+              "global": {
+                  "hideLegend": false
+              },
+              "graphChartSettings": {
+                  "connectNulls": false
+              },
+              "heatmapSettings": {
+                  "yAxis": "VALUE"
+              },
+              "rules": [
+                  {
+                      "matcher": "A:",
+                      "properties": {
+                          "color": "DEFAULT",
+                          "seriesType": "LINE"
+                      },
+                      "seriesOverrides": []
+                  }
+              ],
+              "tableSettings": {},
+              "thresholds": [
+                  {
+                      "axisTarget": "LEFT",
+                      "queryId": "",
+                      "rules": [
+                          {
+                              "color": "#7dc540"
+                          },
+                          {
+                              "color": "#f5d30f"
+                          },
+                          {
+                              "color": "#dc172a"
+                          }
+                      ],
+                      "visible": true
+                  }
+              ],
+              "type": "GRAPH_CHART"
+          }
+      })
+    bounds {
+      height = 304
+      left   = 76
+      top    = 1216
+      width  = 304
+    }
+  }
+}

EMEA_PREPROD/management_zone/cd_cicd.tf

@@ -0,0 +1,20 @@
+# DEFINE dynatrace_management_zone.CD_CICD.id = 6119204091544376229
+resource "dynatrace_management_zone" "CD_CICD" {
+  name = "CD_CICD"
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:CICD\"))"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"compass-id:CICD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"compass-id:CICD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:CICD\")"
+  }
+}

EMEA_PREPROD/management_zone/cd_tol-tssb.tf

@@ -1,95 +0,0 @@
-# DEFINE dynatrace_management_zone.CD_tol-tssb.id = -2479801801971642988
-resource "dynatrace_management_zone" "CD_tol-tssb" {
-  name = "CD_tol-tssb"
-  rules {
-    type    = "CLOUD_APPLICATION"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "CLOUD_APPLICATION_NAME"
-      }
-      string {
-        case_sensitive = true
-        # negate       = false
-        operator       = "CONTAINS"
-        value          = "tol-tssb"
-      }
-    }
-  }
-  rules {
-    type    = "CLOUD_APPLICATION_NAMESPACE"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "CLOUD_APPLICATION_NAMESPACE_NAME"
-      }
-      string {
-        case_sensitive = true
-        # negate       = false
-        operator       = "CONTAINS"
-        value          = "tol-tssb"
-      }
-    }
-  }
-  rules {
-    type    = "HOST"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "HOST_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "tol-tssb"
-        }
-      }
-    }
-  }
-  rules {
-    type              = "PROCESS_GROUP"
-    enabled           = true
-    propagation_types = [ "PROCESS_GROUP_TO_HOST" ]
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "PROCESS_GROUP_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "tol-tssb"
-        }
-      }
-    }
-  }
-  rules {
-    type              = "SERVICE"
-    enabled           = true
-    propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ]
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "SERVICE_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "tol-tssb"
-        }
-      }
-    }
-  }
-}

EMEA_PROD/alerting/cd_cicd_prod.tf

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

EMEA_PROD/dashboard/cd_cicd_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_CICD_E2E.id = 58252e47-e38c-49b0-b2e0-99d96475f4a1
+data "dynatrace_management_zone" "CD_CICD_E2E"{ name="CD_CICD" }
+resource "dynatrace_dashboard" "CD_CICD_E2E" {
   dashboard_metadata {
-    name   = "CD_tol-tssb E2E"
+    name   = "CD_CICD E2E"
     owner  = "Ignacio.Goldman@partner.bmwgroup.com"
     preset = true
     shared = true
-    tags   = [ "tol-tssb" ]
+    tags   = [ "CD_CICD" ]
     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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_E2E.id
       }
     }
   }
@@ -106,6 +112,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
       top    = 0
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_E2E.id
+      }
+    }
     filter_config {
       type         = "HOST"
       custom_name  = "Hosts"
@@ -312,7 +348,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_E2E" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:tol-tssb" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }

EMEA_PROD/dashboard/cd_cicd_prod.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_CICD_PROD.id = be4681cf-da5e-42da-ace9-60f5db778801
+data "dynatrace_management_zone" "CD_CICD_PROD"{ name="CD_CICD" }
+resource "dynatrace_dashboard" "CD_CICD_PROD" {
   dashboard_metadata {
-    name   = "CD_tol-tssb PROD"
+    name   = "CD_CICD PROD"
     owner  = "Ignacio.Goldman@partner.bmwgroup.com"
     preset = true
     shared = true
-    tags   = [ "tol-tssb" ]
+    tags   = [ "CD_CICD" ]
     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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_PROD.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:PROD" ]
           }
         }
       }
@@ -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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_PROD.id
       }
     }
   }
@@ -106,6 +112,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
       top    = 0
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_PROD.id
+      }
+    }
   }
   tile {
     name       = "Markdown"
@@ -138,6 +150,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
       top    = 570
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_PROD.id
+      }
+    }
     filter_config {
       type         = "MIXED"
       custom_name  = "Response time, Request Count and Number of Errors"
@@ -195,7 +213,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -233,6 +251,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_PROD.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:PROD" ]
           }
         }
       }
@@ -266,6 +290,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_PROD.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:PROD" ]
           }
         }
       }
@@ -299,6 +329,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_PROD" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_PROD.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:PROD" ]
           }
         }
       }

EMEA_PROD/management_zone/cd_cicd.tf

@@ -0,0 +1,20 @@
+# DEFINE dynatrace_management_zone.CD_CICD.id = 5483395701072092813
+resource "dynatrace_management_zone" "CD_CICD" {
+  name = "CD_CICD"
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:CICD\"))"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"compass-id:CICD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"compass-id:CICD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:CICD\")"
+  }
+}

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"
-        }
-      }
-    }
-  }
-}

NA_PREPROD/alerting/cd_cicd_int.tf

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

NA_PREPROD/dashboard/cd_cicd_int.tf

@@ -1,12 +1,12 @@
-# DEFINE dynatrace_dashboard.CD_tol-tssb_INT.id = 2742371a-b24a-4ea9-ade3-2296c9265d70
-data "dynatrace_management_zone" "CD_tol-tssb_INT"{ name="CD_tol-tssb" }
-resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
+# DEFINE dynatrace_dashboard.CD_CICD_INT.id = a75465ed-0815-42e4-8c57-bed3059eef7a
+data "dynatrace_management_zone" "CD_CICD_INT"{ name="CD_CICD" }
+resource "dynatrace_dashboard" "CD_CICD_INT" {
   dashboard_metadata {
-    name   = "CD_tol-tssb INT"
+    name   = "CD_CICD INT"
     owner  = "Ignacio.Goldman@partner.bmwgroup.com"
     preset = true
     shared = true
-    tags   = [ "tol-tssb" ]
+    tags   = [ "CD_CICD" ]
     filter {
       timeframe = "-24h to now"
     }
@@ -24,6 +24,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
       top    = 228
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_INT.id
+      }
+    }
     filter_config {
       type         = "MIXED"
       custom_name  = "Failure rate (HTTP 4xx/5xx  errors)"
@@ -67,7 +73,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:INT" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -88,8 +94,8 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
     }
     filter {
       management_zone {
-        name = "CD_tol-tssb"
-        id   = data.dynatrace_management_zone.CD_tol-tssb_INT.id
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_INT.id
       }
     }
   }
@@ -106,6 +112,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
       top    = 0
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_INT.id
+      }
+    }
   }
   tile {
     name       = "Markdown"
@@ -138,6 +150,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
       top    = 570
       width  = 1064
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:INT" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -233,6 +251,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_INT.id
+      }
+    }
     filter_config {
       type         = "DATABASE"
       custom_name  = "Databases"
@@ -246,7 +270,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:INT" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -266,6 +290,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_INT.id
+      }
+    }
     filter_config {
       type         = "SERVICE"
       custom_name  = "Services"
@@ -279,7 +309,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:INT" ]
+            values = [ "Environment:INT" ]
           }
         }
       }
@@ -299,6 +329,12 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
       top    = 38
       width  = 190
     }
+    filter {
+      management_zone {
+        name = "CD_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_INT.id
+      }
+    }
     filter_config {
       type         = "HOST"
       custom_name  = "Hosts"
@@ -312,7 +348,7 @@ resource "dynatrace_dashboard" "CD_tol-tssb_INT" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:tol-tssb", "Environment:INT" ]
+            values = [ "Environment:INT" ]
           }
         }
       }

NA_PREPROD/dashboard/cd_cicd_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_CICD_TEST.id = 72735530-3442-48db-b0cc-00c5764a7625
+data "dynatrace_management_zone" "CD_CICD_TEST"{ name="CD_CICD" }
+resource "dynatrace_dashboard" "CD_CICD_TEST" {
   dashboard_metadata {
-    name   = "CD_tol-tssb TEST"
+    name   = "CD_CICD TEST"
     owner  = "Ignacio.Goldman@partner.bmwgroup.com"
     preset = true
     shared = true
-    tags   = [ "CD_tol-tssb" ]
+    tags   = [ "CD_CICD" ]
     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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_TEST.id
       }
     }
     filter_config {

NA_PREPROD/dashboard/cd_tol-tssb_test.tf

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

NA_PREPROD/management_zone/cd_cicd.tf

@@ -0,0 +1,20 @@
+# DEFINE dynatrace_management_zone.CD_CICD.id = -668260432530163275
+resource "dynatrace_management_zone" "CD_CICD" {
+  name = "CD_CICD"
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:CICD\"))"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"compass-id:CICD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"compass-id:CICD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:CICD\")"
+  }
+}

NA_PREPROD/management_zone/cd_tol-tssb.tf

@@ -1,95 +0,0 @@
-# DEFINE dynatrace_management_zone.CD_tol-tssb.id = 7963368354883748043
-resource "dynatrace_management_zone" "CD_tol-tssb" {
-  name = "CD_tol-tssb"
-  rules {
-    type    = "CLOUD_APPLICATION"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "CLOUD_APPLICATION_NAME"
-      }
-      string {
-        case_sensitive = true
-        # negate       = false
-        operator       = "CONTAINS"
-        value          = "tol-tssb"
-      }
-    }
-  }
-  rules {
-    type    = "CLOUD_APPLICATION_NAMESPACE"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "CLOUD_APPLICATION_NAMESPACE_NAME"
-      }
-      string {
-        case_sensitive = true
-        # negate       = false
-        operator       = "CONTAINS"
-        value          = "tol-tssb"
-      }
-    }
-  }
-  rules {
-    type    = "HOST"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "HOST_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "tol-tssb"
-        }
-      }
-    }
-  }
-  rules {
-    type              = "PROCESS_GROUP"
-    enabled           = true
-    propagation_types = [ "PROCESS_GROUP_TO_HOST" ]
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "PROCESS_GROUP_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "tol-tssb"
-        }
-      }
-    }
-  }
-  rules {
-    type              = "SERVICE"
-    enabled           = true
-    propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ]
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "SERVICE_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "tol-tssb"
-        }
-      }
-    }
-  }
-}

NA_PROD/alerting/cd_cicd_prod.tf

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

NA_PROD/dashboard/cd_cicd_e2e.tf

@@ -0,0 +1,357 @@
+# DEFINE dynatrace_dashboard.CD_CICD_E2E.id = 4f34309f-a08b-4824-853a-f6fb27dbba66
+data "dynatrace_management_zone" "CD_CICD_E2E"{ name="CD_CICD" }
+resource "dynatrace_dashboard" "CD_CICD_E2E" {
+  dashboard_metadata {
+    name   = "CD_CICD E2E"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "CD_CICD" ]
+    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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_E2E.id
+      }
+    }
+    filter_config {
+      type         = "HOST"
+      custom_name  = "Hosts"
+      default_name = "Hosts"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "HOST"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:E2E" ]
+          }
+        }
+      }
+    }
+  }
+}

NA_PROD/dashboard/cd_cicd_prod.tf

@@ -0,0 +1,357 @@
+# DEFINE dynatrace_dashboard.CD_CICD_PROD.id = 789f76aa-658d-4278-bc00-ae1a6afae018
+data "dynatrace_management_zone" "CD_CICD_PROD"{ name="CD_CICD" }
+resource "dynatrace_dashboard" "CD_CICD_PROD" {
+  dashboard_metadata {
+    name   = "CD_CICD PROD"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "CD_CICD" ]
+    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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_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_CICD"
+        id   = data.dynatrace_management_zone.CD_CICD_PROD.id
+      }
+    }
+    filter_config {
+      type         = "HOST"
+      custom_name  = "Hosts"
+      default_name = "Hosts"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "HOST"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:PROD" ]
+          }
+        }
+      }
+    }
+  }
+}

NA_PROD/dashboard/cd_tol-tssb_e2e.tf

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

NA_PROD/dashboard/cd_tol-tssb_prod.tf

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

NA_PROD/management_zone/cd_cicd.tf

@@ -0,0 +1,20 @@
+# DEFINE dynatrace_management_zone.CD_CICD.id = -7769862963126429535
+resource "dynatrace_management_zone" "CD_CICD" {
+  name = "CD_CICD"
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:CICD\"))"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"compass-id:CICD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"compass-id:CICD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:CICD\")"
+  }
+}

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"
-        }
-      }
-    }
-  }
-}