combined TP_Vehicle_Provisioning

Merge in OPAPM/coco_terraform_config from OPMAAS-3810 to master

* commit '5a38c7019c204ec3764f9deed239cf9126a4b350':
  modified Wirkkette Provisioning

CN_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf

@@ -1,11 +1,29 @@
 resource "dynatrace_management_zone" "PD_AccountManagementConnectedCar" {
   name = "PD_AccountManagementConnectedCar" 
+ // compass product: ConnectedDrive Account Management 
+
   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-ECS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"AccountManagementConnectedCar\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-LPS\", \"compass-id:AM-TACS\", \"compass-id:AM-UI\", \"compass-id:rsu-adapter\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"AccountManagementConnectedCar\")"
   }
+
+  // compass sub product: CD Rules Engine
+
+  // compass sub product: Lifecycle Management
+  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-ECS\",\"compass-id:AM-LPS\",\"compass-id:AM-TACS\",\"compass-id:AM-UI\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:TestdataTool\", \"compass-id:rsu-adapter\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Countly\",\"compass-id:TAMSArchive\")" 
+  }
+
+  // compass sub product: Connected User Insights Services
+
 }

CN_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf

@@ -1,27 +1,29 @@
 resource "dynatrace_management_zone" "PD_AutomotiveSecurity" {
   name = "PD_AutomotiveSecurity" 
+  // compass product: Automotive Security
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"AutomotiveSecurity\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"AutomotiveSecurity\")"
+  }
+
+  // compass sub product: Shared ASBC Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:SWLSEC2-Checker\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-HAL\",\"compass-id:ASBS\",\"compass-id:HPAuth\",\"compass-id:STS\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-NGTP\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:CAC-AGENT\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:DFPH\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:ts-wlupdater\",\"compass-id:TVP\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-HAL\",\"compass-id:ASBC-NGTP\",\"compass-id:ASBS\",\"compass-id:HPAuth\",\"compass-id:STS\")" 
+    selector = "type(Service),tag(\"compass-id:ts-wlupdater\",\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
   }
+
 }

CN_PREPROD/PD_management_zone/PD_CallServices.tf

@@ -1,27 +1,47 @@
 resource "dynatrace_management_zone" "PD_CallServices" {
   name = "PD_CallServices" 
+  // compass product: Connected Call Services
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"CallServices\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"CallServices\")"
   }
+
+  // compass sub product: Call Handling
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:BASE\",\"compass-id:CCC\",\"compass-id:RSA\",\"compass-id:RSA-ASD-Search\")" 
+    selector = "type(Service),tag(\"compass-id:APPCALL\",\"compass-id:B2V-NGTP\",\"compass-id:ECS\",\"compass-id:EVNS2\",\"compass-id:NGTP-CS\",\"compass-id:XCS\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
     selector = "type(PROCESS_GROUP),tag(\"compass-id:ecs\",\"compass-id:appcall\",\"compass-id:xcs\")" 
   }
+
+  // compass sub product: Call Handling Frontends
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
+    selector = "type(Service),tag(\"compass-id:BASE\",\"compass-id:Base Angular app\",\"compass-id:coco-hm\",\"compass-id:RSA-ASD-Search\",\"compass-id:RSA-DB\",\"compass-id:rsa-pi-model\")" 
+  }
+
+  // compass sub product: Voice Connectivity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:epm-js-app\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
+  }
+
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCC\",\"compass-id:RSA\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ACDS\",\"compass-id:APPCALL\",\"compass-id:B2V-NGTP\",\"compass-id:ECALLGW\",\"compass-id:ECS\",\"compass-id:EVNS2\",\"compass-id:EVNS2T\",\"compass-id:NGTP-CS\",\"compass-id:XCS\")" 
+    selector = "type(Service),tag(\"compass-id:ACDS\",\"compass-id:ECALLGW\",\"compass-id:EVNS2T\")" 
   }
+
 }

CN_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf

@@ -1,15 +1,49 @@
 resource "dynatrace_management_zone" "PD_ConnectedDriveStoreBackend" {
   name = "PD_ConnectedDriveStoreBackend" 
+ // compass product: ConnectedDrive Store Backend 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:AM-Store\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedDriveStoreBackend\")"
   }
   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\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedDriveStoreBackend\")"
   }
+
+  // compass sub product: CD Store Engine
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:Concat\",\"compass-id:Connected-Catalog\")" 
+    selector = "type(Service),tag(\"compass-id:AM-Store\",\"compass-id:Buffet-CIC-Backend\",\"compass-id:Buffet-Core\",\"compass-id:Buffet-External-CDM\",\"compass-id:Buffet-External-Offer\",\"compass-id:Buffet-External-Tax\",\"compass-id:Buffet-IF41\",\"compass-id:Buffet-IF50\",\"compass-id:Buffet-IF52\",\"compass-id:Buffet-IF53\",\"compass-id:Buffet-IF56\",\"compass-id:Buffet-IF58\",\"compass-id:Buffet-IF60\",\"compass-id:Buffet-IF90\")" 
   }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:buffet-if56\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Buffet-Birt\",\"compass-id:Buffet-External-Payment\",\"compass-id:Buffet-GAM\",\"compass-id:Buffet-IF33\",\"compass-id:Buffet-IF38\",\"compass-id:Buffet-IF51\",\"compass-id:Buffet-IF54\",\"compass-id:Buffet-Promo-API\")" 
+  }
+
+  // compass sub product: Product Catalog Digital Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Concat\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Connected-Catalog\")" 
+  }
+
+
+  // compass sub product: BMW Points Engine
+  // deprecated
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:IME-CDS\",\"compass-id:IME-CS\",\"compass-id:IME-RDC\",\"compass-id:IME-SS\",\"compass-id:IME-WS\")" 
+  }
+
 }

CN_PREPROD/PD_management_zone/PD_ConnectedSecurityServices.tf

@@ -0,0 +1,57 @@
+resource "dynatrace_management_zone" "PD_ConnectedSecurityServices" {
+  name = "PD_ConnectedSecurityServices" 
+  // compass product: Connected Security Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedSecurityServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedSecurityServices\")"
+  }
+
+  // compass sub product: Vehicle Software Security Services
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:asbcswlsec2\",\"compass-id:psdzchecker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:swlsec2checker\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SWLSEC2-Checker\")" 
+  }
+
+  // compass sub product: Smart Access
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CAC-AGENT\")" 
+  }
+
+  // compass sub product: Key Management Services
+  // should be removed from PD_AutomotiveSecurity
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
+  }
+  // others that don't exist in compass, should be removed
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFPH\")" 
+  }
+
+  // compass sub product: Feature Security Services
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-FSC-AST\",\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:TVP\")" 
+  }
+
+}

CN_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf

@@ -1,15 +1,36 @@
 resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
   name = "PD_ConnectedUserProfileServices" 
+ // compass product: Connected User Profile Services
+
+  entity_selector_based_rule {
+    enabled = true
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedUserProfileServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = true
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedUserProfileServices\")"
+  }
+
+  // compass sub product: Connected User Mapping Services
   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\",\"compass-id:MAPPING-STUB\",\"compass-id:UMS-UI\")" 
   }
+    
+  // compass sub product: Connected User Personalization Services
   entity_selector_based_rule {
     enabled = true 
-    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:agent-service\",\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:agent-service\")" 
+    selector = "type(Service),tag(\"compass-id:am-cns\", \"compass-id:am-proxy\", \"compass-id:AM-PROXY\", \"compass-id:am-svms\", \"compass-id:am-vms\", \"compass-id:ums-ui\", \"compass-id:eCSM\", \"compass-id:ECSM\")" 
   }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\",\"compass-id:ESA\", \"compass-id:esa\",\"compass-id:UIS\", \"compass-id:uis\")" 
+  }
+
 }

CN_PREPROD/PD_management_zone/PD_ConversationServices.tf

@@ -0,0 +1,21 @@
+resource "dynatrace_management_zone" "PD_ConversationServices" {
+  name = "PD_ConversationServices" 
+  // compass product: Conversation Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConversationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConversationServices\")"
+  }
+
+  // compass sub product: Speech
+  // should be removed from PD_CallServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
+  }
+
+}

CN_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf

@@ -1,31 +1,62 @@
 resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
   name = "PD_InfotainmentInteractivityServices" 
+  // compass product: Entertainment & Interactivity Backend 
+
   entity_selector_based_rule {
     enabled = true 
     selector = "type(HTTP_CHECK),entityName(\"InfotainmentInteractivityServices\")" 
   }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(SYNTHETIC_TEST),entityName(\"InfotainmentInteractivityServices\")" 
+  }
+
+  // compass sub product: Audio & Video Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:cm-config\",\"compass-id:cm-gracenote\",\"compass-id:cm-spotify\",\"compass-id:cm-ximalaya\",\"compass-id:OED\",\"compass-id:OED-CN\",\"compass-id:OEG\",\"compass-id:OEP\",\"compass-id:OES\",\"compass-id:OES-CN\",\"compass-id:OET\")" 
+  }
+  // not  (yet?) in compass
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:OEG-CN\",\"compass-id:OEO\",\"compass-id:OEO-CN\",\"compass-id:OEP-CN\",\"compass-id:OET-CN\",\"compass-id:shortvideo\")" 
+  }
+
+  // compass sub product: Customer-centric Information Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCIS-Download\",\"compass-id:ID5-EXT\",\"compass-id:ISE-NEWS\",\"compass-id:ISE-PAR\",\"compass-id:WEA\",\"compass-id:WEA-ID5\",\"compass-id:WEA-IN-MAP\",\"compass-id:news-next\")" 
+  }
+
+  // compass sub product: In-Car Experience Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ambientmusic\")" 
+  }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ambient-music\",\"compass-id:festive-mode\")" 
   }
+
+  // compass sub product: Vehicle-centric Information Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:GEN3\",\"compass-id:ID5\",\"compass-id:ISE-CDR\",\"compass-id:ISE-EML\",\"compass-id:ISE-GEN2\",\"compass-id:ISE-ID7\",\"compass-id:ISE-LIS\",\"compass-id:ISE-LOC\",\"compass-id:ISE-RSL\",\"compass-id:ISE-VPS\")" 
+  }
+
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ISE-BEV\",\"compass-id:ISE-INP\",\"compass-id:ISE-IPA\",\"compass-id:ISE-MCL\",\"compass-id:ISE-VSD\",\"compass-id:tmpp-admin-ui\",\"compass-id:tmpp-manifest\",\"compass-id:tmpp-web-proxy\",\"compass-id:UPS\")" 
+  }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCIS-Download\",\"compass-id:Geolocator\",\"compass-id:intelligent-reminder\",\"compass-id:news-next\",\"compass-id:restaurant-reservation\")" 
+    selector = "type(Service),tag(\"compass-id:Geolocator\",\"compass-id:intelligent-reminder\",\"compass-id:restaurant-reservation\")" 
   }
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:CDIP\")" 
   }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:GEN3\",\"compass-id:ID5\",\"compass-id:ID5-APP\",\"compass-id:ID5-EXT\",\"compass-id:ISE-BEV\",\"compass-id:ISE-CDR\",\"compass-id:ISE-EML\",\"compass-id:ISE-GEN2\",\"compass-id:ISE-ID7\",\"compass-id:ISE-INP\",\"compass-id:ISE-IPA\",\"compass-id:ISE-LIS\",\"compass-id:ISE-LOC\",\"compass-id:ISE-MCL\",\"compass-id:ISE-NEWS\",\"compass-id:ISE-PAR\",\"compass-id:ISE-RSL\",\"compass-id:ISE-VPS\",\"compass-id:ISE-VSD\",\"compass-id:tmpp-admin-ui\",\"compass-id:tmpp-manifest\",\"compass-id:tmpp-web-proxy\",\"compass-id:UPS\",\"compass-id:WEA\",\"compass-id:WEA-ID5\",\"compass-id:WEA-IN-MAP\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:cm-config\",\"compass-id:cm-gracenote\",\"compass-id:cm-spotify\",\"compass-id:cm-ximalaya\",\"compass-id:OED\",\"compass-id:OED-CN\",\"compass-id:OEG\",\"compass-id:OEG-CN\",\"compass-id:OEO\",\"compass-id:OEO-CN\",\"compass-id:OEP\",\"compass-id:OEP-CN\",\"compass-id:OES\",\"compass-id:OES-CN\",\"compass-id:OET\",\"compass-id:OET-CN\",\"compass-id:shortvideo\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
-  }
+
 }

CN_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf

@@ -0,0 +1,21 @@
+resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServicesChina" {
+  name = "PD_InfotainmentInteractivityServicesChina" 
+  // compass product: Infotainment & Interactivity Services China 
+
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(HTTP_CHECK),entityName(\"InfotainmentInteractivityServicesChina\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(SYNTHETIC_TEST),entityName(\"InfotainmentInteractivityServicesChina\")" 
+  }
+
+  // no sub product
+  // should be removed from PD_InfotainmentInteractivityServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
+  }
+
+}

CN_PREPROD/PD_management_zone/PD_LocationServices.tf

@@ -1,15 +1,42 @@
 resource "dynatrace_management_zone" "PD_LocationServices" {
   name = "PD_LocationServices" 
+  // compass product: Location Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"LocationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"LocationServices\")"
+  }
+
+  // compass sub product: Premium Locations
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:LOS-CHA\",\"compass-id:LOS-CHA-CNV\",\"compass-id:LOS-FTS\",\"compass-id:LOS-JOY\",\"compass-id:LOS-MSC\",\"compass-id:LOS-OPS\",\"compass-id:LOS-PAR\",\"compass-id:LOS-PER\",\"compass-id:LOS-REF\")" 
+  }  
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:LOS-MOD\")" 
+  }  
+ 
+  // compass sub product: Smart Locations
+  // not configured: GCS-COUNTRIES, GCS-GEOCODING, GCS-TIMEZONES
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ercaf\",\"compass-id:ERCR\",\"compass-id:ERTP\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:LOS-FTS\",\"compass-id:potholes-reader\",\"compass-id:potholes-service\",\"compass-id:sc-reader\",\"compass-id:sc-service\")" 
+    selector = "type(Service),tag(\"compass-id:potholes-reader\",\"compass-id:potholes-service\",\"compass-id:sc-reader\",\"compass-id:sc-service\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:C2B-BS\",\"compass-id:GCS\",\"compass-id:LOS-CHA\",\"compass-id:LOS-CHA-CNV\",\"compass-id:LOS-JOY\",\"compass-id:LOS-MOD\",\"compass-id:LOS-MSC\",\"compass-id:LOS-OPS\",\"compass-id:LOS-PAR\",\"compass-id:LOS-PER\",\"compass-id:LOS-REF\",\"compass-id:RES-PAR\")" 
+    selector = "type(Service),tag(\"compass-id:C2B-BS\",\"compass-id:GCS\",\"compass-id:RES-PAR\")" 
   }
+  
 }

CN_PREPROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf

@@ -1,11 +1,39 @@
 resource "dynatrace_management_zone" "PD_MapServicesAutomatedDriving" {
   name = "PD_MapServicesAutomatedDriving" 
+  // compass product: Map Services & Automated Driving
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"MapServicesAutomatedDriving\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"MapServicesAutomatedDriving\")"
+  }
+
+  // compass sub product: Automated Driving Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ms-hdmap-lcv\",\"compass-id:ms-hdmap-map-viewer\",\"compass-id:ms-hdmap-mci-adapter\",\"compass-id:ms-hdmap-mci-downloader\",\"compass-id:ms-hdmap-nds-downloader\",\"compass-id:ms-hdmap-qc-bl\",\"compass-id:ms-hdmap-qc-checks\",\"compass-id:ms-hdmap-tile-delivery\",\"compass-id:ms-hdmap-tile-generator\",\"compass-id:ms-hdmap-vehicle-mock\",\"compass-id:mupi-backend\",\"compass-id:MUPI-BE\",\"compass-id:mupi-cloud-discovery-service\",\"compass-id:mupi-cloud-dumm-adapter-service\",\"compass-id:mupi-cloud-hd-adapter-service\",\"compass-id:mupi-cloud-import-service\",\"compass-id:mupi-cloud-integration-service\",\"compass-id:mupi-cloud-joynr-adapter-class-service\",\"compass-id:mupi-cloud-joynr-adapter-service\",\"compass-id:mupi-cloud-stats-service\",\"compass-id:mupi-cockpit\",\"compass-id:mupi-gateway\")" 
+    selector = "type(Service),tag(\"compass-id:GNSS API Gateway\",\"compass-id:gnss-reader\",\"compass-id:gnss-service\",\"compass-id:tc-app\",\"compass-id:tc-service\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:GNSS API Gateway\",\"compass-id:gnss-reader\",\"compass-id:gnss-service\",\"compass-id:ms-3dp-rc\",\"compass-id:tc-app\",\"compass-id:tc-service\")" 
+    selector = "type(Service),tag(\"compass-id:ms-3dp-rc\")" 
   }
+
+  // compass sub product: SD-MapUpdate Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:MUPI-BE\",\"compass-id:mupi-cloud-discovery-service\",\"compass-id:mupi-cloud-dumm-adapter-service\",\"compass-id:mupi-cloud-hd-adapter-service\",\"compass-id:mupi-cloud-import-service\",\"compass-id:mupi-cloud-integration-service\",\"compass-id:mupi-cloud-joynr-adapter-class-service\",\"compass-id:mupi-cloud-joynr-adapter-service\",\"compass-id:mupi-cloud-stats-service\",\"compass-id:mupi-cockpit\",\"compass-id:mupi-gateway\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:mupi-backend\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ms-hdmap-lcv\",\"compass-id:ms-hdmap-map-viewer\",\"compass-id:ms-hdmap-mci-adapter\",\"compass-id:ms-hdmap-mci-downloader\",\"compass-id:ms-hdmap-nds-downloader\",\"compass-id:ms-hdmap-qc-bl\",\"compass-id:ms-hdmap-qc-checks\",\"compass-id:ms-hdmap-tile-delivery\",\"compass-id:ms-hdmap-tile-generator\",\"compass-id:ms-hdmap-vehicle-mock\")" 
+  }
+
 }

CN_PREPROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf

@@ -1,7 +1,19 @@
 resource "dynatrace_management_zone" "PD_MyBMWMINIAppAsAProduct" {
   name = "PD_MyBMWMINIAppAsAProduct" 
+  // compass product: My BMW / MINI App as a product
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"CallSeMyBMWMINIAppAsAProductrvices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"MyBMWMINIAppAsAProduct\")"
+  }
+
+  // compass system: App Frontend eMobility and MyJourney
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:destination-composite-service\")" 
+    selector = "type(Service),tag(\"compass-id:destination-composite-service\",\"compass-id:send-to-car-service\")" 
   }
 }

CN_PREPROD/PD_management_zone/PD_NavigationServices.tf

@@ -1,15 +1,42 @@
 resource "dynatrace_management_zone" "PD_NavigationServices" {
   name = "PD_NavigationServices" 
+  // compass product: Navigation Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"NavigationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"NavigationServices\")"
+  }
+
+  // compass sub product: Realtime Parking
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:OSPI\")" 
   }
+  
+  // compass sub product: Realtime Routing
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CNGW\",\"compass-id:RTTI\")" 
+    selector = "type(Service),tag(\"compass-id:Drive Manager Cloud\",\"compass-id:eRoute-Adapter\",\"compass-id:eRouteExt\",\"compass-id:NaaS\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DM\",\"compass-id:eRoute\",\"compass-id:NaaS\")" 
+    selector = "type(Service),tag(\"compass-id:DM\",\"compass-id:eRoute\")" 
   }
+
+  // compass sub product: Realtime Traffic
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RTTI\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CNGW\")" 
+  }
+
 }

CN_PREPROD/PD_management_zone/PD_RemoteMessagingServices.tf

@@ -1,11 +1,41 @@
 resource "dynatrace_management_zone" "PD_RemoteMessagingServices" {
   name = "PD_RemoteMessagingServices" 
+ // compass product: Remote & Messaging Services 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:APIGW\",\"compass-id:FMC\",\"compass-id:RS\",\"compass-id:RS360\",\"compass-id:RSCockpit\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"RemoteMessagingServices\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:EADB\",\"compass-id:ICNB\",\"compass-id:MSGSVC\",\"compass-id:OMGW\",\"compass-id:TCN\",\"compass-id:XCC-CAMPAIGNS\",\"compass-id:XCC-CMGR\",\"compass-id:XCC-SETTINGS\",\"compass-id:XCC-STATISTICS\",\"compass-id:XCC-USERS\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"RemoteMessagingServices\")"
   }
+
+  // compass sub product: Message Services
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:EADB\",\"compass-id:MSGSVC\",\"compass-id:XCC-CAMPAIGNS\",\"compass-id:XCC-CMGR\",\"compass-id:XCC-SETTINGS\",\"compass-id:XCC-STATISTICS\",\"compass-id:XCC-USERS\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ICNB\",\"compass-id:OMGW\",\"compass-id:TCN\")" 
+  }
+
+  // compass sub product: Remote Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RS\",\"compass-id:RS-360\",\"compass-id:RS-Cockpit\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FMC\",\"compass-id:RS360\",\"compass-id:RSCockpit\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FMC\")" 
+  }
+
 }

CN_PREPROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf

