TP_Mobile_Wirkketten_Anpassung_2

EMEA_PROD/slo/TP_Mobile_DigitalKey.tf

@@ -12,14 +12,7 @@ module TP_Mobile_DigitalKey {
 
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<-EOT
-(100)*
+(100)*((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
 			fromRelationship.isServiceMethodOfService(
 				type(~"SERVICE~"),entityName.in(
                                          ~"TrackApi - smc - PROD~",
@@ -27,21 +20,13 @@ module TP_Mobile_DigitalKey {
                                  )
 				)
 			,entityName.in(
-						~"POST /smc2-bl/track/v2/trackKey~",
+				~"trackKey~",
-						~"POST /smc2-bl/track/v2/manageKey~",
+				~"manageKey~",
 				~"GET /api/v1/digitalkey/<VIN>/password~",
                                 ~"GET /api/v1/digitalkey/<VIN>/pairing~"
-						)")
+			)"))))):splitBy())
-				)
+	/
-))):splitBy())
+		(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-/
-(builtin:service.keyRequest.count.server:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
 			fromRelationship.isServiceMethodOfService(
 				type(~"SERVICE~"),entityName.in(
                                         ~"TrackApi - smc - PROD~",
@@ -49,14 +34,12 @@ module TP_Mobile_DigitalKey {
                                   )
 				)
 			,entityName.in(
-						~"POST /smc2-bl/track/v2/trackKey~",
+				~"trackKey~",
-						~"POST /smc2-bl/track/v2/manageKey~",
+				~"manageKey~",
 				~"GET /api/v1/digitalkey/<VIN>/password~",
                                 ~"GET /api/v1/digitalkey/<VIN>/pairing~"
-						)")
+			)"))))):splitBy()))					
-				)
+    EOT
-))):splitBy()))
-EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         

EMEA_PROD/slo/TP_Mobile_PersonalFavorites.tf

@@ -11,15 +11,8 @@ module TP_Mobile_PersonalFavorites {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = <<-EOT
+    metric_expression           = <<EOT
-(100)*
+    (100)* ((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-((builtin:service.keyRequest.errors.server.successCount:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
                         fromRelationship.isServiceMethodOfService(
 			        type(~"SERVICE~"),entityName.in(
 					~"btc-destination-composite-service - PROD~"
@@ -35,17 +28,9 @@ module TP_Mobile_PersonalFavorites {
 					~"PUT /api/v3/favorites/<favoriteId>~",
 					~"PUT /api/v2/favorites/homework/1~",
 					~"PUT /api/v2/favorites/homework/2~" 
-						)")
+			)"))))):splitBy())
-				)
+	/
-))):splitBy())
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-/
-(builtin:service.keyRequest.count.server:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
                 fromRelationship.isServiceMethodOfService(
 				type(~"SERVICE~"),entityName.in(
 					~"btc-destination-composite-service - PROD~"
@@ -61,10 +46,9 @@ module TP_Mobile_PersonalFavorites {
 					~"PUT /api/v3/favorites/<favoriteId>~",
 					~"PUT /api/v2/favorites/homework/1~",
 					~"PUT /api/v2/favorites/homework/2~"
-						)")
+			)"))))):splitBy()))
-				)
+
-))):splitBy()))
+    EOT
-EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         

EMEA_PROD/slo/TP_Mobile_Remote360.tf

@@ -11,15 +11,8 @@ module TP_Mobile_Remote360 {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = <<-EOT
+    metric_expression           = <<EOT
-(100)*
+    (100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), 
-((builtin:service.keyRequest.errors.server.successCount:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
                         fromRelationship.isServiceMethodOfService(
                             type(~"SERVICE~"),entityName.in(
                                 ~"remote-360-composite-service - PROD~"
@@ -34,35 +27,9 @@ module TP_Mobile_Remote360 {
                                 ~"GET /api/v1/vehicle/<VIN>/egomodelurl~",
                                 ~"GET /api/v1/vehicle/<VIN>/key~",
                                 ~"GET /api/v1/recordings/vehicle/<VIN>~"
-						)")
+                        )"))))):splitBy())
-				)
+
-))):splitBy())
+    EOT
-/
-(builtin:service.keyRequest.count.server:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
-						fromRelationship.isServiceMethodOfService(
-							type(~"SERVICE~"),entityName.in(
-								~"remote-360-composite-service - PROD~"
-								)
-						)
-					,entityName.in(
-						~"GET /api/v1/events/[UUID]~",
-						~"POST /api/v1/events/[UUID]/cancel~",
-						~"POST /api/v1/event/execute~",
-						~"GET /api/v1/download/[UUID]/<fileName>~",
-						~"POST /api/v1/download/[UUID]/<fileName>/confirm~",
-						~"GET /api/v1/vehicle/<VIN>/egomodelurl~",
-						~"GET /api/v1/vehicle/<VIN>/key~",
-						~"GET /api/v1/recordings/vehicle/<VIN>~" 
-						)")
-				)
-))):splitBy()))
-EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         

