From 8947207572e32d8c4cc3ad5e0e4fa99518e7a9f7 Mon Sep 17 00:00:00 2001
From: Mohammed Abadel <mohammed.abadel@bmw.de>
Date: Wed, 19 Oct 2022 17:52:20 +0200
Subject: [PATCH] adjusting SLOs for eRoute and RTTI-Service

---
 ...-Service__-_Reliability_of_key_requests.tf | 21 ++++++++++------
 ...-Service__-_Reliability_of_key_requests.tf | 24 ++++++++++++-------
 ..._Service__-_Reliability_of_key_requests.tf |  2 +-
 ...-Service__-_Reliability_of_key_requests.tf | 22 ++++++++++++-----
 ..._Service__-_Reliability_of_key_requests.tf |  2 +-
 5 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/CN_PROD/slo/Wirkkette__RTTI-Service__-_Reliability_of_key_requests.tf b/CN_PROD/slo/Wirkkette__RTTI-Service__-_Reliability_of_key_requests.tf
index c5d9be2..f95fd9a 100644
--- a/CN_PROD/slo/Wirkkette__RTTI-Service__-_Reliability_of_key_requests.tf
+++ b/CN_PROD/slo/Wirkkette__RTTI-Service__-_Reliability_of_key_requests.tf
@@ -8,13 +8,22 @@ module Wirkkette__RTTI-Service__-_Reliability_of_key_requests {
     description                 = "CoCo-QM-Report_Vehicle" 
 
     
-    
     #entity selector object 
-    filter                      = "type(Service),entityId(\"SERVICE-488DA9D36CC7B77C\",\"SERVICE-B78ED2FB7B54C0BF\")" 
+    filter                      = "" 
             
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*(builtin:service.errors.server.successCount:splitBy())/(builtin:service.requestCount.server:splitBy())" 
+    metric_expression           = <<EOT
+        (100)*((builtin:service.errors.fivexx.successCount:filter(and(or(in("dt.entity.service",entitySelector("type(service),
+                        entityName.equals(
+                                ~"rtti-*-*-*-* - rtti - prod~"
+                        )"))))):splitBy())
+		/
+		(builtin:service.requestCount.total:filter(and(or(in("dt.entity.service",entitySelector("type(service),
+                        entityName.equals(
+                                ~"rtti-*-*-*-* - rtti - prod~"
+                        )"))))):splitBy()))
+    EOT 
  
 
     #if not set (removed) it's defaulted to "-1d" 
@@ -25,9 +34,7 @@ module Wirkkette__RTTI-Service__-_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__RTTI-Service__-_Reliability_of_key_requests.tf b/EMEA_PROD/slo/Wirkkette__RTTI-Service__-_Reliability_of_key_requests.tf
index a1ac292..c00324f 100644
--- a/EMEA_PROD/slo/Wirkkette__RTTI-Service__-_Reliability_of_key_requests.tf
+++ b/EMEA_PROD/slo/Wirkkette__RTTI-Service__-_Reliability_of_key_requests.tf
@@ -10,24 +10,30 @@ module Wirkkette__RTTI-Service__-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(Service),entityId(\"SERVICE-5E68800938559687\",\"SERVICE-89EEF5C7E43EB72A\")" 
+    filter                      = "" 
             
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*(builtin:service.errors.server.successCount:splitBy())/(builtin:service.requestCount.server:splitBy())" 
+    metric_expression           = <<EOT
+        (100)*((builtin:service.errors.fivexx.successCount:filter(and(or(in("dt.entity.service",entitySelector("type(service),
+                        entityName.equals(
+                                ~"rtti-service~"  
+                         )"))))):splitBy())
+		/
+		(builtin:service.requestCount.total:filter(and(or(in("dt.entity.service",entitySelector("type(service),
+                        entityName.equals(
+                                ~"rtti-service~"
+                         )"))))):splitBy()))
+    EOT 
  
-
     #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
+    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__eRoute_Service__-_Reliability_of_key_requests.tf b/EMEA_PROD/slo/Wirkkette__eRoute_Service__-_Reliability_of_key_requests.tf
index d1b9eaa..e318ab3 100644
--- a/EMEA_PROD/slo/Wirkkette__eRoute_Service__-_Reliability_of_key_requests.tf
+++ b/EMEA_PROD/slo/Wirkkette__eRoute_Service__-_Reliability_of_key_requests.tf
@@ -15,7 +15,7 @@ module Wirkkette__eRoute_Service__-_Reliability_of_key_requests {
 
     #metric expression of the calculation as done in data explorer ui
     metric_expression           =  <<EOT
-        (100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+        (100)*((builtin:service.keyRequest.errors.fivexx.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
                         fromRelationship.isServiceMethodOfService(
                             type(~"SERVICE~"),entityName.in(
                                 ~"Netty on 0.0.0.0:8080 - eroute-ext - prod~"
diff --git a/NA_PROD/slo/Wirkkette__RTTI-Service__-_Reliability_of_key_requests.tf b/NA_PROD/slo/Wirkkette__RTTI-Service__-_Reliability_of_key_requests.tf
index fe26a70..e546c4c 100644
--- a/NA_PROD/slo/Wirkkette__RTTI-Service__-_Reliability_of_key_requests.tf
+++ b/NA_PROD/slo/Wirkkette__RTTI-Service__-_Reliability_of_key_requests.tf
@@ -10,11 +10,23 @@ module Wirkkette__RTTI-Service__-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(Service),entityId(\"SERVICE-10B940DDDCBF48B4\",\"SERVICE-B29D788A61386E63\")" 
+    filter                      = "" 
             
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*(builtin:service.errors.server.successCount:splitBy())/(builtin:service.requestCount.server:splitBy())" 
+    metric_expression           = <<EOT
+        (100)*((builtin:service.errors.fivexx.successCount:filter(and(or(in("dt.entity.service",entitySelector("type(service),
+                        entityName.in(
+                                ~"rtti-*-*-*-* - rtti - prod~",
+                                ~"rtti-service~"
+                        )"))))):splitBy())
+		/
+		(builtin:service.requestCount.total:filter(and(or(in("dt.entity.service",entitySelector("type(service),
+                        entityName.in(
+                                ~"rtti-*-*-*-* - rtti - prod~",
+                                ~"rtti-service~"
+                        )"))))):splitBy()))
+    EOT 
  
 
     #if not set (removed) it's defaulted to "-1d" 
@@ -25,9 +37,7 @@ module Wirkkette__RTTI-Service__-_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__eRoute_Service__-_Reliability_of_key_requests.tf b/NA_PROD/slo/Wirkkette__eRoute_Service__-_Reliability_of_key_requests.tf
index b376659..c1ec61b 100644
--- a/NA_PROD/slo/Wirkkette__eRoute_Service__-_Reliability_of_key_requests.tf
+++ b/NA_PROD/slo/Wirkkette__eRoute_Service__-_Reliability_of_key_requests.tf
@@ -15,7 +15,7 @@ module Wirkkette__eRoute_Service__-_Reliability_of_key_requests {
 
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<EOT
-        (100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+        (100)*((builtin:service.keyRequest.errors.fivexx.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
                         fromRelationship.isServiceMethodOfService(
                             type(~"SERVICE~"),entityName.in(
                                 ~"Netty on 0.0.0.0:8080 - eroute-ext - prod~"