From abe70686b38baa8d7c63d29d8d727e68f30e26b9 Mon Sep 17 00:00:00 2001
From: rforstner <r.reneforstner@gmail.com>
Date: Mon, 14 Mar 2022 12:11:15 +0100
Subject: [PATCH] adding EMEAPROD SLO

---
 EMEA_PREPROD/_Demo/dashboard.tf               |  4 +--
 EMEA_PREPROD/_Demo/management_zone.tf         |  4 +--
 EMEA_PROD/slo/main.tf                         | 26 -------------------
 .../dynatrace-service-level-objective.tf      |  2 +-
 4 files changed, 5 insertions(+), 31 deletions(-)
 delete mode 100644 EMEA_PROD/slo/main.tf

diff --git a/EMEA_PREPROD/_Demo/dashboard.tf b/EMEA_PREPROD/_Demo/dashboard.tf
index 7f6063f..5448355 100644
--- a/EMEA_PREPROD/_Demo/dashboard.tf
+++ b/EMEA_PREPROD/_Demo/dashboard.tf
@@ -4,7 +4,7 @@ module dashboard1 {
     
     env                            = "INT"
     mzId                           = module.mz1.id
-    mzName                         = "AM-CDRE"
+    mzName                         = "Demo"
 
 }
 
@@ -14,6 +14,6 @@ module dashboard2 {
 
     env                            = "TEST"
     mzId                           = module.mz1.id
-    mzName                         = "AM-CDRE"
+    mzName                         = "Demo"
 
 }
\ No newline at end of file
diff --git a/EMEA_PREPROD/_Demo/management_zone.tf b/EMEA_PREPROD/_Demo/management_zone.tf
index c6adf4b..bed452e 100644
--- a/EMEA_PREPROD/_Demo/management_zone.tf
+++ b/EMEA_PREPROD/_Demo/management_zone.tf
@@ -2,8 +2,8 @@ module mz1 {
 
     source = "../../../_dynatrace-base-modules/dynatrace-management-zone"
     
-    msIds                          = "\"ms-id:AM-CDRE\""
-    mzName                         = "AM-CDRE"
+    msIds                          = "\"ms-id:Demo\""
+    mzName                         = "Demo"
     
 }
 
diff --git a/EMEA_PROD/slo/main.tf b/EMEA_PROD/slo/main.tf
deleted file mode 100644
index 99fb748..0000000
--- a/EMEA_PROD/slo/main.tf
+++ /dev/null
@@ -1,26 +0,0 @@
-terraform {
-  required_providers {
-    dynatrace = {
-      version = "1.10.0"
-      source  = "dynatrace-oss/dynatrace"
-    }
-  }
-
-  backend "s3" {
-    bucket = "coco-dynatrace-tfstate"
-    key = "euprod/slo/terraform.tfstate"
-    region = "eu-central-1"
-    dynamodb_table = "coco-dynatrace-tfstate"
-    encrypt = true
-  }
-  
-}
-
-variable EMEA_PROD_ENV_URL {}
-variable EMEA_PROD_API_TOKEN {}
-
-
-provider "dynatrace" {
-    dt_env_url    = "${var.EMEA_PROD_ENV_URL}"
-    dt_api_token  = "${var.EMEA_PROD_API_TOKEN}"
-}
\ No newline at end of file
diff --git a/_dynatrace-base-modules/dynatrace-service-level-objective/dynatrace-service-level-objective.tf b/_dynatrace-base-modules/dynatrace-service-level-objective/dynatrace-service-level-objective.tf
index f068ec6..c8a27b3 100644
--- a/_dynatrace-base-modules/dynatrace-service-level-objective/dynatrace-service-level-objective.tf
+++ b/_dynatrace-base-modules/dynatrace-service-level-objective/dynatrace-service-level-objective.tf
@@ -17,7 +17,7 @@ resource dynatrace_slo main {
     warning = "${var.warning}"
 
 
-    metric_expression = "${var.metric_expression}"
+    metric_expression = trimspace("${var.metric_expression}")
     filter = "${var.filter}"
 }