From 6faa4793ee1577187ede8f1df3bd57cdf4fdde86 Mon Sep 17 00:00:00 2001
From: Mohammed Abadel <mohammed.abadel@bmw.de>
Date: Fri, 17 Feb 2023 11:37:27 +0100
Subject: [PATCH] Adjusting SLOs for Send to Vehicle to use names instead of
 ids and deleting old SLOs for WK Call Service

---
 ...ll_Service_Reliability_of_key_rerquests.tf | 14 --------
 ..._Legacy___-_Reliability_of_key_requests.tf | 23 +++++++++----
 ...ar__MGU___-_Reliability_of_key_requests.tf | 32 ++++++++++++++----
 ...ce__MGU___-_Reliability_of_key_requests.tf | 33 -------------------
 ..._Legacy___-_Reliability_of_key_requests.tf | 23 +++++++++----
 ...ar__MGU___-_Reliability_of_key_requests.tf | 32 ++++++++++++++----
 ..._Legacy___-_Reliability_of_key_requests.tf | 23 +++++++++----
 ...ar__MGU___-_Reliability_of_key_requests.tf | 32 ++++++++++++++----
 8 files changed, 129 insertions(+), 83 deletions(-)
 delete mode 100644 CN_PROD/slo/Wirkkette_Call_Service_Reliability_of_key_rerquests.tf
 delete mode 100644 EMEA_PROD/slo/Wirkkette__Call_Service__MGU___-_Reliability_of_key_requests.tf

