Pull request #14: Adjusting tf config

Merge in OPAPM/coco_apm_terraform_onboarding from template to master

* commit '35e34132a442ac67e5d85ab116b5596b26ba5b69':
  Adjusting readme file
  Adjusting tf config

CN_PREPROD/alerting/providers.tf

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

CN_PREPROD/custom_service/providers.tf

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

CN_PREPROD/dashboard/providers.tf

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

CN_PREPROD/main.tf

@@ -4,9 +4,9 @@ module "management_zone" {
 
 module "alerting" {
   source = "./alerting"
-  depends_on = [module.management_zone]
+  mzid = "${module.management_zone.mzid}"
 }
 module "dashboard" {
   source = "./dashboard"
-  depends_on = [module.management_zone]
+  mzid = "${module.management_zone.mzid}"
 }

CN_PREPROD/management_zone/providers.tf

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

CN_PREPROD/processgroup_naming/providers.tf

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

CN_PREPROD/service_naming/providers.tf

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

CN_PROD/alerting/providers.tf

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

CN_PROD/custom_service/providers.tf

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

CN_PROD/dashboard/providers.tf

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

CN_PROD/main.tf

@@ -4,9 +4,9 @@ module "management_zone" {
 
 module "alerting" {
   source = "./alerting"
-  depends_on = [module.management_zone]
+  mzid = "${module.management_zone.mzid}"
 }
 module "dashboard" {
   source = "./dashboard"
-  depends_on = [module.management_zone]
+  mzid = "${module.management_zone.mzid}"
 }

CN_PROD/management_zone/providers.tf

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

CN_PROD/processgroup_naming/providers.tf

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

CN_PROD/service_naming/providers.tf

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

EMEA_PREPROD/alerting/providers.tf

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

EMEA_PREPROD/custom_service/providers.tf

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

EMEA_PREPROD/dashboard/providers.tf

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

EMEA_PREPROD/main.tf

@@ -4,9 +4,9 @@ module "management_zone" {
 
 module "alerting" {
   source = "./alerting"
-  depends_on = [module.management_zone]
+  mzid = "${module.management_zone.mzid}"
 }
 module "dashboard" {
   source = "./dashboard"
-  depends_on = [module.management_zone]
+  mzid = "${module.management_zone.mzid}"
 }

EMEA_PREPROD/management_zone/providers.tf

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

EMEA_PREPROD/processgroup_naming/providers.tf

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

EMEA_PREPROD/service_naming/providers.tf

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

EMEA_PROD/alerting/providers.tf

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

EMEA_PROD/custom_service/providers.tf

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

EMEA_PROD/dashboard/providers.tf

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

EMEA_PROD/main.tf

@@ -4,9 +4,9 @@ module "management_zone" {
 
 module "alerting" {
   source = "./alerting"
-  depends_on = [module.management_zone]
+  mzid = "${module.management_zone.mzid}"
 }
 module "dashboard" {
   source = "./dashboard"
-  depends_on = [module.management_zone]
+  mzid = "${module.management_zone.mzid}"
 }

EMEA_PROD/management_zone/providers.tf

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

EMEA_PROD/processgroup_naming/providers.tf

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

EMEA_PROD/service_naming/providers.tf

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

NA_PREPROD/alerting/providers.tf

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

NA_PREPROD/custom_service/providers.tf

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

NA_PREPROD/dashboard/providers.tf

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

NA_PREPROD/main.tf

@@ -4,9 +4,9 @@ module "management_zone" {
 
 module "alerting" {
   source = "./alerting"
-  depends_on = [module.management_zone]
+  mzid = "${module.management_zone.mzid}"
 }
 module "dashboard" {
   source = "./dashboard"
-  depends_on = [module.management_zone]
+  mzid = "${module.management_zone.mzid}"
 }

NA_PREPROD/management_zone/providers.tf

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

NA_PREPROD/processgroup_naming/providers.tf

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

NA_PREPROD/service_naming/providers.tf

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

NA_PROD/alerting/providers.tf

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

NA_PROD/custom_service/providers.tf

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

NA_PROD/dashboard/providers.tf

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

NA_PROD/main.tf

@@ -4,9 +4,9 @@ module "management_zone" {
 
 module "alerting" {
   source = "./alerting"
-  depends_on = [module.management_zone]
+  mzid = "${module.management_zone.mzid}"
 }
 module "dashboard" {
   source = "./dashboard"
-  depends_on = [module.management_zone]
+  mzid = "${module.management_zone.mzid}"
 }

NA_PROD/management_zone/providers.tf

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

NA_PROD/processgroup_naming/providers.tf

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

NA_PROD/service_naming/providers.tf

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

_templates/_template_alerting.tf

@@ -1,6 +1,6 @@
 resource "dynatrace_alerting" "<APPNAME>_<APPENV>" {
   name            = "<APPNAME> <APPENV>"
-  management_zone = data.dynatrace_management_zone.<APPNAME>.id
+  management_zone = var.mzid
   rules {
     rule {
       delay_in_minutes = 0

_templates/_template_dashboard.tf

@@ -22,7 +22,7 @@ resource "dynatrace_dashboard" "<APPNAME>_<APPENV>" {
     filter {
       management_zone {
         name = "<APPNAME>"
-        id   = data.dynatrace_management_zone.<APPNAME>.id
+        id   = var.mzid
       }
     }
     filter_config {
@@ -87,7 +87,7 @@ resource "dynatrace_dashboard" "<APPNAME>_<APPENV>" {
     filter {
       management_zone {
         name = "<APPNAME>"
-        id   = data.dynatrace_management_zone.<APPNAME>.id
+        id   = var.mzid
       }
     }
   }
@@ -104,7 +104,7 @@ resource "dynatrace_dashboard" "<APPNAME>_<APPENV>" {
     filter {
       management_zone {
         name = "<APPNAME>"
-        id   = data.dynatrace_management_zone.<APPNAME>.id
+        id   = var.mzid
       }
     }
   }
@@ -136,7 +136,7 @@ resource "dynatrace_dashboard" "<APPNAME>_<APPENV>" {
     filter {
       management_zone {
         name = "<APPNAME>"
-        id   = data.dynatrace_management_zone.<APPNAME>.id
+        id   = var.mzid
       }
     }
     filter_config {
@@ -231,7 +231,7 @@ resource "dynatrace_dashboard" "<APPNAME>_<APPENV>" {
     filter {
       management_zone {
         name = "<APPNAME>"
-        id   = data.dynatrace_management_zone.<APPNAME>.id
+        id   = var.mzid
       }
     }
     filter_config {
@@ -267,7 +267,7 @@ resource "dynatrace_dashboard" "<APPNAME>_<APPENV>" {
     filter {
       management_zone {
         name = "<APPNAME>"
-        id   = data.dynatrace_management_zone.<APPNAME>.id
+        id   = var.mzid
       }
     }
     filter_config {
@@ -303,7 +303,7 @@ resource "dynatrace_dashboard" "<APPNAME>_<APPENV>" {
     filter {
       management_zone {
         name = "<APPNAME>"
-        id   = data.dynatrace_management_zone.<APPNAME>.id
+        id   = var.mzid
       }
     }
     filter_config {

_templates/_template_management_zone.tf

@@ -17,3 +17,6 @@ resource "dynatrace_management_zone" "<APPNAME>" {
     selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:<COMPASSID>\"))"
   }
 }
+output "mzid" {
+  value = "${dynatrace_management_zone.<APPNAME>.id}"
+}

readme.md

@@ -10,7 +10,7 @@ Before executing scripts, python requirements have to be satisfied. To do so, ex
 # Instructions
 
     1. Clone template:
-        git clone --branch template ssh://git@git.bmwgroup.net:7999/opapm/coco_apm_terraform_onboarding.git
+        git clone --branch template https://atc.bmwgroup.net/bitbucket/scm/opapm/coco_apm_terraform_onboarding.git
     2. Create branch:
         git checkout -b CD_<appname>
     3.Install python dependencies: