From 628792a36b9d867456a0b03c64db2bc074b3b745 Mon Sep 17 00:00:00 2001
From: Markus Dlugi <markus.dlugi@bmw.de>
Date: Fri, 21 Apr 2023 12:36:16 +0200
Subject: [PATCH] COMFY-1088: Switch to name-based SLOs for RSU VDM SLOs

---
 CN_PROD/slo/VDM_-_RSU_-_CN_E2E.tf      | 83 +++++++++++++++++++-------
 CN_PROD/slo/VDM_-_RSU_-_CN_PROD.tf     | 83 +++++++++++++++++++-------
 EMEA_PROD/slo/VDM_-_RSU_-_EMEA_E2E.tf  | 83 +++++++++++++++++++-------
 EMEA_PROD/slo/VDM_-_RSU_-_EMEA_PROD.tf | 83 +++++++++++++++++++-------
 NA_PROD/slo/VDM_-_RSU_-_US_E2E.tf      | 83 +++++++++++++++++++-------
 NA_PROD/slo/VDM_-_RSU_-_US_PROD.tf     | 83 +++++++++++++++++++-------
 6 files changed, 378 insertions(+), 120 deletions(-)

diff --git a/CN_PROD/slo/VDM_-_RSU_-_CN_E2E.tf b/CN_PROD/slo/VDM_-_RSU_-_CN_E2E.tf
index 218a7c8..b4d8698 100644
--- a/CN_PROD/slo/VDM_-_RSU_-_CN_E2E.tf
+++ b/CN_PROD/slo/VDM_-_RSU_-_CN_E2E.tf
@@ -1,33 +1,76 @@
 module VDM_-_RSU_-_CN_E2E {
-    
+
     source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "VDM - RSU - CN E2E" 
 
-    description                 = "" 
 
-    
-    
-    #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-898ADB916A9006DF\",\"SERVICE_METHOD-D455B80D3009938B\",\"SERVICE_METHOD-5DB6B71A030178EA\",\"SERVICE_METHOD-F092B225B92A3686\",\"SERVICE_METHOD-683EA6C5B7A2EEF3\",\"SERVICE_METHOD-4BE59D7BC11AC780\",\"SERVICE_METHOD-4006422986343BCB\",\"SERVICE_METHOD-86BE9998B76A0E16\",\"SERVICE_METHOD-DA3CB26978350B98\",\"SERVICE_METHOD-A0AFA5A73B98276E\",\"SERVICE_METHOD-F5343291B69763AB\")" 
-            
+    name                        = "VDM - RSU - CN E2E"
+
+    description                 = "Custom Vehicle Device Management (VDM) SLO for Remote Software Upgrade (RSU)"
+
+
+
+    #entity selector object
+    filter                      = ""
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*((builtin:service.keyRequest.errors.server.successCount:splitBy())/(builtin:service.keyRequest.count.server:splitBy()))" 
- 
+    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(
+                        ~"UpdateRequestResource - rsu - e2e~",
+                        ~"UpdateManifestResource - rsu - e2e~",
+                        ~"SendReportResource - rsu - e2e~",
+                        ~"MessageEndpointProxy - rsu - e2e~"
+                )
+			)
+			,entityName.in(
+				~"askForUpdate~",
+                ~"askForUpdateManifest~",
+                ~"sendReport~",
+                ~"Queue: BMW.RSU.ZFUS_MPG_OUTPUT~",
+                ~"Queue: BMW.RSU.RN.RNB_TO_RSA~",
+                ~"Queue: BMW.RSU.DEC_VEHICLE_REQUEST.ASBC_TO_RSA~",
+                ~"Queue: BMW.RSA.VEHICLE_MESSAGES~",
+                ~"Queue: BMW.RSU.UPDATEMANIFEST.ZFUS_TO_RSA~",
+                ~"Queue: BMW.RSU.ENC_UPDATEMANIFEST.ASBC_TO_RSA~",
+                ~"Queue: BMW.RSU.VEHICLE_TRIGGER~",
+                ~"Queue: BMW.RSU.RSA_PIPELINE~"
+            )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+		        fromRelationship.isServiceMethodOfService(
+			        type(~"SERVICE~"),entityName.in(
+                        ~"UpdateRequestResource - rsu - e2e~",
+                        ~"UpdateManifestResource - rsu - e2e~",
+                        ~"SendReportResource - rsu - e2e~",
+                        ~"MessageEndpointProxy - rsu - e2e~"
+                )
+			)
+			,entityName.in(
+				~"askForUpdate~",
+                ~"askForUpdateManifest~",
+                ~"sendReport~",
+                ~"Queue: BMW.RSU.ZFUS_MPG_OUTPUT~",
+                ~"Queue: BMW.RSU.RN.RNB_TO_RSA~",
+                ~"Queue: BMW.RSU.DEC_VEHICLE_REQUEST.ASBC_TO_RSA~",
+                ~"Queue: BMW.RSA.VEHICLE_MESSAGES~",
+                ~"Queue: BMW.RSU.UPDATEMANIFEST.ZFUS_TO_RSA~",
+                ~"Queue: BMW.RSU.ENC_UPDATEMANIFEST.ASBC_TO_RSA~",
+                ~"Queue: BMW.RSU.VEHICLE_TRIGGER~",
+                ~"Queue: BMW.RSU.RSA_PIPELINE~"
+            )"))))):splitBy()))
+    EOT
+
+
+    #if not set (removed) it's defaulted to "-1d"
+    timeframe                   = "-1d"
 
-    #if not set (removed) it's defaulted to "-1d" 
-    timeframe                   = "-1d" 
-         
 
     #currently the only possible value
-    evaluation                  = "AGGREGATE"           
+    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
+    target                      = 98            #if not set(removed) it's defaulted to 98
+    warning                     = 99            #if not set(removed) it's defaulted to 99
     
 }
\ No newline at end of file
diff --git a/CN_PROD/slo/VDM_-_RSU_-_CN_PROD.tf b/CN_PROD/slo/VDM_-_RSU_-_CN_PROD.tf
index 66462b4..0b60237 100644
--- a/CN_PROD/slo/VDM_-_RSU_-_CN_PROD.tf
+++ b/CN_PROD/slo/VDM_-_RSU_-_CN_PROD.tf
@@ -1,33 +1,76 @@
 module VDM_-_RSU_-_CN_PROD {
-    
+
     source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "VDM - RSU - CN PROD" 
 
-    description                 = "" 
 
-    
-    
-    #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-377E4E1ABDDB99D8\",\"SERVICE_METHOD-68DAAEF95DD2FAAE\",\"SERVICE_METHOD-BFABC791A0681CB5\",\"SERVICE_METHOD-36A7BE9A88451E76\",\"SERVICE_METHOD-A965F7F2B2B9089B\",\"SERVICE_METHOD-3DE7492449C0C534\",\"SERVICE_METHOD-E852026F09F006AC\",\"SERVICE_METHOD-A1A6107CF8782AD0\",\"SERVICE_METHOD-58B150DCF684E386\",\"SERVICE_METHOD-77A9E64812520490\")" 
-            
+    name                        = "VDM - RSU - CN PROD"
+
+    description                 = "Custom Vehicle Device Management (VDM) SLO for Remote Software Upgrade (RSU)"
+
+
+
+    #entity selector object
+    filter                      = ""
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*((builtin:service.keyRequest.errors.server.successCount:splitBy())/(builtin:service.keyRequest.count.server:splitBy()))" 
- 
+    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(
+                        ~"UpdateRequestResource - rsu - prod~",
+                        ~"UpdateManifestResource - rsu - prod~",
+                        ~"SendReportResource - rsu - prod~",
+                        ~"MessageEndpointProxy - rsu - prod~"
+                )
+			)
+			,entityName.in(
+				~"askForUpdate~",
+                ~"askForUpdateManifest~",
+                ~"sendReport~",
+                ~"Queue: BMW.RSU.ZFUS_MPG_OUTPUT~",
+                ~"Queue: BMW.RSU.RN.RNB_TO_RSA~",
+                ~"Queue: BMW.RSU.DEC_VEHICLE_REQUEST.ASBC_TO_RSA~",
+                ~"Queue: BMW.RSA.VEHICLE_MESSAGES~",
+                ~"Queue: BMW.RSU.UPDATEMANIFEST.ZFUS_TO_RSA~",
+                ~"Queue: BMW.RSU.ENC_UPDATEMANIFEST.ASBC_TO_RSA~",
+                ~"Queue: BMW.RSU.VEHICLE_TRIGGER~",
+                ~"Queue: BMW.RSU.RSA_PIPELINE~"
+            )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+		        fromRelationship.isServiceMethodOfService(
+			        type(~"SERVICE~"),entityName.in(
+                        ~"UpdateRequestResource - rsu - prod~",
+                        ~"UpdateManifestResource - rsu - prod~",
+                        ~"SendReportResource - rsu - prod~",
+                        ~"MessageEndpointProxy - rsu - prod~"
+                )
+			)
+			,entityName.in(
+				~"askForUpdate~",
+                ~"askForUpdateManifest~",
+                ~"sendReport~",
+                ~"Queue: BMW.RSU.ZFUS_MPG_OUTPUT~",
+                ~"Queue: BMW.RSU.RN.RNB_TO_RSA~",
+                ~"Queue: BMW.RSU.DEC_VEHICLE_REQUEST.ASBC_TO_RSA~",
+                ~"Queue: BMW.RSA.VEHICLE_MESSAGES~",
+                ~"Queue: BMW.RSU.UPDATEMANIFEST.ZFUS_TO_RSA~",
+                ~"Queue: BMW.RSU.ENC_UPDATEMANIFEST.ASBC_TO_RSA~",
+                ~"Queue: BMW.RSU.VEHICLE_TRIGGER~",
+                ~"Queue: BMW.RSU.RSA_PIPELINE~"
+            )"))))):splitBy()))
+    EOT
+
+
+    #if not set (removed) it's defaulted to "-1d"
+    timeframe                   = "-1d"
 