diff --git a/CN_PROD/slo/Wirkkette_Call_Service_Reliability_of_key_rerquests.tf b/CN_PROD/slo/Wirkkette_Call_Service_Reliability_of_key_rerquests.tf
deleted file mode 100644
index beae50d..0000000
--- a/CN_PROD/slo/Wirkkette_Call_Service_Reliability_of_key_rerquests.tf
+++ /dev/null
@@ -1,14 +0,0 @@
-module Wirkette_Call_Service_Reliability_of_key-requests {
-    
-    source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "Wirkkette \"Call Service\" - Reliability of key request"
-    description                 = "CoCo-QM-Report_Draf"
-    evaluation                  = "AGGREGATE"
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-3823E0E98B8A527\")"
-    metric_expression           = "(100)*(builtin:service.keyRequest.errors.server.successCount:splitBy())/(builtin:service.keyRequest.count.server:splitBy())"
-    timeframe                   = "-1d"
-    
-     
-}
\ No newline at end of file
diff --git a/CN_PROD/slo/Wirkkette__Send_to_Car__Legacy___-_Reliability_of_key_requests.tf b/CN_PROD/slo/Wirkkette__Send_to_Car__Legacy___-_Reliability_of_key_requests.tf
index f2a5c2c..d3a2f73 100644
--- a/CN_PROD/slo/Wirkkette__Send_to_Car__Legacy___-_Reliability_of_key_requests.tf
+++ b/CN_PROD/slo/Wirkkette__Send_to_Car__Legacy___-_Reliability_of_key_requests.tf
@@ -10,11 +10,24 @@ module Wirkkette__Send_to_Car__Legacy___-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(SERVICE),entityName(\"LegacyPoiApi - msgsvc - prod\")" 
+    filter                      = "" 
             
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*((builtin:service.errors.server.successCount:splitBy())/(builtin:service.requestCount.total:splitBy()))" 
+    metric_expression           = <<EOT
+        (100)*((builtin:service.errors.server.successCount:filter(and(or(in("dt.entity.service",
+		        entitySelector("type(service),
+				entityName.in(
+					~"LegacyPoiApi - msgsvc - prod~"
+						)
+					"))))):splitBy())
+        /
+        (builtin:service.requestCount.total:filter(and(or(in("dt.entity.service",entitySelector("type(service),
+			entityName.in(
+				~"LegacyPoiApi - msgsvc - prod~"
+					)
+					"))))):splitBy()))
+    EOT 
  
 
     #if not set (removed) it's defaulted to "-1d" 
@@ -25,9 +38,7 @@ module Wirkkette__Send_to_Car__Legacy___-_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/CN_PROD/slo/Wirkkette__Send_to_Car__MGU___-_Reliability_of_key_requests.tf b/CN_PROD/slo/Wirkkette__Send_to_Car__MGU___-_Reliability_of_key_requests.tf
index 3887e07..829fd51 100644
--- a/CN_PROD/slo/Wirkkette__Send_to_Car__MGU___-_Reliability_of_key_requests.tf
+++ b/CN_PROD/slo/Wirkkette__Send_to_Car__MGU___-_Reliability_of_key_requests.tf
@@ -10,11 +10,33 @@ module Wirkkette__Send_to_Car__MGU___-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityName.in(\"/v2/motorist/[UUID]/trips\",\"/v3/motorist/[UUID]/trips\")"
+    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.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+				fromRelationship.isServiceMethodOfService(
+					type(~"SERVICE~"),entityName.in(
+                                                ~"TripService - PROD~"
+                                        )
+				)
+				,entityName.in(
+                                        ~"/v2/motorist/[UUID]/trips~",
+                                        ~"/v3/motorist/[UUID]/trips~"
+                                        )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+				fromRelationship.isServiceMethodOfService(
+					type(~"SERVICE~"),entityName.in(
+                                                ~"TripService - PROD~"
+                                        )
+				)
+				,entityName.in(
+					~"/v2/motorist/[UUID]/trips~",
+                                        ~"/v3/motorist/[UUID]/trips~"
+                                        )"))))):splitBy()))
+    EOT 
  
 
     #if not set (removed) it's defaulted to "-1d" 
@@ -25,9 +47,7 @@ module Wirkkette__Send_to_Car__MGU___-_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__Call_Service__MGU___-_Reliability_of_key_requests.tf b/EMEA_PROD/slo/Wirkkette__Call_Service__MGU___-_Reliability_of_key_requests.tf
deleted file mode 100644
index 8ffbf12..0000000
--- a/EMEA_PROD/slo/Wirkkette__Call_Service__MGU___-_Reliability_of_key_requests.tf
+++ /dev/null
@@ -1,33 +0,0 @@
-module Wirkkette__Call_Service__MGU___-_Reliability_of_key_requests {
-    
-    source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "Wirkkette \"Call Service (MGU)\" - Reliability of key requests" 
-
-    description                 = "CoCo-QM-Report_Draft" 
-
-    
-    
-    #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-4739AF35B2983FB8\",\"SERVICE_METHOD-06231C0889206120\",\"SERVICE_METHOD-0F06D49AB1D3947B\",\"SERVICE_METHOD-1B1B4A6D5552A079\",\"SERVICE_METHOD-8179FFD58382E60F\",\"SERVICE_METHOD-8268C0533638C43B\",\"SERVICE_METHOD-D55CA88611955FBB\",\"SERVICE_METHOD-52D701CA89D09A73\",\"SERVICE_METHOD-88BE374734D99107\",\"SERVICE_METHOD-917FCFD59FA44E5B\",\"SERVICE_METHOD-1AB04BA86023E9C8\")" 
-            
-
-    #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())" 
- 
-
-    #if not set (removed) it's defaulted to "-1d" 
-    timeframe                   = "-1d" 
-         
-
-    #currently the only possible value
-    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
-    
-}
\ No newline at end of file
diff --git a/EMEA_PROD/slo/Wirkkette__Send_to_Car__Legacy___-_Reliability_of_key_requests.tf b/EMEA_PROD/slo/Wirkkette__Send_to_Car__Legacy___-_Reliability_of_key_requests.tf
index ca2d2c5..d3a2f73 100644
--- a/EMEA_PROD/slo/Wirkkette__Send_to_Car__Legacy___-_Reliability_of_key_requests.tf
+++ b/EMEA_PROD/slo/Wirkkette__Send_to_Car__Legacy___-_Reliability_of_key_requests.tf
@@ -10,11 +10,24 @@ module Wirkkette__Send_to_Car__Legacy___-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(SERVICE),entityName(\"legacypoiapi - msgsvc - prod\")" 
+    filter                      = "" 
             
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*((builtin:service.errors.server.successCount:splitBy())/(builtin:service.requestCount.total:splitBy()))" 
+    metric_expression           = <<EOT
+        (100)*((builtin:service.errors.server.successCount:filter(and(or(in("dt.entity.service",
+		        entitySelector("type(service),
+				entityName.in(
+					~"LegacyPoiApi - msgsvc - prod~"
+						)
+					"))))):splitBy())
+        /
+        (builtin:service.requestCount.total:filter(and(or(in("dt.entity.service",entitySelector("type(service),
+			entityName.in(
+				~"LegacyPoiApi - msgsvc - prod~"
+					)
+					"))))):splitBy()))
+    EOT 
  
 
     #if not set (removed) it's defaulted to "-1d" 
@@ -25,9 +38,7 @@ module Wirkkette__Send_to_Car__Legacy___-_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__Send_to_Car__MGU___-_Reliability_of_key_requests.tf b/EMEA_PROD/slo/Wirkkette__Send_to_Car__MGU___-_Reliability_of_key_requests.tf
index 34bf228..14cb907 100644
--- a/EMEA_PROD/slo/Wirkkette__Send_to_Car__MGU___-_Reliability_of_key_requests.tf
+++ b/EMEA_PROD/slo/Wirkkette__Send_to_Car__MGU___-_Reliability_of_key_requests.tf
@@ -10,11 +10,33 @@ module Wirkkette__Send_to_Car__MGU___-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityName.in(\"/v2/motorist/[UUID]/trips\",\"/v3/motorist/[UUID]/trips\")" 
+    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.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+				fromRelationship.isServiceMethodOfService(
+					type(~"SERVICE~"),entityName.in(
+                                                ~"TripService - PROD~"
+                                        )
+				)
+				,entityName.in(
+                                        ~"/v2/motorist/[UUID]/trips~",
+                                        ~"/v3/motorist/[UUID]/trips~"
+                                        )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+				fromRelationship.isServiceMethodOfService(
+					type(~"SERVICE~"),entityName.in(
+                                                ~"TripService - PROD~"
+                                        )
+				)
+				,entityName.in(
+					~"/v2/motorist/[UUID]/trips~",
+                                        ~"/v3/motorist/[UUID]/trips~"
+                                        )"))))):splitBy()))
+    EOT 
  
 
     #if not set (removed) it's defaulted to "-1d" 
@@ -25,9 +47,7 @@ module Wirkkette__Send_to_Car__MGU___-_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__Send_to_Car__Legacy___-_Reliability_of_key_requests.tf b/NA_PROD/slo/Wirkkette__Send_to_Car__Legacy___-_Reliability_of_key_requests.tf
index ca2d2c5..d3a2f73 100644
--- a/NA_PROD/slo/Wirkkette__Send_to_Car__Legacy___-_Reliability_of_key_requests.tf
+++ b/NA_PROD/slo/Wirkkette__Send_to_Car__Legacy___-_Reliability_of_key_requests.tf
@@ -10,11 +10,24 @@ module Wirkkette__Send_to_Car__Legacy___-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(SERVICE),entityName(\"legacypoiapi - msgsvc - prod\")" 
+    filter                      = "" 
             
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*((builtin:service.errors.server.successCount:splitBy())/(builtin:service.requestCount.total:splitBy()))" 
+    metric_expression           = <<EOT
+        (100)*((builtin:service.errors.server.successCount:filter(and(or(in("dt.entity.service",
+		        entitySelector("type(service),
+				entityName.in(
+					~"LegacyPoiApi - msgsvc - prod~"
+						)
+					"))))):splitBy())
+        /
+        (builtin:service.requestCount.total:filter(and(or(in("dt.entity.service",entitySelector("type(service),
+			entityName.in(
+				~"LegacyPoiApi - msgsvc - prod~"
+					)
+					"))))):splitBy()))
+    EOT 
  
 
     #if not set (removed) it's defaulted to "-1d" 
@@ -25,9 +38,7 @@ module Wirkkette__Send_to_Car__Legacy___-_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__Send_to_Car__MGU___-_Reliability_of_key_requests.tf b/NA_PROD/slo/Wirkkette__Send_to_Car__MGU___-_Reliability_of_key_requests.tf
index 3887e07..ea170fc 100644
--- a/NA_PROD/slo/Wirkkette__Send_to_Car__MGU___-_Reliability_of_key_requests.tf
+++ b/NA_PROD/slo/Wirkkette__Send_to_Car__MGU___-_Reliability_of_key_requests.tf
@@ -10,11 +10,33 @@ module Wirkkette__Send_to_Car__MGU___-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityName.in(\"/v2/motorist/[UUID]/trips\",\"/v3/motorist/[UUID]/trips\")"
+    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.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+				fromRelationship.isServiceMethodOfService(
+					type(~"SERVICE~"),entityName.in(
+                                                ~"TripService - PROD~"
+                                        )
+				)
+				,entityName.in(
+                                        ~"/v2/motorist/[UUID]/trips~",
+                                        ~"/v3/motorist/[UUID]/trips~"
+                                        )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+				fromRelationship.isServiceMethodOfService(
+					type(~"SERVICE~"),entityName.in(
+                                                ~"TripService - PROD~"
+                                        )
+				)
+				,entityName.in(
+					~"/v2/motorist/[UUID]/trips~",
+                                        ~"/v3/motorist/[UUID]/trips~"
+                                        )"))))):splitBy()))
+    EOT
  
 
     #if not set (removed) it's defaulted to "-1d" 
@@ -25,9 +47,7 @@ module Wirkkette__Send_to_Car__MGU___-_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