From 7e778f0b1c651ca241ab9a940d69c3e20694dd37 Mon Sep 17 00:00:00 2001
From: Mohammed Abadel <mohammed.abadel@bmw.de>
Date: Fri, 24 Feb 2023 14:03:47 +0100
Subject: [PATCH] Adjusting SLOs for Remote Services in EMEA and NA

---
 EMEA_PROD/slo/TP_Mobile_RemoteServices.tf     | 33 ++++++++++++-------
 ...Services__-_Reliability_of_key_requests.tf | 33 ++++++++++++-------
 NA_PROD/slo/TP_Mobile_RemoteServices.tf       | 15 ++++++---
 ...Services__-_Reliability_of_key_requests.tf | 13 ++++++--
 4 files changed, 65 insertions(+), 29 deletions(-)

diff --git a/EMEA_PROD/slo/TP_Mobile_RemoteServices.tf b/EMEA_PROD/slo/TP_Mobile_RemoteServices.tf
index 92b4c9e..dadc566 100644
--- a/EMEA_PROD/slo/TP_Mobile_RemoteServices.tf
+++ b/EMEA_PROD/slo/TP_Mobile_RemoteServices.tf
@@ -12,22 +12,33 @@ module TP_Mobile_RemoteServices {
 
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<EOT
-    (100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), 
+(100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), 
                 fromRelationship.isServiceMethodOfService(
                         type(~"SERVICE~"),entityName.in(
-                                ~"btc-destination-composite-service - PROD~"
+                                ~"btc-vehicle-remote-commands-composite-service - PROD~"
                                 )
                         )
                         ,entityName.in(
-                                ~"POST /api/v2/favorites/~",
-                                ~"POST /api/v3/favorites/~",
-                                ~"GET /api/v2/favorites/~",
-                                ~"GET /api/v3/favorites/~",
-                                ~"GET /api/v1/favorites~",
-                                ~"PUT /api/v2/favorites/<favoriteId>~",
-                                ~"PUT /api/v3/favorites/<favoriteId>~",
-                                ~"PUT /api/v2/favorites/homework/1~",
-                                ~"PUT /api/v2/favorites/homework/2~"
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/door-lock~",
+                                ~"POST /api/v3/presentation/remote-commands/<VIN>/door-lock~",
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-now~",
+                                ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-now~",
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/door-unlock~",
+                                ~"POST /api/v3/presentation/remote-commands/<VIN>/door-unlock~",
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/vehicle-finder~",
+                                ~"POST /api/v3/presentation/remote-commands/<VIN>/vehicle-finder~",
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-timer~",
+                                ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-timer~",
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/horn-blow~",
+                                ~"POST /api/v3/presentation/remote-commands/<VIN>/horn-blow~",
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/light-flash~",
+                                ~"POST /api/v3/presentation/remote-commands/<VIN>/light-flash~",
+                                ~"GET /api/v1/presentation/remote-history/<VIN>~",
+                                ~"GET /api/v2/presentation/remote-history/<VIN>~",
+                                ~"GET /api/v3/presentation/remote-history/<VIN>~",
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/charging-profile~",
+                                ~"POST /api/v2/presentation/remote-commands/eventPosition~",
+                                ~"POST /api/v3/presentation/remote-commands/eventPosition~"
                         )"))))):splitBy())
 
     EOT
diff --git a/EMEA_PROD/slo/Wirkkette__Remote_Services__-_Reliability_of_key_requests.tf b/EMEA_PROD/slo/Wirkkette__Remote_Services__-_Reliability_of_key_requests.tf
index f35591e..7db983e 100644
--- a/EMEA_PROD/slo/Wirkkette__Remote_Services__-_Reliability_of_key_requests.tf
+++ b/EMEA_PROD/slo/Wirkkette__Remote_Services__-_Reliability_of_key_requests.tf
@@ -15,22 +15,33 @@ module Wirkkette__Remote_Services__-_Reliability_of_key_requests {
 
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<EOT
-    (100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), 
+(100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), 
                 fromRelationship.isServiceMethodOfService(
                         type(~"SERVICE~"),entityName.in(
-                                ~"btc-destination-composite-service - PROD~"
+                                ~"btc-vehicle-remote-commands-composite-service - PROD~"
                                 )
                         )
                         ,entityName.in(
-                                ~"POST /api/v2/favorites/~",
-                                ~"POST /api/v3/favorites/~",
-                                ~"GET /api/v2/favorites/~",
-                                ~"GET /api/v3/favorites/~",
-                                ~"GET /api/v1/favorites~",
-                                ~"PUT /api/v2/favorites/<favoriteId>~",
-                                ~"PUT /api/v3/favorites/<favoriteId>~",
-                                ~"PUT /api/v2/favorites/homework/1~",
-                                ~"PUT /api/v2/favorites/homework/2~"
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/door-lock~",
+                                ~"POST /api/v3/presentation/remote-commands/<VIN>/door-lock~",
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-now~",
+                                ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-now~",
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/door-unlock~",
+                                ~"POST /api/v3/presentation/remote-commands/<VIN>/door-unlock~",
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/vehicle-finder~",
+                                ~"POST /api/v3/presentation/remote-commands/<VIN>/vehicle-finder~",
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-timer~",
+                                ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-timer~",
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/horn-blow~",
+                                ~"POST /api/v3/presentation/remote-commands/<VIN>/horn-blow~",
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/light-flash~",
+                                ~"POST /api/v3/presentation/remote-commands/<VIN>/light-flash~",
+                                ~"GET /api/v1/presentation/remote-history/<VIN>~",
+                                ~"GET /api/v2/presentation/remote-history/<VIN>~",
+                                ~"GET /api/v3/presentation/remote-history/<VIN>~",
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/charging-profile~",
+                                ~"POST /api/v2/presentation/remote-commands/eventPosition~",
+                                ~"POST /api/v3/presentation/remote-commands/eventPosition~"
                         )"))))):splitBy())
 
     EOT
diff --git a/NA_PROD/slo/TP_Mobile_RemoteServices.tf b/NA_PROD/slo/TP_Mobile_RemoteServices.tf
index b6dfa71..c8a1a2b 100644
--- a/NA_PROD/slo/TP_Mobile_RemoteServices.tf
+++ b/NA_PROD/slo/TP_Mobile_RemoteServices.tf
@@ -12,7 +12,7 @@ module TP_Mobile_RemoteServices {
 
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<EOT
-    (100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), 
+(100)-(builtin:service.keyRequest.errors.fivexx.rate: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~"
@@ -20,18 +20,25 @@ module TP_Mobile_RemoteServices {
                         )
                                 ,entityName.in(
                                         ~"POST /api/v2/presentation/remote-commands/<VIN>/door-lock~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/door-lock~",										
                                         ~"POST /api/v2/presentation/remote-commands/<VIN>/door-unlock~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/door-unlock~",
                                         ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-now~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-now~",
                                         ~"POST /api/v2/presentation/remote-commands/<VIN>/vehicle-finder~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/vehicle-finder~",
                                         ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-timer~",
+                                        ~"POST /api/v3/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/v3/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/<VIN>/charging-profile~",										
                                         ~"POST /api/v2/presentation/remote-commands/eventPosition~",
+                                        ~"POST /api/v3/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~"
+                                        ~"GET /api/v3/presentation/remote-history/<VIN>~"
                                 )"))))):splitBy())
 
     EOT
diff --git a/NA_PROD/slo/Wirkkette__Remote_Services__-_Reliability_of_key_requests.tf b/NA_PROD/slo/Wirkkette__Remote_Services__-_Reliability_of_key_requests.tf
index 3d2e86a..75b811d 100644
--- a/NA_PROD/slo/Wirkkette__Remote_Services__-_Reliability_of_key_requests.tf
+++ b/NA_PROD/slo/Wirkkette__Remote_Services__-_Reliability_of_key_requests.tf
@@ -23,18 +23,25 @@ module Wirkkette__Remote_Services__-_Reliability_of_key_requests {
                         )
                                 ,entityName.in(
                                         ~"POST /api/v2/presentation/remote-commands/<VIN>/door-lock~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/door-lock~",										
                                         ~"POST /api/v2/presentation/remote-commands/<VIN>/door-unlock~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/door-unlock~",
                                         ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-now~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-now~",
                                         ~"POST /api/v2/presentation/remote-commands/<VIN>/vehicle-finder~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/vehicle-finder~",
                                         ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-timer~",
+                                        ~"POST /api/v3/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/v3/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/<VIN>/charging-profile~",										
                                         ~"POST /api/v2/presentation/remote-commands/eventPosition~",
+                                        ~"POST /api/v3/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~"
+                                        ~"GET /api/v3/presentation/remote-history/<VIN>~"
                                 )"))))):splitBy())
 
     EOT