Pull request #83: OPMAAS-3500 adjusted compass id again

Merge in OPAPM/coco_terraform_config from OPMAAS-3500-2 to master * commit '5e919dece218c6d3887a7a0b25f54f8b3b65c2f8': OPMAAS-3500 adjusted compass id again
2023-03-02 09:02:40 +00:00 · 2023-03-02 09:02:40 +00:00 · db2801978e
parent 2f8d0e05f2 5e919dece2
commit db2801978e
6 changed files with 12 additions and 156 deletions
--- a/CN_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
+++ b/CN_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
@ -2,38 +2,14 @@ resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
  name = "PD_ConnectedUserProfileServices" 
  entity_selector_based_rule {
    enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-CNS\",\"compass-id:am-config\",\"compass-id:AM-LMCS\",\"compass-id:AM-Proxy\",\"compass-id:AM-SVMS\",\"compass-id:AM-VMS\")" 
-  }
-  entity_selector_based_rule {
-    # enabled = false 
-    selector = "type(Service),tag(\"compass-id:OMC Table Storage Expiration Service\",\"compass-id:omc-client-analytics-hub-consumer-ms\")" 
-  }
-  entity_selector_based_rule {
-    # enabled = false 
-    selector = "type(Service),tag(\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
+    selector = "type(Service),tag(\"compass-id:AM-CNS\",\"compass-id:am-config\",\"compass-id:am-lmcs\",\"compass-id:AM-Proxy\",\"compass-id:AM-SVMS\",\"compass-id:AM-VMS\",\"compass-id:MAPPING-STUB\",\"compass-id:UMS-UI\")" 
  }
  entity_selector_based_rule {
    enabled = true 
-    selector = "type(Service),tag(\"compass-id:dpm\",\"compass-id:DPP\")" 
+    selector = "type(Service),tag(\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
  }
  entity_selector_based_rule {
    enabled = true 
    selector = "type(Service),tag(\"compass-id:agent-service\")" 
  }
-  rules {
-    type = "SERVICE" 
-    # enabled = false 
-    conditions {
-      key {
-        type = "STATIC" 
-        attribute = "SERVICE_NAME" 
-      }
-      string {
-        case_sensitive = true 
-        # negate = false 
-        operator = "EQUALS" 
-        value = "ProtectedDppV1RestApi - dpp - prod" 
-      }
-    }
-  }
 }
--- a/CN_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
+++ b/CN_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
@ -2,38 +2,14 @@ resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
  name = "PD_ConnectedUserProfileServices" 
  entity_selector_based_rule {
    enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-CNS\",\"compass-id:am-config\",\"compass-id:AM-LMCS\",\"compass-id:AM-Proxy\",\"compass-id:AM-SVMS\",\"compass-id:AM-VMS\")" 
-  }
-  entity_selector_based_rule {
-    # enabled = false 
-    selector = "type(Service),tag(\"compass-id:OMC Table Storage Expiration Service\",\"compass-id:omc-client-analytics-hub-consumer-ms\")" 
-  }
-  entity_selector_based_rule {
-    # enabled = false 
-    selector = "type(Service),tag(\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
+    selector = "type(Service),tag(\"compass-id:AM-CNS\",\"compass-id:am-config\",\"compass-id:am-lmcs\",\"compass-id:AM-Proxy\",\"compass-id:AM-SVMS\",\"compass-id:AM-VMS\",\"compass-id:MAPPING-STUB\",\"compass-id:UMS-UI\")" 
  }
  entity_selector_based_rule {
    enabled = true 
-    selector = "type(Service),tag(\"compass-id:dpm\",\"compass-id:DPP\")" 
+    selector = "type(Service),tag(\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
  }
  entity_selector_based_rule {
    enabled = true 
    selector = "type(Service),tag(\"compass-id:agent-service\")" 
  }
-  rules {
-    type = "SERVICE" 
-    # enabled = false 
-    conditions {
-      key {
-        type = "STATIC" 
-        attribute = "SERVICE_NAME" 
-      }
-      string {
-        case_sensitive = true 
-        # negate = false 
-        operator = "EQUALS" 
-        value = "ProtectedDppV1RestApi - dpp - prod" 
-      }
-    }
-  }
 }
--- a/EMEA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
@ -2,38 +2,14 @@ resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
  name = "PD_ConnectedUserProfileServices" 
  entity_selector_based_rule {
    enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-CNS\",\"compass-id:am-config\",\"compass-id:AM-LMCS\",\"compass-id:AM-Proxy\",\"compass-id:AM-SVMS\",\"compass-id:AM-VMS\")" 
-  }
-  entity_selector_based_rule {
-    # enabled = false 
-    selector = "type(Service),tag(\"compass-id:OMC Table Storage Expiration Service\",\"compass-id:omc-client-analytics-hub-consumer-ms\")" 
-  }
-  entity_selector_based_rule {
-    # enabled = false 
-    selector = "type(Service),tag(\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
+    selector = "type(Service),tag(\"compass-id:AM-CNS\",\"compass-id:am-config\",\"compass-id:am-lmcs\",\"compass-id:AM-Proxy\",\"compass-id:AM-SVMS\",\"compass-id:AM-VMS\",\"compass-id:MAPPING-STUB\",\"compass-id:UMS-UI\")" 
  }
  entity_selector_based_rule {
    enabled = true 
-    selector = "type(Service),tag(\"compass-id:dpm\",\"compass-id:DPP\")" 
+    selector = "type(Service),tag(\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
  }
  entity_selector_based_rule {
    enabled = true 
    selector = "type(Service),tag(\"compass-id:agent-service\")" 
  }
