solve merge conflicts

CN_PREPROD/alerting/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

CN_PREPROD/custom_service/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

CN_PREPROD/dashboard/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

CN_PREPROD/management_zone/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

CN_PREPROD/processgroup_naming/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

CN_PREPROD/providers.tf

@@ -1,10 +1,17 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }
+backend "s3" {
+    bucket = "coco-dynatrace-onboarding"
+    key = "onboarding/cnpreprod"
+    region = "eu-central-1"
+    dynamodb_table = "coco-dynatrace-onboarding"
+    encrypt = true
+  }
 }
 variable "DYNATRACE_CNPREPROD_ENV_URL" {
     type        = string

CN_PREPROD/service_naming/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

CN_PROD/alerting/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

CN_PROD/custom_service/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

CN_PROD/dashboard/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

CN_PROD/main.tf

@@ -17,4 +17,7 @@ module "processgroup_naming" {
 }
 module "service_naming" {
   source = "./service_naming"
+}
+module "slo" {
+  source = "./slo"
 }

CN_PROD/management_zone/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

CN_PROD/processgroup_naming/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

CN_PROD/providers.tf

@@ -1,10 +1,17 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }
+backend "s3" {
+    bucket = "coco-dynatrace-onboarding"
+    key = "onboarding/cnprod"
+    region = "eu-central-1"
+    dynamodb_table = "coco-dynatrace-onboarding"
+    encrypt = true
+  }
 }
 variable "DYNATRACE_CNPROD_ENV_URL" {
     type        = string

CN_PROD/service_naming/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

CN_PROD/slo/providers.tf

@@ -0,0 +1,8 @@
+terraform {
+  required_providers {
+    dynatrace = {
+      version = "1.25.1"
+      source = "dynatrace-oss/dynatrace"
+    }
+  }
+}

EMEA_PREPROD/alerting/CD_HVD_INT.tf

@@ -0,0 +1,37 @@
+data "dynatrace_management_zone" "CD_HVD_INT"{ name="CD_HVD" }
+resource "dynatrace_alerting" "CD_HVD_INT" {
+  name            = "CD_HVD INT"
+  management_zone = data.dynatrace_management_zone.CD_HVD_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" ]
+    }
+  }
+}

EMEA_PREPROD/alerting/CD_HVD_TEST.tf

@@ -0,0 +1,37 @@
+data "dynatrace_management_zone" "CD_HVD_TEST"{ name="CD_HVD" }
+resource "dynatrace_alerting" "CD_HVD_TEST" {
+  name            = "CD_HVD TEST"
+  management_zone = data.dynatrace_management_zone.CD_HVD_TEST.id
+  rules {
+    rule {
+      delay_in_minutes = 0
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "AVAILABILITY"
+      tags             = [ "Environment:TEST" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "CUSTOM_ALERT"
+      tags             = [ "Environment:TEST" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "ERRORS"
+      tags             = [ "Environment:TEST" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "PERFORMANCE"
+      tags             = [ "Environment:TEST" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "RESOURCE_CONTENTION"
+      tags             = [ "Environment:TEST" ]
+    }
+  }
+}

EMEA_PREPROD/alerting/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

EMEA_PREPROD/custom_service/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

EMEA_PREPROD/dashboard/CD_HVD_INT.tf

@@ -0,0 +1,329 @@
+data "dynatrace_management_zone" "CD_HVD_INT"{ name="CD_HVD" }
+resource "dynatrace_dashboard" "CD_HVD_INT" {
+  dashboard_metadata {
+    name   = "CD_HVD INT"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "CD_HVD" ]
+    filter {
+      timeframe = "-24h to now"
+    }
+  }
+  tile {
+    name       = "Custom chart"
+    configured = true
+    tile_type  = "CUSTOM_CHARTING"
+    bounds {
+      height = 304
+      left   = 38
+      top    = 228
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_INT.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:INT" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name       = "Problems"
+    configured = true
+    tile_type  = "OPEN_PROBLEMS"
+    bounds {
+      height = 152
+      left   = 950
+      top    = 38
+      width  = 152
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_INT.id
+      }
+    }
+  }
+  tile {
+    name       = "Overall Health"
+    configured = true
+    tile_type  = "HEADER"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 0
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_INT.id
+      }
+    }
+  }
+  tile {
+    name       = "Markdown"
+    configured = true
+    markdown   =<<-EOT
+      ---
+      
+    EOT
+    tile_type  = "MARKDOWN"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 532
+      width  = 1064
+    }
+  }
+  tile {
+    name       = "Custom chart"
+    configured = true
+    tile_type  = "CUSTOM_CHARTING"
+    bounds {
+      height = 304
+      left   = 38
+      top    = 570
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_INT.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:INT" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name       = "Markdown"
+    configured = true
+    markdown   =<<-EOT
+      ---
+      
+    EOT
+    tile_type  = "MARKDOWN"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 190
+      width  = 1064
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "DATABASES_OVERVIEW"
+    bounds {
+      height = 152
+      left   = 646
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_INT.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:INT" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "SERVICES"
+    bounds {
+      height = 152
+      left   = 342
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_INT.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:INT" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "HOSTS"
+    bounds {
+      height = 152
+      left   = 38
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_INT.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:INT" ]
+          }
+        }
+      }
+    }
+  }
+}

