From 757e5a6d9a01265f40fe8f354e6676e1e9d364c9 Mon Sep 17 00:00:00 2001
From: Mohammed Abadel <mohammed.abadel@bmw.de>
Date: Wed, 15 Feb 2023 12:27:02 +0100
Subject: [PATCH] Adjusting SLOs for WK-Provisioning: Using names instead of
 ids

---
 ...isioning__-_Reliability_of_key_requests.tf | 60 +++++++++++++++--
 ...isioning__-_Reliability_of_key_requests.tf | 66 +++++++++++++++++--
 ...isioning__-_Reliability_of_key_requests.tf | 62 +++++++++++++++--
 3 files changed, 170 insertions(+), 18 deletions(-)

diff --git a/CN_PROD/slo/Wirkkette__Provisioning__-_Reliability_of_key_requests.tf b/CN_PROD/slo/Wirkkette__Provisioning__-_Reliability_of_key_requests.tf
index f1173b6..c97554a 100644
--- a/CN_PROD/slo/Wirkkette__Provisioning__-_Reliability_of_key_requests.tf
+++ b/CN_PROD/slo/Wirkkette__Provisioning__-_Reliability_of_key_requests.tf
@@ -10,11 +10,61 @@ module Wirkkette__Provisioning__-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-90267D09C476600D\",\"SERVICE_METHOD-5012D6B107EDF510\",\"SERVICE_METHOD-C81BF2A510C393ED\",\"SERVICE_METHOD-9E006396D32357AF\",\"SERVICE_METHOD-E9DAFC08F88C93D9\",\"SERVICE_METHOD-589607CA2084D90D\",\"SERVICE_METHOD-64687ED5BC6BB37B\",\"SERVICE_METHOD-E5008E8F279B39AF\",\"SERVICE_METHOD-0DB37B4A0C33F4D8\",\"SERVICE_METHOD-0FF622893881FE68\",\"SERVICE_METHOD-2B7B71C425E6EF39\")" 
+    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(
+                                        ~"WorkshopProvisioningService - vps-prov - cn~",
+                                        ~"MQSession$FacadeMessageListener - vps-prov - cn~",
+                                        ~"MQSession$FacadeMessageListener - vps-trigger - cn~",
+                                        ~"VpsJoynrApi - vps-prov - cn~",
+                                        ~"MQSession$FacadeMessageListener - noptrigger - prod~",
+                                        ~"ProvisioningService - nopprov - prod~",
+                                        ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"					
+                                )
+			)
+			,entityName.in(
+                                ~"vpsObtainProvisioningSync~",
+                                ~"Queue: B2VCNPROD.BMW.B2VCN.PROV_TRIGGER_INTERNAL~",
+                                ~"Queue: B2VCNPROD.BMW.B2VCN.PROV_TRIGGER_IN~",
+                                ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
+                                ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+                                ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_IN~",
+                                ~"getNOPProvisioningDataForVehicle~",
+                                ~"acknowledgeNOPProvisioningDownload~",
+                                ~"getNOPProvisioningDataForVehicleBase64~",
+                                ~"/nop-prov/v2/mainprov/prov.do~"
+                                )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                        ~"WorkshopProvisioningService - vps-prov - cn~",
+                                        ~"MQSession$FacadeMessageListener - vps-prov - cn~",
+                                        ~"MQSession$FacadeMessageListener - vps-trigger - cn~",
+                                        ~"VpsJoynrApi - vps-prov - cn~",
+                                        ~"MQSession$FacadeMessageListener - noptrigger - prod~",
+                                        ~"ProvisioningService - nopprov - prod~",
+                                        ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"				
+                                )
+			)
+                        ,entityName.in(
+                                ~"vpsObtainProvisioningSync~",
+                                ~"Queue: B2VCNPROD.BMW.B2VCN.PROV_TRIGGER_INTERNAL~",
+                                ~"Queue: B2VCNPROD.BMW.B2VCN.PROV_TRIGGER_IN~",
+                                ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
+                                ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+                                ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_IN~",
+                                ~"getNOPProvisioningDataForVehicle~",
+                                ~"acknowledgeNOPProvisioningDownload~",
+                                ~"getNOPProvisioningDataForVehicleBase64~",
+                                ~"/nop-prov/v2/mainprov/prov.do~"
+                                )"))))):splitBy()))
+    EOT
  
 
     #if not set (removed) it's defaulted to "-1d" 