-    #if not set (removed) it's defaulted to "-1d" 
-    timeframe                   = "-1d" 
-         
 
     #currently the only possible value
-    evaluation                  = "AGGREGATE"           
+    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
+    target                      = 98            #if not set(removed) it's defaulted to 98
+    warning                     = 99            #if not set(removed) it's defaulted to 99
     
 }
\ No newline at end of file
diff --git a/EMEA_PROD/slo/VDM_-_RSU_-_EMEA_E2E.tf b/EMEA_PROD/slo/VDM_-_RSU_-_EMEA_E2E.tf
index 9ff4c15..fc80b2b 100644
--- a/EMEA_PROD/slo/VDM_-_RSU_-_EMEA_E2E.tf
+++ b/EMEA_PROD/slo/VDM_-_RSU_-_EMEA_E2E.tf
@@ -1,33 +1,76 @@
 module VDM_-_RSU_-_EMEA_E2E {
-    
+
     source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "VDM - RSU - EMEA E2E" 
 
-    description                 = "" 
 
-    
-    
-    #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-838A33198DB71C3D\",\"SERVICE_METHOD-544D9A523951DD9D\",\"SERVICE_METHOD-C7C7E7E30134CC4D\",\"SERVICE_METHOD-F5D48F6F3C9BB5A5\",\"SERVICE_METHOD-8C07F6C47928DCE1\",\"SERVICE_METHOD-EC33958252EFBE2D\",\"SERVICE_METHOD-887AD0E6454A03AD\",\"SERVICE_METHOD-C6618A2B5214ED42\",\"SERVICE_METHOD-0700CD81C580BCFE\",\"SERVICE_METHOD-C2A96AF76A2B3357\",\"SERVICE_METHOD-415422AFEC4E5C30\")" 
-            
+    name                        = "VDM - RSU - EMEA E2E"
+
+    description                 = "Custom Vehicle Device Management (VDM) SLO for Remote Software Upgrade (RSU)"
+
+
+
+    #entity selector object
+    filter                      = ""
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*((builtin:service.keyRequest.errors.server.successCount:splitBy())/(builtin:service.keyRequest.count.server:splitBy()))" 
- 
+    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(
+                        ~"UpdateRequestResource - rsu - e2e~",
+                        ~"UpdateManifestResource - rsu - e2e~",
+                        ~"SendReportResource - rsu - e2e~",
+                        ~"MessageEndpointProxy - rsu - e2e~"
+                )
+			)
+			,entityName.in(
+				~"askForUpdate~",
+                ~"askForUpdateManifest~",
+                ~"sendReport~",
+                ~"Queue: BMW.RSU.ZFUS_MPG_OUTPUT~",
+                ~"Queue: BMW.RSU.RN.RNB_TO_RSA~",
+                ~"Queue: BMW.RSU.DEC_VEHICLE_REQUEST.ASBC_TO_RSA~",
+                ~"Queue: BMW.RSA.VEHICLE_MESSAGES~",
+                ~"Queue: BMW.RSU.UPDATEMANIFEST.ZFUS_TO_RSA~",
+                ~"Queue: BMW.RSU.ENC_UPDATEMANIFEST.ASBC_TO_RSA~",
+                ~"Queue: BMW.RSU.VEHICLE_TRIGGER~",
+                ~"Queue: BMW.RSU.RSA_PIPELINE~"
+            )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+		        fromRelationship.isServiceMethodOfService(
+			        type(~"SERVICE~"),entityName.in(
+                        ~"UpdateRequestResource - rsu - e2e~",
+                        ~"UpdateManifestResource - rsu - e2e~",
+                        ~"SendReportResource - rsu - e2e~",
+                        ~"MessageEndpointProxy - rsu - e2e~"
+                )
+			)
+			,entityName.in(
+				~"askForUpdate~",
+                ~"askForUpdateManifest~",
+                ~"sendReport~",
+                ~"Queue: BMW.RSU.ZFUS_MPG_OUTPUT~",
+                ~"Queue: BMW.RSU.RN.RNB_TO_RSA~",
+                ~"Queue: BMW.RSU.DEC_VEHICLE_REQUEST.ASBC_TO_RSA~",
+                ~"Queue: BMW.RSA.VEHICLE_MESSAGES~",
+                ~"Queue: BMW.RSU.UPDATEMANIFEST.ZFUS_TO_RSA~",
+                ~"Queue: BMW.RSU.ENC_UPDATEMANIFEST.ASBC_TO_RSA~",
+                ~"Queue: BMW.RSU.VEHICLE_TRIGGER~",
+                ~"Queue: BMW.RSU.RSA_PIPELINE~"
+            )"))))):splitBy()))
+    EOT
+
+
+    #if not set (removed) it's defaulted to "-1d"
+    timeframe                   = "-1d"
 