EMEA_PREPROD/dashboard/CD_HVD_TEST.tf

@@ -0,0 +1,329 @@
+data "dynatrace_management_zone" "CD_HVD_TEST"{ name="CD_HVD" }
+resource "dynatrace_dashboard" "CD_HVD_TEST" {
+  dashboard_metadata {
+    name   = "CD_HVD TEST"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "CD_HVD" ]
+    filter {
+      timeframe = "-24h to now"
+    }
+  }
+  tile {
+    name       = "Custom chart"
+    configured = true
+    tile_type  = "CUSTOM_CHARTING"
+    bounds {
+      height = 304
+      left   = 38
+      top    = 228
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_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"
+    bounds {
+      height = 152
+      left   = 950
+      top    = 38
+      width  = 152
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_TEST.id
+      }
+    }
+  }
+  tile {
+    name       = "Overall Health"
+    configured = true
+    tile_type  = "HEADER"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 0
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_TEST.id
+      }
+    }
+  }
+  tile {
+    name       = "Markdown"
+    configured = true
+    markdown   =<<-EOT
+      ---
+      
+    EOT
+    tile_type  = "MARKDOWN"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 532
+      width  = 1064
+    }
+  }
+  tile {
+    name       = "Custom chart"
+    configured = true
+    tile_type  = "CUSTOM_CHARTING"
+    bounds {
+      height = 304
+      left   = 38
+      top    = 570
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_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"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 190
+      width  = 1064
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "DATABASES_OVERVIEW"
+    bounds {
+      height = 152
+      left   = 646
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_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"
+    bounds {
+      height = 152
+      left   = 342
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_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"
+    bounds {
+      height = 152
+      left   = 38
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_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" ]
+          }
+        }
+      }
+    }
+  }
+}

EMEA_PREPROD/dashboard/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

EMEA_PREPROD/management_zone/CD_HVD.tf

@@ -0,0 +1,19 @@
+resource "dynatrace_management_zone" "CD_HVD" {
+  name = "CD_HVD"
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:HVD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"compass-id:HVD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"compass-id:HVD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:HVD\"))"
+  }
+}

EMEA_PREPROD/management_zone/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

EMEA_PREPROD/processgroup_naming/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

EMEA_PREPROD/providers.tf