@@ -25,9 +75,7 @@ module Wirkkette__Provisioning__-_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__Provisioning__-_Reliability_of_key_requests.tf b/EMEA_PROD/slo/Wirkkette__Provisioning__-_Reliability_of_key_requests.tf
index 5997e8f..cb75021 100644
--- a/EMEA_PROD/slo/Wirkkette__Provisioning__-_Reliability_of_key_requests.tf
+++ b/EMEA_PROD/slo/Wirkkette__Provisioning__-_Reliability_of_key_requests.tf
@@ -10,11 +10,67 @@ module Wirkkette__Provisioning__-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-75D2BAC835ECD093\",\"SERVICE_METHOD-0939516BFBB3CE01\",\"SERVICE_METHOD-B651CDECBE0A438B\",\"SERVICE_METHOD-F467D45CE2B03938\",\"SERVICE_METHOD-1101B158CA5A8483\",\"SERVICE_METHOD-5F31DEAA854E71DF\",\"SERVICE_METHOD-20139F0FE242F38A\",\"SERVICE_METHOD-7A9EA8EDD89B1FD9\",\"SERVICE_METHOD-E5008E8F279B39AF\",\"SERVICE_METHOD-0FF622893881FE68\",\"SERVICE_METHOD-0DB37B4A0C33F4D8\",\"SERVICE_METHOD-2B7B71C425E6EF39\")" 
+    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(
+                                        ~"WorkshopProvisioningService - vps-prov - prod~",
+                                        ~"MQSession$FacadeMessageListener - vps-prov - prod~",
+                                        ~"MQSession$FacadeMessageListener - vps-trigger - prod~",
+                                        ~"MQSession$FacadeMessageListener - vps-trigger - prod~",
+                                        ~"VpsJoynrApi - vps-prov - prod~",
+                                        ~"MQSession$FacadeMessageListener - noptrigger - prod~",
+                                        ~"ProvisioningService - nopprov - prod~",
+                                        ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"	
+                                )
+                        )
+                        ,entityName.in(
+                                ~"vpsObtainProvisioningSync~",
+                                ~"Queue: B2VPROD.BMW.B2V.PROV_TRIGGER_INTERNAL~",
+                                ~"Queue: B2VPROD.BMW.B2V.PROV_TRIGGER_IN~",
+                                ~"Queue: B2VPROD.BMW.CASA_EMEA.NOP_OUT~",
+                                ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+                                ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
+                                ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_INTERNAL~",
+                                ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_IN~",
+                                ~"getNOPProvisioningDataForVehicle~",
+                                ~"getNOPProvisioningDataForVehicleBase64~",
+                                ~"acknowledgeNOPProvisioningDownload~",
+                                ~"/nop-prov/v2/mainprov/prov.do~"
+                                )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                        ~"WorkshopProvisioningService - vps-prov - prod~",
+                                        ~"MQSession$FacadeMessageListener - vps-prov - prod~",
+                                        ~"MQSession$FacadeMessageListener - vps-trigger - prod~",
+                                        ~"MQSession$FacadeMessageListener - vps-trigger - prod~",
+                                        ~"VpsJoynrApi - vps-prov - prod~",
+                                        ~"MQSession$FacadeMessageListener - noptrigger - prod~",
+                                        ~"ProvisioningService - nopprov - prod~",
+                                        ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"
+                                        )
+                                )
+                        ,entityName.in(
+                                ~"vpsObtainProvisioningSync~",
+                                ~"Queue: B2VPROD.BMW.B2V.PROV_TRIGGER_INTERNAL~",
+                                ~"Queue: B2VPROD.BMW.B2V.PROV_TRIGGER_IN~",
+                                ~"Queue: B2VPROD.BMW.CASA_EMEA.NOP_OUT~",
+                                ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+                                ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
+                                ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_INTERNAL~",
+                                ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_IN~",
+                                ~"getNOPProvisioningDataForVehicle~",
+                                ~"getNOPProvisioningDataForVehicleBase64~",
+                                ~"acknowledgeNOPProvisioningDownload~",
+                                ~"/nop-prov/v2/mainprov/prov.do~"
+                                )"))))):splitBy()))
+    EOT 
  
 
     #if not set (removed) it's defaulted to "-1d" 
