From e3fc29cae96eaecf9d217a6331f078e796574e1e Mon Sep 17 00:00:00 2001
From: Mohammed Abadel <mohammed.abadel@bmw.de>
Date: Mon, 12 Sep 2022 15:06:22 +0200
Subject: [PATCH] Adjusting FTS-SLO and DigitalKey-SLOs to use servicenames
 instead of ids

---
 ...__SMACC___-_Reliability_of_key_requests.tf | 50 ++++++++++---------
 ...__SMACC___-_Reliability_of_key_requests.tf | 32 +++++++++++-
 ...__SMACC___-_Reliability_of_key_requests.tf | 33 ++++++++++--
 ..._Service__-_Reliability_of_key_requests.tf | 16 +++++-
 4 files changed, 100 insertions(+), 31 deletions(-)

diff --git a/CN_PROD/slo/Wirkkette__DigitalKey__SMACC___-_Reliability_of_key_requests.tf b/CN_PROD/slo/Wirkkette__DigitalKey__SMACC___-_Reliability_of_key_requests.tf
index ac4a2b5..7b39d81 100644
--- a/CN_PROD/slo/Wirkkette__DigitalKey__SMACC___-_Reliability_of_key_requests.tf
+++ b/CN_PROD/slo/Wirkkette__DigitalKey__SMACC___-_Reliability_of_key_requests.tf
@@ -16,30 +16,32 @@ module Wirkkette__DigitalKey__SMACC___-_Reliability_of_key_requests {
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<-EOT
 (100)*((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~",
-                                ~"digital-key-composite-service - PROD~"
-                            )
-						)
-					,entityName.in(
-						~"trackKey~",
-						~"manageKey~",
-						~"GET /api/v1/digitalkey/<VIN>/password~",
-                        ~"GET /api/v1/digitalkey/<VIN>/pairing~"
-						)"))))):splitBy())/(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~",
-                                ~"digital-key-composite-service - PROD~"
-                            )
-						)
-					,entityName.in(
-						~"trackKey~",
-						~"manageKey~",
-						~"GET /api/v1/digitalkey/<VIN>/password~",
-                        ~"GET /api/v1/digitalkey/<VIN>/pairing~"
-						)"))))):splitBy()))
+			fromRelationship.isServiceMethodOfService(
+				type(~"SERVICE~"),entityName.in(
+                                         ~"TrackApi - smc - PROD~",
+                                         ~"digital-key-composite-service - PROD~"
+                                 )
+				)
+			,entityName.in(
+				~"trackKey~",
+				~"manageKey~",
+				~"GET /api/v1/digitalkey/<VIN>/password~",
+                                ~"GET /api/v1/digitalkey/<VIN>/pairing~"
+			)"))))):splitBy())
+	/
+		(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~",
+                                        ~"digital-key-composite-service - PROD~"
+                                  )
+				)
+			,entityName.in(
+				~"trackKey~",
+				~"manageKey~",
+				~"GET /api/v1/digitalkey/<VIN>/password~",
+                                ~"GET /api/v1/digitalkey/<VIN>/pairing~"
+			)"))))):splitBy()))					
     EOT
  
 
