From 2f8d0e05f25d687c07fe4305d6a96af93e637bb5 Mon Sep 17 00:00:00 2001
From: Mohammed Abadel <mohammed.abadel@bmw.de>
Date: Wed, 1 Mar 2023 10:11:20 +0100
Subject: [PATCH] Adjusting SLOs for RTTI to use only one metric instead of two

---
 CN_PROD/slo/TP_Vehicle_RTTI.tf                |  7 +----
 ...-Service__-_Reliability_of_key_requests.tf |  7 +----
 EMEA_PROD/slo/TP_Vehicle_RTTI.tf              |  9 ++-----
 ...-Service__-_Reliability_of_key_requests.tf |  9 ++-----
 NA_PROD/slo/TP_Vehicle_RTTI.tf                | 27 +++----------------
 ...-Service__-_Reliability_of_key_requests.tf |  9 ++-----
 6 files changed, 12 insertions(+), 56 deletions(-)

diff --git a/CN_PROD/slo/TP_Vehicle_RTTI.tf b/CN_PROD/slo/TP_Vehicle_RTTI.tf
index 1f694f4..e12102a 100644
--- a/CN_PROD/slo/TP_Vehicle_RTTI.tf
+++ b/CN_PROD/slo/TP_Vehicle_RTTI.tf
@@ -14,15 +14,10 @@ module TP_Vehicle_RTTI {
 
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<EOT
-        (100)*((builtin:service.errors.fivexx.successCount:filter(and(or(in("dt.entity.service",entitySelector("type(service),
+        (100)-(builtin:service.errors.fivexx.rate:filter(and(or(in("dt.entity.service",entitySelector("type(service),
                         entityName.equals(
                                 ~"Netty on 0.0.0.0:8080 - rtti - prod~"
                         )"))))):splitBy())
-		/
-		(builtin:service.requestCount.total:filter(and(or(in("dt.entity.service",entitySelector("type(service),
-                        entityName.equals(
-                                ~"Netty on 0.0.0.0:8080 - rtti - prod~"
-                        )"))))):splitBy()))
     EOT 
  
 
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 e8e4cec..887d8ab 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
@@ -14,15 +14,10 @@ module Wirkkette__RTTI-Service__-_Reliability_of_key_requests {
 
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<EOT
-        (100)*((builtin:service.errors.fivexx.successCount:filter(and(or(in("dt.entity.service",entitySelector("type(service),
+        (100)-(builtin:service.errors.fivexx.rate:filter(and(or(in("dt.entity.service",entitySelector("type(service),
                         entityName.equals(
                                 ~"Netty on 0.0.0.0:8080 - rtti - prod~"
                         )"))))):splitBy())
-		/
-		(builtin:service.requestCount.total:filter(and(or(in("dt.entity.service",entitySelector("type(service),
-                        entityName.equals(
-                                ~"Netty on 0.0.0.0:8080 - rtti - prod~"
-                        )"))))):splitBy()))
     EOT 
  
 
diff --git a/EMEA_PROD/slo/TP_Vehicle_RTTI.tf b/EMEA_PROD/slo/TP_Vehicle_RTTI.tf
index 427862e..b1f5c98 100644
--- a/EMEA_PROD/slo/TP_Vehicle_RTTI.tf
+++ b/EMEA_PROD/slo/TP_Vehicle_RTTI.tf
@@ -15,15 +15,10 @@ module TP_Vehicle_RTTI {
 
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<EOT
-        (100)*((builtin:service.errors.fivexx.successCount:filter(and(or(in("dt.entity.service",entitySelector("type(service),
-                        entityName.equals(
-                                ~"Netty on 0.0.0.0:8080 - rtti - prod~"  
-                         )"))))):splitBy())
-		/
-		(builtin:service.requestCount.total:filter(and(or(in("dt.entity.service",entitySelector("type(service),
+        (100)-(builtin:service.errors.fivexx.rate:filter(and(or(in("dt.entity.service",entitySelector("type(service),
                         entityName.equals(
                                 ~"Netty on 0.0.0.0:8080 - rtti - prod~"
-                         )"))))):splitBy()))
+                        )"))))):splitBy())
     EOT 
  
     #if not set (removed) it's defaulted to "-1d" 
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 89523dd..595e390 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
@@ -15,15 +15,10 @@ module Wirkkette__RTTI-Service__-_Reliability_of_key_requests {
 
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<EOT
-        (100)*((builtin:service.errors.fivexx.successCount:filter(and(or(in("dt.entity.service",entitySelector("type(service),
-                        entityName.equals(
-                                ~"Netty on 0.0.0.0:8080 - rtti - prod~"  
-                         )"))))):splitBy())
-		/
-		(builtin:service.requestCount.total:filter(and(or(in("dt.entity.service",entitySelector("type(service),
+        (100)-(builtin:service.errors.fivexx.rate:filter(and(or(in("dt.entity.service",entitySelector("type(service),
                         entityName.equals(
                                 ~"Netty on 0.0.0.0:8080 - rtti - prod~"
-                         )"))))):splitBy()))
+                        )"))))):splitBy())
     EOT 
  
     #if not set (removed) it's defaulted to "-1d" 
diff --git a/NA_PROD/slo/TP_Vehicle_RTTI.tf b/NA_PROD/slo/TP_Vehicle_RTTI.tf
index 93d9b64..c2753f5 100644
--- a/NA_PROD/slo/TP_Vehicle_RTTI.tf
+++ b/NA_PROD/slo/TP_Vehicle_RTTI.tf
@@ -15,29 +15,10 @@ module TP_Vehicle_RTTI {
 
     #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),
-						fromRelationship.isServiceMethodOfService(
-							type(~"SERVICE~"),entityName.in(
-                                ~"btc-vehicle-composite-service - PROD~"
-                            )
-						)
-					,entityName.in(
-						~"GET /api/v2/vehicles~",
-						~"GET /api/v4/vehicles~"
-						)"))))):splitBy())
-	/
-	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",
-					entitySelector("type(service_method),
-						fromRelationship.isServiceMethodOfService(
-							type(~"SERVICE~"),entityName.in(
-                                ~"btc-vehicle-composite-service - PROD~"
-                            )
-						)
-					,entityName.in(
-					    ~"GET /api/v2/vehicles~",
-						~"GET /api/v4/vehicles~"
-						)"))))):splitBy()))
+  	(100)-(builtin:service.errors.fivexx.rate:filter(and(or(in("dt.entity.service",entitySelector("type(service),
+                        entityName.equals(
+                                ~"Netty on 0.0.0.0:8080 - rtti - prod~"
+                        )"))))):splitBy())
 EOT
  
 
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 fad5826..2db6c5f 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
@@ -15,15 +15,10 @@ module Wirkkette__RTTI-Service__-_Reliability_of_key_requests {
 
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<EOT
-        (100)*((builtin:service.errors.fivexx.successCount:filter(and(or(in("dt.entity.service",entitySelector("type(service),
-                        entityName.in(
+        (100)-(builtin:service.errors.fivexx.rate:filter(and(or(in("dt.entity.service",entitySelector("type(service),
+                        entityName.equals(
                                 ~"Netty on 0.0.0.0:8080 - rtti - prod~"
                         )"))))):splitBy())
-		/
-		(builtin:service.requestCount.total:filter(and(or(in("dt.entity.service",entitySelector("type(service),
-                        entityName.in(
-                                ~"Netty on 0.0.0.0:8080 - rtti - prod~"
-                        )"))))):splitBy()))
     EOT