@@ -25,9 +81,7 @@ module Wirkkette__Provisioning__-_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__Provisioning__-_Reliability_of_key_requests.tf b/NA_PROD/slo/Wirkkette__Provisioning__-_Reliability_of_key_requests.tf
index c3a614b..fb14b7e 100644
--- a/NA_PROD/slo/Wirkkette__Provisioning__-_Reliability_of_key_requests.tf
+++ b/NA_PROD/slo/Wirkkette__Provisioning__-_Reliability_of_key_requests.tf
@@ -10,11 +10,63 @@ module Wirkkette__Provisioning__-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-6289F2F27D743A54\",\"SERVICE_METHOD-EEA31D10A5CE5289\",\"SERVICE_METHOD-82E8086C7EEAB715\",\"SERVICE_METHOD-F3FFFB4D04AD6C22\",\"SERVICE_METHOD-82AF06A977AE7DDE\",\"SERVICE_METHOD-78A96EAD07EF5109\",\"SERVICE_METHOD-204C40F1CB4FF7F7\",\"SERVICE_METHOD-E5008E8F279B39AF\",\"SERVICE_METHOD-0DB37B4A0C33F4D8\",\"SERVICE_METHOD-0FF622893881FE68\",\"SERVICE_METHOD-2B7B71C425E6EF39\")" 
+    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(
+                                        ~"WorkshopProvisioningService - vps-prov - us~",
+                                        ~"MQSession$FacadeMessageListener - vps-prov - us~",
+                                        ~"MQSession$FacadeMessageListener - vps-trigger - us~",
+                                        ~"VpsJoynrApi - vps-prov - us~",
+                                        ~"MQSession$FacadeMessageListener - noptrigger - prod~",
+                                        ~"ProvisioningService - nopprov - prod~",
+                                        ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"
+                                )
+			)
+                        ,entityName.in(
+                                ~"vpsObtainProvisioningSync~",
+                                ~"Queue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_INTERNALQueue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_INTERNAL~",
+                                ~"Queue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_IN~",
+                                ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
+                                ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+                                ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_INTERNAL~",
+                                ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_IN~",
+                                ~"getNOPProvisioningDataForVehicle~",
+                                ~"acknowledgeNOPProvisioningDownload~",
+                                ~"getNOPProvisioningDataForVehicleBase64~",
+                                ~"/nop-prov/v2/mainprov/prov.do~"
+                                )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                        ~"WorkshopProvisioningService - vps-prov - us~",
+                                        ~"MQSession$FacadeMessageListener - vps-prov - us~",
+                                        ~"MQSession$FacadeMessageListener - vps-trigger - us~",
+                                        ~"VpsJoynrApi - vps-prov - us~",
+                                        ~"MQSession$FacadeMessageListener - noptrigger - prod~",
+                                        ~"ProvisioningService - nopprov - prod~",
+                                        ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"			
+                                )
+			)
+			,entityName.in(
+				~"vpsObtainProvisioningSync~",
+                                ~"Queue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_INTERNALQueue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_INTERNAL~",
+                                ~"Queue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_IN~",
+                                ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
+                                ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+                                ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_INTERNAL~",
+                                ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_IN~",
+                                ~"getNOPProvisioningDataForVehicle~",
+                                ~"acknowledgeNOPProvisioningDownload~",
+                                ~"getNOPProvisioningDataForVehicleBase64~",
+                                ~"/nop-prov/v2/mainprov/prov.do~"
+                                )"))))):splitBy()))
+    EOT 
  
 
     #if not set (removed) it's defaulted to "-1d" 
@@ -25,9 +77,7 @@ module Wirkkette__Provisioning__-_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