EMEA_PROD/slo/TP_Mobile_RemoteServices.tf

@@ -11,62 +11,26 @@ module TP_Mobile_RemoteServices {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = <<-EOT
+    metric_expression           = <<EOT
-(100)*
+    (100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), 
-((builtin:service.keyRequest.errors.server.successCount:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
                 fromRelationship.isServiceMethodOfService(
                         type(~"SERVICE~"),entityName.in(
-								~"btc-vehicle-remote-commands-composite-service - PROD~"
+                                ~"btc-destination-composite-service - PROD~"
                                 )
                         )
                         ,entityName.in(
-						~"POST /api/v2/presentation/remote-commands/<VIN>/door-lock~",
+                                ~"POST /api/v2/favorites/~",
-						~"POST /api/v2/presentation/remote-commands/<VIN>/door-unlock~",
+                                ~"POST /api/v3/favorites/~",
-						~"POST /api/v2/presentation/remote-commands/<VIN>/climate-now~",
+                                ~"GET /api/v2/favorites/~",
-						~"POST /api/v2/presentation/remote-commands/<VIN>/vehicle-finder~",
+                                ~"GET /api/v3/favorites/~",
-						~"POST /api/v2/presentation/remote-commands/<VIN>/climate-timer~",
+                                ~"GET /api/v1/favorites~",
-						~"POST /api/v2/presentation/remote-commands/<VIN>/light-flash~",
+                                ~"PUT /api/v2/favorites/<favoriteId>~",
-						~"POST /api/v2/presentation/remote-commands/<VIN>/charging-profile~",
+                                ~"PUT /api/v3/favorites/<favoriteId>~",
-						~"POST /api/v2/presentation/remote-commands/eventPosition~",
+                                ~"PUT /api/v2/favorites/homework/1~",
-						~"GET /api/v1/presentation/remote-history/<VIN>~",
+                                ~"PUT /api/v2/favorites/homework/2~"
-						~"POST /api/v2/presentation/remote-commands/eventStatus~"
+                        )"))))):splitBy())
-						)")
+
-				)
+    EOT
-))):splitBy())
-/
-(builtin:service.keyRequest.count.server:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
-						fromRelationship.isServiceMethodOfService(
-							type(~"SERVICE~"),entityName.in(
-								~"btc-vehicle-remote-commands-composite-service - PROD~"
-								)
-						)
-					,entityName.in(
-						~"POST /api/v2/presentation/remote-commands/<VIN>/door-lock~",
-						~"POST /api/v2/presentation/remote-commands/<VIN>/door-unlock~",
-						~"POST /api/v2/presentation/remote-commands/<VIN>/climate-now~",
-						~"POST /api/v2/presentation/remote-commands/<VIN>/vehicle-finder~",
-						~"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>/charging-profile~",
-						~"POST /api/v2/presentation/remote-commands/eventPosition~",
-						~"GET /api/v1/presentation/remote-history/<VIN>~",
-						~"POST /api/v2/presentation/remote-commands/eventStatus~"
-						)")
-				)
-))):splitBy()))
-EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         

EMEA_PROD/slo/TP_Mobile_Send2VehicleLegacy.tf