@@ -1,10 +1,17 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }
+backend "s3" {
+    bucket = "coco-dynatrace-onboarding"
+    key = "onboarding/emeapreprod"
+    region = "eu-central-1"
+    dynamodb_table = "coco-dynatrace-onboarding"
+    encrypt = true
+  }
 }
 variable "DYNATRACE_EMEAPREPROD_ENV_URL" {
     type        = string

EMEA_PREPROD/service_naming/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

EMEA_PROD/alerting/CD_HVD_E2E.tf

@@ -0,0 +1,37 @@
+data "dynatrace_management_zone" "CD_HVD_E2E"{ name="CD_HVD" }
+resource "dynatrace_alerting" "CD_HVD_E2E" {
+  name            = "CD_HVD E2E"
+  management_zone = data.dynatrace_management_zone.CD_HVD_E2E.id
+  rules {
+    rule {
+      delay_in_minutes = 0
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "AVAILABILITY"
+      tags             = [ "Environment:E2E" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "CUSTOM_ALERT"
+      tags             = [ "Environment:E2E" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "ERRORS"
+      tags             = [ "Environment:E2E" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "PERFORMANCE"
+      tags             = [ "Environment:E2E" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "RESOURCE_CONTENTION"
+      tags             = [ "Environment:E2E" ]
+    }
+  }
+}

EMEA_PROD/alerting/CD_HVD_PROD.tf

@@ -0,0 +1,72 @@
+data "dynatrace_management_zone" "CD_HVD_PROD"{ name="CD_HVD" }
+resource "dynatrace_alerting" "CD_HVD_PROD" {
+  name            = "CD_HVD PROD"
+  management_zone = data.dynatrace_management_zone.CD_HVD_PROD.id
+  filters {
+    filter {
+      custom {
+        description {
+          enabled          = true
+          # case_sensitive = false
+          negate           = true
+          operator         = "CONTAINS"
+          value            = "Service method Insert into lock_table has a failure rate increase."
+        }
+      }
+    }
+    filter {
+      custom {
+        description {
+          enabled          = true
+          # case_sensitive = false
+          negate           = true
+          operator         = "BEGINS_WITH"
+          value            = "[HVD PROD ITSM MEDIUM]"
+        }
+      }
+    }
+    filter {
+      custom {
+        description {
+          enabled          = true
+          # case_sensitive = false
+          negate           = true
+          operator         = "BEGINS_WITH"
+          value            = "[HVD PROD ITSM HIGH]"
+        }
+      }
+    }
+  }
+  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/alerting/CD_HVD_PROD_ITSM_HIGH.tf

@@ -0,0 +1,61 @@
+#data "dynatrace_management_zone" "CD_HVD_PROD"{ name="CD_HVD" }
+resource "dynatrace_alerting" "CD_HVD_PROD_ITSM_HIGH" {
+  name            = "CD_HVD PROD ITSM HIGH"
+  management_zone = data.dynatrace_management_zone.CD_HVD_PROD.id
+  filters {
+    filter {
+      custom {
+        description {
+          enabled          = true
+          # case_sensitive = false
+          negate           = true
+          operator         = "CONTAINS"
+          value            = "Service method Insert into lock_table has a failure rate increase."
+        }
+      }
+    }
+    filter {
+      custom {
+        description {
+          enabled          = true
+          # case_sensitive = false
+          negate           = false
+          operator         = "BEGINS_WITH"
+          value            = "[HVD PROD ITSM HIGH]"
+        }
+      }
+    }
+  }
+  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/alerting/CD_HVD_PROD_ITSM_MEDIUM.tf

@@ -0,0 +1,61 @@
+#data "dynatrace_management_zone" "CD_HVD_PROD"{ name="CD_HVD" }
+resource "dynatrace_alerting" "CD_HVD_PROD_ITSM_MEDIUM" {
+  name            = "CD_HVD PROD ITSM MEDIUM"
+  management_zone = data.dynatrace_management_zone.CD_HVD_PROD.id
+  filters {
+    filter {
+      custom {
+        description {
+          enabled          = true
+          # case_sensitive = false
+          negate           = true
+          operator         = "CONTAINS"
+          value            = "Service method Insert into lock_table has a failure rate increase."
+        }
+      }
+    }
+    filter {
+      custom {
+        description {
+          enabled          = true
+          # case_sensitive = false
+          negate           = false
+          operator         = "BEGINS_WITH"
+          value            = "[HVD PROD ITSM MEDIUM]"
+        }
+      }
+    }
+  }
+  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/alerting/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

EMEA_PROD/custom_service/CD_HVD_E2E.tf

@@ -0,0 +1,36 @@
+resource "dynatrace_custom_service" "hvd_e2e_joynr" {
+        name = "hvd_e2e_joynr"
+        technology = "java"
+        enabled = true
+        rule {
+                enabled = true
+                class {
+                    name = "com.bmw.cc.inf.speech.hvd.v03.boundary.HVDDownloadProviderBeanV03"
+                }
+                method {
+                        name = "getDictationLanguages"
+                }
+                method {
+                        name = "getOffboardPoiLanguages"
+                }
+				method {
+                        name = "getNluLanguages"
+                }
+				method {
+                        name = "getPrompterLanguages"
+                }
+				method {
+                        name = "getKeywords"
+                }
+				method {
+                        name = "getDynamicVocabulary"
+                }
+				method {
+                        name = "getKeywordsExtended"
+                }
+				method {
+                        name = "getAuthorizedAppIntents"
+                }
+        }
+        queue_entry_point = false
+}

EMEA_PROD/custom_service/CD_HVD_PROD.txt

@@ -0,0 +1,36 @@
+resource "dynatrace_custom_service" "hvd_prod_joynr" {
+        name = "hvd_prod_joynr"
+        technology = "java"
+        enabled = true
+        rule {
+                enabled = true
+                class {
+                    name = "com.bmw.cc.inf.speech.hvd.v03.boundary.HVDDownloadProviderBeanV03"
+                }
+                method {
+                        name = "getDictationLanguages"
+                }
+                method {
+                        name = "getOffboardPoiLanguages"
+                }
+				method {
+                        name = "getNluLanguages"
+                }
+				method {
+                        name = "getPrompterLanguages"
+                }
+				method {
+                        name = "getKeywords"
+                }
+				method {
+                        name = "getDynamicVocabulary"
+                }
+				method {
+                        name = "getKeywordsExtended"
+                }
+				method {
+                        name = "getAuthorizedAppIntents"
+                }
+        }
+        queue_entry_point = false
+}

EMEA_PROD/custom_service/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

EMEA_PROD/dashboard/CD_HVD_E2E.tf

@@ -0,0 +1,329 @@
+data "dynatrace_management_zone" "CD_HVD_E2E"{ name="CD_HVD" }
+resource "dynatrace_dashboard" "CD_HVD_E2E" {
+  dashboard_metadata {
+    name   = "CD_HVD E2E"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "CD_HVD" ]
+    filter {
+      timeframe = "-24h to now"
+    }
+  }
+  tile {
+    name       = "Custom chart"
+    configured = true
+    tile_type  = "CUSTOM_CHARTING"
+    bounds {
+      height = 304
+      left   = 38
+      top    = 228
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_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"
+    bounds {
+      height = 152
+      left   = 950
+      top    = 38
+      width  = 152
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_E2E.id
+      }
+    }
+  }
+  tile {
+    name       = "Overall Health"
+    configured = true
+    tile_type  = "HEADER"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 0
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_E2E.id
+      }
+    }
+  }
+  tile {
+    name       = "Markdown"
+    configured = true
+    markdown   =<<-EOT
+      ---
+      
+    EOT
+    tile_type  = "MARKDOWN"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 532
+      width  = 1064
+    }
+  }
+  tile {
+    name       = "Custom chart"
+    configured = true
+    tile_type  = "CUSTOM_CHARTING"
+    bounds {
+      height = 304
+      left   = 38
+      top    = 570
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_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"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 190
+      width  = 1064
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "DATABASES_OVERVIEW"
+    bounds {
+      height = 152
+      left   = 646
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_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"
+    bounds {
+      height = 152
+      left   = 342
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_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"
+    bounds {
+      height = 152
+      left   = 38
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_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" ]
+          }
+        }
+      }
+    }
+  }
+}

EMEA_PROD/dashboard/CD_HVD_PROD.tf

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

EMEA_PROD/dashboard/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

EMEA_PROD/main.tf

@@ -17,4 +17,7 @@ module "processgroup_naming" {
 }
 module "service_naming" {
   source = "./service_naming"
+}
+module "slo" {
+  source = "./slo"
 }

EMEA_PROD/management_zone/CD_HVD.tf

@@ -0,0 +1,19 @@
+resource "dynatrace_management_zone" "CD_HVD" {
+  name = "CD_HVD"
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:HVD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"compass-id:HVD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"compass-id:HVD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:HVD\"))"
+  }
+}

EMEA_PROD/management_zone/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

EMEA_PROD/processgroup_naming/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

EMEA_PROD/providers.tf

@@ -1,10 +1,17 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }
+backend "s3" {
+    bucket = "coco-dynatrace-onboarding"
+    key = "onboarding/emeaprod"
+    region = "eu-central-1"
+    dynamodb_table = "coco-dynatrace-onboarding"
+    encrypt = true
+  }
 }
 variable "DYNATRACE_EMEAPROD_ENV_URL" {
     type        = string

EMEA_PROD/service_naming/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

EMEA_PROD/slo/providers.tf

@@ -0,0 +1,8 @@
+terraform {
+  required_providers {
+    dynatrace = {
+      version = "1.25.1"
+      source = "dynatrace-oss/dynatrace"
+    }
+  }
+}

NA_PREPROD/alerting/CD_HVD_INT.tf

@@ -0,0 +1,37 @@
+data "dynatrace_management_zone" "CD_HVD_INT"{ name="CD_HVD" }
+resource "dynatrace_alerting" "CD_HVD_INT" {
+  name            = "CD_HVD INT"
+  management_zone = data.dynatrace_management_zone.CD_HVD_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/alerting/CD_HVD_TEST.tf

@@ -0,0 +1,37 @@
+data "dynatrace_management_zone" "CD_HVD_TEST"{ name="CD_HVD" }
+resource "dynatrace_alerting" "CD_HVD_TEST" {
+  name            = "CD_HVD TEST"
+  management_zone = data.dynatrace_management_zone.CD_HVD_TEST.id
+  rules {
+    rule {
+      delay_in_minutes = 0
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "AVAILABILITY"
+      tags             = [ "Environment:TEST" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "CUSTOM_ALERT"
+      tags             = [ "Environment:TEST" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "ERRORS"
+      tags             = [ "Environment:TEST" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "PERFORMANCE"
+      tags             = [ "Environment:TEST" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "RESOURCE_CONTENTION"
+      tags             = [ "Environment:TEST" ]
+    }
+  }
+}

NA_PREPROD/alerting/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

NA_PREPROD/custom_service/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

NA_PREPROD/dashboard/CD_HVD_INT.tf

@@ -0,0 +1,329 @@
+data "dynatrace_management_zone" "CD_HVD_INT"{ name="CD_HVD" }
+resource "dynatrace_dashboard" "CD_HVD_INT" {
+  dashboard_metadata {
+    name   = "CD_HVD INT"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "CD_HVD" ]
+    filter {
+      timeframe = "-24h to now"
+    }
+  }
+  tile {
+    name       = "Custom chart"
+    configured = true
+    tile_type  = "CUSTOM_CHARTING"
+    bounds {
+      height = 304
+      left   = 38
+      top    = 228
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_INT.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:INT" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name       = "Problems"
+    configured = true
+    tile_type  = "OPEN_PROBLEMS"
+    bounds {
+      height = 152
+      left   = 950
+      top    = 38
+      width  = 152
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_INT.id
+      }
+    }
+  }
+  tile {
+    name       = "Overall Health"
+    configured = true
+    tile_type  = "HEADER"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 0
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_INT.id
+      }
+    }
+  }
+  tile {
+    name       = "Markdown"
+    configured = true
+    markdown   =<<-EOT
+      ---
+      
+    EOT
+    tile_type  = "MARKDOWN"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 532
+      width  = 1064
+    }
+  }
+  tile {
+    name       = "Custom chart"
+    configured = true
+    tile_type  = "CUSTOM_CHARTING"
+    bounds {
+      height = 304
+      left   = 38
+      top    = 570
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_INT.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:INT" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name       = "Markdown"
+    configured = true
+    markdown   =<<-EOT
+      ---
+      
+    EOT
+    tile_type  = "MARKDOWN"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 190
+      width  = 1064
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "DATABASES_OVERVIEW"
+    bounds {
+      height = 152
+      left   = 646
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_INT.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:INT" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "SERVICES"
+    bounds {
+      height = 152
+      left   = 342
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_INT.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:INT" ]
+          }
+        }
+      }
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "HOSTS"
+    bounds {
+      height = 152
+      left   = 38
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_INT.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:INT" ]
+          }
+        }
+      }
+    }
+  }
+}