-    #if not set (removed) it's defaulted to "-1d" 
-    timeframe                   = "-1d" 
-         
 
     #currently the only possible value
-    evaluation                  = "AGGREGATE"           
+    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
+    target                      = 98            #if not set(removed) it's defaulted to 98
+    warning                     = 99            #if not set(removed) it's defaulted to 99
     
 }
\ No newline at end of file
diff --git a/EMEA_PROD/slo/VDM_-_RSU_-_EMEA_PROD.tf b/EMEA_PROD/slo/VDM_-_RSU_-_EMEA_PROD.tf
index 88611ba..5f527bf 100644
--- a/EMEA_PROD/slo/VDM_-_RSU_-_EMEA_PROD.tf
+++ b/EMEA_PROD/slo/VDM_-_RSU_-_EMEA_PROD.tf
@@ -1,33 +1,76 @@
 module VDM_-_RSU_-_EMEA_PROD {
-    
+
     source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "VDM - RSU - EMEA PROD" 
 
-    description                 = "" 
 
-    
-    
-    #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-D326B245FDB9D1ED\",\"SERVICE_METHOD-9302D3E7A92ADDFA\",\"SERVICE_METHOD-906DE650C315D350\",\"SERVICE_METHOD-D8A1844CE8071821\",\"SERVICE_METHOD-0DA998BAE52F2411\",\"SERVICE_METHOD-A4E2775F8C482FAA\",\"SERVICE_METHOD-134EDF22BE9DD08C\",\"SERVICE_METHOD-F88AA0117B1EAFE8\",\"SERVICE_METHOD-66102B135997AC0F\",\"SERVICE_METHOD-09E14021A51BFE1E\",\"SERVICE_METHOD-2C35BCA5F6C89C41\")" 
-            
+    name                        = "VDM - RSU - EMEA PROD"
+
+    description                 = "Custom Vehicle Device Management (VDM) SLO for Remote Software Upgrade (RSU)"
+
+
+
+    #entity selector object
+    filter                      = ""
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*((builtin:service.keyRequest.errors.server.successCount:splitBy())/(builtin:service.keyRequest.count.server:splitBy()))" 
- 
+    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(
+                        ~"UpdateRequestResource - rsu - prod~",
+                        ~"UpdateManifestResource - rsu - prod~",
+                        ~"SendReportResource - rsu - prod~",
+                        ~"MessageEndpointProxy - rsu - prod~"
+                )
+			)
+			,entityName.in(
+				~"askForUpdate~",
+                ~"askForUpdateManifest~",
+                ~"sendReport~",
+                ~"Queue: BMW.RSU.ZFUS_MPG_OUTPUT~",
+                ~"Queue: BMW.RSU.RN.RNB_TO_RSA~",
+                ~"Queue: BMW.RSU.DEC_VEHICLE_REQUEST.ASBC_TO_RSA~",
+                ~"Queue: BMW.RSA.VEHICLE_MESSAGES~",
+                ~"Queue: BMW.RSU.UPDATEMANIFEST.ZFUS_TO_RSA~",
+                ~"Queue: BMW.RSU.ENC_UPDATEMANIFEST.ASBC_TO_RSA~",
+                ~"Queue: BMW.RSU.VEHICLE_TRIGGER~",
+                ~"Queue: BMW.RSU.RSA_PIPELINE~"
+            )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+		        fromRelationship.isServiceMethodOfService(
+			        type(~"SERVICE~"),entityName.in(
+                        ~"UpdateRequestResource - rsu - prod~",
+                        ~"UpdateManifestResource - rsu - prod~",
+                        ~"SendReportResource - rsu - prod~",
+                        ~"MessageEndpointProxy - rsu - prod~"
+                )
+			)
+			,entityName.in(
+				~"askForUpdate~",
+                ~"askForUpdateManifest~",
+                ~"sendReport~",
+                ~"Queue: BMW.RSU.ZFUS_MPG_OUTPUT~",
+                ~"Queue: BMW.RSU.RN.RNB_TO_RSA~",
+                ~"Queue: BMW.RSU.DEC_VEHICLE_REQUEST.ASBC_TO_RSA~",
+                ~"Queue: BMW.RSA.VEHICLE_MESSAGES~",
+                ~"Queue: BMW.RSU.UPDATEMANIFEST.ZFUS_TO_RSA~",
+                ~"Queue: BMW.RSU.ENC_UPDATEMANIFEST.ASBC_TO_RSA~",
+                ~"Queue: BMW.RSU.VEHICLE_TRIGGER~",
+                ~"Queue: BMW.RSU.RSA_PIPELINE~"
+            )"))))):splitBy()))
+    EOT
+
+
+    #if not set (removed) it's defaulted to "-1d"
+    timeframe                   = "-1d"
 