diff --git a/EMEA_PROD/slo/Wirkkette__DigitalKey__SMACC___-_Reliability_of_key_requests.tf b/EMEA_PROD/slo/Wirkkette__DigitalKey__SMACC___-_Reliability_of_key_requests.tf
index 0a0067b..913fbaf 100644
--- a/EMEA_PROD/slo/Wirkkette__DigitalKey__SMACC___-_Reliability_of_key_requests.tf
+++ b/EMEA_PROD/slo/Wirkkette__DigitalKey__SMACC___-_Reliability_of_key_requests.tf
@@ -10,11 +10,39 @@ module Wirkkette__DigitalKey__SMACC___-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(\"SERVICE_METHOD\")" 
+    filter                      = "" 
             
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(and(in(\"dt.entity.service_method\",entitySelector(\"type(service_method),entityId(~\"SERVICE_METHOD-EA852E5283881C68~\",~\"SERVICE_METHOD-6FA84708A746BE9D~\",~\"SERVICE_METHOD-C5331A994ED8A635~\",~\"SERVICE_METHOD-EFCBA1A015A4AD29~\")\")))):splitBy():avg:auto:sort(value(avg,descending)))/(builtin:service.keyRequest.count.server:filter(and(in(\"dt.entity.service_method\",entitySelector(\"type(service_method),entityId(~\"SERVICE_METHOD-EA852E5283881C68~\",~\"SERVICE_METHOD-6FA84708A746BE9D~\",~\"SERVICE_METHOD-C5331A994ED8A635~\",~\"SERVICE_METHOD-EFCBA1A015A4AD29~\")\")))):splitBy():avg:auto:sort(value(avg,descending))))" 
+    metric_expression           = <<-EOT
+(100)*((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~",
+                                         ~"digital-key-composite-service - PROD~"
+                                 )
+				)
+			,entityName.in(
+				~"trackKey~",
+				~"manageKey~",
+				~"GET /api/v1/digitalkey/<VIN>/password~",
+                                ~"GET /api/v1/digitalkey/<VIN>/pairing~"
+			)"))))):splitBy())
+	/
+		(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~",
+                                        ~"digital-key-composite-service - PROD~"
+                                  )
+				)
+			,entityName.in(
+				~"trackKey~",
+				~"manageKey~",
+				~"GET /api/v1/digitalkey/<VIN>/password~",
+                                ~"GET /api/v1/digitalkey/<VIN>/pairing~"
+			)"))))):splitBy()))					
+    EOT
 
 
     #if not set (removed) it's defaulted to "-1d" 
diff --git a/NA_PROD/slo/Wirkkette__DigitalKey__SMACC___-_Reliability_of_key_requests.tf b/NA_PROD/slo/Wirkkette__DigitalKey__SMACC___-_Reliability_of_key_requests.tf
index c4b7d70..380bb67 100644
--- a/NA_PROD/slo/Wirkkette__DigitalKey__SMACC___-_Reliability_of_key_requests.tf
+++ b/NA_PROD/slo/Wirkkette__DigitalKey__SMACC___-_Reliability_of_key_requests.tf
@@ -10,13 +10,40 @@ module Wirkkette__DigitalKey__SMACC___-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(\"SERVICE_METHOD\")" 
+    filter                      = "" 
             
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(and(in(\"dt.entity.service_method\",entitySelector(\"type(service_method),entityId(~\"SERVICE_METHOD-6C9656E749258113~\",~\"SERVICE_METHOD-909E6B5698F981E0~\",~\"SERVICE_METHOD-655CE7E2B1DA0437~\",~\"SERVICE_METHOD-E3C5D791796B5730~\")\")))):splitBy():avg:auto:sort(value(avg,descending)))/(builtin:service.keyRequest.count.server:filter(and(in(\"dt.entity.service_method\",entitySelector(\"type(service_method),entityId(~\"SERVICE_METHOD-6C9656E749258113~\",~\"SERVICE_METHOD-909E6B5698F981E0~\",~\"SERVICE_METHOD-655CE7E2B1DA0437~\",~\"SERVICE_METHOD-E3C5D791796B5730~\")\")))):splitBy():avg:auto:sort(value(avg,descending))))" 
+    metric_expression           = <<-EOT
+(100)*((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~",
+                                         ~"digital-key-composite-service - PROD~"
+                                 )
+				)
+			,entityName.in(
+				~"trackKey~",
+				~"manageKey~",
+				~"GET /api/v1/digitalkey/<VIN>/password~",
+                                ~"GET /api/v1/digitalkey/<VIN>/pairing~"
+			)"))))):splitBy())
+	/
+		(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~",
+                                        ~"digital-key-composite-service - PROD~"
+                                  )
+				)
+			,entityName.in(
+				~"trackKey~",
+				~"manageKey~",
+				~"GET /api/v1/digitalkey/<VIN>/password~",
+                                ~"GET /api/v1/digitalkey/<VIN>/pairing~"
+			)"))))):splitBy()))					
+    EOT
  
-
     #if not set (removed) it's defaulted to "-1d" 
     timeframe                   = "-1d" 
          
diff --git a/NA_PROD/slo/Wirkkette__FTS_Service__-_Reliability_of_key_requests.tf b/NA_PROD/slo/Wirkkette__FTS_Service__-_Reliability_of_key_requests.tf
index a7f56b6..9463340 100644
--- a/NA_PROD/slo/Wirkkette__FTS_Service__-_Reliability_of_key_requests.tf
+++ b/NA_PROD/slo/Wirkkette__FTS_Service__-_Reliability_of_key_requests.tf
@@ -10,11 +10,23 @@ module Wirkkette__FTS_Service__-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(\"SERVICE\")" 
+    filter                      = "" 
             
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*(((calc:service.successful_requests_simplepois_only_fts_calls:splitBy():sum)+(calc:service.successful_requests_getpois_only_fts_calls:splitBy():sum))/((calc:service.request_count_simplepois_only_fts_calls:splitBy():sum)+(calc:service.request_count_getpois_only_fts_calls:splitBy():sum)))" 
+    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(
+                                ~"SimplePOIs~",
+                                ~"POIs~"
+                                )
+                        )
+                ,entityName.in(
+                        ~"getSimplePOIs (FTS Calls)~",
+                        ~"getPOIs (FTS Calls)~"
+                )")))):splitBy())
+    EOT
  
 
     #if not set (removed) it's defaulted to "-1d"