From a47bcccc17eef750dfb347660d49b017dba157d4 Mon Sep 17 00:00:00 2001
From: Mohammed Abadel <mohammed.abadel@bmw.de>
Date: Fri, 9 Dec 2022 11:28:57 +0100
Subject: [PATCH] Adjusting SLOs for connected music to a) use the new
 services. b) use service names instead of ids.

---
 ..._Connected__Music__-_Reliability_of_key_requests.tf | 10 ++++++++--
 ..._Connected__Music__-_Reliability_of_key_requests.tf | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/EMEA_PROD/slo/Wirkkette__Connected__Music__-_Reliability_of_key_requests.tf b/EMEA_PROD/slo/Wirkkette__Connected__Music__-_Reliability_of_key_requests.tf
index 0d3d8d9..b51438c 100644
--- a/EMEA_PROD/slo/Wirkkette__Connected__Music__-_Reliability_of_key_requests.tf
+++ b/EMEA_PROD/slo/Wirkkette__Connected__Music__-_Reliability_of_key_requests.tf
@@ -9,11 +9,17 @@ module Wirkkette__Connected__Music__-_Reliability_of_key_requests {
 
     
     #entity selector object 
-    filter                      = "type(service),entityId(\"SERVICE-A72F6268DCF9508D\")" 
+    filter                      = "" 
             
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*(1-((builtin:service.errors.fivexx.count:splitBy())/(builtin:service.requestCount.server:splitBy())))" 
+    metric_expression           = <<EOT
+    (100) - (builtin:service.errors.fivexx.rate:filter(and(or(in("dt.entity.service",entitySelector("type(service),
+				entityName(
+					~"SpotifyApi - avs - prod~"
+					)"))))):splitBy("dt.entity.service"))
+
+    EOT
  
 
     #if not set (removed) it's defaulted to "-1d" 
diff --git a/NA_PROD/slo/Wirkkette__Connected__Music__-_Reliability_of_key_requests.tf b/NA_PROD/slo/Wirkkette__Connected__Music__-_Reliability_of_key_requests.tf
index 10431b6..6ee0101 100644
--- a/NA_PROD/slo/Wirkkette__Connected__Music__-_Reliability_of_key_requests.tf
+++ b/NA_PROD/slo/Wirkkette__Connected__Music__-_Reliability_of_key_requests.tf
@@ -10,11 +10,17 @@ module Wirkkette__Connected__Music__-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(Service),entityId(\"SERVICE-A72F6268DCF9508D\")" 
+    filter                      = "" 
             
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*(1-((builtin:service.errors.fivexx.count:splitBy())/(builtin:service.requestCount.server:splitBy())))" 
+    metric_expression           = <<EOT
+    (100) - (builtin:service.errors.fivexx.rate:filter(and(or(in("dt.entity.service",entitySelector("type(service),
+				entityName(
+					~"SpotifyApi - avs - prod~"
+					)"))))):splitBy("dt.entity.service"))
+
+    EOT 
  
 
     #if not set (removed) it's defaulted to "-1d"