-    #if not set (removed) it's defaulted to "-1d" 
-    timeframe                   = "-1d" 
-         
 
     #currently the only possible value
-    evaluation                  = "AGGREGATE"           
+    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
+    target                      = 98            #if not set(removed) it's defaulted to 98
+    warning                     = 99            #if not set(removed) it's defaulted to 99
     
 }
\ No newline at end of file
diff --git a/NA_PROD/slo/VDM_-_RSU_-_US_E2E.tf b/NA_PROD/slo/VDM_-_RSU_-_US_E2E.tf
index 45dca3f..86c3ff6 100644
--- a/NA_PROD/slo/VDM_-_RSU_-_US_E2E.tf
+++ b/NA_PROD/slo/VDM_-_RSU_-_US_E2E.tf
@@ -1,33 +1,76 @@
 module VDM_-_RSU_-_US_E2E {
-    
+
     source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "VDM - RSU - US E2E" 
 
-    description                 = "" 
 
-    
-    
-    #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-B7DC53ACF6D15E10\",\"SERVICE_METHOD-4654DDECA5324C2C\")" 
-            
+    name                        = "VDM - RSU - US E2E"
+
+    description                 = "Custom Vehicle Device Management (VDM) SLO for Remote Software Upgrade (RSU)"
+
+
+
+    #entity selector object
+    filter                      = ""
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*((builtin:service.keyRequest.errors.server.successCount:splitBy())/(builtin:service.keyRequest.count.server:splitBy()))" 
- 
+    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(
+                        ~"UpdateRequestResource - rsu - e2e~",
+                        ~"UpdateManifestResource - rsu - e2e~",
+                        ~"SendReportResource - rsu - e2e~",
+                        ~"MessageEndpointProxy - rsu - e2e~"
+                )
+			)
+			,entityName.in(
+				~"askForUpdate~",
+                ~"askForUpdateManifest~",
+                ~"sendReport~",
+                ~"Queue: BMW.RSU.ZFUS_MPG_OUTPUT~",
+                ~"Queue: BMW.RSU.RN.RNB_TO_RSA~",
+                ~"Queue: BMW.RSU.DEC_VEHICLE_REQUEST.ASBC_TO_RSA~",
+                ~"Queue: BMW.RSA.VEHICLE_MESSAGES~",
+                ~"Queue: BMW.RSU.UPDATEMANIFEST.ZFUS_TO_RSA~",
+                ~"Queue: BMW.RSU.ENC_UPDATEMANIFEST.ASBC_TO_RSA~",
+                ~"Queue: BMW.RSU.VEHICLE_TRIGGER~",
+                ~"Queue: BMW.RSU.RSA_PIPELINE~"
+            )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+		        fromRelationship.isServiceMethodOfService(
+			        type(~"SERVICE~"),entityName.in(
+                        ~"UpdateRequestResource - rsu - e2e~",
+                        ~"UpdateManifestResource - rsu - e2e~",
+                        ~"SendReportResource - rsu - e2e~",
+                        ~"MessageEndpointProxy - rsu - e2e~"
+                )
+			)
+			,entityName.in(
+				~"askForUpdate~",
+                ~"askForUpdateManifest~",
+                ~"sendReport~",
+                ~"Queue: BMW.RSU.ZFUS_MPG_OUTPUT~",
+                ~"Queue: BMW.RSU.RN.RNB_TO_RSA~",
+                ~"Queue: BMW.RSU.DEC_VEHICLE_REQUEST.ASBC_TO_RSA~",
+                ~"Queue: BMW.RSA.VEHICLE_MESSAGES~",
+                ~"Queue: BMW.RSU.UPDATEMANIFEST.ZFUS_TO_RSA~",
+                ~"Queue: BMW.RSU.ENC_UPDATEMANIFEST.ASBC_TO_RSA~",
+                ~"Queue: BMW.RSU.VEHICLE_TRIGGER~",
+                ~"Queue: BMW.RSU.RSA_PIPELINE~"
+            )"))))):splitBy()))
+    EOT
+
+
+    #if not set (removed) it's defaulted to "-1d"
+    timeframe                   = "-1d"
 