NA_PREPROD/dashboard/CD_HVD_TEST.tf

@@ -0,0 +1,329 @@
+data "dynatrace_management_zone" "CD_HVD_TEST"{ name="CD_HVD" }
+resource "dynatrace_dashboard" "CD_HVD_TEST" {
+  dashboard_metadata {
+    name   = "CD_HVD TEST"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "CD_HVD" ]
+    filter {
+      timeframe = "-24h to now"
+    }
+  }
+  tile {
+    name       = "Custom chart"
+    configured = true
+    tile_type  = "CUSTOM_CHARTING"
+    bounds {
+      height = 304
+      left   = 38
+      top    = 228
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_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"
+    bounds {
+      height = 152
+      left   = 950
+      top    = 38
+      width  = 152
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_TEST.id
+      }
+    }
+  }
+  tile {
+    name       = "Overall Health"
+    configured = true
+    tile_type  = "HEADER"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 0
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_TEST.id
+      }
+    }
+  }
+  tile {
+    name       = "Markdown"
+    configured = true
+    markdown   =<<-EOT
+      ---
+      
+    EOT
+    tile_type  = "MARKDOWN"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 532
+      width  = 1064
+    }
+  }
+  tile {
+    name       = "Custom chart"
+    configured = true
+    tile_type  = "CUSTOM_CHARTING"
+    bounds {
+      height = 304
+      left   = 38
+      top    = 570
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_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"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 190
+      width  = 1064
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "DATABASES_OVERVIEW"
+    bounds {
+      height = 152
+      left   = 646
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_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"
+    bounds {
+      height = 152
+      left   = 342
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_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"
+    bounds {
+      height = 152
+      left   = 38
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_TEST.id
+      }
+    }
+    filter_config {
+      type         = "HOST"
+      custom_name  = "Hosts"
+      default_name = "Hosts"
+      chart_config {
+        type   = "TIMESERIES"
+        legend = true
+      }
+      filters {
+        filter {
+          entity_type = "HOST"
+          match {
+            key    = "AUTO_TAGS"
+            values = [ "Environment:TEST" ]
+          }
+        }
+      }
+    }
+  }
+}

NA_PREPROD/dashboard/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

NA_PREPROD/management_zone/CD_HVD.tf

@@ -0,0 +1,19 @@
+resource "dynatrace_management_zone" "CD_HVD" {
+  name = "CD_HVD"
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:HVD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"compass-id:HVD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"compass-id:HVD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:HVD\"))"
+  }
+}

