From 43a838fd9ed51f7bded6c1b3e8cc629066f30167 Mon Sep 17 00:00:00 2001 From: "Zhibo Wang (ext.)" Date: Fri, 26 May 2023 08:44:28 +0000 Subject: [PATCH 1/3] cd_connected-oauth-service.tf edited online with Bitbucket Switch management zone from Component to compass-id tag --- .../cd_connected-oauth-service.tf | 105 +++--------------- 1 file changed, 15 insertions(+), 90 deletions(-) diff --git a/CN_PROD/management_zone/cd_connected-oauth-service.tf b/CN_PROD/management_zone/cd_connected-oauth-service.tf index fefb62c2..b615b049 100644 --- a/CN_PROD/management_zone/cd_connected-oauth-service.tf +++ b/CN_PROD/management_zone/cd_connected-oauth-service.tf @@ -1,95 +1,20 @@ -# DEFINE dynatrace_management_zone.CD_connected-oauth-service.id = -340771320666888764 -resource "dynatrace_management_zone" "CD_connected-oauth-service" { - name = "CD_connected-oauth-service" - rules { - type = "CLOUD_APPLICATION" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "connected-oauth-service" - } - } +# DEFINE dynatrace_management_zone.CD_mobile-login = -340771320666888764 +resource "dynatrace_management_zone" "CD_mobile-login" { + name = "CD_mobile-login" + entity_selector_based_rule { + enabled = true + selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:cn-connected-oauth-service\")" } - rules { - type = "CLOUD_APPLICATION_NAMESPACE" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "CLOUD_APPLICATION_NAMESPACE_NAME" - } - string { - case_sensitive = true - # negate = false - operator = "CONTAINS" - value = "connected-oauth-service" - } - } + entity_selector_based_rule { + enabled = true + selector = "type(HOST),tag(\"compass-id:cn-connected-oauth-service\")" } - rules { - type = "HOST" - enabled = true - conditions { - key { - type = "STATIC" - attribute = "HOST_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "connected-oauth-service" - } - } - } + entity_selector_based_rule { + enabled = true + selector = "type(Service),tag(\"compass-id:cn-connected-oauth-service\")" } - rules { - type = "PROCESS_GROUP" - enabled = true - propagation_types = [ "PROCESS_GROUP_TO_HOST" ] - conditions { - key { - type = "STATIC" - attribute = "PROCESS_GROUP_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "connected-oauth-service" - } - } - } - } - rules { - type = "SERVICE" - enabled = true - propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ] - conditions { - key { - type = "STATIC" - attribute = "SERVICE_TAGS" - } - tag { - # negate = false - operator = "EQUALS" - value { - context = "CONTEXTLESS" - key = "Component" - value = "connected-oauth-service" - } - } - } + entity_selector_based_rule { + enabled = true + selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:cn-connected-oauth-service\"))" } } From b4bb10ae975c00bc5a2e55b7607e5e8fff2ba2dd Mon Sep 17 00:00:00 2001 From: "Zhibo Wang (ext.)" Date: Tue, 30 May 2023 03:10:28 +0000 Subject: [PATCH 2/3] cd_connected-oauth-service.tf edited online with Bitbucket --- CN_PROD/management_zone/cd_connected-oauth-service.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CN_PROD/management_zone/cd_connected-oauth-service.tf b/CN_PROD/management_zone/cd_connected-oauth-service.tf index b615b049..54042a92 100644 --- a/CN_PROD/management_zone/cd_connected-oauth-service.tf +++ b/CN_PROD/management_zone/cd_connected-oauth-service.tf @@ -1,6 +1,6 @@ -# DEFINE dynatrace_management_zone.CD_mobile-login = -340771320666888764 -resource "dynatrace_management_zone" "CD_mobile-login" { - name = "CD_mobile-login" +# DEFINE dynatrace_management_zone.CD_mobile_login = -340771320666888764 +resource "dynatrace_management_zone" "CD_mobile_login" { + name = "CD_mobile_login" entity_selector_based_rule { enabled = true selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:cn-connected-oauth-service\")" From b2e22ce542b541e51591e37c0f5a53aab9f3f4dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Serkan=20=C3=96zkan?= Date: Fri, 9 Jun 2023 10:21:33 +0200 Subject: [PATCH 3/3] OPMAAS-4349 - changed the compass-id ASBC-FzgSecCA to ASBC-FzgSSLCA in management zone config files --- CN_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf | 8 ++++---- CN_PROD/management_zone/CD_ASBC-FZGSSLCA.tf | 8 ++++---- EMEA_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf | 8 ++++---- EMEA_PROD/management_zone/CD_ASBC-FZGSSLCA.tf | 8 ++++---- NA_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf | 8 ++++---- NA_PROD/management_zone/CD_ASBC-FZGSSLCA.tf | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/CN_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf b/CN_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf index c9e3f46a..a7ba1a27 100644 --- a/CN_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf +++ b/CN_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf @@ -2,18 +2,18 @@ resource "dynatrace_management_zone" "CD_ASBC-FZGSSLCA" { name = "CD_ASBC-FZGSSLCA" entity_selector_based_rule { enabled = true - selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:ASBC-FzgSecCA\")" + selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:ASBC-FzgSSLCA\")" } entity_selector_based_rule { enabled = true - selector = "type(HOST),tag(\"compass-id:ASBC-FzgSecCA\")" + selector = "type(HOST),tag(\"compass-id:ASBC-FzgSSLCA\")" } entity_selector_based_rule { enabled = true - selector = "type(Service),tag(\"compass-id:ASBC-FzgSecCA\")" + selector = "type(Service),tag(\"compass-id:ASBC-FzgSSLCA\")" } entity_selector_based_rule { enabled = true - selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:ASBC-FzgSecCA\"))" + selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:ASBC-FzgSSLCA\"))" } } \ No newline at end of file diff --git a/CN_PROD/management_zone/CD_ASBC-FZGSSLCA.tf b/CN_PROD/management_zone/CD_ASBC-FZGSSLCA.tf index c9e3f46a..a7ba1a27 100644 --- a/CN_PROD/management_zone/CD_ASBC-FZGSSLCA.tf +++ b/CN_PROD/management_zone/CD_ASBC-FZGSSLCA.tf @@ -2,18 +2,18 @@ resource "dynatrace_management_zone" "CD_ASBC-FZGSSLCA" { name = "CD_ASBC-FZGSSLCA" entity_selector_based_rule { enabled = true - selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:ASBC-FzgSecCA\")" + selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:ASBC-FzgSSLCA\")" } entity_selector_based_rule { enabled = true - selector = "type(HOST),tag(\"compass-id:ASBC-FzgSecCA\")" + selector = "type(HOST),tag(\"compass-id:ASBC-FzgSSLCA\")" } entity_selector_based_rule { enabled = true - selector = "type(Service),tag(\"compass-id:ASBC-FzgSecCA\")" + selector = "type(Service),tag(\"compass-id:ASBC-FzgSSLCA\")" } entity_selector_based_rule { enabled = true - selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:ASBC-FzgSecCA\"))" + selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:ASBC-FzgSSLCA\"))" } } \ No newline at end of file diff --git a/EMEA_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf b/EMEA_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf index c9e3f46a..a7ba1a27 100644 --- a/EMEA_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf +++ b/EMEA_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf @@ -2,18 +2,18 @@ resource "dynatrace_management_zone" "CD_ASBC-FZGSSLCA" { name = "CD_ASBC-FZGSSLCA" entity_selector_based_rule { enabled = true - selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:ASBC-FzgSecCA\")" + selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:ASBC-FzgSSLCA\")" } entity_selector_based_rule { enabled = true - selector = "type(HOST),tag(\"compass-id:ASBC-FzgSecCA\")" + selector = "type(HOST),tag(\"compass-id:ASBC-FzgSSLCA\")" } entity_selector_based_rule { enabled = true - selector = "type(Service),tag(\"compass-id:ASBC-FzgSecCA\")" + selector = "type(Service),tag(\"compass-id:ASBC-FzgSSLCA\")" } entity_selector_based_rule { enabled = true - selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:ASBC-FzgSecCA\"))" + selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:ASBC-FzgSSLCA\"))" } } \ No newline at end of file diff --git a/EMEA_PROD/management_zone/CD_ASBC-FZGSSLCA.tf b/EMEA_PROD/management_zone/CD_ASBC-FZGSSLCA.tf index c9e3f46a..a7ba1a27 100644 --- a/EMEA_PROD/management_zone/CD_ASBC-FZGSSLCA.tf +++ b/EMEA_PROD/management_zone/CD_ASBC-FZGSSLCA.tf @@ -2,18 +2,18 @@ resource "dynatrace_management_zone" "CD_ASBC-FZGSSLCA" { name = "CD_ASBC-FZGSSLCA" entity_selector_based_rule { enabled = true - selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:ASBC-FzgSecCA\")" + selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:ASBC-FzgSSLCA\")" } entity_selector_based_rule { enabled = true - selector = "type(HOST),tag(\"compass-id:ASBC-FzgSecCA\")" + selector = "type(HOST),tag(\"compass-id:ASBC-FzgSSLCA\")" } entity_selector_based_rule { enabled = true - selector = "type(Service),tag(\"compass-id:ASBC-FzgSecCA\")" + selector = "type(Service),tag(\"compass-id:ASBC-FzgSSLCA\")" } entity_selector_based_rule { enabled = true - selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:ASBC-FzgSecCA\"))" + selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:ASBC-FzgSSLCA\"))" } } \ No newline at end of file diff --git a/NA_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf b/NA_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf index c9e3f46a..a7ba1a27 100644 --- a/NA_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf +++ b/NA_PREPROD/management_zone/CD_ASBC-FZGSSLCA.tf @@ -2,18 +2,18 @@ resource "dynatrace_management_zone" "CD_ASBC-FZGSSLCA" { name = "CD_ASBC-FZGSSLCA" entity_selector_based_rule { enabled = true - selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:ASBC-FzgSecCA\")" + selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:ASBC-FzgSSLCA\")" } entity_selector_based_rule { enabled = true - selector = "type(HOST),tag(\"compass-id:ASBC-FzgSecCA\")" + selector = "type(HOST),tag(\"compass-id:ASBC-FzgSSLCA\")" } entity_selector_based_rule { enabled = true - selector = "type(Service),tag(\"compass-id:ASBC-FzgSecCA\")" + selector = "type(Service),tag(\"compass-id:ASBC-FzgSSLCA\")" } entity_selector_based_rule { enabled = true - selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:ASBC-FzgSecCA\"))" + selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:ASBC-FzgSSLCA\"))" } } \ No newline at end of file diff --git a/NA_PROD/management_zone/CD_ASBC-FZGSSLCA.tf b/NA_PROD/management_zone/CD_ASBC-FZGSSLCA.tf index c9e3f46a..a7ba1a27 100644 --- a/NA_PROD/management_zone/CD_ASBC-FZGSSLCA.tf +++ b/NA_PROD/management_zone/CD_ASBC-FZGSSLCA.tf @@ -2,18 +2,18 @@ resource "dynatrace_management_zone" "CD_ASBC-FZGSSLCA" { name = "CD_ASBC-FZGSSLCA" entity_selector_based_rule { enabled = true - selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:ASBC-FzgSecCA\")" + selector = "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:ASBC-FzgSSLCA\")" } entity_selector_based_rule { enabled = true - selector = "type(HOST),tag(\"compass-id:ASBC-FzgSecCA\")" + selector = "type(HOST),tag(\"compass-id:ASBC-FzgSSLCA\")" } entity_selector_based_rule { enabled = true - selector = "type(Service),tag(\"compass-id:ASBC-FzgSecCA\")" + selector = "type(Service),tag(\"compass-id:ASBC-FzgSSLCA\")" } entity_selector_based_rule { enabled = true - selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:ASBC-FzgSecCA\"))" + selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:ASBC-FzgSSLCA\"))" } } \ No newline at end of file