-    #if not set (removed) it's defaulted to "-1d" 
-    timeframe                   = "-1d" 
-         
 
     #currently the only possible value
-    evaluation                  = "AGGREGATE"           
+    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
+    target                      = 98            #if not set(removed) it's defaulted to 98
+    warning                     = 99            #if not set(removed) it's defaulted to 99
     
 }
\ No newline at end of file
diff --git a/NA_PROD/slo/VDM_-_RSU_-_US_PROD.tf b/NA_PROD/slo/VDM_-_RSU_-_US_PROD.tf
index ad3cf7b..033caa6 100644
--- a/NA_PROD/slo/VDM_-_RSU_-_US_PROD.tf
+++ b/NA_PROD/slo/VDM_-_RSU_-_US_PROD.tf
@@ -1,33 +1,76 @@
 module VDM_-_RSU_-_US_PROD {
-    
+
     source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "VDM - RSU - US PROD" 
 
-    description                 = "" 
 
-    
-    
-    #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-6860EF7FE7E8C9C3\",\"SERVICE_METHOD-C2344A4CB98BEEEB\",\"SERVICE_METHOD-BDAEB2DCCD300CD3\",\"SERVICE_METHOD-11049CE6B5E3B03F\",\"SERVICE_METHOD-E0D0EF56C0E8141C\",\"SERVICE_METHOD-79A0EEF7ECB1818A\",\"SERVICE_METHOD-BC753BA99698B5DD\",\"SERVICE_METHOD-9BBF50FD19051A12\",\"SERVICE_METHOD-4711361A434C11E8\",\"SERVICE_METHOD-A0DBC32A08EBE5E1\",\"SERVICE_METHOD-7D3786B7658309D2\")" 
-            
+    name                        = "VDM - RSU - US PROD"
+
+    description                 = "Custom Vehicle Device Management (VDM) SLO for Remote Software Upgrade (RSU)"
+
+
+
+    #entity selector object
+    filter                      = ""
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*((builtin:service.keyRequest.errors.server.successCount:splitBy())/(builtin:service.keyRequest.count.server:splitBy()))" 
- 
+    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(
+                        ~"UpdateRequestResource - rsu - prod~",
+                        ~"UpdateManifestResource - rsu - prod~",
+                        ~"SendReportResource - rsu - prod~",
+                        ~"MessageEndpointProxy - rsu - prod~"
+                )
+			)
+			,entityName.in(
+				~"askForUpdate~",
+                ~"askForUpdateManifest~",
+                ~"sendReport~",
+                ~"Queue: BMW.RSU.ZFUS_MPG_OUTPUT~",
+                ~"Queue: BMW.RSU.RN.RNB_TO_RSA~",
+                ~"Queue: BMW.RSU.DEC_VEHICLE_REQUEST.ASBC_TO_RSA~",
+                ~"Queue: BMW.RSA.VEHICLE_MESSAGES~",
+                ~"Queue: BMW.RSU.UPDATEMANIFEST.ZFUS_TO_RSA~",
+                ~"Queue: BMW.RSU.ENC_UPDATEMANIFEST.ASBC_TO_RSA~",
+                ~"Queue: BMW.RSU.VEHICLE_TRIGGER~",
+                ~"Queue: BMW.RSU.RSA_PIPELINE~"
+            )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+		        fromRelationship.isServiceMethodOfService(
+			        type(~"SERVICE~"),entityName.in(
+                        ~"UpdateRequestResource - rsu - prod~",
+                        ~"UpdateManifestResource - rsu - prod~",
+                        ~"SendReportResource - rsu - prod~",
+                        ~"MessageEndpointProxy - rsu - prod~"
+                )
+			)
+			,entityName.in(
+				~"askForUpdate~",
+                ~"askForUpdateManifest~",
+                ~"sendReport~",
+                ~"Queue: BMW.RSU.ZFUS_MPG_OUTPUT~",
+                ~"Queue: BMW.RSU.RN.RNB_TO_RSA~",
+                ~"Queue: BMW.RSU.DEC_VEHICLE_REQUEST.ASBC_TO_RSA~",
+                ~"Queue: BMW.RSA.VEHICLE_MESSAGES~",
+                ~"Queue: BMW.RSU.UPDATEMANIFEST.ZFUS_TO_RSA~",
+                ~"Queue: BMW.RSU.ENC_UPDATEMANIFEST.ASBC_TO_RSA~",
+                ~"Queue: BMW.RSU.VEHICLE_TRIGGER~",
+                ~"Queue: BMW.RSU.RSA_PIPELINE~"
+            )"))))):splitBy()))
+    EOT
+
+
+    #if not set (removed) it's defaulted to "-1d"
+    timeframe                   = "-1d"
 
-    #if not set (removed) it's defaulted to "-1d" 
-    timeframe                   = "-1d" 
-         
 
     #currently the only possible value
-    evaluation                  = "AGGREGATE"           
+    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
+    target                      = 98            #if not set(removed) it's defaulted to 98
+    warning                     = 99            #if not set(removed) it's defaulted to 99
     
 }
\ No newline at end of file