From 8919d35a946ae45767f7a297ca7828301a3a6e71 Mon Sep 17 00:00:00 2001
From: ermisw <ermis.wieger@gmail.com>
Date: Wed, 19 Apr 2023 12:15:43 +0200
Subject: [PATCH] fixed CD Store slo

---
 CN_PROD/slo/TP_Mobile_CD_Store.tf    |  3 +++
 EMEA_PROD/slo/TP_Mobile_CD_Store.tf  |  9 +++++++--
 EMEA_PROD/slo/TP_Vehicle_CD_Store.tf | 13 +++++++++----
 NA_PROD/slo/TP_Mobile_CD_Store .tf   |  6 ++++--
 NA_PROD/slo/TP_Vehicle_CD_Store.tf   |  6 ++++--
 5 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/CN_PROD/slo/TP_Mobile_CD_Store.tf b/CN_PROD/slo/TP_Mobile_CD_Store.tf
index 20ef1ad..33acc02 100644
--- a/CN_PROD/slo/TP_Mobile_CD_Store.tf
+++ b/CN_PROD/slo/TP_Mobile_CD_Store.tf
@@ -17,6 +17,9 @@ module TP_Mobile_CD_Store {
 (100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(in("dt.entity.service_method",entitySelector("type(service_method), 
 fromRelationship.isServiceMethodOfService(
                             type(~"SERVICE~"),entityName.in(
+                                ~"StoreOfferResourceV6 - am-store - prod~",
+								~"CdStoreOfferResource - am-store - prod~",
+                                
                                 ~"CdStoreOfferResource - cdse - prod~",
 								~"CdStoreOfferResourceV2 - cdse - prod~"
                                 )
diff --git a/EMEA_PROD/slo/TP_Mobile_CD_Store.tf b/EMEA_PROD/slo/TP_Mobile_CD_Store.tf
index 9f784ef..b912157 100644
--- a/EMEA_PROD/slo/TP_Mobile_CD_Store.tf
+++ b/EMEA_PROD/slo/TP_Mobile_CD_Store.tf
@@ -20,12 +20,17 @@ fromRelationship.isServiceMethodOfService(
                                 ~"StoreOfferResourceV6 - am-store - prod~",
 								~"StoreResourceV4 - am-store - prod~",
 								~"CdStoreOfferResource - am-store - prod~",
-                                ~"StoreOfferResourceV7 - am-store - prod~"
+                                ~"StoreOfferResourceV7 - am-store - prod~",
+
+                                ~"CdStoreOfferResource - cdse - prod~",
+								~"CdStoreOfferResourceV2 - cdse - prod~",
+                                ~"StoreOfferResourceV7 - cdse - prod~"
                                 )
                         )
                     ,entityName.in(
                         ~"getOffersAndPortfolio~",
-                        ~"bookedAndBookableCDServices~"
+                        ~"bookedAndBookableCDServices~",
+                        ~"bookedAndBookableCDServices 1~"
                         )"))))):splitBy())
 
 EOT
diff --git a/EMEA_PROD/slo/TP_Vehicle_CD_Store.tf b/EMEA_PROD/slo/TP_Vehicle_CD_Store.tf
index 4a0d09e..c7c9d6f 100644
--- a/EMEA_PROD/slo/TP_Vehicle_CD_Store.tf
+++ b/EMEA_PROD/slo/TP_Vehicle_CD_Store.tf
@@ -14,19 +14,24 @@ module TP_Vehicle_CD_Store {
 
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<-EOT
-(100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(in("dt.entity.service_method",entitySelector("type(service_method), 
+(100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), 
 fromRelationship.isServiceMethodOfService(
                             type(~"SERVICE~"),entityName.in(
                                 ~"StoreOfferResourceV6 - am-store - prod~",
 								~"StoreResourceV4 - am-store - prod~",
 								~"CdStoreOfferResource - am-store - prod~",
-                                ~"StoreOfferResourceV7 - am-store - prod~"
+                                ~"StoreOfferResourceV7 - am-store - prod~",
+
+                                ~"CdStoreOfferResource - cdse - prod~",
+								~"CdStoreOfferResourceV2 - cdse - prod~",
+                                ~"StoreOfferResourceV7 - cdse - prod~"
                                 )
                         )
                     ,entityName.in(
                         ~"getOffersAndPortfolio~",
-						~"bookedAndBookableCDServices~"
-                        )")))):splitBy())
+                        ~"bookedAndBookableCDServices~",
+                        ~"bookedAndBookableCDServices 1~"
+                        )"))))):splitBy())
 
 EOT
 
diff --git a/NA_PROD/slo/TP_Mobile_CD_Store .tf b/NA_PROD/slo/TP_Mobile_CD_Store .tf
index 63090e0..b37d7ed 100644
--- a/NA_PROD/slo/TP_Mobile_CD_Store .tf	
+++ b/NA_PROD/slo/TP_Mobile_CD_Store .tf	
@@ -23,12 +23,14 @@ fromRelationship.isServiceMethodOfService(
                                 ~"StoreOfferResourceV7 - am-store - prod~",
 
                                 ~"CdStoreOfferResource - cdse - prod~",
-								~"CdStoreOfferResourceV2 - cdse - prod~"
+								~"CdStoreOfferResourceV2 - cdse - prod~",
+                                ~"StoreOfferResourceV7 - cdse - prod~"
                                 )
                         )
                     ,entityName.in(
 						~"getOffersAndPortfolio~",
-						~"bookedAndBookableCDServices~"
+						~"bookedAndBookableCDServices~",
+                        ~"bookedAndBookableCDServices 1~"
                         )")))):splitBy())
 
 EOT
diff --git a/NA_PROD/slo/TP_Vehicle_CD_Store.tf b/NA_PROD/slo/TP_Vehicle_CD_Store.tf
index 7296232..0742b63 100644
--- a/NA_PROD/slo/TP_Vehicle_CD_Store.tf
+++ b/NA_PROD/slo/TP_Vehicle_CD_Store.tf
@@ -23,12 +23,14 @@ fromRelationship.isServiceMethodOfService(
                                 ~"StoreOfferResourceV7 - am-store - prod~",
 
                                 ~"CdStoreOfferResource - cdse - prod~",
-								~"CdStoreOfferResourceV2 - cdse - prod~"
+								~"CdStoreOfferResourceV2 - cdse - prod~",
+                                ~"StoreOfferResourceV7 - cdse - prod~"
                                 )
                         )
                     ,entityName.in(
 						~"getOffersAndPortfolio~",
-						~"bookedAndBookableCDServices~"
+						~"bookedAndBookableCDServices~",
+                        ~"bookedAndBookableCDServices 1~"
                         )")))):splitBy())
 
 EOT