Pull request #82: OPMAAS-3500 adjusted PD_ management zones

Merge in OPAPM/coco_terraform_config from OPMAAS-3500 to master

* commit '35af4363548064c24cc8dfa4dbb82fecaa363376':
  OPMAAS-3500 adjusted PD_ management zones

CN_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf

@@ -2,7 +2,7 @@ resource "dynatrace_management_zone" "PD_AccountManagementConnectedCar" {
   name = "PD_AccountManagementConnectedCar" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-CNS\",\"compass-id:AM-ECS\",\"compass-id:AM-LMCS\",\"compass-id:AM-Proxy\",\"compass-id:AM-Store\",\"compass-id:AM-SVMS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:AM-VMS\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
+    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-ECS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
   }
   entity_selector_based_rule {
     enabled = true 

CN_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf

@@ -1,13 +1,13 @@
 resource "dynatrace_management_zone" "PD_ConnectedDriveStoreBackend" {
   name = "PD_ConnectedDriveStoreBackend" 
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:AM-Store\")" 
+  }
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:buffet-if56\",\"compass-id:Buffet-Birt\",\"compass-id:Buffet-CIC-Backend\",\"compass-id:Buffet-Core\",\"compass-id:Buffet-External-CDM\",\"compass-id:Buffet-External-Offer\",\"compass-id:Buffet-External-Payment\",\"compass-id:Buffet-External-Tax\",\"compass-id:Buffet-GAM\",\"compass-id:Buffet-IF33\",\"compass-id:Buffet-IF38\",\"compass-id:Buffet-IF41\",\"compass-id:Buffet-IF50\",\"compass-id:Buffet-IF51\",\"compass-id:Buffet-IF52\",\"compass-id:Buffet-IF53\",\"compass-id:Buffet-IF54\",\"compass-id:Buffet-IF58\",\"compass-id:Buffet-IF60\",\"compass-id:Buffet-IF90\",\"compass-id:Buffet-Promo-API\",\"compass-id:IME-CDS\",\"compass-id:IME-CS\",\"compass-id:IME-RDC\",\"compass-id:IME-SS\",\"compass-id:IME-WS\")" 
   }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"Component:am-store\")" 
-  }
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:Concat\",\"compass-id:Connected-Catalog\")" 

CN_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf

@@ -2,14 +2,38 @@ 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 = true 
+    # enabled = false 
-    selector = "type(Service),tag(\"compass-id:dpm\")" 
+    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:DPM\",\"compass-id:DPP\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
+    selector = "type(Service),tag(\"compass-id:dpm\",\"compass-id:DPP\")" 
+  }
+  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" 
+      }
+    }
   }
 }

CN_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf

@@ -2,7 +2,7 @@ resource "dynatrace_management_zone" "PD_AccountManagementConnectedCar" {
   name = "PD_AccountManagementConnectedCar" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-CNS\",\"compass-id:AM-ECS\",\"compass-id:AM-LMCS\",\"compass-id:AM-Proxy\",\"compass-id:AM-Store\",\"compass-id:AM-SVMS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:AM-VMS\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
+    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-ECS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
   }
   entity_selector_based_rule {
     enabled = true 

CN_PROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf

@@ -1,13 +1,13 @@
 resource "dynatrace_management_zone" "PD_ConnectedDriveStoreBackend" {
   name = "PD_ConnectedDriveStoreBackend" 
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:AM-Store\")" 
+  }
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:buffet-if56\",\"compass-id:Buffet-Birt\",\"compass-id:Buffet-CIC-Backend\",\"compass-id:Buffet-Core\",\"compass-id:Buffet-External-CDM\",\"compass-id:Buffet-External-Offer\",\"compass-id:Buffet-External-Payment\",\"compass-id:Buffet-External-Tax\",\"compass-id:Buffet-GAM\",\"compass-id:Buffet-IF33\",\"compass-id:Buffet-IF38\",\"compass-id:Buffet-IF41\",\"compass-id:Buffet-IF50\",\"compass-id:Buffet-IF51\",\"compass-id:Buffet-IF52\",\"compass-id:Buffet-IF53\",\"compass-id:Buffet-IF54\",\"compass-id:Buffet-IF58\",\"compass-id:Buffet-IF60\",\"compass-id:Buffet-IF90\",\"compass-id:Buffet-Promo-API\",\"compass-id:IME-CDS\",\"compass-id:IME-CS\",\"compass-id:IME-RDC\",\"compass-id:IME-SS\",\"compass-id:IME-WS\")" 
   }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"Component:am-store\")" 
-  }
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:Concat\",\"compass-id:Connected-Catalog\")" 

CN_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf

@@ -2,14 +2,38 @@ 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 = true 
+    # enabled = false 
-    selector = "type(Service),tag(\"compass-id:dpm\")" 
+    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:DPM\",\"compass-id:DPP\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
+    selector = "type(Service),tag(\"compass-id:dpm\",\"compass-id:DPP\")" 
+  }
+  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" 
+      }
+    }
   }
 }

EMEA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf

@@ -2,7 +2,7 @@ resource "dynatrace_management_zone" "PD_AccountManagementConnectedCar" {
   name = "PD_AccountManagementConnectedCar" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-CNS\",\"compass-id:AM-ECS\",\"compass-id:AM-LMCS\",\"compass-id:AM-Proxy\",\"compass-id:AM-Store\",\"compass-id:AM-SVMS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:AM-VMS\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
+    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-ECS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
   }
   entity_selector_based_rule {
     enabled = true 

EMEA_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf

@@ -1,13 +1,13 @@
 resource "dynatrace_management_zone" "PD_ConnectedDriveStoreBackend" {
   name = "PD_ConnectedDriveStoreBackend" 
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:AM-Store\")" 
+  }
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:buffet-if56\",\"compass-id:Buffet-Birt\",\"compass-id:Buffet-CIC-Backend\",\"compass-id:Buffet-Core\",\"compass-id:Buffet-External-CDM\",\"compass-id:Buffet-External-Offer\",\"compass-id:Buffet-External-Payment\",\"compass-id:Buffet-External-Tax\",\"compass-id:Buffet-GAM\",\"compass-id:Buffet-IF33\",\"compass-id:Buffet-IF38\",\"compass-id:Buffet-IF41\",\"compass-id:Buffet-IF50\",\"compass-id:Buffet-IF51\",\"compass-id:Buffet-IF52\",\"compass-id:Buffet-IF53\",\"compass-id:Buffet-IF54\",\"compass-id:Buffet-IF58\",\"compass-id:Buffet-IF60\",\"compass-id:Buffet-IF90\",\"compass-id:Buffet-Promo-API\",\"compass-id:IME-CDS\",\"compass-id:IME-CS\",\"compass-id:IME-RDC\",\"compass-id:IME-SS\",\"compass-id:IME-WS\")" 
   }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"Component:am-store\")" 
-  }
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:Concat\",\"compass-id:Connected-Catalog\")" 

EMEA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf

@@ -2,14 +2,38 @@ 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 = true 
+    # enabled = false 
-    selector = "type(Service),tag(\"compass-id:dpm\")" 
+    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:DPM\",\"compass-id:DPP\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
+    selector = "type(Service),tag(\"compass-id:dpm\",\"compass-id:DPP\")" 
+  }
+  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" 
+      }
+    }
   }
 }

EMEA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf

@@ -2,7 +2,7 @@ resource "dynatrace_management_zone" "PD_AccountManagementConnectedCar" {
   name = "PD_AccountManagementConnectedCar" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-CNS\",\"compass-id:AM-ECS\",\"compass-id:AM-LMCS\",\"compass-id:AM-Proxy\",\"compass-id:AM-Store\",\"compass-id:AM-SVMS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:AM-VMS\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
+    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-ECS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
   }
   entity_selector_based_rule {
     enabled = true 

EMEA_PROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf

@@ -2,7 +2,7 @@ resource "dynatrace_management_zone" "PD_ConnectedDriveStoreBackend" {
   name = "PD_ConnectedDriveStoreBackend" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"Component:am-store\")" 
+    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:AM-Store\")" 
   }
   entity_selector_based_rule {
     enabled = true 

EMEA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf

@@ -1,12 +1,16 @@
 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:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
+    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 

NA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf

@@ -2,7 +2,7 @@ resource "dynatrace_management_zone" "PD_AccountManagementConnectedCar" {
   name = "PD_AccountManagementConnectedCar" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-CNS\",\"compass-id:AM-ECS\",\"compass-id:AM-LMCS\",\"compass-id:AM-Proxy\",\"compass-id:AM-Store\",\"compass-id:AM-SVMS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:AM-VMS\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
+    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-ECS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
   }
   entity_selector_based_rule {
     enabled = true 

NA_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf

@@ -2,11 +2,11 @@ resource "dynatrace_management_zone" "PD_ConnectedDriveStoreBackend" {
   name = "PD_ConnectedDriveStoreBackend" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:Buffet-Birt\",\"compass-id:Buffet-CIC-Backend\",\"compass-id:Buffet-Core\",\"compass-id:Buffet-External-CDM\",\"compass-id:Buffet-External-Offer\",\"compass-id:Buffet-External-Payment\",\"compass-id:Buffet-External-Tax\",\"compass-id:Buffet-GAM\",\"compass-id:Buffet-IF33\",\"compass-id:Buffet-IF38\",\"compass-id:Buffet-IF41\",\"compass-id:Buffet-IF50\",\"compass-id:Buffet-IF51\",\"compass-id:Buffet-IF52\",\"compass-id:Buffet-IF53\",\"compass-id:Buffet-IF54\",\"compass-id:Buffet-IF58\",\"compass-id:Buffet-IF60\",\"compass-id:Buffet-IF90\",\"compass-id:Buffet-Promo-API\",\"compass-id:IME-CDS\",\"compass-id:IME-CS\",\"compass-id:IME-RDC\",\"compass-id:IME-SS\",\"compass-id:IME-WS\")" 
+    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:AM-Store\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"Component:am-store\")" 
+    selector = "type(Service),tag(\"compass-id:buffet-if56\",\"compass-id:Buffet-Birt\",\"compass-id:Buffet-CIC-Backend\",\"compass-id:Buffet-Core\",\"compass-id:Buffet-External-CDM\",\"compass-id:Buffet-External-Offer\",\"compass-id:Buffet-External-Payment\",\"compass-id:Buffet-External-Tax\",\"compass-id:Buffet-GAM\",\"compass-id:Buffet-IF33\",\"compass-id:Buffet-IF38\",\"compass-id:Buffet-IF41\",\"compass-id:Buffet-IF50\",\"compass-id:Buffet-IF51\",\"compass-id:Buffet-IF52\",\"compass-id:Buffet-IF53\",\"compass-id:Buffet-IF54\",\"compass-id:Buffet-IF58\",\"compass-id:Buffet-IF60\",\"compass-id:Buffet-IF90\",\"compass-id:Buffet-Promo-API\",\"compass-id:IME-CDS\",\"compass-id:IME-CS\",\"compass-id:IME-RDC\",\"compass-id:IME-SS\",\"compass-id:IME-WS\")" 
   }
   entity_selector_based_rule {
     enabled = true 

NA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf

@@ -2,14 +2,38 @@ 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 = true 
+    # enabled = false 
-    selector = "type(Service),tag(\"compass-id:dpm\")" 
+    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:DPM\",\"compass-id:DPP\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
+    selector = "type(Service),tag(\"compass-id:dpm\",\"compass-id:DPP\")" 
+  }
+  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" 
+      }
+    }
   }
 }

NA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf

@@ -2,7 +2,7 @@ resource "dynatrace_management_zone" "PD_AccountManagementConnectedCar" {
   name = "PD_AccountManagementConnectedCar" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-CNS\",\"compass-id:AM-ECS\",\"compass-id:AM-LMCS\",\"compass-id:AM-Proxy\",\"compass-id:AM-Store\",\"compass-id:AM-SVMS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:AM-VMS\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
+    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-ECS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
   }
   entity_selector_based_rule {
     enabled = true 

NA_PROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf

@@ -2,14 +2,14 @@ resource "dynatrace_management_zone" "PD_ConnectedDriveStoreBackend" {
   name = "PD_ConnectedDriveStoreBackend" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:Concat\",\"compass-id:Connected-Catalog\")" 
+    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:AM-Store\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"Component:am-store\")" 
   }
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:buffet-if56\",\"compass-id:Buffet-Birt\",\"compass-id:Buffet-CIC-Backend\",\"compass-id:Buffet-Core\",\"compass-id:Buffet-External-CDM\",\"compass-id:Buffet-External-Offer\",\"compass-id:Buffet-External-Payment\",\"compass-id:Buffet-External-Tax\",\"compass-id:Buffet-GAM\",\"compass-id:Buffet-IF33\",\"compass-id:Buffet-IF38\",\"compass-id:Buffet-IF41\",\"compass-id:Buffet-IF50\",\"compass-id:Buffet-IF51\",\"compass-id:Buffet-IF52\",\"compass-id:Buffet-IF53\",\"compass-id:Buffet-IF54\",\"compass-id:Buffet-IF58\",\"compass-id:Buffet-IF60\",\"compass-id:Buffet-IF90\",\"compass-id:Buffet-Promo-API\",\"compass-id:IME-CDS\",\"compass-id:IME-CS\",\"compass-id:IME-RDC\",\"compass-id:IME-SS\",\"compass-id:IME-WS\")" 
   }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Concat\",\"compass-id:Connected-Catalog\")" 
+  }
 }

NA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf

@@ -1,16 +1,24 @@
 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\")" 
+  }
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:dpm\",\"compass-id:DPP\")" 
   }
   entity_selector_based_rule {
-    # enabled = false 
+    enabled = true 
-    selector = "type(Service),tag(\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:PERSEUS\",\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\")" 
+    selector = "type(Service),tag(\"compass-id:agent-service\")" 
   }
   rules {
     type = "SERVICE"