@@ -1,23 +1,79 @@
 resource "dynatrace_management_zone" "PD_RemoteVehicleConfigurationManagement" {
   name = "PD_RemoteVehicleConfigurationManagement" 
+  // compass product: Vehicle Device Mgmt.
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"RemoteVehicleConfigurationManagement\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"RemoteVehicleConfigurationManagement\")"
+  }
+
+  // compass sub product: App-Distribution Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:id5-app\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ID5-APP\")" 
+  }
+
+  // compass sub product: Provisioning Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:NOP-Admin\",\"compass-id:NOP-Archive\",\"compass-id:NOP-Provisioning\",\"compass-id:NOP-Trigger\",\"compass-id:SCM\",\"compass-id:SCMA\",\"compass-id:VPS-Admin\",\"compass-id:VPS-Archive\",\"compass-id:VPS-COMFY-AGENT\",\"compass-id:VPS-Monitor\",\"compass-id:VPS-Prov\",\"compass-id:VPS-Trigger\")" 
+  }
+  // should be removed from PD_VehicleDataConnectivity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-NOTS\")" 
+  }
+
+  // compass sub product: Remote Software Upgrade Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FRE\",\"compass-id:FRS\",\"compass-id:MPG\",\"compass-id:QMC\",\"compass-id:RCM\",\"compass-id:RCP\",\"compass-id:RCS\",\"compass-id:RDC\",\"compass-id:RDH\",\"compass-id:RES\",\"compass-id:RLM\",\"compass-id:RMO\",\"compass-id:RNP\",\"compass-id:RPP\",\"compass-id:RSA Admin GUI\",\"compass-id:RSA Testbench GUI\",\"compass-id:RTE\",\"compass-id:RTS\",\"compass-id:RVC\",\"compass-id:RVE\",\"compass-id:RVI\",\"compass-id:RVS\",\"compass-id:RVT\",\"compass-id:rwd\",\"compass-id:tdp\",\"compass-id:uvm\",\"compass-id:vjm\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ZAS\",\"compass-id:ZDI\",\"compass-id:ZFUS-MP-GENERATOR\",\"compass-id:ZIP\",\"compass-id:ZIS\",\"compass-id:ZMP\",\"compass-id:ZOS\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RNB App\",\"compass-id:zis\")" 
+  }
+
+  // compass sub product: Secure Feature Activation
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:SFA-FRE\",\"compass-id:SFA-OH\",\"compass-id:SFA-OTA\",\"compass-id:SFA-S\",\"compass-id:SFA-TS\")" 
   }
+
+  // compass sub product: Campaign Management
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:comfy-agent-registry\",\"compass-id:comfy-cockpit\",\"compass-id:comfy-management\",\"compass-id:comfy-orchestration\",\"compass-id:NOP-Admin\",\"compass-id:NOP-Archive\",\"compass-id:NOP-Provisioning\",\"compass-id:NOP-Trigger\",\"compass-id:SCM\",\"compass-id:SCMA\",\"compass-id:VPS-Admin\",\"compass-id:VPS-Archive\",\"compass-id:VPS-Monitor\",\"compass-id:VPS-Prov\",\"compass-id:VPS-Trigger\")" 
+    selector = "type(Service),tag(\"compass-id:comfy-agent-registry\",\"compass-id:comfy-cockpit\",\"compass-id:comfy-management\",\"compass-id:comfy-orchestration\",)" 
   }
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:APR\",\"compass-id:APR-NPM\",\"compass-id:APR-Portal\",\"compass-id:APR-Registry\")" 
   }
+  
+  // compass sub product: Extended Vehicle API Gateway
+  // should be removed from PD_RemoteMessagingServices
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ZAS\",\"compass-id:ZDI\",\"compass-id:ZFUS-MP-GENERATOR\",\"compass-id:ZIP\",\"compass-id:zis\",\"compass-id:ZMP\",\"compass-id:ZOS\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:FRE\",\"compass-id:FRS\",\"compass-id:MPG\",\"compass-id:QMC\",\"compass-id:RCM\",\"compass-id:RCP\",\"compass-id:RCS\",\"compass-id:RDC\",\"compass-id:RDH\",\"compass-id:RES\",\"compass-id:RLM\",\"compass-id:RMO\",\"compass-id:RNB App\",\"compass-id:RNP\",\"compass-id:RPP\",\"compass-id:RSA Admin GUI\",\"compass-id:RSA Testbench GUI\",\"compass-id:RTE\",\"compass-id:RTS\",\"compass-id:RVC\",\"compass-id:RVE\",\"compass-id:RVI\",\"compass-id:RVS\",\"compass-id:RVT\",\"compass-id:rwd\",\"compass-id:tdp\",\"compass-id:uvm\",\"compass-id:vjm\")" 
+    selector = "type(Service),tag(\"compass-id:APIGW\")" 
   }
+
+  // compass sub product: Vehicle Software Configuration and Capabilities
+  // vs-cmdb
+
 }

CN_PREPROD/PD_management_zone/PD_Teleservices.tf

@@ -1,15 +1,60 @@
 resource "dynatrace_management_zone" "PD_Teleservices" {
   name = "PD_Teleservices" 
+  // compass product: Vehicle Demand Identification and Lead Management
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"Teleservices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"Teleservices\")"
+  }
+
+  // compass sub product: Teleservices Demands
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:PDMManager\",\"compass-id:PDMUpdater\",\"compass-id:ts-ena-ui\",\"compass-id:WLManager\",\"compass-id:WLUpdater\")" 
+    selector = "type(Service),tag(\"compass-id:rsurservice\",\"compass-id:scallservice\",\"compass-id:seam\",\"compass-id:ts-asc\",\"compass-id:ts-ccm-di\",\"compass-id:ts-pffs\",\"compass-id:ts-sdi\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:tsbgservice\",\"compass-id:tscs\",\"compass-id:tsdd\",\"compass-id:tssb-bt\",\"compass-id:tssb-bti\",\"compass-id:tssb-tsp\",\"compass-id:ttbs\",\"compass-id:ts-incar-ffs\",\"compass-id:ts-cms\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RSURService\",\"compass-id:SCallService\",\"compass-id:SEAM\",\"compass-id:TSBGService\",\"compass-id:TSBM\",\"compass-id:TS-CCM-DI\",\"compass-id:TSCS\",\"compass-id:TSDD\",\"compass-id:TSMR\",\"compass-id:TS-PFFS\",\"compass-id:TSSB-BT\",\"compass-id:TSSB-BTI\",\"compass-id:TSSB-TSP\",\"compass-id:TS-SDI\",\"compass-id:TTBS\")" 
+  }
+
+  // compass sub product: Teleservices Diagnosis
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:bcallservice\",\"compass-id:cas-spm\",\"compass-id:cas-stm\",\"compass-id:diagservice\",\"compass-id:eshad\",\"compass-id:patchcampaign\",\"compass-id:rtcad\",\"compass-id:rtchandler\",\"compass-id:rtcservice\",\"compass-id:ts-bcallhandler\",\"compass-id:ts-pat-ui\",\"compass-id:tsrd\",\"compass-id:ts-rtc-ui\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:BCallService\",\"compass-id:CAS-SPM\",\"compass-id:CAS-STM\",\"compass-id:DiagService\",\"compass-id:ESHAD\",\"compass-id:RTCAD\",\"compass-id:RTCHandler\",\"compass-id:RTCService\",\"compass-id:ts-cts-ui\",\"compass-id:TSRD\")" 
+  }
+
+  // compass sub product: Teleservices Enabling
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:pdmmanager\",\"compass-id:pdmupdater\",\"compass-id:ts-ena-ui\",\"compass-id:wlmanager\",\"compass-id:wlupdater\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PDMManager\",\"compass-id:PDMUpdater\",\"compass-id:WLManager\",\"compass-id:WLUpdater\")" 
+  }
+
+  // compass sub product: Service Partner Management
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:BCallService\",\"compass-id:CAS-SPM\",\"compass-id:CAS-STM\",\"compass-id:DiagService\",\"compass-id:ESHAD\",\"compass-id:patchcampaign\",\"compass-id:RTCAD\",\"compass-id:RTCHandler\",\"compass-id:RTCService\",\"compass-id:ts-bcallhandler\",\"compass-id:ts-cts-ui\",\"compass-id:ts-pat-ui\",\"compass-id:TSRD\",\"compass-id:ts-rtc-ui\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:RSURService\",\"compass-id:SCallService\",\"compass-id:SEAM\",\"compass-id:ts-asc\",\"compass-id:TSBGService\",\"compass-id:TSBM\",\"compass-id:TS-CCM-DI\",\"compass-id:TSCS\",\"compass-id:TSDD\",\"compass-id:TSMR\",\"compass-id:TS-PFFS\",\"compass-id:TSSB-BT\",\"compass-id:TSSB-BTI\",\"compass-id:TSSB-TSP\",\"compass-id:TS-SDI\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:TTBS\")" 
+    selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
   }
+
+ // compass sub product: VDLM Appointment Management
+ // appm-ams
+ 
 }

CN_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf

@@ -1,19 +1,46 @@
 resource "dynatrace_management_zone" "PD_VehicleDataCollection" {
   name = "PD_VehicleDataCollection" 
+  // compass product: Vehicle Data Collection Offboard
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"VehicleDataCollection\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"VehicleDataCollection\")"
+  }
+
+  // compass sub product: Crowd Data Collection Offboard
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:SRManager\",\"compass-id:TSMB\",\"compass-id:TSR-CH\",\"compass-id:TSR-CMA\",\"compass-id:TSR-DD\",\"compass-id:TSR-ICC\",\"compass-id:TSR-VU\")" 
+    selector = "type(Service),tag(\"compass-id:CMCS\",\"compass-id:ERDCDC2FCD\",\"compass-id:ERDFCDUDS\",\"compass-id:ERDMGR\",\"compass-id:ERDPROC\",\"compass-id:ERDXFCDFCD\",\"compass-id:XFCDAnonymizer\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ERDDISP\",\"compass-id:XFCD Cockpit\",\"compass-id:XFCD Configuration\")" 
+  }
+
+  // compass sub product: Vehicle Health Data Collection
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:TSMB\",\"compass-id:TSR-CH\",\"compass-id:TSR-CMA\",\"compass-id:TSR-DD\",\"compass-id:TSR-ICC\",\"compass-id:TSR-VU\",\"compass-id:VHS\")" 
+  }
+ 
+  // compass sub product: Vehicle State Data Collection
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CSU\",\"compass-id:KVSFO\",\"compass-id:KVSST\",\"compass-id:LSCFSU\",\"compass-id:LSCHR\",\"compass-id:LSCJR\",\"compass-id:LSCKC\",\"compass-id:LSCMM\",\"compass-id:LSCOC\",\"compass-id:LSCOG\",\"compass-id:LSCWO\",\"compass-id:tripCollectionApi\",\"compass-id:tripCollectionProcessor\",\"compass-id:vdc-vcs\",\"compass-id:VNS\",\"compass-id:VS-API\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:LSCJHWO\",\"compass-id:tripCollection\",\"compass-id:VHCJR\",\"compass-id:VJDS\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:CMCS\",\"compass-id:ERDCDC2FCD\",\"compass-id:ERDDISP\",\"compass-id:ERDFCDUDS\",\"compass-id:ERDMGR\",\"compass-id:ERDPROC\",\"compass-id:ERDXFCDFCD\",\"compass-id:XFCD Cockpit\",\"compass-id:XFCD Configuration\",\"compass-id:XFCDAnonymizer\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:CSU\",\"compass-id:LSCFSU\",\"compass-id:LSCHR\",\"compass-id:LSCJHWO\",\"compass-id:LSCJR\",\"compass-id:LSCKC\",\"compass-id:LSCMM\",\"compass-id:LSCOC\",\"compass-id:LSCOG\",\"compass-id:LSCWO\",\"compass-id:tripCollection\",\"compass-id:vdc-vcs\",\"compass-id:VHCJR\",\"compass-id:VHS\",\"compass-id:VJDS\",\"compass-id:VNS\",\"compass-id:VS-API\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
+    selector = "type(Service),tag(\"compass-id:SRManager\")" 
   }
+
 }

CN_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf

@@ -1,15 +1,42 @@
 resource "dynatrace_management_zone" "PD_VehicleDataConnectivity" {
   name = "PD_VehicleDataConnectivity" 
+ // compass product: Vehicle Data Connectivity 
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"VehicleDataConnectivity\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"VehicleDataConnectivity\")"
+  }
+
+  // compass sub product: Vehicle Base Connectivity
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:B2V-ADC\",\"compass-id:B2V-ADC-CLOUD\")" 
   }
+
+  // compass sub product: Vehicle Data Connect SP2015  
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:JoynrDS\",\"compass-id:UDS\",\"compass-id:UDS Storage Service\")" 
+    selector = "type(Service),tag(\"compass-id:B2V-COM-ECHO\",\"compass-id:B2V-COM-FE\",\"compass-id:B2VCOMGCDMCLIENT\")" 
   }
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-COM-BE\",\"compass-id:B2V-COM-ECHO\",\"compass-id:B2V-COM-FE\",\"compass-id:B2VCOMGCDMCLIENT\",\"compass-id:B2V-NOTS\")" 
+    selector = "type(Service),tag(\"compass-id:B2V-COM-BE\")" 
   }
+
+  // compass sub product: Vehicle Data Connect SP2018  
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:JoynrDS\",\"compass-id:UDS\",)" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:UDS Storage Service\")" 
+  }
+
 }

CN_PREPROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf

@@ -1,11 +1,31 @@
 resource "dynatrace_management_zone" "PD_eSIMandStaticVehicleDataServices" {
   name = "PD_eSIMandStaticVehicleDataServices" 
+ // compass product: eSIM and Static Vehicle Data Services 
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"eSIMandStaticVehicleDataServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"eSIMandStaticVehicleDataServices\")"
+  }
+
+  // compass sub product: Static Vehicle Data Services
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:IDS Admin\",\"compass-id:IDS-SVDS\",\"compass-id:IDS-Sync\",\"compass-id:IDS-WS\")" 
   }
+
+  // compass sub product: eSIM Management
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-Device\",\"compass-id:CESIM\",\"compass-id:AM-CESIM\",\"compass-id:CESIM Proxy\",\"compass-id:CESIM-TP\",\"compass-id:CESIM-UI\",\"compass-id:EGIM\",\"compass-id:AM-EGIM\",\"compass-id:ESIM-UI\",\"compass-id:MNO-Manager\",\"compass-id:AM-MNO-MANAGER\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\")" 
+    selector = "type(Service),tag(\"compass-id:AM-Device\",\"compass-id:CESIM\",\"compass-id:CESIM Proxy\",\"compass-id:CESIM-TP\",\"compass-id:CESIM-UI\",\"compass-id:EGIM\",\"compass-id:ESIM-UI\",\"compass-id:MNO-Manager\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\")" 
   }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:AM-CESIM\",\"compass-id:AM-EGIM\",\"compass-id:AM-MNO-MANAGER\")" 
+  }
+
 }

CN_PREPROD/PD_management_zone/__main.tf

@@ -7,7 +7,7 @@ terraform {
   }
 
   backend "s3" {
-    bucket = "coco-dynatrace-tfstate"
+    bucket = "coco-dynatrace-tfstate-prod"
     key = "CN_PREPROD/pd_management_zone/terraform.tfstate"
     region = "eu-central-1"
     dynamodb_table = "coco-dynatrace-tfstate"

CN_PREPROD/calculated_service_metrics/main.tf

@@ -7,7 +7,7 @@ terraform {
   }
 
   backend "s3" {
-    bucket = "coco-dynatrace-tfstate"
+    bucket = "coco-dynatrace-tfstate-prod"
     key = "cnpreprod/calculated_service_metrics/terraform.tfstate"
     region = "eu-central-1"
     dynamodb_table = "coco-dynatrace-tfstate"

CN_PREPROD/slo/main.tf

@@ -9,7 +9,7 @@ terraform {
   }
 
   backend "s3" {
-    bucket = "coco-dynatrace-tfstate"
+    bucket = "coco-dynatrace-tfstate-prod"
     key = "cnpreprod/slo/terraform.tfstate"
     region = "eu-central-1"
     dynamodb_table = "coco-dynatrace-tfstate"

CN_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf

@@ -1,11 +1,29 @@
 resource "dynatrace_management_zone" "PD_AccountManagementConnectedCar" {
   name = "PD_AccountManagementConnectedCar" 
+ // compass product: ConnectedDrive Account Management 
+
   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-ECS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"AccountManagementConnectedCar\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-LPS\", \"compass-id:AM-TACS\", \"compass-id:AM-UI\", \"compass-id:rsu-adapter\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"AccountManagementConnectedCar\")"
   }
+
+  // compass sub product: CD Rules Engine
+
+  // compass sub product: Lifecycle Management
+  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-ECS\",\"compass-id:AM-LPS\",\"compass-id:AM-TACS\",\"compass-id:AM-UI\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:TestdataTool\", \"compass-id:rsu-adapter\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Countly\",\"compass-id:TAMSArchive\")" 
+  }
+
+  // compass sub product: Connected User Insights Services
+
 }

CN_PROD/PD_management_zone/PD_AutomotiveSecurity.tf

@@ -1,27 +1,29 @@
 resource "dynatrace_management_zone" "PD_AutomotiveSecurity" {
   name = "PD_AutomotiveSecurity" 
+  // compass product: Automotive Security
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"AutomotiveSecurity\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"AutomotiveSecurity\")"
+  }
+
+  // compass sub product: Shared ASBC Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:SWLSEC2-Checker\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-HAL\",\"compass-id:ASBS\",\"compass-id:HPAuth\",\"compass-id:STS\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-NGTP\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:CAC-AGENT\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:DFPH\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:ts-wlupdater\",\"compass-id:TVP\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-HAL\",\"compass-id:ASBC-NGTP\",\"compass-id:ASBS\",\"compass-id:HPAuth\",\"compass-id:STS\")" 
+    selector = "type(Service),tag(\"compass-id:ts-wlupdater\",\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
   }
+
 }

CN_PROD/PD_management_zone/PD_CallServices.tf

@@ -1,27 +1,47 @@
 resource "dynatrace_management_zone" "PD_CallServices" {
   name = "PD_CallServices" 
+  // compass product: Connected Call Services
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"CallServices\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"CallServices\")"
   }
+
+  // compass sub product: Call Handling
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:BASE\",\"compass-id:CCC\",\"compass-id:RSA\",\"compass-id:RSA-ASD-Search\")" 
+    selector = "type(Service),tag(\"compass-id:APPCALL\",\"compass-id:B2V-NGTP\",\"compass-id:ECS\",\"compass-id:EVNS2\",\"compass-id:NGTP-CS\",\"compass-id:XCS\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
     selector = "type(PROCESS_GROUP),tag(\"compass-id:ecs\",\"compass-id:appcall\",\"compass-id:xcs\")" 
   }
+
+  // compass sub product: Call Handling Frontends
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
+    selector = "type(Service),tag(\"compass-id:BASE\",\"compass-id:Base Angular app\",\"compass-id:coco-hm\",\"compass-id:RSA-ASD-Search\",\"compass-id:RSA-DB\",\"compass-id:rsa-pi-model\")" 
+  }
+
+  // compass sub product: Voice Connectivity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:epm-js-app\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
+  }
+
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCC\",\"compass-id:RSA\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ACDS\",\"compass-id:APPCALL\",\"compass-id:B2V-NGTP\",\"compass-id:ECALLGW\",\"compass-id:ECS\",\"compass-id:EVNS2\",\"compass-id:EVNS2T\",\"compass-id:NGTP-CS\",\"compass-id:XCS\")" 
+    selector = "type(Service),tag(\"compass-id:ACDS\",\"compass-id:ECALLGW\",\"compass-id:EVNS2T\")" 
   }
+
 }

CN_PROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf

@@ -1,15 +1,49 @@
 resource "dynatrace_management_zone" "PD_ConnectedDriveStoreBackend" {
   name = "PD_ConnectedDriveStoreBackend" 
+ // compass product: ConnectedDrive Store Backend 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:AM-Store\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedDriveStoreBackend\")"
   }
   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\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedDriveStoreBackend\")"
   }
+
+  // compass sub product: CD Store Engine
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:Concat\",\"compass-id:Connected-Catalog\")" 
+    selector = "type(Service),tag(\"compass-id:AM-Store\",\"compass-id:Buffet-CIC-Backend\",\"compass-id:Buffet-Core\",\"compass-id:Buffet-External-CDM\",\"compass-id:Buffet-External-Offer\",\"compass-id:Buffet-External-Tax\",\"compass-id:Buffet-IF41\",\"compass-id:Buffet-IF50\",\"compass-id:Buffet-IF52\",\"compass-id:Buffet-IF53\",\"compass-id:Buffet-IF56\",\"compass-id:Buffet-IF58\",\"compass-id:Buffet-IF60\",\"compass-id:Buffet-IF90\")" 
   }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:buffet-if56\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Buffet-Birt\",\"compass-id:Buffet-External-Payment\",\"compass-id:Buffet-GAM\",\"compass-id:Buffet-IF33\",\"compass-id:Buffet-IF38\",\"compass-id:Buffet-IF51\",\"compass-id:Buffet-IF54\",\"compass-id:Buffet-Promo-API\")" 
+  }
+
+  // compass sub product: Product Catalog Digital Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Concat\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Connected-Catalog\")" 
+  }
+
+
+  // compass sub product: BMW Points Engine
+  // deprecated
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:IME-CDS\",\"compass-id:IME-CS\",\"compass-id:IME-RDC\",\"compass-id:IME-SS\",\"compass-id:IME-WS\")" 
+  }
+
 }

CN_PROD/PD_management_zone/PD_ConnectedSecurityServices.tf

@@ -0,0 +1,57 @@
+resource "dynatrace_management_zone" "PD_ConnectedSecurityServices" {
+  name = "PD_ConnectedSecurityServices" 
+  // compass product: Connected Security Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedSecurityServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedSecurityServices\")"
+  }
+
+  // compass sub product: Vehicle Software Security Services
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:asbcswlsec2\",\"compass-id:psdzchecker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:swlsec2checker\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SWLSEC2-Checker\")" 
+  }
+
+  // compass sub product: Smart Access
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CAC-AGENT\")" 
+  }
+
+  // compass sub product: Key Management Services
+  // should be removed from PD_AutomotiveSecurity
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
+  }
+  // others that don't exist in compass, should be removed
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFPH\")" 
+  }
+
+  // compass sub product: Feature Security Services
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-FSC-AST\",\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:TVP\")" 
+  }
+
+}

CN_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf

@@ -1,15 +1,36 @@
 resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
   name = "PD_ConnectedUserProfileServices" 
+ // compass product: Connected User Profile Services
+
+  entity_selector_based_rule {
+    enabled = true
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedUserProfileServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = true
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedUserProfileServices\")"
+  }
+
+  // compass sub product: Connected User Mapping Services
   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\",\"compass-id:MAPPING-STUB\",\"compass-id:UMS-UI\")" 
   }
+    
+  // compass sub product: Connected User Personalization Services
   entity_selector_based_rule {
     enabled = true 
-    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:agent-service\",\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:agent-service\")" 
+    selector = "type(Service),tag(\"compass-id:am-cns\", \"compass-id:am-proxy\", \"compass-id:AM-PROXY\", \"compass-id:am-svms\", \"compass-id:am-vms\", \"compass-id:ums-ui\", \"compass-id:eCSM\", \"compass-id:ECSM\")" 
   }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\",\"compass-id:ESA\", \"compass-id:esa\",\"compass-id:UIS\", \"compass-id:uis\")" 
+  }
+
 }

CN_PROD/PD_management_zone/PD_ConversationServices.tf

@@ -0,0 +1,21 @@
+resource "dynatrace_management_zone" "PD_ConversationServices" {
+  name = "PD_ConversationServices" 
+  // compass product: Conversation Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConversationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConversationServices\")"
+  }
+
+  // compass sub product: Speech
+  // should be removed from PD_CallServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
+  }
+
+}

CN_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf

@@ -1,31 +1,62 @@
 resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
   name = "PD_InfotainmentInteractivityServices" 
+  // compass product: Entertainment & Interactivity Backend 
+
   entity_selector_based_rule {
     enabled = true 
     selector = "type(HTTP_CHECK),entityName(\"InfotainmentInteractivityServices\")" 
   }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(SYNTHETIC_TEST),entityName(\"InfotainmentInteractivityServices\")" 
+  }
+
+  // compass sub product: Audio & Video Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:cm-config\",\"compass-id:cm-gracenote\",\"compass-id:cm-spotify\",\"compass-id:cm-ximalaya\",\"compass-id:OED\",\"compass-id:OED-CN\",\"compass-id:OEG\",\"compass-id:OEP\",\"compass-id:OES\",\"compass-id:OES-CN\",\"compass-id:OET\")" 
+  }
+  // not  (yet?) in compass
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:OEG-CN\",\"compass-id:OEO\",\"compass-id:OEO-CN\",\"compass-id:OEP-CN\",\"compass-id:OET-CN\",\"compass-id:shortvideo\")" 
+  }
+
+  // compass sub product: Customer-centric Information Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCIS-Download\",\"compass-id:ID5-EXT\",\"compass-id:ISE-NEWS\",\"compass-id:ISE-PAR\",\"compass-id:WEA\",\"compass-id:WEA-ID5\",\"compass-id:WEA-IN-MAP\",\"compass-id:news-next\")" 
+  }
+
+  // compass sub product: In-Car Experience Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ambientmusic\")" 
+  }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ambient-music\",\"compass-id:festive-mode\")" 
   }
+
+  // compass sub product: Vehicle-centric Information Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:GEN3\",\"compass-id:ID5\",\"compass-id:ISE-CDR\",\"compass-id:ISE-EML\",\"compass-id:ISE-GEN2\",\"compass-id:ISE-ID7\",\"compass-id:ISE-LIS\",\"compass-id:ISE-LOC\",\"compass-id:ISE-RSL\",\"compass-id:ISE-VPS\")" 
+  }
+
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ISE-BEV\",\"compass-id:ISE-INP\",\"compass-id:ISE-IPA\",\"compass-id:ISE-MCL\",\"compass-id:ISE-VSD\",\"compass-id:tmpp-admin-ui\",\"compass-id:tmpp-manifest\",\"compass-id:tmpp-web-proxy\",\"compass-id:UPS\")" 
+  }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCIS-Download\",\"compass-id:Geolocator\",\"compass-id:intelligent-reminder\",\"compass-id:news-next\",\"compass-id:restaurant-reservation\")" 
+    selector = "type(Service),tag(\"compass-id:Geolocator\",\"compass-id:intelligent-reminder\",\"compass-id:restaurant-reservation\")" 
   }
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:CDIP\")" 
   }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:GEN3\",\"compass-id:ID5\",\"compass-id:ID5-APP\",\"compass-id:ID5-EXT\",\"compass-id:ISE-BEV\",\"compass-id:ISE-CDR\",\"compass-id:ISE-EML\",\"compass-id:ISE-GEN2\",\"compass-id:ISE-ID7\",\"compass-id:ISE-INP\",\"compass-id:ISE-IPA\",\"compass-id:ISE-LIS\",\"compass-id:ISE-LOC\",\"compass-id:ISE-MCL\",\"compass-id:ISE-NEWS\",\"compass-id:ISE-PAR\",\"compass-id:ISE-RSL\",\"compass-id:ISE-VPS\",\"compass-id:ISE-VSD\",\"compass-id:tmpp-admin-ui\",\"compass-id:tmpp-manifest\",\"compass-id:tmpp-web-proxy\",\"compass-id:UPS\",\"compass-id:WEA\",\"compass-id:WEA-ID5\",\"compass-id:WEA-IN-MAP\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:cm-config\",\"compass-id:cm-gracenote\",\"compass-id:cm-spotify\",\"compass-id:cm-ximalaya\",\"compass-id:OED\",\"compass-id:OED-CN\",\"compass-id:OEG\",\"compass-id:OEG-CN\",\"compass-id:OEO\",\"compass-id:OEO-CN\",\"compass-id:OEP\",\"compass-id:OEP-CN\",\"compass-id:OES\",\"compass-id:OES-CN\",\"compass-id:OET\",\"compass-id:OET-CN\",\"compass-id:shortvideo\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
-  }
+
 }

CN_PROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf

@@ -0,0 +1,21 @@
+resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServicesChina" {
+  name = "PD_InfotainmentInteractivityServicesChina" 
+  // compass product: Infotainment & Interactivity Services China 
+
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(HTTP_CHECK),entityName(\"InfotainmentInteractivityServicesChina\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(SYNTHETIC_TEST),entityName(\"InfotainmentInteractivityServicesChina\")" 
+  }
+
+  // no sub product
+  // should be removed from PD_InfotainmentInteractivityServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
+  }
+
+}

CN_PROD/PD_management_zone/PD_LocationServices.tf

@@ -1,15 +1,42 @@
 resource "dynatrace_management_zone" "PD_LocationServices" {
   name = "PD_LocationServices" 
+  // compass product: Location Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"LocationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"LocationServices\")"
+  }
+
+  // compass sub product: Premium Locations
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:LOS-CHA\",\"compass-id:LOS-CHA-CNV\",\"compass-id:LOS-FTS\",\"compass-id:LOS-JOY\",\"compass-id:LOS-MSC\",\"compass-id:LOS-OPS\",\"compass-id:LOS-PAR\",\"compass-id:LOS-PER\",\"compass-id:LOS-REF\")" 
+  }  
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:LOS-MOD\")" 
+  }  
+ 
+  // compass sub product: Smart Locations
+  // not configured: GCS-COUNTRIES, GCS-GEOCODING, GCS-TIMEZONES
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ercaf\",\"compass-id:ERCR\",\"compass-id:ERTP\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:LOS-FTS\",\"compass-id:potholes-reader\",\"compass-id:potholes-service\",\"compass-id:sc-reader\",\"compass-id:sc-service\")" 
+    selector = "type(Service),tag(\"compass-id:potholes-reader\",\"compass-id:potholes-service\",\"compass-id:sc-reader\",\"compass-id:sc-service\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:C2B-BS\",\"compass-id:GCS\",\"compass-id:LOS-CHA\",\"compass-id:LOS-CHA-CNV\",\"compass-id:LOS-JOY\",\"compass-id:LOS-MOD\",\"compass-id:LOS-MSC\",\"compass-id:LOS-OPS\",\"compass-id:LOS-PAR\",\"compass-id:LOS-PER\",\"compass-id:LOS-REF\",\"compass-id:RES-PAR\")" 
+    selector = "type(Service),tag(\"compass-id:C2B-BS\",\"compass-id:GCS\",\"compass-id:RES-PAR\")" 
   }
+  
 }

CN_PROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf

@@ -1,11 +1,39 @@
 resource "dynatrace_management_zone" "PD_MapServicesAutomatedDriving" {
   name = "PD_MapServicesAutomatedDriving" 
+  // compass product: Map Services & Automated Driving
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"MapServicesAutomatedDriving\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"MapServicesAutomatedDriving\")"
+  }
+
+  // compass sub product: Automated Driving Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ms-hdmap-lcv\",\"compass-id:ms-hdmap-map-viewer\",\"compass-id:ms-hdmap-mci-adapter\",\"compass-id:ms-hdmap-mci-downloader\",\"compass-id:ms-hdmap-nds-downloader\",\"compass-id:ms-hdmap-qc-bl\",\"compass-id:ms-hdmap-qc-checks\",\"compass-id:ms-hdmap-tile-delivery\",\"compass-id:ms-hdmap-tile-generator\",\"compass-id:ms-hdmap-vehicle-mock\",\"compass-id:mupi-backend\",\"compass-id:MUPI-BE\",\"compass-id:mupi-cloud-discovery-service\",\"compass-id:mupi-cloud-dumm-adapter-service\",\"compass-id:mupi-cloud-hd-adapter-service\",\"compass-id:mupi-cloud-import-service\",\"compass-id:mupi-cloud-integration-service\",\"compass-id:mupi-cloud-joynr-adapter-class-service\",\"compass-id:mupi-cloud-joynr-adapter-service\",\"compass-id:mupi-cloud-stats-service\",\"compass-id:mupi-cockpit\",\"compass-id:mupi-gateway\")" 
+    selector = "type(Service),tag(\"compass-id:GNSS API Gateway\",\"compass-id:gnss-reader\",\"compass-id:gnss-service\",\"compass-id:tc-app\",\"compass-id:tc-service\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:GNSS API Gateway\",\"compass-id:gnss-reader\",\"compass-id:gnss-service\",\"compass-id:ms-3dp-rc\",\"compass-id:tc-app\",\"compass-id:tc-service\")" 
+    selector = "type(Service),tag(\"compass-id:ms-3dp-rc\")" 
   }
+
+  // compass sub product: SD-MapUpdate Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:MUPI-BE\",\"compass-id:mupi-cloud-discovery-service\",\"compass-id:mupi-cloud-dumm-adapter-service\",\"compass-id:mupi-cloud-hd-adapter-service\",\"compass-id:mupi-cloud-import-service\",\"compass-id:mupi-cloud-integration-service\",\"compass-id:mupi-cloud-joynr-adapter-class-service\",\"compass-id:mupi-cloud-joynr-adapter-service\",\"compass-id:mupi-cloud-stats-service\",\"compass-id:mupi-cockpit\",\"compass-id:mupi-gateway\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:mupi-backend\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ms-hdmap-lcv\",\"compass-id:ms-hdmap-map-viewer\",\"compass-id:ms-hdmap-mci-adapter\",\"compass-id:ms-hdmap-mci-downloader\",\"compass-id:ms-hdmap-nds-downloader\",\"compass-id:ms-hdmap-qc-bl\",\"compass-id:ms-hdmap-qc-checks\",\"compass-id:ms-hdmap-tile-delivery\",\"compass-id:ms-hdmap-tile-generator\",\"compass-id:ms-hdmap-vehicle-mock\")" 
+  }
+
 }

CN_PROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf

@@ -1,7 +1,19 @@
 resource "dynatrace_management_zone" "PD_MyBMWMINIAppAsAProduct" {
   name = "PD_MyBMWMINIAppAsAProduct" 
+  // compass product: My BMW / MINI App as a product
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"CallSeMyBMWMINIAppAsAProductrvices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"MyBMWMINIAppAsAProduct\")"
+  }
+
+  // compass system: App Frontend eMobility and MyJourney
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:destination-composite-service\")" 
+    selector = "type(Service),tag(\"compass-id:destination-composite-service\",\"compass-id:send-to-car-service\")" 
   }
 }

CN_PROD/PD_management_zone/PD_NavigationServices.tf

@@ -1,15 +1,42 @@
 resource "dynatrace_management_zone" "PD_NavigationServices" {
   name = "PD_NavigationServices" 
+  // compass product: Navigation Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"NavigationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"NavigationServices\")"
+  }
+
+  // compass sub product: Realtime Parking
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:OSPI\")" 
   }
+  
+  // compass sub product: Realtime Routing
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CNGW\",\"compass-id:RTTI\")" 
+    selector = "type(Service),tag(\"compass-id:Drive Manager Cloud\",\"compass-id:eRoute-Adapter\",\"compass-id:eRouteExt\",\"compass-id:NaaS\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DM\",\"compass-id:eRoute\",\"compass-id:NaaS\")" 
+    selector = "type(Service),tag(\"compass-id:DM\",\"compass-id:eRoute\")" 
   }
+
+  // compass sub product: Realtime Traffic
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RTTI\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CNGW\")" 
+  }
+
 }

CN_PROD/PD_management_zone/PD_RemoteMessagingServices.tf

@@ -1,11 +1,41 @@
 resource "dynatrace_management_zone" "PD_RemoteMessagingServices" {
   name = "PD_RemoteMessagingServices" 
+ // compass product: Remote & Messaging Services 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:APIGW\",\"compass-id:FMC\",\"compass-id:RS\",\"compass-id:RS360\",\"compass-id:RSCockpit\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"RemoteMessagingServices\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:EADB\",\"compass-id:ICNB\",\"compass-id:MSGSVC\",\"compass-id:OMGW\",\"compass-id:TCN\",\"compass-id:XCC-CAMPAIGNS\",\"compass-id:XCC-CMGR\",\"compass-id:XCC-SETTINGS\",\"compass-id:XCC-STATISTICS\",\"compass-id:XCC-USERS\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"RemoteMessagingServices\")"
   }
+
+  // compass sub product: Message Services
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:EADB\",\"compass-id:MSGSVC\",\"compass-id:XCC-CAMPAIGNS\",\"compass-id:XCC-CMGR\",\"compass-id:XCC-SETTINGS\",\"compass-id:XCC-STATISTICS\",\"compass-id:XCC-USERS\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ICNB\",\"compass-id:OMGW\",\"compass-id:TCN\")" 
+  }
+
+  // compass sub product: Remote Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RS\",\"compass-id:RS-360\",\"compass-id:RS-Cockpit\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FMC\",\"compass-id:RS360\",\"compass-id:RSCockpit\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FMC\")" 
+  }
+
 }

CN_PROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf

@@ -1,23 +1,79 @@
 resource "dynatrace_management_zone" "PD_RemoteVehicleConfigurationManagement" {
   name = "PD_RemoteVehicleConfigurationManagement" 
+  // compass product: Vehicle Device Mgmt.
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"RemoteVehicleConfigurationManagement\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"RemoteVehicleConfigurationManagement\")"
+  }
+
+  // compass sub product: App-Distribution Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:id5-app\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ID5-APP\")" 
+  }
+
+  // compass sub product: Provisioning Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:NOP-Admin\",\"compass-id:NOP-Archive\",\"compass-id:NOP-Provisioning\",\"compass-id:NOP-Trigger\",\"compass-id:SCM\",\"compass-id:SCMA\",\"compass-id:VPS-Admin\",\"compass-id:VPS-Archive\",\"compass-id:VPS-COMFY-AGENT\",\"compass-id:VPS-Monitor\",\"compass-id:VPS-Prov\",\"compass-id:VPS-Trigger\")" 
+  }
+  // should be removed from PD_VehicleDataConnectivity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-NOTS\")" 
+  }
+
+  // compass sub product: Remote Software Upgrade Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FRE\",\"compass-id:FRS\",\"compass-id:MPG\",\"compass-id:QMC\",\"compass-id:RCM\",\"compass-id:RCP\",\"compass-id:RCS\",\"compass-id:RDC\",\"compass-id:RDH\",\"compass-id:RES\",\"compass-id:RLM\",\"compass-id:RMO\",\"compass-id:RNP\",\"compass-id:RPP\",\"compass-id:RSA Admin GUI\",\"compass-id:RSA Testbench GUI\",\"compass-id:RTE\",\"compass-id:RTS\",\"compass-id:RVC\",\"compass-id:RVE\",\"compass-id:RVI\",\"compass-id:RVS\",\"compass-id:RVT\",\"compass-id:rwd\",\"compass-id:tdp\",\"compass-id:uvm\",\"compass-id:vjm\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ZAS\",\"compass-id:ZDI\",\"compass-id:ZFUS-MP-GENERATOR\",\"compass-id:ZIP\",\"compass-id:ZIS\",\"compass-id:ZMP\",\"compass-id:ZOS\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RNB App\",\"compass-id:zis\")" 
+  }
+
+  // compass sub product: Secure Feature Activation
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:SFA-FRE\",\"compass-id:SFA-OH\",\"compass-id:SFA-OTA\",\"compass-id:SFA-S\",\"compass-id:SFA-TS\")" 
   }
+
+  // compass sub product: Campaign Management
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:comfy-agent-registry\",\"compass-id:comfy-cockpit\",\"compass-id:comfy-management\",\"compass-id:comfy-orchestration\",\"compass-id:NOP-Admin\",\"compass-id:NOP-Archive\",\"compass-id:NOP-Provisioning\",\"compass-id:NOP-Trigger\",\"compass-id:SCM\",\"compass-id:SCMA\",\"compass-id:VPS-Admin\",\"compass-id:VPS-Archive\",\"compass-id:VPS-Monitor\",\"compass-id:VPS-Prov\",\"compass-id:VPS-Trigger\")" 
+    selector = "type(Service),tag(\"compass-id:comfy-agent-registry\",\"compass-id:comfy-cockpit\",\"compass-id:comfy-management\",\"compass-id:comfy-orchestration\",)" 
   }
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:APR\",\"compass-id:APR-NPM\",\"compass-id:APR-Portal\",\"compass-id:APR-Registry\")" 
   }
+  
+  // compass sub product: Extended Vehicle API Gateway
+  // should be removed from PD_RemoteMessagingServices
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ZAS\",\"compass-id:ZDI\",\"compass-id:ZFUS-MP-GENERATOR\",\"compass-id:ZIP\",\"compass-id:zis\",\"compass-id:ZMP\",\"compass-id:ZOS\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:FRE\",\"compass-id:FRS\",\"compass-id:MPG\",\"compass-id:QMC\",\"compass-id:RCM\",\"compass-id:RCP\",\"compass-id:RCS\",\"compass-id:RDC\",\"compass-id:RDH\",\"compass-id:RES\",\"compass-id:RLM\",\"compass-id:RMO\",\"compass-id:RNB App\",\"compass-id:RNP\",\"compass-id:RPP\",\"compass-id:RSA Admin GUI\",\"compass-id:RSA Testbench GUI\",\"compass-id:RTE\",\"compass-id:RTS\",\"compass-id:RVC\",\"compass-id:RVE\",\"compass-id:RVI\",\"compass-id:RVS\",\"compass-id:RVT\",\"compass-id:rwd\",\"compass-id:tdp\",\"compass-id:uvm\",\"compass-id:vjm\")" 
+    selector = "type(Service),tag(\"compass-id:APIGW\")" 
   }
+
+  // compass sub product: Vehicle Software Configuration and Capabilities
+  // vs-cmdb
+
 }

CN_PROD/PD_management_zone/PD_Teleservices.tf

@@ -1,15 +1,60 @@
 resource "dynatrace_management_zone" "PD_Teleservices" {
   name = "PD_Teleservices" 
+  // compass product: Vehicle Demand Identification and Lead Management
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"Teleservices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"Teleservices\")"
+  }
+
+  // compass sub product: Teleservices Demands
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:PDMManager\",\"compass-id:PDMUpdater\",\"compass-id:ts-ena-ui\",\"compass-id:WLManager\",\"compass-id:WLUpdater\")" 
+    selector = "type(Service),tag(\"compass-id:rsurservice\",\"compass-id:scallservice\",\"compass-id:seam\",\"compass-id:ts-asc\",\"compass-id:ts-ccm-di\",\"compass-id:ts-pffs\",\"compass-id:ts-sdi\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:tsbgservice\",\"compass-id:tscs\",\"compass-id:tsdd\",\"compass-id:tssb-bt\",\"compass-id:tssb-bti\",\"compass-id:tssb-tsp\",\"compass-id:ttbs\",\"compass-id:ts-incar-ffs\",\"compass-id:ts-cms\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RSURService\",\"compass-id:SCallService\",\"compass-id:SEAM\",\"compass-id:TSBGService\",\"compass-id:TSBM\",\"compass-id:TS-CCM-DI\",\"compass-id:TSCS\",\"compass-id:TSDD\",\"compass-id:TSMR\",\"compass-id:TS-PFFS\",\"compass-id:TSSB-BT\",\"compass-id:TSSB-BTI\",\"compass-id:TSSB-TSP\",\"compass-id:TS-SDI\",\"compass-id:TTBS\")" 
+  }
+
+  // compass sub product: Teleservices Diagnosis
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:bcallservice\",\"compass-id:cas-spm\",\"compass-id:cas-stm\",\"compass-id:diagservice\",\"compass-id:eshad\",\"compass-id:patchcampaign\",\"compass-id:rtcad\",\"compass-id:rtchandler\",\"compass-id:rtcservice\",\"compass-id:ts-bcallhandler\",\"compass-id:ts-pat-ui\",\"compass-id:tsrd\",\"compass-id:ts-rtc-ui\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:BCallService\",\"compass-id:CAS-SPM\",\"compass-id:CAS-STM\",\"compass-id:DiagService\",\"compass-id:ESHAD\",\"compass-id:RTCAD\",\"compass-id:RTCHandler\",\"compass-id:RTCService\",\"compass-id:ts-cts-ui\",\"compass-id:TSRD\")" 
+  }
+
+  // compass sub product: Teleservices Enabling
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:pdmmanager\",\"compass-id:pdmupdater\",\"compass-id:ts-ena-ui\",\"compass-id:wlmanager\",\"compass-id:wlupdater\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PDMManager\",\"compass-id:PDMUpdater\",\"compass-id:WLManager\",\"compass-id:WLUpdater\")" 
+  }
+
+  // compass sub product: Service Partner Management
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:BCallService\",\"compass-id:CAS-SPM\",\"compass-id:CAS-STM\",\"compass-id:DiagService\",\"compass-id:ESHAD\",\"compass-id:patchcampaign\",\"compass-id:RTCAD\",\"compass-id:RTCHandler\",\"compass-id:RTCService\",\"compass-id:ts-bcallhandler\",\"compass-id:ts-cts-ui\",\"compass-id:ts-pat-ui\",\"compass-id:TSRD\",\"compass-id:ts-rtc-ui\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:RSURService\",\"compass-id:SCallService\",\"compass-id:SEAM\",\"compass-id:ts-asc\",\"compass-id:TSBGService\",\"compass-id:TSBM\",\"compass-id:TS-CCM-DI\",\"compass-id:TSCS\",\"compass-id:TSDD\",\"compass-id:TSMR\",\"compass-id:TS-PFFS\",\"compass-id:TSSB-BT\",\"compass-id:TSSB-BTI\",\"compass-id:TSSB-TSP\",\"compass-id:TS-SDI\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:TTBS\")" 
+    selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
   }
+
+ // compass sub product: VDLM Appointment Management
+ // appm-ams
+ 
 }

CN_PROD/PD_management_zone/PD_VehicleDataCollection.tf

@@ -1,19 +1,46 @@
 resource "dynatrace_management_zone" "PD_VehicleDataCollection" {
   name = "PD_VehicleDataCollection" 
+  // compass product: Vehicle Data Collection Offboard
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"VehicleDataCollection\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"VehicleDataCollection\")"
+  }
+
+  // compass sub product: Crowd Data Collection Offboard
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:SRManager\",\"compass-id:TSMB\",\"compass-id:TSR-CH\",\"compass-id:TSR-CMA\",\"compass-id:TSR-DD\",\"compass-id:TSR-ICC\",\"compass-id:TSR-VU\")" 
+    selector = "type(Service),tag(\"compass-id:CMCS\",\"compass-id:ERDCDC2FCD\",\"compass-id:ERDFCDUDS\",\"compass-id:ERDMGR\",\"compass-id:ERDPROC\",\"compass-id:ERDXFCDFCD\",\"compass-id:XFCDAnonymizer\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ERDDISP\",\"compass-id:XFCD Cockpit\",\"compass-id:XFCD Configuration\")" 
+  }
+
+  // compass sub product: Vehicle Health Data Collection
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:TSMB\",\"compass-id:TSR-CH\",\"compass-id:TSR-CMA\",\"compass-id:TSR-DD\",\"compass-id:TSR-ICC\",\"compass-id:TSR-VU\",\"compass-id:VHS\")" 
+  }
+ 
+  // compass sub product: Vehicle State Data Collection
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CSU\",\"compass-id:KVSFO\",\"compass-id:KVSST\",\"compass-id:LSCFSU\",\"compass-id:LSCHR\",\"compass-id:LSCJR\",\"compass-id:LSCKC\",\"compass-id:LSCMM\",\"compass-id:LSCOC\",\"compass-id:LSCOG\",\"compass-id:LSCWO\",\"compass-id:tripCollectionApi\",\"compass-id:tripCollectionProcessor\",\"compass-id:vdc-vcs\",\"compass-id:VNS\",\"compass-id:VS-API\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:LSCJHWO\",\"compass-id:tripCollection\",\"compass-id:VHCJR\",\"compass-id:VJDS\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:CMCS\",\"compass-id:ERDCDC2FCD\",\"compass-id:ERDDISP\",\"compass-id:ERDFCDUDS\",\"compass-id:ERDMGR\",\"compass-id:ERDPROC\",\"compass-id:ERDXFCDFCD\",\"compass-id:XFCD Cockpit\",\"compass-id:XFCD Configuration\",\"compass-id:XFCDAnonymizer\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:CSU\",\"compass-id:LSCFSU\",\"compass-id:LSCHR\",\"compass-id:LSCJHWO\",\"compass-id:LSCJR\",\"compass-id:LSCKC\",\"compass-id:LSCMM\",\"compass-id:LSCOC\",\"compass-id:LSCOG\",\"compass-id:LSCWO\",\"compass-id:tripCollection\",\"compass-id:vdc-vcs\",\"compass-id:VHCJR\",\"compass-id:VHS\",\"compass-id:VJDS\",\"compass-id:VNS\",\"compass-id:VS-API\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
+    selector = "type(Service),tag(\"compass-id:SRManager\")" 
   }
+
 }

CN_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf

@@ -1,15 +1,42 @@
 resource "dynatrace_management_zone" "PD_VehicleDataConnectivity" {
   name = "PD_VehicleDataConnectivity" 
+ // compass product: Vehicle Data Connectivity 
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"VehicleDataConnectivity\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"VehicleDataConnectivity\")"
+  }
+
+  // compass sub product: Vehicle Base Connectivity
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:B2V-ADC\",\"compass-id:B2V-ADC-CLOUD\")" 
   }
+
+  // compass sub product: Vehicle Data Connect SP2015  
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:JoynrDS\",\"compass-id:UDS\",\"compass-id:UDS Storage Service\")" 
+    selector = "type(Service),tag(\"compass-id:B2V-COM-ECHO\",\"compass-id:B2V-COM-FE\",\"compass-id:B2VCOMGCDMCLIENT\")" 
   }
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-COM-BE\",\"compass-id:B2V-COM-ECHO\",\"compass-id:B2V-COM-FE\",\"compass-id:B2VCOMGCDMCLIENT\",\"compass-id:B2V-NOTS\")" 
+    selector = "type(Service),tag(\"compass-id:B2V-COM-BE\")" 
   }
+
+  // compass sub product: Vehicle Data Connect SP2018  
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:JoynrDS\",\"compass-id:UDS\",)" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:UDS Storage Service\")" 
+  }
+
 }

CN_PROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf

@@ -1,11 +1,31 @@
 resource "dynatrace_management_zone" "PD_eSIMandStaticVehicleDataServices" {
   name = "PD_eSIMandStaticVehicleDataServices" 
+ // compass product: eSIM and Static Vehicle Data Services 
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"eSIMandStaticVehicleDataServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"eSIMandStaticVehicleDataServices\")"
+  }
+
+  // compass sub product: Static Vehicle Data Services
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:IDS Admin\",\"compass-id:IDS-SVDS\",\"compass-id:IDS-Sync\",\"compass-id:IDS-WS\")" 
   }
+
+  // compass sub product: eSIM Management
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-Device\",\"compass-id:CESIM\",\"compass-id:AM-CESIM\",\"compass-id:CESIM Proxy\",\"compass-id:CESIM-TP\",\"compass-id:CESIM-UI\",\"compass-id:EGIM\",\"compass-id:AM-EGIM\",\"compass-id:ESIM-UI\",\"compass-id:MNO-Manager\",\"compass-id:AM-MNO-MANAGER\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\")" 
+    selector = "type(Service),tag(\"compass-id:AM-Device\",\"compass-id:CESIM\",\"compass-id:CESIM Proxy\",\"compass-id:CESIM-TP\",\"compass-id:CESIM-UI\",\"compass-id:EGIM\",\"compass-id:ESIM-UI\",\"compass-id:MNO-Manager\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\")" 
   }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:AM-CESIM\",\"compass-id:AM-EGIM\",\"compass-id:AM-MNO-MANAGER\")" 
+  }
+
 }

CN_PROD/PD_management_zone/__main.tf

@@ -7,7 +7,7 @@ terraform {
   }
 
   backend "s3" {
-    bucket = "coco-dynatrace-tfstate"
+    bucket = "coco-dynatrace-tfstate-prod"
     key = "CN_PROD/pd_management_zone/terraform.tfstate"
     region = "eu-central-1"
     dynamodb_table = "coco-dynatrace-tfstate"

CN_PROD/alerting_profiles/__main.tf

@@ -7,7 +7,7 @@ terraform {
   }
 
   backend "s3" {
-    bucket = "coco-dynatrace-tfstate"
+    bucket = "coco-dynatrace-tfstate-prod"
     key = "cnprod/alerting_profiles/terraform.tfstate"
     region = "eu-central-1"
     dynamodb_table = "coco-dynatrace-tfstate"

CN_PROD/calculated_service_metrics/main.tf

@@ -7,7 +7,7 @@ terraform {
   }
 
   backend "s3" {
-    bucket = "coco-dynatrace-tfstate"
+    bucket = "coco-dynatrace-tfstate-prod"
     key = "cnprod/calculated_service_metrics/terraform.tfstate"
     region = "eu-central-1"
     dynamodb_table = "coco-dynatrace-tfstate"

CN_PROD/custom_anomalies/__main.tf

@@ -7,7 +7,7 @@ terraform {
   }
 
   backend "s3" {
-    bucket = "coco-dynatrace-tfstate"
+    bucket = "coco-dynatrace-tfstate-prod"
     key = "cnprod/custom_anomalies/terraform.tfstate"
     region = "eu-central-1"
     dynamodb_table = "coco-dynatrace-tfstate"
@@ -29,7 +29,7 @@ provider "dynatrace" {
 data "terraform_remote_state" "slo" {  
   backend = "s3"
   config = {  
-    bucket = "coco-dynatrace-tfstate"
+    bucket = "coco-dynatrace-tfstate-prod"
     key = "cnprod/slo/terraform.tfstate"
     region = "eu-central-1"
     encrypt = true

CN_PROD/problem_notification/__main.tf

@@ -7,7 +7,7 @@ terraform {
   }
 
   backend "s3" {
-    bucket = "coco-dynatrace-tfstate"
+    bucket = "coco-dynatrace-tfstate-prod"
     key = "cnprod/problem_notification/terraform.tfstate"
     region = "eu-central-1"
     dynamodb_table = "coco-dynatrace-tfstate"
@@ -19,7 +19,7 @@ terraform {
 data "terraform_remote_state" "alerting_profiles" {  
   backend = "s3"
   config = {  
-    bucket = "coco-dynatrace-tfstate"
+    bucket = "coco-dynatrace-tfstate-prod"
     key = "cnprod/alerting_profiles/terraform.tfstate"
     region = "eu-central-1"
     encrypt = true

CN_PROD/slo/TP_Mobile_CD_Store.tf

@@ -5,7 +5,7 @@ module TP_Mobile_CD_Store {
     
     name                        = "TP_Mobile_CD_Store" 
 
-    description                 = "CoCo-QM-Report_Mobile" 
+    description                 = "" 
 
     
     

CN_PROD/slo/TP_Mobile_RemoteServices.tf

@@ -28,17 +28,14 @@ module TP_Mobile_RemoteServices {
                                         ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-timer~",
                                         ~"POST /api/v2/presentation/remote-commands/<VIN>/light-flash~",
                                         ~"POST /api/v2/presentation/remote-commands/<VIN>/vehicle-finder~",
-                                        ~"GET /api/v1/presentation/remote-history/<VIN>~",
                                         ~"POST /api/v3/presentation/remote-commands/eventStatus~",
                                         ~"POST /api/v3/presentation/remote-commands/<VIN>/door-lock~",
                                         ~"POST /api/v3/presentation/remote-commands/<VIN>/door-unlock~",
                                         ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-now~",
-                                        ~"GET /api/v3/presentation/remote-history/<VIN>~",
                                         ~"POST /api/v3/presentation/remote-commands/<VIN>/horn-blow~",
                                         ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-timer~",
                                         ~"POST /api/v3/presentation/remote-commands/<VIN>/light-flash~",
-                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/vehicle-finder~",
-                                        ~"POST /api/v3/presentation/remote-commands/eventPosition~"
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/vehicle-finder~"
                                 )"))))):splitBy())
     EOT
 

CN_PROD/slo/TP_Mobile_Send2VehicleMGU.tf

@@ -19,8 +19,7 @@ module TP_Mobile_Send2VehicleMGU {
                                         )
 				)
 				,entityName.in(
-                                        ~"/v2/motorist/[UUID]/trips~",
-                                        ~"/v3/motorist/[UUID]/trips~"
+                                         ~"/v3/motorist/[UUID]/trips~"
                                         )"))))):splitBy())
 	/
 	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
@@ -30,7 +29,6 @@ module TP_Mobile_Send2VehicleMGU {
                                         )
 				)
 				,entityName.in(
-					~"/v2/motorist/[UUID]/trips~",
                                         ~"/v3/motorist/[UUID]/trips~"
                                         )"))))):splitBy()))
     EOT

CN_PROD/slo/TP_Mobile_VehicleData.tf

@@ -21,6 +21,8 @@ module TP_Mobile_VehicleData {
                         )
                         ,entityName.in(
                                 ~"GET /api/v1/vehicles/<VIN>/state~",
+                                ~"GET /api/v2/vehicles/<VIN>/state~",
+                                ~"GET /api/v4/vehicles/state~",
                                 ~"GET /v1/vehicle/<VIN>~",
                                 ~"GET /v2/vehicle/<VIN>~"
                                 )")))):splitBy())

CN_PROD/slo/TP_Mobile_VehicleList.tf

@@ -20,7 +20,8 @@ module TP_Mobile_VehicleList {
                             )
 						)
 					,entityName.in(
-						~"GET /api/v1/vehicles~"
+						~"GET /api/v1/vehicles~",
+						~"GET /api/v2/vehicles~"
 						)"))))):splitBy())
 	/
 	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",
@@ -31,7 +32,8 @@ module TP_Mobile_VehicleList {
                             )
 						)
 					,entityName.in(
-					    ~"GET /api/v1/vehicles~"
+					    ~"GET /api/v1/vehicles~",
+						~"GET /api/v2/vehicles~"
 						)"))))):splitBy()))
 EOT
 

CN_PROD/slo/TP_Vehicle_ConnectedMusic.tf

@@ -19,7 +19,7 @@ module TP_Vehicle_ConnectedMusic {
 			"dt.entity.service_method"
 			,entitySelector(
 				"type(service_method)
-				,entityName(~"Vehicle_Successful_ResponseCode~")"
+				,entityName.contains(~"Vehicle_Successful_ResponseCode~")"
 )))):splitBy()
 / 
 (builtin:service.keyRequest.errors.server.successCount:filter(
@@ -28,7 +28,7 @@ module TP_Vehicle_ConnectedMusic {
 			"dt.entity.service_method"
 			,entitySelector(
 				"type(service_method)
-				,entityName(~"Vehicle_Successful_ResponseCode~")"
+				,entityName.contains(~"Vehicle_Successful_ResponseCode~")"
 )))):splitBy()
 	+
 	builtin:service.keyRequest.errors.server.successCount:filter(
@@ -37,7 +37,7 @@ module TP_Vehicle_ConnectedMusic {
 				"dt.entity.service_method"
 				,entitySelector(
 					"type(service_method)
-					,entityName(~"Vehicle_Failed_ResponseCode~")"
+					,entityName.contains(~"Vehicle_Failed_ResponseCode~")"
 	)))):splitBy()))
 EOT
 

CN_PROD/slo/TP_Vehicle_Provisioning.tf

@@ -12,61 +12,103 @@ module TP_Vehicle_Provisioning {
     #entity selector object 
     filter                      = "" 
             
-
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<EOT
-        (100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-			fromRelationship.isServiceMethodOfService(
-				type(~"SERVICE~"),entityName.in(
-                                        ~"WorkshopProvisioningService - vps-prov - cn~",
-                                        ~"MQSession$FacadeMessageListener - vps-prov - cn~",
-                                        ~"MQSession$FacadeMessageListener - vps-trigger - cn~",
-                                        ~"VpsJoynrApi - vps-prov - cn~",
-                                        ~"MQSession$FacadeMessageListener - noptrigger - prod~",
-                                        ~"ProvisioningService - nopprov - prod~",
-                                        ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"					
-                                )
-			)
-			,entityName.in(
-                                ~"vpsObtainProvisioningSync~",
-                                ~"Queue: B2VCNPROD.BMW.B2VCN.PROV_TRIGGER_INTERNAL~",
-                                ~"Queue: B2VCNPROD.BMW.B2VCN.PROV_TRIGGER_IN~",
-                                ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
-                                ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
-                                ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_IN~",
-                                ~"getNOPProvisioningDataForVehicle~",
-                                ~"acknowledgeNOPProvisioningDownload~",
-                                ~"getNOPProvisioningDataForVehicleBase64~",
-                                ~"/nop-prov/v2/mainprov/prov.do~"
-                                )"))))):splitBy())
-	/
-	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-                        fromRelationship.isServiceMethodOfService(
-                                type(~"SERVICE~"),entityName.in(
-                                        ~"WorkshopProvisioningService - vps-prov - cn~",
-                                        ~"MQSession$FacadeMessageListener - vps-prov - cn~",
-                                        ~"MQSession$FacadeMessageListener - vps-trigger - cn~",
-                                        ~"VpsJoynrApi - vps-prov - cn~",
-                                        ~"MQSession$FacadeMessageListener - noptrigger - prod~",
-                                        ~"ProvisioningService - nopprov - prod~",
-                                        ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"				
-                                )
-			)
-                        ,entityName.in(
-                                ~"vpsObtainProvisioningSync~",
-                                ~"Queue: B2VCNPROD.BMW.B2VCN.PROV_TRIGGER_INTERNAL~",
-                                ~"Queue: B2VCNPROD.BMW.B2VCN.PROV_TRIGGER_IN~",
-                                ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
-                                ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
-                                ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_IN~",
-                                ~"getNOPProvisioningDataForVehicle~",
-                                ~"acknowledgeNOPProvisioningDownload~",
-                                ~"getNOPProvisioningDataForVehicleBase64~",
-                                ~"/nop-prov/v2/mainprov/prov.do~"
-                                )"))))):splitBy()))
-    EOT
+(100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+fromRelationship.isServiceMethodOfService(
+type(~"SERVICE~"),entityName.in(
+~"WorkshopProvisioningService - provisioning - prod~",
+~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"VpsJoynrApi - provisioning - prod~",
+~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"NOP-Provisioning (/nop-prov) - provisioning - prod~",
+~"ProvisioningService - provisioning - prod~",
+~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"WorkshopProvisioningService - vps-prov - cn~",
+~"MQSession$FacadeMessageListener - vps-prov - cn~",
+~"MQSession$FacadeMessageListener - vps-trigger - cn~",
+~"VpsJoynrApi - vps-prov - cn~",
+~"MQSession$FacadeMessageListener - noptrigger - prod~",
+~"ProvisioningService - nopprov - prod~",
+~"NOP-Provisioning (/nop-prov) - nopprov - prod~"))
+,entityName.in(
+~"vpsObtainProvisioningSync~",
+~"Queue: PROV_TRIGGER_ACK-prod~",
+~"Queue: PROV_TRIGGER_INTERNAL-prod~",
+~"Queue: PROV_Trigger_IN-prod~",
+~"Queue: PROV_ARCHIVE_IN-prod~",
+~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
+~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+~"Queue: NOP_ARCHIVE_IN-prod~",
+~"Queue: NOP_Trigger_IN-prod~",
+~"Queue: NOP_TRIGGER_ACK-prod~",
+~"Queue: NOP_TRIGGER_INTERNAL-prod~",
+~"getNOPProvisioningDataForVehicle~",
+~"acknowledgeNOPProvisioningDownload~",
+~"getNOPProvisioningDataForVehicleBase64~",
+~"/nop-prov/v2/mainprov/prov.do~",
+~"vpsObtainProvisioningSync~",
+~"Queue: B2VCNPROD.BMW.B2VCN.PROV_TRIGGER_INTERNAL~",
+~"Queue: B2VCNPROD.BMW.B2VCN.PROV_TRIGGER_IN~",
+~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
+~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_IN~",
+~"getNOPProvisioningDataForVehicle~",
+~"acknowledgeNOPProvisioningDownload~",
+~"getNOPProvisioningDataForVehicleBase64~"
+)"))))):splitBy())/(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+fromRelationship.isServiceMethodOfService(
+ type(~"SERVICE~"),entityName.in(
+~"WorkshopProvisioningService - provisioning - prod~",
+~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"VpsJoynrApi - provisioning - prod~",
+~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"NOP-Provisioning (/nop-prov) - provisioning - prod~",
+~"ProvisioningService - provisioning - prod~",
+~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"WorkshopProvisioningService - vps-prov - cn~",
+~"MQSession$FacadeMessageListener - vps-prov - cn~",
+~"MQSession$FacadeMessageListener - vps-trigger - cn~",
+~"VpsJoynrApi - vps-prov - cn~",
+~"MQSession$FacadeMessageListener - noptrigger - prod~",
+~"ProvisioningService - nopprov - prod~",
+~"NOP-Provisioning (/nop-prov) - nopprov - prod~"))
+,entityName.in(
+~"vpsObtainProvisioningSync~",
+~"Queue: PROV_TRIGGER_ACK-prod~",
+~"Queue: PROV_TRIGGER_INTERNAL-prod~",
+~"Queue: PROV_Trigger_IN-prod~",
+~"Queue: PROV_ARCHIVE_IN-prod~",
+~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
+~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+~"Queue: NOP_ARCHIVE_IN-prod~",
+~"Queue: NOP_Trigger_IN-prod~",
+~"Queue: NOP_TRIGGER_ACK-prod~",
+~"Queue: NOP_TRIGGER_INTERNAL-prod~",
+~"getNOPProvisioningDataForVehicle~",
+~"acknowledgeNOPProvisioningDownload~",
+~"getNOPProvisioningDataForVehicleBase64~",
+~"/nop-prov/v2/mainprov/prov.do~",
+~"vpsObtainProvisioningSync~",
+~"Queue: B2VCNPROD.BMW.B2VCN.PROV_TRIGGER_INTERNAL~",
+~"Queue: B2VCNPROD.BMW.B2VCN.PROV_TRIGGER_IN~",
+~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
+~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_IN~",
+~"getNOPProvisioningDataForVehicle~",
+~"acknowledgeNOPProvisioningDownload~",
+~"getNOPProvisioningDataForVehicleBase64~"
+)"))))):splitBy()))
+EOT
  
-
     #if not set (removed) it's defaulted to "-1d" 
     timeframe                   = "-1d" 
          

CN_PROD/slo/TP_Vehicle_SmartRefuel.tf

@@ -23,7 +23,7 @@ module TP_Vehicle_SmartRefuel {
                                        "dt.entity.service_method",
                                        entitySelector("type(service_method),
                                        fromRelationship.isServiceMethodOfService(
-                                               type(~"SERVICE~"),entityName(~"omcsmtrflce20q3~"),mzName(~"CN_OMC_PROD~")
+                                               type(~"SERVICE~"),entityName.contains(~"omcsmtrflce20q3~"),mzName(~"CN_OMC_PROD~")
                                        )
                                        ,entityName.in(
                                                ~"/smtrfl/api/v1/order~",
@@ -40,7 +40,7 @@ module TP_Vehicle_SmartRefuel {
                                        "dt.entity.service_method",
                                        entitySelector("type(service_method),
                                        fromRelationship.isServiceMethodOfService(
-                                               type(~"SERVICE~"),entityName(~"omcsmtrflce20q3~"),mzName(~"CN_OMC_PROD~")
+                                               type(~"SERVICE~"),entityName.contains(~"omcsmtrflce20q3~"),mzName(~"CN_OMC_PROD~")
                                        )
                                        ,entityName.in(
                                                ~"/smtrfl/api/v1/order~",

CN_PROD/slo/TP_Vehicle_TmallGenie.tf

@@ -1,45 +0,0 @@
-module TP_Vehicle_TmallGenie {
-    
-    source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "TP_Vehicle_TmallGenie" 
-
-    description                 = "CoCo-QM-Report_Vehicle" 
-
-    
-    
-    #entity selector object 
-    filter                      = "" 
-            
-
-    #metric expression of the calculation as done in data explorer ui
-    metric_expression           = <<-EOT
-    (100)*
-    (builtin:service.errors.server.successCount:filter(in("dt.entity.service",
-        entitySelector("type(~"SERVICE~"),entityName.in(
-                ~"cn-tmall-genie-composite-service - PROD~",
-                ~"hvd (/hvd) - ipa-backend-cn - prod~"
-                )"))):splitBy())
-    /
-    (builtin:service.requestCount.server:filter(in("dt.entity.service",
-        entitySelector("type(~"SERVICE~"),entityName.in(
-                ~"cn-tmall-genie-composite-service - PROD~",
-                ~"hvd (/hvd) - ipa-backend-cn - prod~"
-                )"))):splitBy())
-    EOT
-
-    #if not set (removed) it's defaulted to "-1d" 
-    timeframe                   = "-1d" 
-         
-
-    #currently the only possible value
-    evaluation                  = "AGGREGATE"           
-
-    #Target and warning percentage of the SLO as double
-    target                      = 98 
-            #if not set(removed) it's defaulted to 98
-    warning                     = 99 
-           #if not set(removed) it's defaulted to 99
-    
-}

CN_PROD/slo/Wirkkette__Provisioning__-_Reliability_of_key_requests.tf

@@ -16,54 +16,68 @@ module Wirkkette__Provisioning__-_Reliability_of_key_requests {
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<EOT
         (100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-			fromRelationship.isServiceMethodOfService(
-				type(~"SERVICE~"),entityName.in(
-                                        ~"WorkshopProvisioningService - vps-prov - cn~",
-                                        ~"MQSession$FacadeMessageListener - vps-prov - cn~",
-                                        ~"MQSession$FacadeMessageListener - vps-trigger - cn~",
-                                        ~"VpsJoynrApi - vps-prov - cn~",
-                                        ~"MQSession$FacadeMessageListener - noptrigger - prod~",
-                                        ~"ProvisioningService - nopprov - prod~",
-                                        ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"					
-                                )
-			)
-			,entityName.in(
+                fromRelationship.isServiceMethodOfService(
+                        type(~"SERVICE~"),entityName.in(
+                                ~"WorkshopProvisioningService - provisioning - prod~",
+                                ~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                ~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                ~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                ~"VpsJoynrApi - provisioning - prod~",
+                                ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                ~"NOP-Provisioning (/nop-prov) - provisioning - prod~",
+                                ~"ProvisioningService - provisioning - prod~",
+                                ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",))
+		        ,entityName.in(
                                 ~"vpsObtainProvisioningSync~",
-                                ~"Queue: B2VCNPROD.BMW.B2VCN.PROV_TRIGGER_INTERNAL~",
-                                ~"Queue: B2VCNPROD.BMW.B2VCN.PROV_TRIGGER_IN~",
+                                ~"Queue: PROV_TRIGGER_ACK-prod~",
+                                ~"Queue: PROV_TRIGGER_INTERNAL-prod~",
+                                ~"Queue: PROV_Trigger_IN-prod~",
+                                ~"Queue: PROV_ARCHIVE_IN-prod~",
                                 ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
                                 ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
-                                ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_IN~",
+                                ~"Queue: NOP_ARCHIVE_IN-prod~",
+                                ~"Queue: NOP_Trigger_IN-prod~",
+                                ~"Queue: NOP_TRIGGER_ACK-prod~",
+                                ~"Queue: NOP_TRIGGER_INTERNAL-prod~",
                                 ~"getNOPProvisioningDataForVehicle~",
                                 ~"acknowledgeNOPProvisioningDownload~",
                                 ~"getNOPProvisioningDataForVehicleBase64~",
-                                ~"/nop-prov/v2/mainprov/prov.do~"
+                                ~"/nop-prov/v2/mainprov/prov.do~",
                                 )"))))):splitBy())
-	/
-	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-                        fromRelationship.isServiceMethodOfService(
-                                type(~"SERVICE~"),entityName.in(
-                                        ~"WorkshopProvisioningService - vps-prov - cn~",
-                                        ~"MQSession$FacadeMessageListener - vps-prov - cn~",
-                                        ~"MQSession$FacadeMessageListener - vps-trigger - cn~",
-                                        ~"VpsJoynrApi - vps-prov - cn~",
-                                        ~"MQSession$FacadeMessageListener - noptrigger - prod~",
-                                        ~"ProvisioningService - nopprov - prod~",
-                                        ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"				
-                                )
-			)
-                        ,entityName.in(
-                                ~"vpsObtainProvisioningSync~",
-                                ~"Queue: B2VCNPROD.BMW.B2VCN.PROV_TRIGGER_INTERNAL~",
-                                ~"Queue: B2VCNPROD.BMW.B2VCN.PROV_TRIGGER_IN~",
-                                ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
-                                ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
-                                ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_IN~",
-                                ~"getNOPProvisioningDataForVehicle~",
-                                ~"acknowledgeNOPProvisioningDownload~",
-                                ~"getNOPProvisioningDataForVehicleBase64~",
-                                ~"/nop-prov/v2/mainprov/prov.do~"
-                                )"))))):splitBy()))
+/
+(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+        fromRelationship.isServiceMethodOfService(
+                type(~"SERVICE~"),entityName.in(
+                        ~"WorkshopProvisioningService - provisioning - prod~",
+                        ~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                        ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                        ~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                        ~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                        ~"VpsJoynrApi - provisioning - prod~",
+                        ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                        ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                        ~"NOP-Provisioning (/nop-prov) - provisioning - prod~",
+                        ~"ProvisioningService - provisioning - prod~",
+                        ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",))
+                ,entityName.in(
+                        ~"vpsObtainProvisioningSync~",
+                        ~"Queue: PROV_TRIGGER_ACK-prod~",
+                        ~"Queue: PROV_TRIGGER_INTERNAL-prod~",
+                        ~"Queue: PROV_Trigger_IN-prod~",
+                        ~"Queue: PROV_ARCHIVE_IN-prod~",
+                        ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
+                        ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+                        ~"Queue: NOP_ARCHIVE_IN-prod~",
+                        ~"Queue: NOP_Trigger_IN-prod~",
+                        ~"Queue: NOP_TRIGGER_ACK-prod~",
+                        ~"Queue: NOP_TRIGGER_INTERNAL-prod~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"/nop-prov/v2/mainprov/prov.do~",
+                        )"))))):splitBy()))
     EOT
  
 

CN_PROD/slo/Wirkkette__Remote_Services__-_Reliability_of_key_requests.tf

@@ -31,17 +31,14 @@ module Wirkkette__Remote_Services__-_Reliability_of_key_requests {
                                         ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-timer~",
                                         ~"POST /api/v2/presentation/remote-commands/<VIN>/light-flash~",
                                         ~"POST /api/v2/presentation/remote-commands/<VIN>/vehicle-finder~",
-                                        ~"GET /api/v1/presentation/remote-history/<VIN>~",
                                         ~"POST /api/v3/presentation/remote-commands/eventStatus~",
                                         ~"POST /api/v3/presentation/remote-commands/<VIN>/door-lock~",
                                         ~"POST /api/v3/presentation/remote-commands/<VIN>/door-unlock~",
                                         ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-now~",
-                                        ~"GET /api/v3/presentation/remote-history/<VIN>~",
                                         ~"POST /api/v3/presentation/remote-commands/<VIN>/horn-blow~",
                                         ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-timer~",
                                         ~"POST /api/v3/presentation/remote-commands/<VIN>/light-flash~",
-                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/vehicle-finder~",
-                                        ~"POST /api/v3/presentation/remote-commands/eventPosition~"
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/vehicle-finder~"
                                 )"))))):splitBy())
     EOT
  

CN_PROD/slo/Wirkkette__Send_to_Car__MGU___-_Reliability_of_key_requests.tf

@@ -22,7 +22,6 @@ module Wirkkette__Send_to_Car__MGU___-_Reliability_of_key_requests {
                                         )
 				)
 				,entityName.in(
-                                        ~"/v2/motorist/[UUID]/trips~",
                                         ~"/v3/motorist/[UUID]/trips~"
                                         )"))))):splitBy())
 	/
@@ -33,7 +32,6 @@ module Wirkkette__Send_to_Car__MGU___-_Reliability_of_key_requests {
                                         )
 				)
 				,entityName.in(
-					~"/v2/motorist/[UUID]/trips~",
                                         ~"/v3/motorist/[UUID]/trips~"
                                         )"))))):splitBy()))
     EOT 

CN_PROD/slo/Wirkkette__TMALL_Genie__-_Reliability_of_key_requests.tf

@@ -1,45 +0,0 @@
-module Wirkkette__TMALL_Genie__-_Reliability_of_key_requests {
-    
-    source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "Wirkkette \"TMALL Genie\" - Reliability of key requests" 
-
-    description                 = "CoCo-QM-Report_Vehicle" 
-
-    
-    
-    #entity selector object 
-    filter                      = "" 
-            
-
-    #metric expression of the calculation as done in data explorer ui
-    metric_expression           = <<-EOT
-    (100)*
-    (builtin:service.errors.server.successCount:filter(in("dt.entity.service",
-        entitySelector("type(~"SERVICE~"),entityName.in(
-                ~"cn-tmall-genie-composite-service - PROD~",
-                ~"hvd (/hvd) - ipa-backend-cn - prod~"
-                )"))):splitBy())
-    /
-    (builtin:service.requestCount.server:filter(in("dt.entity.service",
-        entitySelector("type(~"SERVICE~"),entityName.in(
-                ~"cn-tmall-genie-composite-service - PROD~",
-                ~"hvd (/hvd) - ipa-backend-cn - prod~"
-                )"))):splitBy())
-    EOT
-
-    #if not set (removed) it's defaulted to "-1d" 
-    timeframe                   = "-1d" 
-         
-
-    #currently the only possible value
-    evaluation                  = "AGGREGATE"           
-
-    #Target and warning percentage of the SLO as double
-    target                      = 98 
-            #if not set(removed) it's defaulted to 98
-    warning                     = 99 
-           #if not set(removed) it's defaulted to 99
-    
-}

CN_PROD/slo/Wirkkette__Vehicle_Data__-_Reliability_of_key_requests.tf

@@ -24,6 +24,8 @@ module Wirkkette__Vehicle_Data__-_Reliability_of_key_requests {
                         )
                         ,entityName.in(
                                 ~"GET /api/v1/vehicles/<VIN>/state~",
+                                ~"GET /api/v2/vehicles/<VIN>/state~",
+                                ~"GET /api/v4/vehicles/state~",
                                 ~"GET /v1/vehicle/<VIN>~",
                                 ~"GET /v2/vehicle/<VIN>~"
                                 )")))):splitBy())

CN_PROD/slo/Wirkkette__Vehicle_List__-_Reliability_of_key_requests.tf

@@ -21,7 +21,8 @@ module Wirkkette__Vehicle_List__-_Reliability_of_key_requests {
                             )
 						)
 					,entityName.in(
-						~"GET /api/v1/vehicles~"
+						~"GET /api/v1/vehicles~",
+						~"GET /api/v2/vehicles~"
 						)"))))):splitBy())
 	/
 	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",
@@ -32,7 +33,8 @@ module Wirkkette__Vehicle_List__-_Reliability_of_key_requests {
                             )
 						)
 					,entityName.in(
-					    ~"GET /api/v1/vehicles~"
+					    ~"GET /api/v1/vehicles~",
+						~"GET /api/v2/vehicles~"
 						)"))))):splitBy()))
 EOT
  

CN_PROD/slo/__main.tf

@@ -7,7 +7,7 @@ terraform {
   }
 
   backend "s3" {
-    bucket = "coco-dynatrace-tfstate"
+    bucket = "coco-dynatrace-tfstate-prod"
     key = "cnprod/slo/terraform.tfstate"
     region = "eu-central-1"
     dynamodb_table = "coco-dynatrace-tfstate"

EMEA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf

@@ -1,11 +1,29 @@
 resource "dynatrace_management_zone" "PD_AccountManagementConnectedCar" {
   name = "PD_AccountManagementConnectedCar" 
+ // compass product: ConnectedDrive Account Management 
+
   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-ECS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"AccountManagementConnectedCar\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-LPS\", \"compass-id:AM-TACS\", \"compass-id:AM-UI\", \"compass-id:rsu-adapter\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"AccountManagementConnectedCar\")"
   }
+
+  // compass sub product: CD Rules Engine
+
+  // compass sub product: Lifecycle Management
+  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-ECS\",\"compass-id:AM-LPS\",\"compass-id:AM-TACS\",\"compass-id:AM-UI\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:TestdataTool\", \"compass-id:rsu-adapter\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Countly\",\"compass-id:TAMSArchive\")" 
+  }
+
+  // compass sub product: Connected User Insights Services
+
 }

EMEA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf

@@ -1,27 +1,29 @@
 resource "dynatrace_management_zone" "PD_AutomotiveSecurity" {
   name = "PD_AutomotiveSecurity" 
+  // compass product: Automotive Security
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"AutomotiveSecurity\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"AutomotiveSecurity\")"
+  }
+
+  // compass sub product: Shared ASBC Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:SWLSEC2-Checker\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-HAL\",\"compass-id:ASBS\",\"compass-id:HPAuth\",\"compass-id:STS\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-NGTP\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:CAC-AGENT\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:DFPH\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:ts-wlupdater\",\"compass-id:TVP\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-HAL\",\"compass-id:ASBC-NGTP\",\"compass-id:ASBS\",\"compass-id:HPAuth\",\"compass-id:STS\")" 
+    selector = "type(Service),tag(\"compass-id:ts-wlupdater\",\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
   }
+
 }

EMEA_PREPROD/PD_management_zone/PD_CallServices.tf

@@ -1,27 +1,47 @@
 resource "dynatrace_management_zone" "PD_CallServices" {
   name = "PD_CallServices" 
+  // compass product: Connected Call Services
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"CallServices\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"CallServices\")"
   }
+
+  // compass sub product: Call Handling
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:BASE\",\"compass-id:CCC\",\"compass-id:RSA\",\"compass-id:RSA-ASD-Search\")" 
+    selector = "type(Service),tag(\"compass-id:APPCALL\",\"compass-id:B2V-NGTP\",\"compass-id:ECS\",\"compass-id:EVNS2\",\"compass-id:NGTP-CS\",\"compass-id:XCS\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
     selector = "type(PROCESS_GROUP),tag(\"compass-id:ecs\",\"compass-id:appcall\",\"compass-id:xcs\")" 
   }
+
+  // compass sub product: Call Handling Frontends
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
+    selector = "type(Service),tag(\"compass-id:BASE\",\"compass-id:Base Angular app\",\"compass-id:coco-hm\",\"compass-id:RSA-ASD-Search\",\"compass-id:RSA-DB\",\"compass-id:rsa-pi-model\")" 
+  }
+
+  // compass sub product: Voice Connectivity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:epm-js-app\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
+  }
+
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCC\",\"compass-id:RSA\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ACDS\",\"compass-id:APPCALL\",\"compass-id:B2V-NGTP\",\"compass-id:ECALLGW\",\"compass-id:ECS\",\"compass-id:EVNS2\",\"compass-id:EVNS2T\",\"compass-id:NGTP-CS\",\"compass-id:XCS\")" 
+    selector = "type(Service),tag(\"compass-id:ACDS\",\"compass-id:ECALLGW\",\"compass-id:EVNS2T\")" 
   }
+
 }

EMEA_PREPROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf

@@ -1,15 +1,49 @@
 resource "dynatrace_management_zone" "PD_ConnectedDriveStoreBackend" {
   name = "PD_ConnectedDriveStoreBackend" 
+ // compass product: ConnectedDrive Store Backend 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:AM-Store\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedDriveStoreBackend\")"
   }
   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\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedDriveStoreBackend\")"
   }
+
+  // compass sub product: CD Store Engine
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:Concat\",\"compass-id:Connected-Catalog\")" 
+    selector = "type(Service),tag(\"compass-id:AM-Store\",\"compass-id:Buffet-CIC-Backend\",\"compass-id:Buffet-Core\",\"compass-id:Buffet-External-CDM\",\"compass-id:Buffet-External-Offer\",\"compass-id:Buffet-External-Tax\",\"compass-id:Buffet-IF41\",\"compass-id:Buffet-IF50\",\"compass-id:Buffet-IF52\",\"compass-id:Buffet-IF53\",\"compass-id:Buffet-IF56\",\"compass-id:Buffet-IF58\",\"compass-id:Buffet-IF60\",\"compass-id:Buffet-IF90\")" 
   }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:buffet-if56\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Buffet-Birt\",\"compass-id:Buffet-External-Payment\",\"compass-id:Buffet-GAM\",\"compass-id:Buffet-IF33\",\"compass-id:Buffet-IF38\",\"compass-id:Buffet-IF51\",\"compass-id:Buffet-IF54\",\"compass-id:Buffet-Promo-API\")" 
+  }
+
+  // compass sub product: Product Catalog Digital Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Concat\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Connected-Catalog\")" 
+  }
+
+
+  // compass sub product: BMW Points Engine
+  // deprecated
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:IME-CDS\",\"compass-id:IME-CS\",\"compass-id:IME-RDC\",\"compass-id:IME-SS\",\"compass-id:IME-WS\")" 
+  }
+
 }

EMEA_PREPROD/PD_management_zone/PD_ConnectedSecurityServices.tf

@@ -0,0 +1,57 @@
+resource "dynatrace_management_zone" "PD_ConnectedSecurityServices" {
+  name = "PD_ConnectedSecurityServices" 
+  // compass product: Connected Security Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedSecurityServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedSecurityServices\")"
+  }
+
+  // compass sub product: Vehicle Software Security Services
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:asbcswlsec2\",\"compass-id:psdzchecker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:swlsec2checker\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SWLSEC2-Checker\")" 
+  }
+
+  // compass sub product: Smart Access
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CAC-AGENT\")" 
+  }
+
+  // compass sub product: Key Management Services
+  // should be removed from PD_AutomotiveSecurity
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
+  }
+  // others that don't exist in compass, should be removed
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFPH\")" 
+  }
+
+  // compass sub product: Feature Security Services
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-FSC-AST\",\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:TVP\")" 
+  }
+
+}

EMEA_PREPROD/PD_management_zone/PD_ConnectedUserProfileServices.tf

@@ -1,15 +1,36 @@
 resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
   name = "PD_ConnectedUserProfileServices" 
+ // compass product: Connected User Profile Services
+
+  entity_selector_based_rule {
+    enabled = true
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedUserProfileServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = true
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedUserProfileServices\")"
+  }
+
+  // compass sub product: Connected User Mapping Services
   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\",\"compass-id:MAPPING-STUB\",\"compass-id:UMS-UI\")" 
   }
+    
+  // compass sub product: Connected User Personalization Services
   entity_selector_based_rule {
     enabled = true 
-    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:agent-service\",\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:agent-service\")" 
+    selector = "type(Service),tag(\"compass-id:am-cns\", \"compass-id:am-proxy\", \"compass-id:AM-PROXY\", \"compass-id:am-svms\", \"compass-id:am-vms\", \"compass-id:ums-ui\", \"compass-id:eCSM\", \"compass-id:ECSM\")" 
   }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\",\"compass-id:ESA\", \"compass-id:esa\",\"compass-id:UIS\", \"compass-id:uis\")" 
+  }
+
 }

EMEA_PREPROD/PD_management_zone/PD_ConversationServices.tf

@@ -0,0 +1,21 @@
+resource "dynatrace_management_zone" "PD_ConversationServices" {
+  name = "PD_ConversationServices" 
+  // compass product: Conversation Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConversationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConversationServices\")"
+  }
+
+  // compass sub product: Speech
+  // should be removed from PD_CallServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
+  }
+
+}

EMEA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf

@@ -1,31 +1,62 @@
 resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
   name = "PD_InfotainmentInteractivityServices" 
+  // compass product: Entertainment & Interactivity Backend 
+
   entity_selector_based_rule {
     enabled = true 
     selector = "type(HTTP_CHECK),entityName(\"InfotainmentInteractivityServices\")" 
   }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(SYNTHETIC_TEST),entityName(\"InfotainmentInteractivityServices\")" 
+  }
+
+  // compass sub product: Audio & Video Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:cm-config\",\"compass-id:cm-gracenote\",\"compass-id:cm-spotify\",\"compass-id:cm-ximalaya\",\"compass-id:OED\",\"compass-id:OED-CN\",\"compass-id:OEG\",\"compass-id:OEP\",\"compass-id:OES\",\"compass-id:OES-CN\",\"compass-id:OET\")" 
+  }
+  // not  (yet?) in compass
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:OEG-CN\",\"compass-id:OEO\",\"compass-id:OEO-CN\",\"compass-id:OEP-CN\",\"compass-id:OET-CN\",\"compass-id:shortvideo\")" 
+  }
+
+  // compass sub product: Customer-centric Information Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCIS-Download\",\"compass-id:ID5-EXT\",\"compass-id:ISE-NEWS\",\"compass-id:ISE-PAR\",\"compass-id:WEA\",\"compass-id:WEA-ID5\",\"compass-id:WEA-IN-MAP\",\"compass-id:news-next\")" 
+  }
+
+  // compass sub product: In-Car Experience Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ambientmusic\")" 
+  }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ambient-music\",\"compass-id:festive-mode\")" 
   }
+
+  // compass sub product: Vehicle-centric Information Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:GEN3\",\"compass-id:ID5\",\"compass-id:ISE-CDR\",\"compass-id:ISE-EML\",\"compass-id:ISE-GEN2\",\"compass-id:ISE-ID7\",\"compass-id:ISE-LIS\",\"compass-id:ISE-LOC\",\"compass-id:ISE-RSL\",\"compass-id:ISE-VPS\")" 
+  }
+
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ISE-BEV\",\"compass-id:ISE-INP\",\"compass-id:ISE-IPA\",\"compass-id:ISE-MCL\",\"compass-id:ISE-VSD\",\"compass-id:tmpp-admin-ui\",\"compass-id:tmpp-manifest\",\"compass-id:tmpp-web-proxy\",\"compass-id:UPS\")" 
+  }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCIS-Download\",\"compass-id:Geolocator\",\"compass-id:intelligent-reminder\",\"compass-id:news-next\",\"compass-id:restaurant-reservation\")" 
+    selector = "type(Service),tag(\"compass-id:Geolocator\",\"compass-id:intelligent-reminder\",\"compass-id:restaurant-reservation\")" 
   }
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:CDIP\")" 
   }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:GEN3\",\"compass-id:ID5\",\"compass-id:ID5-APP\",\"compass-id:ID5-EXT\",\"compass-id:ISE-BEV\",\"compass-id:ISE-CDR\",\"compass-id:ISE-EML\",\"compass-id:ISE-GEN2\",\"compass-id:ISE-ID7\",\"compass-id:ISE-INP\",\"compass-id:ISE-IPA\",\"compass-id:ISE-LIS\",\"compass-id:ISE-LOC\",\"compass-id:ISE-MCL\",\"compass-id:ISE-NEWS\",\"compass-id:ISE-PAR\",\"compass-id:ISE-RSL\",\"compass-id:ISE-VPS\",\"compass-id:ISE-VSD\",\"compass-id:tmpp-admin-ui\",\"compass-id:tmpp-manifest\",\"compass-id:tmpp-web-proxy\",\"compass-id:UPS\",\"compass-id:WEA\",\"compass-id:WEA-ID5\",\"compass-id:WEA-IN-MAP\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:cm-config\",\"compass-id:cm-gracenote\",\"compass-id:cm-spotify\",\"compass-id:cm-ximalaya\",\"compass-id:OED\",\"compass-id:OED-CN\",\"compass-id:OEG\",\"compass-id:OEG-CN\",\"compass-id:OEO\",\"compass-id:OEO-CN\",\"compass-id:OEP\",\"compass-id:OEP-CN\",\"compass-id:OES\",\"compass-id:OES-CN\",\"compass-id:OET\",\"compass-id:OET-CN\",\"compass-id:shortvideo\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
-  }
+
 }

EMEA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf

@@ -0,0 +1,21 @@
+resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServicesChina" {
+  name = "PD_InfotainmentInteractivityServicesChina" 
+  // compass product: Infotainment & Interactivity Services China 
+
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(HTTP_CHECK),entityName(\"InfotainmentInteractivityServicesChina\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(SYNTHETIC_TEST),entityName(\"InfotainmentInteractivityServicesChina\")" 
+  }
+
+  // no sub product
+  // should be removed from PD_InfotainmentInteractivityServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
+  }
+
+}

EMEA_PREPROD/PD_management_zone/PD_LocationServices.tf

@@ -1,15 +1,42 @@
 resource "dynatrace_management_zone" "PD_LocationServices" {
   name = "PD_LocationServices" 
+  // compass product: Location Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"LocationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"LocationServices\")"
+  }
+
+  // compass sub product: Premium Locations
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:LOS-CHA\",\"compass-id:LOS-CHA-CNV\",\"compass-id:LOS-FTS\",\"compass-id:LOS-JOY\",\"compass-id:LOS-MSC\",\"compass-id:LOS-OPS\",\"compass-id:LOS-PAR\",\"compass-id:LOS-PER\",\"compass-id:LOS-REF\")" 
+  }  
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:LOS-MOD\")" 
+  }  
+ 
+  // compass sub product: Smart Locations
+  // not configured: GCS-COUNTRIES, GCS-GEOCODING, GCS-TIMEZONES
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ercaf\",\"compass-id:ERCR\",\"compass-id:ERTP\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:LOS-FTS\",\"compass-id:potholes-reader\",\"compass-id:potholes-service\",\"compass-id:sc-reader\",\"compass-id:sc-service\")" 
+    selector = "type(Service),tag(\"compass-id:potholes-reader\",\"compass-id:potholes-service\",\"compass-id:sc-reader\",\"compass-id:sc-service\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:C2B-BS\",\"compass-id:GCS\",\"compass-id:LOS-CHA\",\"compass-id:LOS-CHA-CNV\",\"compass-id:LOS-JOY\",\"compass-id:LOS-MOD\",\"compass-id:LOS-MSC\",\"compass-id:LOS-OPS\",\"compass-id:LOS-PAR\",\"compass-id:LOS-PER\",\"compass-id:LOS-REF\",\"compass-id:RES-PAR\")" 
+    selector = "type(Service),tag(\"compass-id:C2B-BS\",\"compass-id:GCS\",\"compass-id:RES-PAR\")" 
   }
+  
 }

EMEA_PREPROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf

@@ -1,11 +1,39 @@
 resource "dynatrace_management_zone" "PD_MapServicesAutomatedDriving" {
   name = "PD_MapServicesAutomatedDriving" 
+  // compass product: Map Services & Automated Driving
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"MapServicesAutomatedDriving\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"MapServicesAutomatedDriving\")"
+  }
+
+  // compass sub product: Automated Driving Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ms-hdmap-lcv\",\"compass-id:ms-hdmap-map-viewer\",\"compass-id:ms-hdmap-mci-adapter\",\"compass-id:ms-hdmap-mci-downloader\",\"compass-id:ms-hdmap-nds-downloader\",\"compass-id:ms-hdmap-qc-bl\",\"compass-id:ms-hdmap-qc-checks\",\"compass-id:ms-hdmap-tile-delivery\",\"compass-id:ms-hdmap-tile-generator\",\"compass-id:ms-hdmap-vehicle-mock\",\"compass-id:mupi-backend\",\"compass-id:MUPI-BE\",\"compass-id:mupi-cloud-discovery-service\",\"compass-id:mupi-cloud-dumm-adapter-service\",\"compass-id:mupi-cloud-hd-adapter-service\",\"compass-id:mupi-cloud-import-service\",\"compass-id:mupi-cloud-integration-service\",\"compass-id:mupi-cloud-joynr-adapter-class-service\",\"compass-id:mupi-cloud-joynr-adapter-service\",\"compass-id:mupi-cloud-stats-service\",\"compass-id:mupi-cockpit\",\"compass-id:mupi-gateway\")" 
+    selector = "type(Service),tag(\"compass-id:GNSS API Gateway\",\"compass-id:gnss-reader\",\"compass-id:gnss-service\",\"compass-id:tc-app\",\"compass-id:tc-service\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:GNSS API Gateway\",\"compass-id:gnss-reader\",\"compass-id:gnss-service\",\"compass-id:ms-3dp-rc\",\"compass-id:tc-app\",\"compass-id:tc-service\")" 
+    selector = "type(Service),tag(\"compass-id:ms-3dp-rc\")" 
   }
+
+  // compass sub product: SD-MapUpdate Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:MUPI-BE\",\"compass-id:mupi-cloud-discovery-service\",\"compass-id:mupi-cloud-dumm-adapter-service\",\"compass-id:mupi-cloud-hd-adapter-service\",\"compass-id:mupi-cloud-import-service\",\"compass-id:mupi-cloud-integration-service\",\"compass-id:mupi-cloud-joynr-adapter-class-service\",\"compass-id:mupi-cloud-joynr-adapter-service\",\"compass-id:mupi-cloud-stats-service\",\"compass-id:mupi-cockpit\",\"compass-id:mupi-gateway\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:mupi-backend\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ms-hdmap-lcv\",\"compass-id:ms-hdmap-map-viewer\",\"compass-id:ms-hdmap-mci-adapter\",\"compass-id:ms-hdmap-mci-downloader\",\"compass-id:ms-hdmap-nds-downloader\",\"compass-id:ms-hdmap-qc-bl\",\"compass-id:ms-hdmap-qc-checks\",\"compass-id:ms-hdmap-tile-delivery\",\"compass-id:ms-hdmap-tile-generator\",\"compass-id:ms-hdmap-vehicle-mock\")" 
+  }
+
 }

EMEA_PREPROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf

@@ -1,7 +1,19 @@
 resource "dynatrace_management_zone" "PD_MyBMWMINIAppAsAProduct" {
   name = "PD_MyBMWMINIAppAsAProduct" 
+  // compass product: My BMW / MINI App as a product
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"CallSeMyBMWMINIAppAsAProductrvices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"MyBMWMINIAppAsAProduct\")"
+  }
+
+  // compass system: App Frontend eMobility and MyJourney
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:destination-composite-service\")" 
+    selector = "type(Service),tag(\"compass-id:destination-composite-service\",\"compass-id:send-to-car-service\")" 
   }
 }

EMEA_PREPROD/PD_management_zone/PD_NavigationServices.tf

@@ -1,15 +1,42 @@
 resource "dynatrace_management_zone" "PD_NavigationServices" {
   name = "PD_NavigationServices" 
+  // compass product: Navigation Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"NavigationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"NavigationServices\")"
+  }
+
+  // compass sub product: Realtime Parking
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:OSPI\")" 
   }
+  
+  // compass sub product: Realtime Routing
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CNGW\",\"compass-id:RTTI\")" 
+    selector = "type(Service),tag(\"compass-id:Drive Manager Cloud\",\"compass-id:eRoute-Adapter\",\"compass-id:eRouteExt\",\"compass-id:NaaS\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DM\",\"compass-id:eRoute\",\"compass-id:NaaS\")" 
+    selector = "type(Service),tag(\"compass-id:DM\",\"compass-id:eRoute\")" 
   }
+
+  // compass sub product: Realtime Traffic
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RTTI\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CNGW\")" 
+  }
+
 }

EMEA_PREPROD/PD_management_zone/PD_RemoteMessagingServices.tf

@@ -1,11 +1,41 @@
 resource "dynatrace_management_zone" "PD_RemoteMessagingServices" {
   name = "PD_RemoteMessagingServices" 
+ // compass product: Remote & Messaging Services 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:APIGW\",\"compass-id:FMC\",\"compass-id:RS\",\"compass-id:RS360\",\"compass-id:RSCockpit\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"RemoteMessagingServices\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:EADB\",\"compass-id:ICNB\",\"compass-id:MSGSVC\",\"compass-id:OMGW\",\"compass-id:TCN\",\"compass-id:XCC-CAMPAIGNS\",\"compass-id:XCC-CMGR\",\"compass-id:XCC-SETTINGS\",\"compass-id:XCC-STATISTICS\",\"compass-id:XCC-USERS\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"RemoteMessagingServices\")"
   }
+
+  // compass sub product: Message Services
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:EADB\",\"compass-id:MSGSVC\",\"compass-id:XCC-CAMPAIGNS\",\"compass-id:XCC-CMGR\",\"compass-id:XCC-SETTINGS\",\"compass-id:XCC-STATISTICS\",\"compass-id:XCC-USERS\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ICNB\",\"compass-id:OMGW\",\"compass-id:TCN\")" 
+  }
+
+  // compass sub product: Remote Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RS\",\"compass-id:RS-360\",\"compass-id:RS-Cockpit\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FMC\",\"compass-id:RS360\",\"compass-id:RSCockpit\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FMC\")" 
+  }
+
 }

EMEA_PREPROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf

@@ -1,23 +1,79 @@
 resource "dynatrace_management_zone" "PD_RemoteVehicleConfigurationManagement" {
   name = "PD_RemoteVehicleConfigurationManagement" 
+  // compass product: Vehicle Device Mgmt.
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"RemoteVehicleConfigurationManagement\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"RemoteVehicleConfigurationManagement\")"
+  }
+
+  // compass sub product: App-Distribution Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:id5-app\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ID5-APP\")" 
+  }
+
+  // compass sub product: Provisioning Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:NOP-Admin\",\"compass-id:NOP-Archive\",\"compass-id:NOP-Provisioning\",\"compass-id:NOP-Trigger\",\"compass-id:SCM\",\"compass-id:SCMA\",\"compass-id:VPS-Admin\",\"compass-id:VPS-Archive\",\"compass-id:VPS-COMFY-AGENT\",\"compass-id:VPS-Monitor\",\"compass-id:VPS-Prov\",\"compass-id:VPS-Trigger\")" 
+  }
+  // should be removed from PD_VehicleDataConnectivity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-NOTS\")" 
+  }
+
+  // compass sub product: Remote Software Upgrade Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FRE\",\"compass-id:FRS\",\"compass-id:MPG\",\"compass-id:QMC\",\"compass-id:RCM\",\"compass-id:RCP\",\"compass-id:RCS\",\"compass-id:RDC\",\"compass-id:RDH\",\"compass-id:RES\",\"compass-id:RLM\",\"compass-id:RMO\",\"compass-id:RNP\",\"compass-id:RPP\",\"compass-id:RSA Admin GUI\",\"compass-id:RSA Testbench GUI\",\"compass-id:RTE\",\"compass-id:RTS\",\"compass-id:RVC\",\"compass-id:RVE\",\"compass-id:RVI\",\"compass-id:RVS\",\"compass-id:RVT\",\"compass-id:rwd\",\"compass-id:tdp\",\"compass-id:uvm\",\"compass-id:vjm\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ZAS\",\"compass-id:ZDI\",\"compass-id:ZFUS-MP-GENERATOR\",\"compass-id:ZIP\",\"compass-id:ZIS\",\"compass-id:ZMP\",\"compass-id:ZOS\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RNB App\",\"compass-id:zis\")" 
+  }
+
+  // compass sub product: Secure Feature Activation
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:SFA-FRE\",\"compass-id:SFA-OH\",\"compass-id:SFA-OTA\",\"compass-id:SFA-S\",\"compass-id:SFA-TS\")" 
   }
+
+  // compass sub product: Campaign Management
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:comfy-agent-registry\",\"compass-id:comfy-cockpit\",\"compass-id:comfy-management\",\"compass-id:comfy-orchestration\",\"compass-id:NOP-Admin\",\"compass-id:NOP-Archive\",\"compass-id:NOP-Provisioning\",\"compass-id:NOP-Trigger\",\"compass-id:SCM\",\"compass-id:SCMA\",\"compass-id:VPS-Admin\",\"compass-id:VPS-Archive\",\"compass-id:VPS-Monitor\",\"compass-id:VPS-Prov\",\"compass-id:VPS-Trigger\")" 
+    selector = "type(Service),tag(\"compass-id:comfy-agent-registry\",\"compass-id:comfy-cockpit\",\"compass-id:comfy-management\",\"compass-id:comfy-orchestration\",)" 
   }
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:APR\",\"compass-id:APR-NPM\",\"compass-id:APR-Portal\",\"compass-id:APR-Registry\")" 
   }
+  
+  // compass sub product: Extended Vehicle API Gateway
+  // should be removed from PD_RemoteMessagingServices
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ZAS\",\"compass-id:ZDI\",\"compass-id:ZFUS-MP-GENERATOR\",\"compass-id:ZIP\",\"compass-id:zis\",\"compass-id:ZMP\",\"compass-id:ZOS\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:FRE\",\"compass-id:FRS\",\"compass-id:MPG\",\"compass-id:QMC\",\"compass-id:RCM\",\"compass-id:RCP\",\"compass-id:RCS\",\"compass-id:RDC\",\"compass-id:RDH\",\"compass-id:RES\",\"compass-id:RLM\",\"compass-id:RMO\",\"compass-id:RNB App\",\"compass-id:RNP\",\"compass-id:RPP\",\"compass-id:RSA Admin GUI\",\"compass-id:RSA Testbench GUI\",\"compass-id:RTE\",\"compass-id:RTS\",\"compass-id:RVC\",\"compass-id:RVE\",\"compass-id:RVI\",\"compass-id:RVS\",\"compass-id:RVT\",\"compass-id:rwd\",\"compass-id:tdp\",\"compass-id:uvm\",\"compass-id:vjm\")" 
+    selector = "type(Service),tag(\"compass-id:APIGW\")" 
   }
+
+  // compass sub product: Vehicle Software Configuration and Capabilities
+  // vs-cmdb
+
 }

EMEA_PREPROD/PD_management_zone/PD_Teleservices.tf

@@ -1,15 +1,60 @@
 resource "dynatrace_management_zone" "PD_Teleservices" {
   name = "PD_Teleservices" 
+  // compass product: Vehicle Demand Identification and Lead Management
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"Teleservices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"Teleservices\")"
+  }
+
+  // compass sub product: Teleservices Demands
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:PDMManager\",\"compass-id:PDMUpdater\",\"compass-id:ts-ena-ui\",\"compass-id:WLManager\",\"compass-id:WLUpdater\")" 
+    selector = "type(Service),tag(\"compass-id:rsurservice\",\"compass-id:scallservice\",\"compass-id:seam\",\"compass-id:ts-asc\",\"compass-id:ts-ccm-di\",\"compass-id:ts-pffs\",\"compass-id:ts-sdi\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:tsbgservice\",\"compass-id:tscs\",\"compass-id:tsdd\",\"compass-id:tssb-bt\",\"compass-id:tssb-bti\",\"compass-id:tssb-tsp\",\"compass-id:ttbs\",\"compass-id:ts-incar-ffs\",\"compass-id:ts-cms\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RSURService\",\"compass-id:SCallService\",\"compass-id:SEAM\",\"compass-id:TSBGService\",\"compass-id:TSBM\",\"compass-id:TS-CCM-DI\",\"compass-id:TSCS\",\"compass-id:TSDD\",\"compass-id:TSMR\",\"compass-id:TS-PFFS\",\"compass-id:TSSB-BT\",\"compass-id:TSSB-BTI\",\"compass-id:TSSB-TSP\",\"compass-id:TS-SDI\",\"compass-id:TTBS\")" 
+  }
+
+  // compass sub product: Teleservices Diagnosis
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:bcallservice\",\"compass-id:cas-spm\",\"compass-id:cas-stm\",\"compass-id:diagservice\",\"compass-id:eshad\",\"compass-id:patchcampaign\",\"compass-id:rtcad\",\"compass-id:rtchandler\",\"compass-id:rtcservice\",\"compass-id:ts-bcallhandler\",\"compass-id:ts-pat-ui\",\"compass-id:tsrd\",\"compass-id:ts-rtc-ui\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:BCallService\",\"compass-id:CAS-SPM\",\"compass-id:CAS-STM\",\"compass-id:DiagService\",\"compass-id:ESHAD\",\"compass-id:RTCAD\",\"compass-id:RTCHandler\",\"compass-id:RTCService\",\"compass-id:ts-cts-ui\",\"compass-id:TSRD\")" 
+  }
+
+  // compass sub product: Teleservices Enabling
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:pdmmanager\",\"compass-id:pdmupdater\",\"compass-id:ts-ena-ui\",\"compass-id:wlmanager\",\"compass-id:wlupdater\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PDMManager\",\"compass-id:PDMUpdater\",\"compass-id:WLManager\",\"compass-id:WLUpdater\")" 
+  }
+
+  // compass sub product: Service Partner Management
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:BCallService\",\"compass-id:CAS-SPM\",\"compass-id:CAS-STM\",\"compass-id:DiagService\",\"compass-id:ESHAD\",\"compass-id:patchcampaign\",\"compass-id:RTCAD\",\"compass-id:RTCHandler\",\"compass-id:RTCService\",\"compass-id:ts-bcallhandler\",\"compass-id:ts-cts-ui\",\"compass-id:ts-pat-ui\",\"compass-id:TSRD\",\"compass-id:ts-rtc-ui\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:RSURService\",\"compass-id:SCallService\",\"compass-id:SEAM\",\"compass-id:ts-asc\",\"compass-id:TSBGService\",\"compass-id:TSBM\",\"compass-id:TS-CCM-DI\",\"compass-id:TSCS\",\"compass-id:TSDD\",\"compass-id:TSMR\",\"compass-id:TS-PFFS\",\"compass-id:TSSB-BT\",\"compass-id:TSSB-BTI\",\"compass-id:TSSB-TSP\",\"compass-id:TS-SDI\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:TTBS\")" 
+    selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
   }