NA_PREPROD/management_zone/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

NA_PREPROD/processgroup_naming/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

NA_PREPROD/providers.tf

@@ -1,10 +1,17 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }
+backend "s3" {
+    bucket = "coco-dynatrace-onboarding"
+    key = "onboarding/napreprod"
+    region = "eu-central-1"
+    dynamodb_table = "coco-dynatrace-onboarding"
+    encrypt = true
+  }
 }
 variable "DYNATRACE_NAPREPROD_ENV_URL" {
     type        = string

NA_PREPROD/service_naming/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

NA_PROD/alerting/CD_HVD_E2E.tf

@@ -0,0 +1,37 @@
+data "dynatrace_management_zone" "CD_HVD_E2E"{ name="CD_HVD" }
+resource "dynatrace_alerting" "CD_HVD_E2E" {
+  name            = "CD_HVD E2E"
+  management_zone = data.dynatrace_management_zone.CD_HVD_E2E.id
+  rules {
+    rule {
+      delay_in_minutes = 0
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "AVAILABILITY"
+      tags             = [ "Environment:E2E" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "CUSTOM_ALERT"
+      tags             = [ "Environment:E2E" ]
+    }
+    rule {
+      delay_in_minutes = 10
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "ERRORS"
+      tags             = [ "Environment:E2E" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "PERFORMANCE"
+      tags             = [ "Environment:E2E" ]
+    }
+    rule {
+      delay_in_minutes = 30
+      include_mode     = "INCLUDE_ALL"
+      severity_level   = "RESOURCE_CONTENTION"
+      tags             = [ "Environment:E2E" ]
+    }
+  }
+}

NA_PROD/alerting/CD_HVD_PROD.tf

@@ -0,0 +1,72 @@
+data "dynatrace_management_zone" "CD_HVD_PROD"{ name="CD_HVD" }
+resource "dynatrace_alerting" "CD_HVD_PROD" {
+  name            = "CD_HVD PROD"
+  management_zone = data.dynatrace_management_zone.CD_HVD_PROD.id
+  filters {
+    filter {
+      custom {
+        description {
+          enabled          = true
+          # case_sensitive = false
+          negate           = true
+          operator         = "CONTAINS"
+          value            = "Service method Insert into lock_table has a failure rate increase."
+        }
+      }
+    }
+    filter {
+      custom {
+        description {
+          enabled          = true
+          # case_sensitive = false
+          negate           = true
+          operator         = "BEGINS_WITH"
+          value            = "[HVD PROD ITSM MEDIUM]"
+        }
+      }
+    }
+    filter {
+      custom {
+        description {
+          enabled          = true
+          # case_sensitive = false
+          negate           = true
+          operator         = "BEGINS_WITH"
+          value            = "[HVD PROD ITSM HIGH]"
+        }
+      }
+    }
+  }
+  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/alerting/CD_HVD_PROD_ITSM_HIGH.tf

@@ -0,0 +1,61 @@
+#data "dynatrace_management_zone" "CD_HVD_PROD"{ name="CD_HVD" }
+resource "dynatrace_alerting" "CD_HVD_PROD_ITSM_HIGH" {
+  name            = "CD_HVD PROD ITSM HIGH"
+  management_zone = data.dynatrace_management_zone.CD_HVD_PROD.id
+  filters {
+    filter {
+      custom {
+        description {
+          enabled          = true
+          # case_sensitive = false
+          negate           = true
+          operator         = "CONTAINS"
+          value            = "Service method Insert into lock_table has a failure rate increase."
+        }
+      }
+    }
+    filter {
+      custom {
+        description {
+          enabled          = true
+          # case_sensitive = false
+          negate           = false
+          operator         = "BEGINS_WITH"
+          value            = "[HVD PROD ITSM HIGH]"
+        }
+      }
+    }
+  }
+  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/alerting/CD_HVD_PROD_ITSM_MEDIUM.tf

@@ -0,0 +1,61 @@
+#data "dynatrace_management_zone" "CD_HVD_PROD"{ name="CD_HVD" }
+resource "dynatrace_alerting" "CD_HVD_PROD_ITSM_MEDIUM" {
+  name            = "CD_HVD PROD ITSM MEDIUM"
+  management_zone = data.dynatrace_management_zone.CD_HVD_PROD.id
+  filters {
+    filter {
+      custom {
+        description {
+          enabled          = true
+          # case_sensitive = false
+          negate           = true
+          operator         = "CONTAINS"
+          value            = "Service method Insert into lock_table has a failure rate increase."
+        }
+      }
+    }
+    filter {
+      custom {
+        description {
+          enabled          = true
+          # case_sensitive = false
+          negate           = false
+          operator         = "BEGINS_WITH"
+          value            = "[HVD PROD ITSM MEDIUM]"
+        }
+      }
+    }
+  }
+  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/alerting/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

NA_PROD/custom_service/CD_HVD_E2E.tf

@@ -0,0 +1,36 @@
+resource "dynatrace_custom_service" "hvd_e2e_joynr" {
+        name = "hvd_e2e_joynr"
+        technology = "java"
+        enabled = true
+        rule {
+                enabled = true
+                class {
+                    name = "com.bmw.cc.inf.speech.hvd.v03.boundary.HVDDownloadProviderBeanV03"
+                }
+                method {
+                        name = "getDictationLanguages"
+                }
+                method {
+                        name = "getOffboardPoiLanguages"
+                }
+				method {
+                        name = "getNluLanguages"
+                }
+				method {
+                        name = "getPrompterLanguages"
+                }
+				method {
+                        name = "getKeywords"
+                }
+				method {
+                        name = "getDynamicVocabulary"
+                }
+				method {
+                        name = "getKeywordsExtended"
+                }
+				method {
+                        name = "getAuthorizedAppIntents"
+                }
+        }
+        queue_entry_point = false
+}

NA_PROD/custom_service/CD_HVD_PROD.txt

@@ -0,0 +1,36 @@
+resource "dynatrace_custom_service" "hvd_prod_joynr" {
+        name = "hvd_prod_joynr"
+        technology = "java"
+        enabled = true
+        rule {
+                enabled = true
+                class {
+                    name = "com.bmw.cc.inf.speech.hvd.v03.boundary.HVDDownloadProviderBeanV03"
+                }
+                method {
+                        name = "getDictationLanguages"
+                }
+                method {
+                        name = "getOffboardPoiLanguages"
+                }
+				method {
+                        name = "getNluLanguages"
+                }
+				method {
+                        name = "getPrompterLanguages"
+                }
+				method {
+                        name = "getKeywords"
+                }
+				method {
+                        name = "getDynamicVocabulary"
+                }
+				method {
+                        name = "getKeywordsExtended"
+                }
+				method {
+                        name = "getAuthorizedAppIntents"
+                }
+        }
+        queue_entry_point = false
+}

NA_PROD/custom_service/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

NA_PROD/dashboard/CD_HVD_E2E.tf

@@ -0,0 +1,329 @@
+data "dynatrace_management_zone" "CD_HVD_E2E"{ name="CD_HVD" }
+resource "dynatrace_dashboard" "CD_HVD_E2E" {
+  dashboard_metadata {
+    name   = "CD_HVD E2E"
+    owner  = "Ignacio.Goldman@partner.bmwgroup.com"
+    preset = true
+    shared = true
+    tags   = [ "CD_HVD" ]
+    filter {
+      timeframe = "-24h to now"
+    }
+  }
+  tile {
+    name       = "Custom chart"
+    configured = true
+    tile_type  = "CUSTOM_CHARTING"
+    bounds {
+      height = 304
+      left   = 38
+      top    = 228
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_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"
+    bounds {
+      height = 152
+      left   = 950
+      top    = 38
+      width  = 152
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_E2E.id
+      }
+    }
+  }
+  tile {
+    name       = "Overall Health"
+    configured = true
+    tile_type  = "HEADER"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 0
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_E2E.id
+      }
+    }
+  }
+  tile {
+    name       = "Markdown"
+    configured = true
+    markdown   =<<-EOT
+      ---
+      
+    EOT
+    tile_type  = "MARKDOWN"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 532
+      width  = 1064
+    }
+  }
+  tile {
+    name       = "Custom chart"
+    configured = true
+    tile_type  = "CUSTOM_CHARTING"
+    bounds {
+      height = 304
+      left   = 38
+      top    = 570
+      width  = 1064
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_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"
+    bounds {
+      height = 38
+      left   = 38
+      top    = 190
+      width  = 1064
+    }
+  }
+  tile {
+    name          = ""
+    chart_visible = true
+    configured    = true
+    tile_type     = "DATABASES_OVERVIEW"
+    bounds {
+      height = 152
+      left   = 646
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_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"
+    bounds {
+      height = 152
+      left   = 342
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_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"
+    bounds {
+      height = 152
+      left   = 38
+      top    = 38
+      width  = 190
+    }
+    filter {
+      management_zone {
+        name = "CD_HVD"
+        id   = data.dynatrace_management_zone.CD_HVD_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_HVD_PROD.tf

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

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

NA_PROD/main.tf

@@ -17,4 +17,7 @@ module "processgroup_naming" {
 }
 module "service_naming" {
   source = "./service_naming"
+}
+module "slo" {
+  source = "./slo"
 }

NA_PROD/management_zone/CD_HVD.tf

@@ -0,0 +1,19 @@
+resource "dynatrace_management_zone" "CD_HVD" {
+  name = "CD_HVD"
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:HVD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"compass-id:HVD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"compass-id:HVD\")"
+  }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:HVD\"))"
+  }
+}

NA_PROD/management_zone/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

NA_PROD/processgroup_naming/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

NA_PROD/providers.tf

@@ -1,10 +1,17 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }
+backend "s3" {
+    bucket = "coco-dynatrace-onboarding"
+    key = "onboarding/naprod"
+    region = "eu-central-1"
+    dynamodb_table = "coco-dynatrace-onboarding"
+    encrypt = true
+  }
 }
 variable "DYNATRACE_NAPROD_ENV_URL" {
     type        = string

NA_PROD/service_naming/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.16.0"
+      version = "1.25.1"
       source = "dynatrace-oss/dynatrace"
     }
   }

NA_PROD/slo/providers.tf

@@ -0,0 +1,8 @@
+terraform {
+  required_providers {
+    dynatrace = {
+      version = "1.25.1"
+      source = "dynatrace-oss/dynatrace"
+    }
+  }
+}