From f2991c9e3fc072768796da79247d93d20648cff5 Mon Sep 17 00:00:00 2001
From: Mohammed Abadel <mohammed.abadel@bmw.de>
Date: Mon, 31 Oct 2022 15:38:28 +0100
Subject: [PATCH] Adjusting SLO for Vehicle Data to use request names instead
 of ids

---
 ...cle_Data__-_Reliability_of_key_requests.tf | 23 ++++++++++++++-----
 ...cle_Data__-_Reliability_of_key_requests.tf | 22 +++++++++++++-----
 ...cle_Data__-_Reliability_of_key_requests.tf | 22 +++++++++++++-----
 3 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/CN_PROD/slo/Wirkkette__Vehicle_Data__-_Reliability_of_key_requests.tf b/CN_PROD/slo/Wirkkette__Vehicle_Data__-_Reliability_of_key_requests.tf
index 4887e40..b0f17f4 100644
--- a/CN_PROD/slo/Wirkkette__Vehicle_Data__-_Reliability_of_key_requests.tf
+++ b/CN_PROD/slo/Wirkkette__Vehicle_Data__-_Reliability_of_key_requests.tf
@@ -10,11 +10,24 @@ module Wirkkette__Vehicle_Data__-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-76A9DA915F262474\",\"SERVICE_METHOD-405F007AA0570671\",\"SERVICE_METHOD-959F2E3E489257E0\")" 
+    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.fivexx.rate:filter(and(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" 
@@ -25,9 +38,7 @@ module Wirkkette__Vehicle_Data__-_Reliability_of_key_requests {
     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/Wirkkette__Vehicle_Data__-_Reliability_of_key_requests.tf b/EMEA_PROD/slo/Wirkkette__Vehicle_Data__-_Reliability_of_key_requests.tf
index 995e48b..88c4763 100644
--- a/EMEA_PROD/slo/Wirkkette__Vehicle_Data__-_Reliability_of_key_requests.tf
+++ b/EMEA_PROD/slo/Wirkkette__Vehicle_Data__-_Reliability_of_key_requests.tf
@@ -10,11 +10,23 @@ module Wirkkette__Vehicle_Data__-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-769506A99DD5D4A4\",\"SERVICE_METHOD-88B4248DCF959D93\")" 
+    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.fivexx.rate:filter(and(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" 
@@ -25,9 +37,7 @@ module Wirkkette__Vehicle_Data__-_Reliability_of_key_requests {
     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/Wirkkette__Vehicle_Data__-_Reliability_of_key_requests.tf b/NA_PROD/slo/Wirkkette__Vehicle_Data__-_Reliability_of_key_requests.tf
index 2073812..88c4763 100644
--- a/NA_PROD/slo/Wirkkette__Vehicle_Data__-_Reliability_of_key_requests.tf
+++ b/NA_PROD/slo/Wirkkette__Vehicle_Data__-_Reliability_of_key_requests.tf
@@ -10,11 +10,23 @@ module Wirkkette__Vehicle_Data__-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-0E5B844EBB82F6ED\",\"SERVICE_METHOD-0F83A5B89D63CD6F\",\"SERVICE_METHOD-CC975B01204F0CE4\")" 
+    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.fivexx.rate:filter(and(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" 
@@ -25,9 +37,7 @@ module Wirkkette__Vehicle_Data__-_Reliability_of_key_requests {
     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