+
+ // compass sub product: VDLM Appointment Management
+ // appm-ams
+ 
 }

EMEA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf

@@ -1,19 +1,46 @@
 resource "dynatrace_management_zone" "PD_VehicleDataCollection" {
   name = "PD_VehicleDataCollection" 
+  // compass product: Vehicle Data Collection Offboard
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"VehicleDataCollection\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"VehicleDataCollection\")"
+  }
+
+  // compass sub product: Crowd Data Collection Offboard
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:SRManager\",\"compass-id:TSMB\",\"compass-id:TSR-CH\",\"compass-id:TSR-CMA\",\"compass-id:TSR-DD\",\"compass-id:TSR-ICC\",\"compass-id:TSR-VU\")" 
+    selector = "type(Service),tag(\"compass-id:CMCS\",\"compass-id:ERDCDC2FCD\",\"compass-id:ERDFCDUDS\",\"compass-id:ERDMGR\",\"compass-id:ERDPROC\",\"compass-id:ERDXFCDFCD\",\"compass-id:XFCDAnonymizer\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ERDDISP\",\"compass-id:XFCD Cockpit\",\"compass-id:XFCD Configuration\")" 
+  }
+
+  // compass sub product: Vehicle Health Data Collection
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:TSMB\",\"compass-id:TSR-CH\",\"compass-id:TSR-CMA\",\"compass-id:TSR-DD\",\"compass-id:TSR-ICC\",\"compass-id:TSR-VU\",\"compass-id:VHS\")" 
+  }
+ 
+  // compass sub product: Vehicle State Data Collection
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CSU\",\"compass-id:KVSFO\",\"compass-id:KVSST\",\"compass-id:LSCFSU\",\"compass-id:LSCHR\",\"compass-id:LSCJR\",\"compass-id:LSCKC\",\"compass-id:LSCMM\",\"compass-id:LSCOC\",\"compass-id:LSCOG\",\"compass-id:LSCWO\",\"compass-id:tripCollectionApi\",\"compass-id:tripCollectionProcessor\",\"compass-id:vdc-vcs\",\"compass-id:VNS\",\"compass-id:VS-API\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:LSCJHWO\",\"compass-id:tripCollection\",\"compass-id:VHCJR\",\"compass-id:VJDS\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:CMCS\",\"compass-id:ERDCDC2FCD\",\"compass-id:ERDDISP\",\"compass-id:ERDFCDUDS\",\"compass-id:ERDMGR\",\"compass-id:ERDPROC\",\"compass-id:ERDXFCDFCD\",\"compass-id:XFCD Cockpit\",\"compass-id:XFCD Configuration\",\"compass-id:XFCDAnonymizer\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:CSU\",\"compass-id:LSCFSU\",\"compass-id:LSCHR\",\"compass-id:LSCJHWO\",\"compass-id:LSCJR\",\"compass-id:LSCKC\",\"compass-id:LSCMM\",\"compass-id:LSCOC\",\"compass-id:LSCOG\",\"compass-id:LSCWO\",\"compass-id:tripCollection\",\"compass-id:vdc-vcs\",\"compass-id:VHCJR\",\"compass-id:VHS\",\"compass-id:VJDS\",\"compass-id:VNS\",\"compass-id:VS-API\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
+    selector = "type(Service),tag(\"compass-id:SRManager\")" 
   }
+
 }

EMEA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf

@@ -1,15 +1,42 @@
 resource "dynatrace_management_zone" "PD_VehicleDataConnectivity" {
   name = "PD_VehicleDataConnectivity" 
+ // compass product: Vehicle Data Connectivity 
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"VehicleDataConnectivity\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"VehicleDataConnectivity\")"
+  }
+
+  // compass sub product: Vehicle Base Connectivity
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:B2V-ADC\",\"compass-id:B2V-ADC-CLOUD\")" 
   }
+
+  // compass sub product: Vehicle Data Connect SP2015  
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:JoynrDS\",\"compass-id:UDS\",\"compass-id:UDS Storage Service\")" 
+    selector = "type(Service),tag(\"compass-id:B2V-COM-ECHO\",\"compass-id:B2V-COM-FE\",\"compass-id:B2VCOMGCDMCLIENT\")" 
   }
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-COM-BE\",\"compass-id:B2V-COM-ECHO\",\"compass-id:B2V-COM-FE\",\"compass-id:B2VCOMGCDMCLIENT\",\"compass-id:B2V-NOTS\")" 
+    selector = "type(Service),tag(\"compass-id:B2V-COM-BE\")" 
   }
+
+  // compass sub product: Vehicle Data Connect SP2018  
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:JoynrDS\",\"compass-id:UDS\",)" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:UDS Storage Service\")" 
+  }
+
 }

EMEA_PREPROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf

@@ -1,11 +1,31 @@
 resource "dynatrace_management_zone" "PD_eSIMandStaticVehicleDataServices" {
   name = "PD_eSIMandStaticVehicleDataServices" 
+ // compass product: eSIM and Static Vehicle Data Services 
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"eSIMandStaticVehicleDataServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"eSIMandStaticVehicleDataServices\")"
+  }
+
+  // compass sub product: Static Vehicle Data Services
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:IDS Admin\",\"compass-id:IDS-SVDS\",\"compass-id:IDS-Sync\",\"compass-id:IDS-WS\")" 
   }
+
+  // compass sub product: eSIM Management
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-Device\",\"compass-id:CESIM\",\"compass-id:AM-CESIM\",\"compass-id:CESIM Proxy\",\"compass-id:CESIM-TP\",\"compass-id:CESIM-UI\",\"compass-id:EGIM\",\"compass-id:AM-EGIM\",\"compass-id:ESIM-UI\",\"compass-id:MNO-Manager\",\"compass-id:AM-MNO-MANAGER\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\")" 
+    selector = "type(Service),tag(\"compass-id:AM-Device\",\"compass-id:CESIM\",\"compass-id:CESIM Proxy\",\"compass-id:CESIM-TP\",\"compass-id:CESIM-UI\",\"compass-id:EGIM\",\"compass-id:ESIM-UI\",\"compass-id:MNO-Manager\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\")" 
   }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:AM-CESIM\",\"compass-id:AM-EGIM\",\"compass-id:AM-MNO-MANAGER\")" 
+  }
+
 }

EMEA_PREPROD/PD_management_zone/__main.tf

@@ -7,7 +7,7 @@ terraform {
   }
 
   backend "s3" {
-    bucket = "coco-dynatrace-tfstate"
+    bucket = "coco-dynatrace-tfstate-prod"
     key = "EMEA_PREPROD/pd_management_zone/terraform.tfstate"
     region = "eu-central-1"
     dynamodb_table = "coco-dynatrace-tfstate"

EMEA_PREPROD/slo/__main.tf

@@ -7,7 +7,7 @@ terraform {
   }
 
   backend "s3" {
-    bucket = "coco-dynatrace-tfstate"
+    bucket = "coco-dynatrace-tfstate-prod"
     key = "EMEA_PREPROD/slo/terraform.tfstate"
     region = "eu-central-1"
     dynamodb_table = "coco-dynatrace-tfstate"

EMEA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf

@@ -1,11 +1,29 @@
 resource "dynatrace_management_zone" "PD_AccountManagementConnectedCar" {
   name = "PD_AccountManagementConnectedCar" 
+ // compass product: ConnectedDrive Account Management 
+
   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-ECS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"AccountManagementConnectedCar\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-LPS\", \"compass-id:AM-TACS\", \"compass-id:AM-UI\", \"compass-id:rsu-adapter\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"AccountManagementConnectedCar\")"
   }
+
+  // compass sub product: CD Rules Engine
+
+  // compass sub product: Lifecycle Management
+  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-ECS\",\"compass-id:AM-LPS\",\"compass-id:AM-TACS\",\"compass-id:AM-UI\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:TestdataTool\", \"compass-id:rsu-adapter\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Countly\",\"compass-id:TAMSArchive\")" 
+  }
+
+  // compass sub product: Connected User Insights Services
+
 }

EMEA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf

@@ -1,27 +1,29 @@
 resource "dynatrace_management_zone" "PD_AutomotiveSecurity" {
   name = "PD_AutomotiveSecurity" 
+  // compass product: Automotive Security
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"AutomotiveSecurity\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"AutomotiveSecurity\")"
+  }
+
+  // compass sub product: Shared ASBC Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:SWLSEC2-Checker\")" 
+    selector = "type(Service),tag(\"compass-id:ASBC-HAL\",\"compass-id:ASBS\",\"compass-id:HPAuth\",\"compass-id:STS\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-NGTP\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:CAC-AGENT\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:DFPH\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:ts-wlupdater\",\"compass-id:TVP\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-HAL\",\"compass-id:ASBC-NGTP\",\"compass-id:ASBS\",\"compass-id:HPAuth\",\"compass-id:STS\")" 
+    selector = "type(Service),tag(\"compass-id:ts-wlupdater\",\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
   }
+
 }

EMEA_PROD/PD_management_zone/PD_CallServices.tf

@@ -1,63 +1,47 @@
 resource "dynatrace_management_zone" "PD_CallServices" {
   name = "PD_CallServices" 
+  // compass product: Connected Call Services
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"CallServices\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"CallServices\")"
   }
+
+  // compass sub product: Call Handling
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(PROCESS_GROUP),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(PROCESS_GROUP),tag(\"compass-id:BASE\",\"compass-id:CCC\",\"compass-id:RSA\",\"compass-id:RSA-ASD-Search\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ACDS\",\"compass-id:APPCALL\",\"compass-id:B2V-NGTP\",\"compass-id:ECALLGW\",\"compass-id:ECS\",\"compass-id:EVNS2\",\"compass-id:EVNS2T\",\"compass-id:NGTP-CS\",\"compass-id:XCS\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(PROCESS_GROUP),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(PROCESS_GROUP),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:BASE\",\"compass-id:CCC\",\"compass-id:RSA\",\"compass-id:RSA-ASD-Search\")" 
+    selector = "type(Service),tag(\"compass-id:APPCALL\",\"compass-id:B2V-NGTP\",\"compass-id:ECS\",\"compass-id:EVNS2\",\"compass-id:NGTP-CS\",\"compass-id:XCS\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
     selector = "type(PROCESS_GROUP),tag(\"compass-id:ecs\",\"compass-id:appcall\",\"compass-id:xcs\")" 
   }
-  rules {
-    type = "PROCESS_GROUP" 
+
+  // compass sub product: Call Handling Frontends
+  entity_selector_based_rule {
     enabled = true 
-    propagation_types = ["PROCESS_GROUP_TO_SERVICE"] 
-    conditions {
-      custom_process_metadata {
-        attribute = "PROCESS_GROUP_CUSTOM_METADATA" 
-        dynamic_key {
-          key = "compass-id" 
-          source = "KUBERNETES" 
-        }
-      }
-      string {
-        # case_sensitive = false 
-        # negate = false 
-        operator = "BEGINS_WITH" 
-        value = "ecs" 
-      }
-    }
+    selector = "type(Service),tag(\"compass-id:BASE\",\"compass-id:Base Angular app\",\"compass-id:coco-hm\",\"compass-id:RSA-ASD-Search\",\"compass-id:RSA-DB\",\"compass-id:rsa-pi-model\")" 
   }
+
+  // compass sub product: Voice Connectivity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:epm-js-app\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
+  }
+
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCC\",\"compass-id:RSA\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ACDS\",\"compass-id:ECALLGW\",\"compass-id:EVNS2T\")" 
+  }
+
 }

EMEA_PROD/PD_management_zone/PD_ConnectedDriveStoreBackend.tf

@@ -1,15 +1,49 @@
 resource "dynatrace_management_zone" "PD_ConnectedDriveStoreBackend" {
   name = "PD_ConnectedDriveStoreBackend" 
+ // compass product: ConnectedDrive Store Backend 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:AM-Store\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedDriveStoreBackend\")"
   }
   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\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedDriveStoreBackend\")"
   }
+
+  // compass sub product: CD Store Engine
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:Concat\",\"compass-id:Connected-Catalog\")" 
+    selector = "type(Service),tag(\"compass-id:AM-Store\",\"compass-id:Buffet-CIC-Backend\",\"compass-id:Buffet-Core\",\"compass-id:Buffet-External-CDM\",\"compass-id:Buffet-External-Offer\",\"compass-id:Buffet-External-Tax\",\"compass-id:Buffet-IF41\",\"compass-id:Buffet-IF50\",\"compass-id:Buffet-IF52\",\"compass-id:Buffet-IF53\",\"compass-id:Buffet-IF56\",\"compass-id:Buffet-IF58\",\"compass-id:Buffet-IF60\",\"compass-id:Buffet-IF90\")" 
   }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"Component:am-store\",\"compass-id:buffet-if56\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Buffet-Birt\",\"compass-id:Buffet-External-Payment\",\"compass-id:Buffet-GAM\",\"compass-id:Buffet-IF33\",\"compass-id:Buffet-IF38\",\"compass-id:Buffet-IF51\",\"compass-id:Buffet-IF54\",\"compass-id:Buffet-Promo-API\")" 
+  }
+
+  // compass sub product: Product Catalog Digital Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Concat\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:Connected-Catalog\")" 
+  }
+
+
+  // compass sub product: BMW Points Engine
+  // deprecated
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:IME-CDS\",\"compass-id:IME-CS\",\"compass-id:IME-RDC\",\"compass-id:IME-SS\",\"compass-id:IME-WS\")" 
+  }
+
 }

EMEA_PROD/PD_management_zone/PD_ConnectedSecurityServices.tf

@@ -0,0 +1,57 @@
+resource "dynatrace_management_zone" "PD_ConnectedSecurityServices" {
+  name = "PD_ConnectedSecurityServices" 
+  // compass product: Connected Security Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedSecurityServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedSecurityServices\")"
+  }
+
+  // compass sub product: Vehicle Software Security Services
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:asbcswlsec2\",\"compass-id:psdzchecker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:swlsec2checker\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SWLSEC2-Checker\")" 
+  }
+
+  // compass sub product: Smart Access
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CAC-AGENT\")" 
+  }
+
+  // compass sub product: Key Management Services
+  // should be removed from PD_AutomotiveSecurity
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
+  }
+  // others that don't exist in compass, should be removed
+    entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:DFPH\")" 
+  }
+
+  // compass sub product: Feature Security Services
+  // should be removed from PD_AutomotiveSecurity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ASBC-FSC-AST\",\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:TVP\")" 
+  }
+
+}

EMEA_PROD/PD_management_zone/PD_ConnectedUserProfileServices.tf

@@ -1,15 +1,36 @@
 resource "dynatrace_management_zone" "PD_ConnectedUserProfileServices" {
   name = "PD_ConnectedUserProfileServices" 
+ // compass product: Connected User Profile Services
+
+  entity_selector_based_rule {
+    enabled = true
+    selector = "type(HTTP_CHECK),entityName(\"ConnectedUserProfileServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = true
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConnectedUserProfileServices\")"
+  }
+
+  // compass sub product: Connected User Mapping Services
   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\",\"compass-id:MAPPING-STUB\",\"compass-id:UMS-UI\")" 
   }
+    
+  // compass sub product: Connected User Personalization Services
   entity_selector_based_rule {
     enabled = true 
-    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:agent-service\",\"compass-id:DPM\",\"compass-id:DPP\",\"compass-id:ecsm\",\"compass-id:PERSEUS\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:agent-service\")" 
+    selector = "type(Service),tag(\"compass-id:am-cns\", \"compass-id:am-proxy\", \"compass-id:AM-PROXY\", \"compass-id:am-svms\", \"compass-id:am-vms\", \"compass-id:ums-ui\", \"compass-id:eCSM\", \"compass-id:ECSM\")" 
   }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PIABO\",\"compass-id:PIAEP\",\"compass-id:PIAOP\",\"compass-id:PIAPE\",\"compass-id:ESA\", \"compass-id:esa\",\"compass-id:UIS\", \"compass-id:uis\")" 
+  }
+
 }

EMEA_PROD/PD_management_zone/PD_ConversationServices.tf

@@ -0,0 +1,21 @@
+resource "dynatrace_management_zone" "PD_ConversationServices" {
+  name = "PD_ConversationServices" 
+  // compass product: Conversation Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"ConversationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"ConversationServices\")"
+  }
+
+  // compass sub product: Speech
+  // should be removed from PD_CallServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
+  }
+
+}

EMEA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf

@@ -1,31 +1,62 @@
 resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
   name = "PD_InfotainmentInteractivityServices" 
+  // compass product: Entertainment & Interactivity Backend 
+
   entity_selector_based_rule {
     enabled = true 
     selector = "type(HTTP_CHECK),entityName(\"InfotainmentInteractivityServices\")" 
   }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(SYNTHETIC_TEST),entityName(\"InfotainmentInteractivityServices\")" 
+  }
+
+  // compass sub product: Audio & Video Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:cm-config\",\"compass-id:cm-gracenote\",\"compass-id:cm-spotify\",\"compass-id:cm-ximalaya\",\"compass-id:OED\",\"compass-id:OED-CN\",\"compass-id:OEG\",\"compass-id:OEP\",\"compass-id:OES\",\"compass-id:OES-CN\",\"compass-id:OET\")" 
+  }
+  // not  (yet?) in compass
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:OEG-CN\",\"compass-id:OEO\",\"compass-id:OEO-CN\",\"compass-id:OEP-CN\",\"compass-id:OET-CN\",\"compass-id:shortvideo\")" 
+  }
+
+  // compass sub product: Customer-centric Information Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCIS-Download\",\"compass-id:ID5-EXT\",\"compass-id:ISE-NEWS\",\"compass-id:ISE-PAR\",\"compass-id:WEA\",\"compass-id:WEA-ID5\",\"compass-id:WEA-IN-MAP\",\"compass-id:news-next\")" 
+  }
+
+  // compass sub product: In-Car Experience Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ambientmusic\")" 
+  }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ambient-music\",\"compass-id:festive-mode\")" 
   }
+
+  // compass sub product: Vehicle-centric Information Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:GEN3\",\"compass-id:ID5\",\"compass-id:ISE-CDR\",\"compass-id:ISE-EML\",\"compass-id:ISE-GEN2\",\"compass-id:ISE-ID7\",\"compass-id:ISE-LIS\",\"compass-id:ISE-LOC\",\"compass-id:ISE-RSL\",\"compass-id:ISE-VPS\")" 
+  }
+
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ISE-BEV\",\"compass-id:ISE-INP\",\"compass-id:ISE-IPA\",\"compass-id:ISE-MCL\",\"compass-id:ISE-VSD\",\"compass-id:tmpp-admin-ui\",\"compass-id:tmpp-manifest\",\"compass-id:tmpp-web-proxy\",\"compass-id:UPS\")" 
+  }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCIS-Download\",\"compass-id:Geolocator\",\"compass-id:intelligent-reminder\",\"compass-id:news-next\",\"compass-id:restaurant-reservation\")" 
+    selector = "type(Service),tag(\"compass-id:Geolocator\",\"compass-id:intelligent-reminder\",\"compass-id:restaurant-reservation\")" 
   }
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:CDIP\")" 
   }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:GEN3\",\"compass-id:ID5\",\"compass-id:ID5-APP\",\"compass-id:ID5-EXT\",\"compass-id:ISE-BEV\",\"compass-id:ISE-CDR\",\"compass-id:ISE-EML\",\"compass-id:ISE-GEN2\",\"compass-id:ISE-ID7\",\"compass-id:ISE-INP\",\"compass-id:ISE-IPA\",\"compass-id:ISE-LIS\",\"compass-id:ISE-LOC\",\"compass-id:ISE-MCL\",\"compass-id:ISE-NEWS\",\"compass-id:ISE-PAR\",\"compass-id:ISE-RSL\",\"compass-id:ISE-VPS\",\"compass-id:ISE-VSD\",\"compass-id:tmpp-admin-ui\",\"compass-id:tmpp-manifest\",\"compass-id:tmpp-web-proxy\",\"compass-id:UPS\",\"compass-id:WEA\",\"compass-id:WEA-ID5\",\"compass-id:WEA-IN-MAP\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:cm-config\",\"compass-id:cm-gracenote\",\"compass-id:cm-spotify\",\"compass-id:cm-ximalaya\",\"compass-id:OED\",\"compass-id:OED-CN\",\"compass-id:OEG\",\"compass-id:OEG-CN\",\"compass-id:OEO\",\"compass-id:OEO-CN\",\"compass-id:OEP\",\"compass-id:OEP-CN\",\"compass-id:OES\",\"compass-id:OES-CN\",\"compass-id:OET\",\"compass-id:OET-CN\",\"compass-id:shortvideo\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
-  }
+
 }

EMEA_PROD/PD_management_zone/PD_InfotainmentInteractivityServicesChina.tf

@@ -0,0 +1,21 @@
+resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServicesChina" {
+  name = "PD_InfotainmentInteractivityServicesChina" 
+  // compass product: Infotainment & Interactivity Services China 
+
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(HTTP_CHECK),entityName(\"InfotainmentInteractivityServicesChina\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(SYNTHETIC_TEST),entityName(\"InfotainmentInteractivityServicesChina\")" 
+  }
+
+  // no sub product
+  // should be removed from PD_InfotainmentInteractivityServices
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
+  }
+
+}

EMEA_PROD/PD_management_zone/PD_LocationServices.tf

