From 78f7d5d23c90e0b4378b010454c106ea93f446d5 Mon Sep 17 00:00:00 2001 From: "Steidle, Julian, RG" Date: Mon, 17 Jul 2023 07:58:58 +0200 Subject: [PATCH] solve merge conflicts --- EMEA_PROD/alerting/CD_HVD_PROD_ITSM_HIGH.tf | 1 + EMEA_PROD/alerting/CD_HVD_PROD_ITSM_MEDIUM.tf | 1 + NA_PROD/alerting/CD_HVD_PROD_ITSM_HIGH.tf | 1 + NA_PROD/alerting/CD_HVD_PROD_ITSM_MEDIUM.tf | 1 + 4 files changed, 4 insertions(+) diff --git a/EMEA_PROD/alerting/CD_HVD_PROD_ITSM_HIGH.tf b/EMEA_PROD/alerting/CD_HVD_PROD_ITSM_HIGH.tf index 5f941bbf..56f607fb 100644 --- a/EMEA_PROD/alerting/CD_HVD_PROD_ITSM_HIGH.tf +++ b/EMEA_PROD/alerting/CD_HVD_PROD_ITSM_HIGH.tf @@ -1,3 +1,4 @@ +#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 diff --git a/EMEA_PROD/alerting/CD_HVD_PROD_ITSM_MEDIUM.tf b/EMEA_PROD/alerting/CD_HVD_PROD_ITSM_MEDIUM.tf index 18454cbf..6be8268a 100644 --- a/EMEA_PROD/alerting/CD_HVD_PROD_ITSM_MEDIUM.tf +++ b/EMEA_PROD/alerting/CD_HVD_PROD_ITSM_MEDIUM.tf @@ -1,3 +1,4 @@ +#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 diff --git a/NA_PROD/alerting/CD_HVD_PROD_ITSM_HIGH.tf b/NA_PROD/alerting/CD_HVD_PROD_ITSM_HIGH.tf index 5f941bbf..56f607fb 100644 --- a/NA_PROD/alerting/CD_HVD_PROD_ITSM_HIGH.tf +++ b/NA_PROD/alerting/CD_HVD_PROD_ITSM_HIGH.tf @@ -1,3 +1,4 @@ +#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 diff --git a/NA_PROD/alerting/CD_HVD_PROD_ITSM_MEDIUM.tf b/NA_PROD/alerting/CD_HVD_PROD_ITSM_MEDIUM.tf index 18454cbf..6be8268a 100644 --- a/NA_PROD/alerting/CD_HVD_PROD_ITSM_MEDIUM.tf +++ b/NA_PROD/alerting/CD_HVD_PROD_ITSM_MEDIUM.tf @@ -1,3 +1,4 @@ +#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