-  rules {
-    type = "SERVICE" 
-    # enabled = false 
-    conditions {
-      key {
-        type = "STATIC" 
-        attribute = "SERVICE_NAME" 
-      }
-      string {
-        case_sensitive = true 
-        # negate = false 
-        operator = "EQUALS" 
-        value = "ProtectedDppV1RestApi - dpp - prod" 
-      }
-    }
-  }
 }
--- a/EMEA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
+++ b/EMEA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
@ -2,38 +2,14 @@ resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
  name = "PD_ConnectedUserProfileServices" 
  entity_selector_based_rule {
    enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-CNS\",\"compass-id:am-config\",\"compass-id:AM-LMCS\",\"compass-id:AM-Proxy\",\"compass-id:AM-SVMS\",\"compass-id:AM-VMS\")" 
-  }
-  entity_selector_based_rule {
-    # enabled = false 
-    selector = "type(Service),tag(\"compass-id:OMC Table Storage Expiration Service\",\"compass-id:omc-client-analytics-hub-consumer-ms\")" 
-  }
-  entity_selector_based_rule {
-    # enabled = false 
-    selector = "type(Service),tag(\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
+    selector = "type(Service),tag(\"compass-id:AM-CNS\",\"compass-id:am-config\",\"compass-id:am-lmcs\",\"compass-id:AM-Proxy\",\"compass-id:AM-SVMS\",\"compass-id:AM-VMS\",\"compass-id:MAPPING-STUB\",\"compass-id:UMS-UI\")" 
  }
  entity_selector_based_rule {
    enabled = true 
-    selector = "type(Service),tag(\"compass-id:dpm\",\"compass-id:DPP\")" 
+    selector = "type(Service),tag(\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
  }
  entity_selector_based_rule {
    enabled = true 
    selector = "type(Service),tag(\"compass-id:agent-service\")" 
  }
-  rules {
-    type = "SERVICE" 
-    # enabled = false 
-    conditions {
-      key {
-        type = "STATIC" 
-        attribute = "SERVICE_NAME" 
-      }
-      string {
-        case_sensitive = true 
-        # negate = false 
-        operator = "EQUALS" 
-        value = "ProtectedDppV1RestApi - dpp - prod" 
-      }
-    }
-  }
 }
--- a/NA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
+++ b/NA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
@ -2,38 +2,14 @@ resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
  name = "PD_ConnectedUserProfileServices" 
  entity_selector_based_rule {
    enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-CNS\",\"compass-id:am-config\",\"compass-id:AM-LMCS\",\"compass-id:AM-Proxy\",\"compass-id:AM-SVMS\",\"compass-id:AM-VMS\")" 
-  }
-  entity_selector_based_rule {
-    # enabled = false 
-    selector = "type(Service),tag(\"compass-id:OMC Table Storage Expiration Service\",\"compass-id:omc-client-analytics-hub-consumer-ms\")" 
-  }
-  entity_selector_based_rule {
-    # enabled = false 
-    selector = "type(Service),tag(\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
+    selector = "type(Service),tag(\"compass-id:AM-CNS\",\"compass-id:am-config\",\"compass-id:am-lmcs\",\"compass-id:AM-Proxy\",\"compass-id:AM-SVMS\",\"compass-id:AM-VMS\",\"compass-id:MAPPING-STUB\",\"compass-id:UMS-UI\")" 
  }
  entity_selector_based_rule {
    enabled = true 
-    selector = "type(Service),tag(\"compass-id:dpm\",\"compass-id:DPP\")" 
+    selector = "type(Service),tag(\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
  }
  entity_selector_based_rule {
    enabled = true 
    selector = "type(Service),tag(\"compass-id:agent-service\")" 
  }
-  rules {
-    type = "SERVICE" 
-    # enabled = false 
-    conditions {
-      key {
-        type = "STATIC" 
-        attribute = "SERVICE_NAME" 
-      }
-      string {
-        case_sensitive = true 
-        # negate = false 
-        operator = "EQUALS" 
-        value = "ProtectedDppV1RestApi - dpp - prod" 
-      }
-    }
-  }
 }
--- a/NA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
+++ b/NA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf
@ -2,38 +2,14 @@ resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
  name = "PD_ConnectedUserProfileServices" 
  entity_selector_based_rule {
    enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-CNS\",\"compass-id:am-config\",\"compass-id:AM-LMCS\",\"compass-id:AM-Proxy\",\"compass-id:AM-SVMS\",\"compass-id:AM-VMS\")" 
-  }
-  entity_selector_based_rule {
-    # enabled = false 
-    selector = "type(Service),tag(\"compass-id:OMC Table Storage Expiration Service\",\"compass-id:omc-client-analytics-hub-consumer-ms\")" 
-  }
-  entity_selector_based_rule {
-    # enabled = false 
-    selector = "type(Service),tag(\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
+    selector = "type(Service),tag(\"compass-id:AM-CNS\",\"compass-id:am-config\",\"compass-id:am-lmcs\",\"compass-id:AM-Proxy\",\"compass-id:AM-SVMS\",\"compass-id:AM-VMS\",\"compass-id:MAPPING-STUB\",\"compass-id:UMS-UI\")" 
  }
  entity_selector_based_rule {
    enabled = true 
-    selector = "type(Service),tag(\"compass-id:dpm\",\"compass-id:DPP\")" 
+    selector = "type(Service),tag(\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
  }
  entity_selector_based_rule {
    enabled = true 
    selector = "type(Service),tag(\"compass-id:agent-service\")" 
  }
-  rules {
-    type = "SERVICE" 
-    # enabled = false 
-    conditions {
-      key {
-        type = "STATIC" 
-        attribute = "SERVICE_NAME" 
-      }
-      string {
-        case_sensitive = true 
-        # negate = false 
-        operator = "EQUALS" 
-        value = "ProtectedDppV1RestApi - dpp - prod" 
-      }
-    }
-  }
 }