From 6f357e40bc7a0aac60c02b08f4bb882a40b83247 Mon Sep 17 00:00:00 2001
From: Mohammed Abadel <mohammed.abadel@bmw.de>
Date: Mon, 27 Feb 2023 13:33:39 +0100
Subject: [PATCH] Adjusting SLO for Remote Services to exclude v3 endpoints

---
 ...Services__-_Reliability_of_key_requests.tf | 27 ++++--------
 ...Services__-_Reliability_of_key_requests.tf | 42 ++++++++-----------
 2 files changed, 26 insertions(+), 43 deletions(-)

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 7db983e..d0da7cf 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
@@ -22,26 +22,17 @@ 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>/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~",
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/door-lock~",                             
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-now~",                             
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/door-unlock~",                                
+                                ~"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>/horn-blow~",                               
+                                ~"POST /api/v2/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>~",
+                                ~"GET /api/v2/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~"
+                                ~"POST /api/v2/presentation/remote-commands/eventPosition~",                                
                         )"))))):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 75b811d..4206b8f 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
@@ -16,33 +16,25 @@ 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), 
-                        fromRelationship.isServiceMethodOfService(
-                                type(~"SERVICE~"),entityName.in(
-                                        ~"btc-vehicle-remote-commands-composite-service - PROD~"
+                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/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>/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~",
-                                        ~"POST /api/v3/presentation/remote-commands/eventPosition~",
-                                        ~"GET /api/v1/presentation/remote-history/<VIN>~",
-                                        ~"GET /api/v2/presentation/remote-history/<VIN>~",
-                                        ~"GET /api/v3/presentation/remote-history/<VIN>~"
-                                )"))))):splitBy())
+                        ,entityName.in(
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/door-lock~",                             
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-now~",                             
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/door-unlock~",                                
+                                ~"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>/horn-blow~",                               
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/light-flash~",                               
+                                ~"GET /api/v1/presentation/remote-history/<VIN>~",
+                                ~"GET /api/v2/presentation/remote-history/<VIN>~",                                
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/charging-profile~",
+                                ~"POST /api/v2/presentation/remote-commands/eventPosition~",                                
+                        )"))))):splitBy())
+
 
     EOT