@@ -1,15 +1,42 @@
 resource "dynatrace_management_zone" "PD_LocationServices" {
   name = "PD_LocationServices" 
+  // compass product: Location Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"LocationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"LocationServices\")"
+  }
+
+  // compass sub product: Premium Locations
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:LOS-CHA\",\"compass-id:LOS-CHA-CNV\",\"compass-id:LOS-FTS\",\"compass-id:LOS-JOY\",\"compass-id:LOS-MSC\",\"compass-id:LOS-OPS\",\"compass-id:LOS-PAR\",\"compass-id:LOS-PER\",\"compass-id:LOS-REF\")" 
+  }  
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:LOS-MOD\")" 
+  }  
+ 
+  // compass sub product: Smart Locations
+  // not configured: GCS-COUNTRIES, GCS-GEOCODING, GCS-TIMEZONES
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ercaf\",\"compass-id:ERCR\",\"compass-id:ERTP\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:LOS-FTS\",\"compass-id:potholes-reader\",\"compass-id:potholes-service\",\"compass-id:sc-reader\",\"compass-id:sc-service\")" 
+    selector = "type(Service),tag(\"compass-id:potholes-reader\",\"compass-id:potholes-service\",\"compass-id:sc-reader\",\"compass-id:sc-service\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:C2B-BS\",\"compass-id:GCS\",\"compass-id:LOS-CHA\",\"compass-id:LOS-CHA-CNV\",\"compass-id:LOS-JOY\",\"compass-id:LOS-MOD\",\"compass-id:LOS-MSC\",\"compass-id:LOS-OPS\",\"compass-id:LOS-PAR\",\"compass-id:LOS-PER\",\"compass-id:LOS-REF\",\"compass-id:RES-PAR\")" 
+    selector = "type(Service),tag(\"compass-id:C2B-BS\",\"compass-id:GCS\",\"compass-id:RES-PAR\")" 
   }
+  
 }

EMEA_PROD/PD_management_zone/PD_MapServicesAutomatedDriving.tf

@@ -1,11 +1,39 @@
 resource "dynatrace_management_zone" "PD_MapServicesAutomatedDriving" {
   name = "PD_MapServicesAutomatedDriving" 
+  // compass product: Map Services & Automated Driving
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"MapServicesAutomatedDriving\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"MapServicesAutomatedDriving\")"
+  }
+
+  // compass sub product: Automated Driving Services
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ms-hdmap-lcv\",\"compass-id:ms-hdmap-map-viewer\",\"compass-id:ms-hdmap-mci-adapter\",\"compass-id:ms-hdmap-mci-downloader\",\"compass-id:ms-hdmap-nds-downloader\",\"compass-id:ms-hdmap-qc-bl\",\"compass-id:ms-hdmap-qc-checks\",\"compass-id:ms-hdmap-tile-delivery\",\"compass-id:ms-hdmap-tile-generator\",\"compass-id:ms-hdmap-vehicle-mock\",\"compass-id:mupi-backend\",\"compass-id:MUPI-BE\",\"compass-id:mupi-cloud-discovery-service\",\"compass-id:mupi-cloud-dumm-adapter-service\",\"compass-id:mupi-cloud-hd-adapter-service\",\"compass-id:mupi-cloud-import-service\",\"compass-id:mupi-cloud-integration-service\",\"compass-id:mupi-cloud-joynr-adapter-class-service\",\"compass-id:mupi-cloud-joynr-adapter-service\",\"compass-id:mupi-cloud-stats-service\",\"compass-id:mupi-cockpit\",\"compass-id:mupi-gateway\")" 
+    selector = "type(Service),tag(\"compass-id:GNSS API Gateway\",\"compass-id:gnss-reader\",\"compass-id:gnss-service\",\"compass-id:tc-app\",\"compass-id:tc-service\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:GNSS API Gateway\",\"compass-id:gnss-reader\",\"compass-id:gnss-service\",\"compass-id:ms-3dp-rc\",\"compass-id:tc-app\",\"compass-id:tc-service\")" 
+    selector = "type(Service),tag(\"compass-id:ms-3dp-rc\")" 
   }
+
+  // compass sub product: SD-MapUpdate Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:MUPI-BE\",\"compass-id:mupi-cloud-discovery-service\",\"compass-id:mupi-cloud-dumm-adapter-service\",\"compass-id:mupi-cloud-hd-adapter-service\",\"compass-id:mupi-cloud-import-service\",\"compass-id:mupi-cloud-integration-service\",\"compass-id:mupi-cloud-joynr-adapter-class-service\",\"compass-id:mupi-cloud-joynr-adapter-service\",\"compass-id:mupi-cloud-stats-service\",\"compass-id:mupi-cockpit\",\"compass-id:mupi-gateway\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:mupi-backend\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ms-hdmap-lcv\",\"compass-id:ms-hdmap-map-viewer\",\"compass-id:ms-hdmap-mci-adapter\",\"compass-id:ms-hdmap-mci-downloader\",\"compass-id:ms-hdmap-nds-downloader\",\"compass-id:ms-hdmap-qc-bl\",\"compass-id:ms-hdmap-qc-checks\",\"compass-id:ms-hdmap-tile-delivery\",\"compass-id:ms-hdmap-tile-generator\",\"compass-id:ms-hdmap-vehicle-mock\")" 
+  }
+
 }

EMEA_PROD/PD_management_zone/PD_MyBMWMINIAppAsAProduct.tf

@@ -1,11 +1,19 @@
 resource "dynatrace_management_zone" "PD_MyBMWMINIAppAsAProduct" {
   name = "PD_MyBMWMINIAppAsAProduct" 
+  // compass product: My BMW / MINI App as a product
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:destination-composite-service\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"CallSeMyBMWMINIAppAsAProductrvices\")"
   }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"MyBMWMINIAppAsAProduct\")"
+  }
+
+  // compass system: App Frontend eMobility and MyJourney
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:send-to-car-service\",\"compass-id:trip-service\")" 
+    selector = "type(Service),tag(\"compass-id:destination-composite-service\",\"compass-id:send-to-car-service\")" 
   }
 }

EMEA_PROD/PD_management_zone/PD_NavigationServices.tf

@@ -1,15 +1,42 @@
 resource "dynatrace_management_zone" "PD_NavigationServices" {
   name = "PD_NavigationServices" 
+  // compass product: Navigation Services
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"NavigationServices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"NavigationServices\")"
+  }
+
+  // compass sub product: Realtime Parking
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:OSPI\")" 
   }
+  
+  // compass sub product: Realtime Routing
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:CNGW\",\"compass-id:RTTI\")" 
+    selector = "type(Service),tag(\"compass-id:Drive Manager Cloud\",\"compass-id:eRoute-Adapter\",\"compass-id:eRouteExt\",\"compass-id:NaaS\")" 
   }
+  // for wrongly tagged services we still keep:
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:DM\",\"compass-id:eRoute\",\"compass-id:NaaS\")" 
+    selector = "type(Service),tag(\"compass-id:DM\",\"compass-id:eRoute\")" 
   }
+
+  // compass sub product: Realtime Traffic
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RTTI\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CNGW\")" 
+  }
+
 }

EMEA_PROD/PD_management_zone/PD_RemoteMessagingServices.tf

@@ -1,47 +1,41 @@
 resource "dynatrace_management_zone" "PD_RemoteMessagingServices" {
   name = "PD_RemoteMessagingServices" 
+ // compass product: Remote & Messaging Services 
+
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:APIGW\",\"compass-id:RS\",\"compass-id:RS360\",\"compass-id:RSCockpit\")" 
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"RemoteMessagingServices\")"
   }
   entity_selector_based_rule {
-    enabled = true 
-    selector = "type(service),tag(\"compass-id:eadb\",\"compass-id:icnb\",\"compass-id:msgsvc\",\"compass-id:omgw\",\"compass-id:tcn\",\"compass-id:xcc-campaigns\",\"compass-id:xcc-cmgr\",\"compass-id:xcc-settings\",\"compass-id:xcc-statistics\",\"compass-id:xcc-users\")" 
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"RemoteMessagingServices\")"
   }
-  rules {
-    type = "MOBILE_APPLICATION" 
+
+  // compass sub product: Message Services
+    entity_selector_based_rule {
     enabled = true 
-    conditions {
-      key {
-        type = "STATIC" 
-        attribute = "MOBILE_APPLICATION_NAME" 
-      }
-      string {
-        case_sensitive = true 
-        # negate = false 
-        operator = "CONTAINS" 
-        value = "2.0" 
-      }
-    }
+    selector = "type(Service),tag(\"compass-id:EADB\",\"compass-id:MSGSVC\",\"compass-id:XCC-CAMPAIGNS\",\"compass-id:XCC-CMGR\",\"compass-id:XCC-SETTINGS\",\"compass-id:XCC-STATISTICS\",\"compass-id:XCC-USERS\")" 
   }
-  rules {
-    type = "SERVICE" 
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
     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 = "compass-id" 
-          value = "rs" 
-        }
-      }
-    }
+    selector = "type(Service),tag(\"compass-id:ICNB\",\"compass-id:OMGW\",\"compass-id:TCN\")" 
   }
+
+  // compass sub product: Remote Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RS\",\"compass-id:RS-360\",\"compass-id:RS-Cockpit\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FMC\",\"compass-id:RS360\",\"compass-id:RSCockpit\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FMC\")" 
+  }
+
 }

EMEA_PROD/PD_management_zone/PD_RemoteVehicleConfigurationManagement.tf

@@ -1,23 +1,79 @@
 resource "dynatrace_management_zone" "PD_RemoteVehicleConfigurationManagement" {
   name = "PD_RemoteVehicleConfigurationManagement" 
+  // compass product: Vehicle Device Mgmt.
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"RemoteVehicleConfigurationManagement\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"RemoteVehicleConfigurationManagement\")"
+  }
+
+  // compass sub product: App-Distribution Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:id5-app\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ID5-APP\")" 
+  }
+
+  // compass sub product: Provisioning Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:NOP-Admin\",\"compass-id:NOP-Archive\",\"compass-id:NOP-Provisioning\",\"compass-id:NOP-Trigger\",\"compass-id:SCM\",\"compass-id:SCMA\",\"compass-id:VPS-Admin\",\"compass-id:VPS-Archive\",\"compass-id:VPS-COMFY-AGENT\",\"compass-id:VPS-Monitor\",\"compass-id:VPS-Prov\",\"compass-id:VPS-Trigger\")" 
+  }
+  // should be removed from PD_VehicleDataConnectivity
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:B2V-NOTS\")" 
+  }
+
+  // compass sub product: Remote Software Upgrade Services
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:FRE\",\"compass-id:FRS\",\"compass-id:MPG\",\"compass-id:QMC\",\"compass-id:RCM\",\"compass-id:RCP\",\"compass-id:RCS\",\"compass-id:RDC\",\"compass-id:RDH\",\"compass-id:RES\",\"compass-id:RLM\",\"compass-id:RMO\",\"compass-id:RNP\",\"compass-id:RPP\",\"compass-id:RSA Admin GUI\",\"compass-id:RSA Testbench GUI\",\"compass-id:RTE\",\"compass-id:RTS\",\"compass-id:RVC\",\"compass-id:RVE\",\"compass-id:RVI\",\"compass-id:RVS\",\"compass-id:RVT\",\"compass-id:rwd\",\"compass-id:tdp\",\"compass-id:uvm\",\"compass-id:vjm\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ZAS\",\"compass-id:ZDI\",\"compass-id:ZFUS-MP-GENERATOR\",\"compass-id:ZIP\",\"compass-id:ZIS\",\"compass-id:ZMP\",\"compass-id:ZOS\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RNB App\",\"compass-id:zis\")" 
+  }
+
+  // compass sub product: Secure Feature Activation
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:SFA-FRE\",\"compass-id:SFA-OH\",\"compass-id:SFA-OTA\",\"compass-id:SFA-S\",\"compass-id:SFA-TS\")" 
   }
+
+  // compass sub product: Campaign Management
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:comfy-agent-registry\",\"compass-id:comfy-cockpit\",\"compass-id:comfy-management\",\"compass-id:comfy-orchestration\",\"compass-id:NOP-Admin\",\"compass-id:NOP-Archive\",\"compass-id:NOP-Provisioning\",\"compass-id:NOP-Trigger\",\"compass-id:SCM\",\"compass-id:SCMA\",\"compass-id:VPS-Admin\",\"compass-id:VPS-Archive\",\"compass-id:VPS-Monitor\",\"compass-id:VPS-Prov\",\"compass-id:VPS-Trigger\")" 
+    selector = "type(Service),tag(\"compass-id:comfy-agent-registry\",\"compass-id:comfy-cockpit\",\"compass-id:comfy-management\",\"compass-id:comfy-orchestration\",)" 
   }
+
+  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:APR\",\"compass-id:APR-NPM\",\"compass-id:APR-Portal\",\"compass-id:APR-Registry\")" 
   }
+  
+  // compass sub product: Extended Vehicle API Gateway
+  // should be removed from PD_RemoteMessagingServices
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:ZAS\",\"compass-id:ZDI\",\"compass-id:ZFUS-MP-GENERATOR\",\"compass-id:ZIP\",\"compass-id:zis\",\"compass-id:ZMP\",\"compass-id:ZOS\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:FRE\",\"compass-id:FRS\",\"compass-id:MPG\",\"compass-id:QMC\",\"compass-id:RCM\",\"compass-id:RCP\",\"compass-id:RCS\",\"compass-id:RDC\",\"compass-id:RDH\",\"compass-id:RES\",\"compass-id:RLM\",\"compass-id:RMO\",\"compass-id:RNB App\",\"compass-id:RNP\",\"compass-id:RPP\",\"compass-id:RSA Admin GUI\",\"compass-id:RSA Testbench GUI\",\"compass-id:RTE\",\"compass-id:RTS\",\"compass-id:RVC\",\"compass-id:RVE\",\"compass-id:RVI\",\"compass-id:RVS\",\"compass-id:RVT\",\"compass-id:rwd\",\"compass-id:tdp\",\"compass-id:uvm\",\"compass-id:vjm\")" 
+    selector = "type(Service),tag(\"compass-id:APIGW\")" 
   }
+
+  // compass sub product: Vehicle Software Configuration and Capabilities
+  // vs-cmdb
+
 }

EMEA_PROD/PD_management_zone/PD_Teleservices.tf

@@ -1,15 +1,60 @@
 resource "dynatrace_management_zone" "PD_Teleservices" {
   name = "PD_Teleservices" 
+  // compass product: Vehicle Demand Identification and Lead Management
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"Teleservices\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"Teleservices\")"
+  }
+
+  // compass sub product: Teleservices Demands
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:PDMManager\",\"compass-id:PDMUpdater\",\"compass-id:ts-ena-ui\",\"compass-id:WLManager\",\"compass-id:WLUpdater\")" 
+    selector = "type(Service),tag(\"compass-id:rsurservice\",\"compass-id:scallservice\",\"compass-id:seam\",\"compass-id:ts-asc\",\"compass-id:ts-ccm-di\",\"compass-id:ts-pffs\",\"compass-id:ts-sdi\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:tsbgservice\",\"compass-id:tscs\",\"compass-id:tsdd\",\"compass-id:tssb-bt\",\"compass-id:tssb-bti\",\"compass-id:tssb-tsp\",\"compass-id:ttbs\",\"compass-id:ts-incar-ffs\",\"compass-id:ts-cms\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:RSURService\",\"compass-id:SCallService\",\"compass-id:SEAM\",\"compass-id:TSBGService\",\"compass-id:TSBM\",\"compass-id:TS-CCM-DI\",\"compass-id:TSCS\",\"compass-id:TSDD\",\"compass-id:TSMR\",\"compass-id:TS-PFFS\",\"compass-id:TSSB-BT\",\"compass-id:TSSB-BTI\",\"compass-id:TSSB-TSP\",\"compass-id:TS-SDI\",\"compass-id:TTBS\")" 
+  }
+
+  // compass sub product: Teleservices Diagnosis
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:bcallservice\",\"compass-id:cas-spm\",\"compass-id:cas-stm\",\"compass-id:diagservice\",\"compass-id:eshad\",\"compass-id:patchcampaign\",\"compass-id:rtcad\",\"compass-id:rtchandler\",\"compass-id:rtcservice\",\"compass-id:ts-bcallhandler\",\"compass-id:ts-pat-ui\",\"compass-id:tsrd\",\"compass-id:ts-rtc-ui\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:BCallService\",\"compass-id:CAS-SPM\",\"compass-id:CAS-STM\",\"compass-id:DiagService\",\"compass-id:ESHAD\",\"compass-id:RTCAD\",\"compass-id:RTCHandler\",\"compass-id:RTCService\",\"compass-id:ts-cts-ui\",\"compass-id:TSRD\")" 
+  }
+
+  // compass sub product: Teleservices Enabling
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:pdmmanager\",\"compass-id:pdmupdater\",\"compass-id:ts-ena-ui\",\"compass-id:wlmanager\",\"compass-id:wlupdater\")" 
+  }
+  // for wrongly tagged services we still keep:
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PDMManager\",\"compass-id:PDMUpdater\",\"compass-id:WLManager\",\"compass-id:WLUpdater\")" 
+  }
+
+  // compass sub product: Service Partner Management
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:BCallService\",\"compass-id:CAS-SPM\",\"compass-id:CAS-STM\",\"compass-id:DiagService\",\"compass-id:ESHAD\",\"compass-id:patchcampaign\",\"compass-id:RTCAD\",\"compass-id:RTCHandler\",\"compass-id:RTCService\",\"compass-id:ts-bcallhandler\",\"compass-id:ts-cts-ui\",\"compass-id:ts-pat-ui\",\"compass-id:TSRD\",\"compass-id:ts-rtc-ui\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:RSURService\",\"compass-id:SCallService\",\"compass-id:SEAM\",\"compass-id:ts-asc\",\"compass-id:TSBGService\",\"compass-id:TSBM\",\"compass-id:TS-CCM-DI\",\"compass-id:TSCS\",\"compass-id:TSDD\",\"compass-id:TSMR\",\"compass-id:TS-PFFS\",\"compass-id:TSSB-BT\",\"compass-id:TSSB-BTI\",\"compass-id:TSSB-TSP\",\"compass-id:TS-SDI\",\"compass-id:ts-tyredi\",\"compass-id:ts-tyrewf\",\"compass-id:TTBS\")" 
+    selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
   }
+
+ // compass sub product: VDLM Appointment Management
+ // appm-ams
+ 
 }

EMEA_PROD/PD_management_zone/PD_VehicleDataCollection.tf

@@ -1,19 +1,46 @@
 resource "dynatrace_management_zone" "PD_VehicleDataCollection" {
   name = "PD_VehicleDataCollection" 
+  // compass product: Vehicle Data Collection Offboard
+
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(HTTP_CHECK),entityName(\"VehicleDataCollection\")"
+  }
+  entity_selector_based_rule {
+    enabled = false
+    selector = "type(SYNTHETIC_TEST),entityName(\"VehicleDataCollection\")"
+  }
+
+  // compass sub product: Crowd Data Collection Offboard
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:SRManager\",\"compass-id:TSMB\",\"compass-id:TSR-CH\",\"compass-id:TSR-CMA\",\"compass-id:TSR-DD\",\"compass-id:TSR-ICC\",\"compass-id:TSR-VU\")" 
+    selector = "type(Service),tag(\"compass-id:CMCS\",\"compass-id:ERDCDC2FCD\",\"compass-id:ERDFCDUDS\",\"compass-id:ERDMGR\",\"compass-id:ERDPROC\",\"compass-id:ERDXFCDFCD\",\"compass-id:XFCDAnonymizer\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:ERDDISP\",\"compass-id:XFCD Cockpit\",\"compass-id:XFCD Configuration\")" 
+  }
+
+  // compass sub product: Vehicle Health Data Collection
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:TSMB\",\"compass-id:TSR-CH\",\"compass-id:TSR-CMA\",\"compass-id:TSR-DD\",\"compass-id:TSR-ICC\",\"compass-id:TSR-VU\",\"compass-id:VHS\")" 
+  }
+ 
+  // compass sub product: Vehicle State Data Collection
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CSU\",\"compass-id:KVSFO\",\"compass-id:KVSST\",\"compass-id:LSCFSU\",\"compass-id:LSCHR\",\"compass-id:LSCJR\",\"compass-id:LSCKC\",\"compass-id:LSCMM\",\"compass-id:LSCOC\",\"compass-id:LSCOG\",\"compass-id:LSCWO\",\"compass-id:tripCollectionApi\",\"compass-id:tripCollectionProcessor\",\"compass-id:vdc-vcs\",\"compass-id:VNS\",\"compass-id:VS-API\")" 
+  }
+  // others that don't exist in compass, should be removed
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:LSCJHWO\",\"compass-id:tripCollection\",\"compass-id:VHCJR\",\"compass-id:VJDS\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:CMCS\",\"compass-id:ERDCDC2FCD\",\"compass-id:ERDDISP\",\"compass-id:ERDFCDUDS\",\"compass-id:ERDMGR\",\"compass-id:ERDPROC\",\"compass-id:ERDXFCDFCD\",\"compass-id:XFCD Cockpit\",\"compass-id:XFCD Configuration\",\"compass-id:XFCDAnonymizer\")" 
-  }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:CSU\",\"compass-id:LSCFSU\",\"compass-id:LSCHR\",\"compass-id:LSCJHWO\",\"compass-id:LSCJR\",\"compass-id:LSCKC\",\"compass-id:LSCMM\",\"compass-id:LSCOC\",\"compass-id:LSCOG\",\"compass-id:LSCWO\",\"compass-id:tripCollection\",\"compass-id:vdc-vcs\",\"compass-id:VHCJR\",\"compass-id:VHS\",\"compass-id:VJDS\",\"compass-id:VNS\",\"compass-id:VS-API\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
+    selector = "type(Service),tag(\"compass-id:SRManager\")" 
   }
+
 }