@@ -11,36 +11,20 @@ module TP_Mobile_Send2VehicleLegacy {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = <<-EOT
+    metric_expression           = <<EOT
-(100)*
+        (100)*((builtin:service.errors.server.successCount:filter(and(or(in("dt.entity.service",
-((builtin:service.errors.server.successCount:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service",
 		        entitySelector("type(service),
 				entityName.in(
 					~"LegacyPoiApi - msgsvc - prod~"
 						)
-					")
+					"))))):splitBy())
-				)
+        /
-			)
+        (builtin:service.requestCount.total:filter(and(or(in("dt.entity.service",entitySelector("type(service),
-)):splitBy())
-/
-(builtin:service.requestCount.total:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service",
-					entitySelector("type(service),
 			entityName.in(
 				~"LegacyPoiApi - msgsvc - prod~"
 					)
-					")
+					"))))):splitBy()))
-				)
+    EOT
-			)
-)):splitBy()))
-EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         

EMEA_PROD/slo/TP_Mobile_Send2VehicleMGU.tf

@@ -11,15 +11,8 @@ module TP_Mobile_Send2VehicleMGU {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = <<-EOT
+    metric_expression           = <<EOT
-(100)*
+        (100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-((builtin:service.keyRequest.errors.server.successCount:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
 				fromRelationship.isServiceMethodOfService(
 					type(~"SERVICE~"),entityName.in(
                                                 ~"TripService - PROD~"
@@ -28,17 +21,9 @@ module TP_Mobile_Send2VehicleMGU {
 				,entityName.in(
                                         ~"/v2/motorist/[UUID]/trips~",
                                         ~"/v3/motorist/[UUID]/trips~"
-						)")
+                                        )"))))):splitBy())
-				)
+	/
-))):splitBy())
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-/
-(builtin:service.keyRequest.count.server:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
 				fromRelationship.isServiceMethodOfService(
 					type(~"SERVICE~"),entityName.in(
                                                 ~"TripService - PROD~"
@@ -47,10 +32,8 @@ module TP_Mobile_Send2VehicleMGU {
 				,entityName.in(
 					~"/v2/motorist/[UUID]/trips~",
                                         ~"/v3/motorist/[UUID]/trips~"
-						)")
+                                        )"))))):splitBy()))
-				)
+    EOT 
-))):splitBy()))
-EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         

EMEA_PROD/slo/TP_Mobile_VehicleData.tf

@@ -11,15 +11,8 @@ module TP_Mobile_VehicleData {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = <<-EOT
+    metric_expression           = <<EOT
-(100)*
+    (100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(in("dt.entity.service_method",entitySelector("type(service_method), 
-((builtin:service.keyRequest.errors.server.successCount:filter(
-    and(
-        or(
-            in(
-                "dt.entity.service_method",
-                    entitySelector(
-                        "type(service_method),
                 fromRelationship.isServiceMethodOfService(
                         type(~"SERVICE~"),entityName.in(
                                 ~"btc-vehicle-composite-service - PROD~",
@@ -28,31 +21,10 @@ module TP_Mobile_VehicleData {
                         )
                         ,entityName.in(
                                 ~"GET /api/v1/vehicles/<VIN>/state~",
-                        ~"GET /v1/vehicle/<VIN>~"
+                                ~"GET /v1/vehicle/<VIN>~",
-                        )")
+                                ~"GET /v2/vehicle/<VIN>~"
-                )
+                                )")))):splitBy())
-))):splitBy())
+    EOT
-/
-(builtin:service.keyRequest.count.server:filter(
-    and(
-        or(
-            in(
-                "dt.entity.service_method",
-                    entitySelector(
-                        "type(service_method),
-                        fromRelationship.isServiceMethodOfService(
-                            type(~"SERVICE~"),entityName.in(
-                                ~"btc-vehicle-composite-service - PROD~",
-                                ~"VehicleService - PROD~"
-                                )
-                        )
-                    ,entityName.in(
-                        ~"GET /api/v1/vehicles/<VIN>/state~",
-                        ~"GET /v1/vehicle/<VIN>~"
-                        )")
-                )
-))):splitBy()))
-EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         

NA_PROD/slo/TP_Mobile_DigitalKey.tf

@@ -12,14 +12,7 @@ module TP_Mobile_DigitalKey {
 
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<-EOT
-(100)*
+(100)*((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
 			fromRelationship.isServiceMethodOfService(
 				type(~"SERVICE~"),entityName.in(
                                          ~"TrackApi - smc - PROD~",
@@ -27,21 +20,13 @@ module TP_Mobile_DigitalKey {
                                  )
 				)
 			,entityName.in(
-						~"POST /smc2-bl/track/v2/trackKey~",
+				~"trackKey~",
-						~"POST /smc2-bl/track/v2/manageKey~",
+				~"manageKey~",
 				~"GET /api/v1/digitalkey/<VIN>/password~",
                                 ~"GET /api/v1/digitalkey/<VIN>/pairing~"
-						)")
+			)"))))):splitBy())
-				)
+	/
-))):splitBy())
+		(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-/
-(builtin:service.keyRequest.count.server:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
 			fromRelationship.isServiceMethodOfService(
 				type(~"SERVICE~"),entityName.in(
                                         ~"TrackApi - smc - PROD~",
@@ -49,14 +34,12 @@ module TP_Mobile_DigitalKey {
                                   )
 				)
 			,entityName.in(
-						~"POST /smc2-bl/track/v2/trackKey~",
+				~"trackKey~",
-						~"POST /smc2-bl/track/v2/manageKey~",
+				~"manageKey~",
 				~"GET /api/v1/digitalkey/<VIN>/password~",
                                 ~"GET /api/v1/digitalkey/<VIN>/pairing~"
-						)")
+			)"))))):splitBy()))					
-				)
+    EOT
-))):splitBy()))
-EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         

NA_PROD/slo/TP_Mobile_Login.tf

@@ -11,15 +11,8 @@ module TP_Mobile_Login {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = <<-EOT
+    metric_expression           = <<EOT
-(100)*
+    (100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), 
-((builtin:service.keyRequest.errors.server.successCount:filter(
-    and(
-        or(
-            in(
-                "dt.entity.service_method",
-                    entitySelector(
-                        "type(service_method),
                         fromRelationship.isServiceMethodOfService(
                             type(~"SERVICE~"),entityName.in(
                                 ~"btc-user-composite-service - PROD~",
@@ -30,31 +23,9 @@ module TP_Mobile_Login {
                                 ~"GET /api/v1/presentation/oauth/config~",
                                 ~"GET /api/v1/presentation/profile-tab~",
                                 ~"POST /api/v1/oauth/token/identifier~"
-                        )")
+                                )"))))):splitBy())
-                )
+
-))):splitBy())
+    EOT
-/
-(builtin:service.keyRequest.count.server:filter(
-    and(
-        or(
-            in(
-                "dt.entity.service_method",
-                    entitySelector(
-                        "type(service_method),
-                        fromRelationship.isServiceMethodOfService(
-                            type(~"SERVICE~"),entityName.in(
-                                ~"btc-user-composite-service - PROD~",
-                                ~"btc-connected-oauth-service - PROD~"
-                                )
-                        )
-                    ,entityName.in(
-                        ~"GET /api/v1/presentation/oauth/config~",
-                        ~"GET /api/v1/presentation/profile-tab~",
-                        ~"POST /api/v1/oauth/token/identifier~"
-                        )")
-                )
-))):splitBy()))
-EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         

NA_PROD/slo/TP_Mobile_PersonalFavorites.tf

@@ -11,15 +11,8 @@ module TP_Mobile_PersonalFavorites {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = <<-EOT
+    metric_expression           = <<EOT
-(100)*
+    (100)* ((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-((builtin:service.keyRequest.errors.server.successCount:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
                         fromRelationship.isServiceMethodOfService(
 			        type(~"SERVICE~"),entityName.in(
 					~"btc-destination-composite-service - PROD~"
@@ -33,17 +26,9 @@ module TP_Mobile_PersonalFavorites {
 					~"PUT /api/v2/favorites/<favoriteId>~",
 					~"PUT /api/v3/favorites/<favoriteId>~",
 					~"DELETE /api/v2/favorites/<favoriteId>~"
-						)")
+			)"))))):splitBy())
-				)
+	/
-))):splitBy())
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-/
-(builtin:service.keyRequest.count.server:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
                 fromRelationship.isServiceMethodOfService(
 			type(~"SERVICE~"),entityName.in(
 					~"btc-destination-composite-service - PROD~"
@@ -57,10 +42,9 @@ module TP_Mobile_PersonalFavorites {
 					~"PUT /api/v2/favorites/<favoriteId>~",
 					~"PUT /api/v3/favorites/<favoriteId>~",
 					~"DELETE /api/v2/favorites/<favoriteId>~"
-						)")
+			)"))))):splitBy()))
-				)
+
-))):splitBy()))
+    EOT
-EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         

NA_PROD/slo/TP_Mobile_Remote360.tf

@@ -11,15 +11,8 @@ module TP_Mobile_Remote360 {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = <<-EOT
+    metric_expression           = <<EOT
-(100)*
+    (100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), 
-((builtin:service.keyRequest.errors.server.successCount:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
                         fromRelationship.isServiceMethodOfService(
                                 type(~"SERVICE~"),entityName.in(
                                         ~"remote-360-composite-service - PROD~"
@@ -34,35 +27,9 @@ module TP_Mobile_Remote360 {
                                 ~"GET /api/v1/vehicle/<VIN>/egomodelurl~",
                                 ~"GET /api/v1/vehicle/<VIN>/key~",
                                 ~"GET /api/v1/recordings/vehicle/<VIN>~"
-						)")
+                        )"))))):splitBy())
-				)
+
-))):splitBy())
+    EOT
-/
-(builtin:service.keyRequest.count.server:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
-						fromRelationship.isServiceMethodOfService(
-							type(~"SERVICE~"),entityName.in(
-								~"remote-360-composite-service - PROD~"
-								)
-						)
-					,entityName.in(
-						~"GET /api/v1/events/[UUID]~",
-						~"POST /api/v1/events/[UUID]/cancel~",
-						~"POST /api/v1/event/execute~",
-						~"GET /api/v1/download/[UUID]/<fileName>~",
-						~"POST /api/v1/download/[UUID]/<fileName>/confirm~",
-						~"GET /api/v1/vehicle/<VIN>/egomodelurl~",
-						~"GET /api/v1/vehicle/<VIN>/key~",
-						~"GET /api/v1/recordings/vehicle/<VIN>~" 
-						)")
-				)
-))):splitBy()))
-EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         

NA_PROD/slo/TP_Mobile_RemoteServices.tf

@@ -11,15 +11,8 @@ module TP_Mobile_RemoteServices {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = <<-EOT
+    metric_expression           = <<EOT
-(100)*
+    (100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), 
-((builtin:service.keyRequest.errors.server.successCount:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
                         fromRelationship.isServiceMethodOfService(
                                 type(~"SERVICE~"),entityName.in(
                                         ~"btc-vehicle-remote-commands-composite-service - PROD~"
@@ -39,40 +32,9 @@ module TP_Mobile_RemoteServices {
                                         ~"GET /api/v1/presentation/remote-history/<VIN>~",
                                         ~"GET /api/v2/presentation/remote-history/<VIN>~",
                                         ~"POST /api/v2/presentation/remote-commands/eventStatus~"
-						)")
+                                )"))))):splitBy())
-				)
+
-))):splitBy())
+    EOT
-/
-(builtin:service.keyRequest.count.server:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
-						fromRelationship.isServiceMethodOfService(
-							type(~"SERVICE~"),entityName.in(
-								~"btc-vehicle-remote-commands-composite-service - PROD~"
-								)
-						)
-					,entityName.in(
-						~"POST /api/v2/presentation/remote-commands/<VIN>/door-lock~",
-						~"POST /api/v2/presentation/remote-commands/<VIN>/door-unlock~",
-						~"POST /api/v2/presentation/remote-commands/<VIN>/climate-now~",
-						~"POST /api/v2/presentation/remote-commands/<VIN>/vehicle-finder~",
-						~"POST /api/v2/presentation/remote-commands/<VIN>/climate-timer~",
-						~"POST /api/v2/presentation/remote-commands/<VIN>/light-flash~",
-						~"POST /api/v3/presentation/remote-commands/<VIN>/horn-blow~",
-						~"POST /api/v2/presentation/remote-commands/<VIN>/horn-blow~",
-						~"POST /api/v2/presentation/remote-commands/<VIN>/charging-profile~",
-						~"POST /api/v2/presentation/remote-commands/eventPosition~",
-						~"GET /api/v1/presentation/remote-history/<VIN>~",
-						~"GET /api/v2/presentation/remote-history/<VIN>~",
-						~"POST /api/v2/presentation/remote-commands/eventStatus~"
-						)")
-				)
-))):splitBy()))
-EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         

NA_PROD/slo/TP_Mobile_Send2VehicleLegacy.tf

@@ -11,36 +11,20 @@ module TP_Mobile_Send2VehicleLegacy {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = <<-EOT
+    metric_expression           = <<EOT
-(100)*
+        (100)*((builtin:service.errors.server.successCount:filter(and(or(in("dt.entity.service",
-((builtin:service.errors.server.successCount:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service",
 		        entitySelector("type(service),
 				entityName.in(
 					~"LegacyPoiApi - msgsvc - prod~"
 						)
-					")
+					"))))):splitBy())
-				)
+        /
-			)
+        (builtin:service.requestCount.total:filter(and(or(in("dt.entity.service",entitySelector("type(service),
-)):splitBy())
-/
-(builtin:service.requestCount.total:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service",
-					entitySelector("type(service),
 			entityName.in(
 				~"LegacyPoiApi - msgsvc - prod~"
 					)
-					")
+					"))))):splitBy()))
-				)
+    EOT
-			)
-)):splitBy()))
-EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         

NA_PROD/slo/TP_Mobile_Send2VehicleMGU.tf

@@ -11,15 +11,8 @@ module TP_Mobile_Send2VehicleMGU {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = <<-EOT
+    metric_expression           = <<EOT
-(100)*
+        (100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-((builtin:service.keyRequest.errors.server.successCount:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
 				fromRelationship.isServiceMethodOfService(
 					type(~"SERVICE~"),entityName.in(
                                                 ~"TripService - PROD~"
@@ -28,17 +21,9 @@ module TP_Mobile_Send2VehicleMGU {
 				,entityName.in(
                                         ~"/v2/motorist/[UUID]/trips~",
                                         ~"/v3/motorist/[UUID]/trips~"
-						)")
+                                        )"))))):splitBy())
-				)
+	/
-))):splitBy())
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-/
-(builtin:service.keyRequest.count.server:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
 				fromRelationship.isServiceMethodOfService(
 					type(~"SERVICE~"),entityName.in(
                                                 ~"TripService - PROD~"
@@ -47,10 +32,8 @@ module TP_Mobile_Send2VehicleMGU {
 				,entityName.in(
 					~"/v2/motorist/[UUID]/trips~",
                                         ~"/v3/motorist/[UUID]/trips~"
-						)")
+                                        )"))))):splitBy()))
-				)
+    EOT
-))):splitBy()))
-EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         

NA_PROD/slo/TP_Mobile_VehicleData.tf

@@ -11,15 +11,8 @@ module TP_Mobile_VehicleData {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = <<-EOT
+    metric_expression           = <<EOT
-(100)*
+    (100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(in("dt.entity.service_method",entitySelector("type(service_method), 
-((builtin:service.keyRequest.errors.server.successCount:filter(
-    and(
-        or(
-            in(
-                "dt.entity.service_method",
-                    entitySelector(
-                        "type(service_method),
                 fromRelationship.isServiceMethodOfService(
                         type(~"SERVICE~"),entityName.in(
                                 ~"btc-vehicle-composite-service - PROD~",
@@ -28,31 +21,10 @@ module TP_Mobile_VehicleData {
                         )
                         ,entityName.in(
                                 ~"GET /api/v1/vehicles/<VIN>/state~",
-                        ~"GET /v1/vehicle/<VIN>~"
+                                ~"GET /v1/vehicle/<VIN>~",
-                        )")
+                                ~"GET /v2/vehicle/<VIN>~"
-                )
+                                )")))):splitBy())
-))):splitBy())
+    EOT
-/
-(builtin:service.keyRequest.count.server:filter(
-    and(
-        or(
-            in(
-                "dt.entity.service_method",
-                    entitySelector(
-                        "type(service_method),
-                        fromRelationship.isServiceMethodOfService(
-                            type(~"SERVICE~"),entityName.in(
-                                ~"btc-vehicle-composite-service - PROD~",
-                                ~"VehicleService - PROD~"
-                                )
-                        )
-                    ,entityName.in(
-                        ~"GET /api/v1/vehicles/<VIN>/state~",
-                        ~"GET /v1/vehicle/<VIN>~"
-                        )")
-                )
-))):splitBy()))
-EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"