From 8ebcf69a175cce898c0073734ea5750e6818f89f Mon Sep 17 00:00:00 2001
From: Doris Ruppert <Doris.Ruppert@partner.bmw.de>
Date: Mon, 24 Apr 2023 19:07:51 +0200
Subject: [PATCH 1/2] OPMAAS-3832 try to get it smaller

---
 NA_PROD/slo/TP_Vehicle_Provisioning.tf | 145 ++++++++++++-------------
 1 file changed, 67 insertions(+), 78 deletions(-)

diff --git a/NA_PROD/slo/TP_Vehicle_Provisioning.tf b/NA_PROD/slo/TP_Vehicle_Provisioning.tf
index 40b2c86..65ff395 100644
--- a/NA_PROD/slo/TP_Vehicle_Provisioning.tf
+++ b/NA_PROD/slo/TP_Vehicle_Provisioning.tf
@@ -12,90 +12,36 @@ module TP_Vehicle_Provisioning {
     #entity selector object 
     filter                      = "" 
             
-
     #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(
-  ~"WorkshopProvisioningService - provisioning - prod~",
- ~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
- ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
- ~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
- ~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
- ~"VpsJoynrApi - provisioning - prod~",
-
- ~"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~",
-  ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-  ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-  ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-  ~"ProvisioningService - provisioning - prod~",
-  ~"NOP-Provisioning (/nop-prov) - provisioning - prod~"
-                                )
-			)
-                        ,entityName.in(
-~"vpsObtainProvisioningSync~",
-~"Queue: PROV_TRIGGER_ACK-prod~",
-~"Queue: PROV_TRIGGER_INTERNAL-prod~",
-~"Queue: PROV_Trigger_IN-prod~",
-~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
-~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
-
-~"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~",
-~"Queue: NOP_ARCHIVE_IN-prod~",
-~"Queue: NOP_Trigger_IN-prod~",
-~"Queue: NOP_TRIGGER_ACK-prod~",
-~"Queue: NOP_TRIGGER_INTERNAL-prod~"
-                                )"))))):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 - provisioning - prod~",
- ~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
- ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
- ~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
- ~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
- ~"VpsJoynrApi - provisioning - prod~",
-
+(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 - provisioning - prod~",
+~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"VpsJoynrApi - provisioning - prod~",
 ~"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~",
-  ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-  ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-  ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-  ~"ProvisioningService - provisioning - prod~",
-  ~"NOP-Provisioning (/nop-prov) - provisioning - prod~" 			
-                                )
-			)
-			,entityName.in(
-				~"vpsObtainProvisioningSync~",
+~"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~",
+~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"ProvisioningService - provisioning - prod~",
+~"NOP-Provisioning (/nop-prov) - provisioning - prod~"))
+,entityName.in(
+~"vpsObtainProvisioningSync~",
 ~"Queue: PROV_TRIGGER_ACK-prod~",
 ~"Queue: PROV_TRIGGER_INTERNAL-prod~",
 ~"Queue: PROV_Trigger_IN-prod~",
 ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
 ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
-
 ~"vpsObtainProvisioningSync~",
 ~"Queue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_INTERNALQueue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_INTERNAL~",
 ~"Queue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_IN~",
@@ -111,8 +57,51 @@ module TP_Vehicle_Provisioning {
 ~"Queue: NOP_Trigger_IN-prod~",
 ~"Queue: NOP_TRIGGER_ACK-prod~",
 ~"Queue: NOP_TRIGGER_INTERNAL-prod~"
-                                )"))))):splitBy()))
-    EOT 
+)"))))):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 - provisioning - prod~",
+~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"VpsJoynrApi - provisioning - prod~",
+~"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~",
+~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"ProvisioningService - provisioning - prod~",
+~"NOP-Provisioning (/nop-prov) - provisioning - prod~"))
+,entityName.in(
+~"vpsObtainProvisioningSync~",
+~"Queue: PROV_TRIGGER_ACK-prod~",
+~"Queue: PROV_TRIGGER_INTERNAL-prod~",
+~"Queue: PROV_Trigger_IN-prod~",
+~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
+~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+~"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~",
+~"Queue: NOP_ARCHIVE_IN-prod~",
+~"Queue: NOP_Trigger_IN-prod~",
+~"Queue: NOP_TRIGGER_ACK-prod~",
+~"Queue: NOP_TRIGGER_INTERNAL-prod~"
+)"))))):splitBy()))
+EOT 
  
 
     #if not set (removed) it's defaulted to "-1d" 

From 238bc5d08400887ca889634544e1700998b7db37 Mon Sep 17 00:00:00 2001
From: Doris Ruppert <Doris.Ruppert@partner.bmw.de>
Date: Tue, 25 Apr 2023 08:41:24 +0200
Subject: [PATCH 2/2] OPMAAS-3832 try to get it smaller

---
 EMEA_PROD/slo/TP_Vehicle_Provisioning.tf | 58 ++++++++++--------------
 NA_PROD/slo/TP_Vehicle_Provisioning.tf   |  2 -
 2 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/EMEA_PROD/slo/TP_Vehicle_Provisioning.tf b/EMEA_PROD/slo/TP_Vehicle_Provisioning.tf
index 0c66a59..423a851 100644
--- a/EMEA_PROD/slo/TP_Vehicle_Provisioning.tf
+++ b/EMEA_PROD/slo/TP_Vehicle_Provisioning.tf
@@ -15,16 +15,15 @@ module TP_Vehicle_Provisioning {
 
     #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(
+(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 - provisioning - prod~",
-					~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
 ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
 ~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
 ~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
 ~"VpsJoynrApi - provisioning - prod~",
-
 ~"WorkshopProvisioningService - vps-prov - prod~",
 ~"MQSession$FacadeMessageListener - vps-prov - prod~",
 ~"MQSession$FacadeMessageListener - vps-trigger - prod~",
@@ -33,21 +32,18 @@ module TP_Vehicle_Provisioning {
 ~"MQSession$FacadeMessageListener - noptrigger - prod~",
 ~"ProvisioningService - nopprov - prod~",
 ~"NOP-Provisioning (/nop-prov) - nopprov - prod~",
-  ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-  ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-  ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-  ~"ProvisioningService - provisioning - prod~",
-  ~"NOP-Provisioning (/nop-prov) - provisioning - prod~"	
-                                )
-                        )
-                        ,entityName.in(
+~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"ProvisioningService - provisioning - prod~",
+~"NOP-Provisioning (/nop-prov) - provisioning - prod~"))
+,entityName.in(
 ~"vpsObtainProvisioningSync~",
 ~"Queue: PROV_TRIGGER_ACK-prod~",
 ~"Queue: PROV_TRIGGER_INTERNAL-prod~",
 ~"Queue: PROV_Trigger_IN-prod~",
 ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
 ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
-
 ~"vpsObtainProvisioningSync~",
 ~"Queue: B2VPROD.BMW.B2V.PROV_TRIGGER_INTERNAL~",
 ~"Queue: B2VPROD.BMW.B2V.PROV_TRIGGER_IN~",
@@ -64,18 +60,15 @@ module TP_Vehicle_Provisioning {
 ~"Queue: NOP_Trigger_IN-prod~",
 ~"Queue: NOP_TRIGGER_ACK-prod~",
 ~"Queue: NOP_TRIGGER_INTERNAL-prod~"
-                                )"))))):splitBy())
-	/
-	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-                        fromRelationship.isServiceMethodOfService(
-                                type(~"SERVICE~"),entityName.in(
+)"))))):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 - provisioning - prod~",
-					~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
 ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
 ~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
 ~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
 ~"VpsJoynrApi - provisioning - prod~",
-
 ~"WorkshopProvisioningService - vps-prov - prod~",
 ~"MQSession$FacadeMessageListener - vps-prov - prod~",
 ~"MQSession$FacadeMessageListener - vps-trigger - prod~",
@@ -84,21 +77,18 @@ module TP_Vehicle_Provisioning {
 ~"MQSession$FacadeMessageListener - noptrigger - prod~",
 ~"ProvisioningService - nopprov - prod~",
 ~"NOP-Provisioning (/nop-prov) - nopprov - prod~",
-  ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-  ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-  ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-  ~"ProvisioningService - provisioning - prod~",
-  ~"NOP-Provisioning (/nop-prov) - provisioning - prod~"
-                                        )
-                                )
-                        ,entityName.in(
+~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+~"ProvisioningService - provisioning - prod~",
+~"NOP-Provisioning (/nop-prov) - provisioning - prod~"))
+,entityName.in(
 ~"vpsObtainProvisioningSync~",
 ~"Queue: PROV_TRIGGER_ACK-prod~",
 ~"Queue: PROV_TRIGGER_INTERNAL-prod~",
 ~"Queue: PROV_Trigger_IN-prod~",
 ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
 ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
-
 ~"vpsObtainProvisioningSync~",
 ~"Queue: B2VPROD.BMW.B2V.PROV_TRIGGER_INTERNAL~",
 ~"Queue: B2VPROD.BMW.B2V.PROV_TRIGGER_IN~",
@@ -115,13 +105,11 @@ module TP_Vehicle_Provisioning {
 ~"Queue: NOP_Trigger_IN-prod~",
 ~"Queue: NOP_TRIGGER_ACK-prod~",
 ~"Queue: NOP_TRIGGER_INTERNAL-prod~"
-                                )"))))):splitBy()))
-    EOT 
- 
+)"))))):splitBy()))
+EOT 
 
     #if not set (removed) it's defaulted to "-1d" 
-    timeframe                   = "-1d" 
-         
+    timeframe                   = "-1d"  
 
     #currently the only possible value
     evaluation                  = "AGGREGATE"           
diff --git a/NA_PROD/slo/TP_Vehicle_Provisioning.tf b/NA_PROD/slo/TP_Vehicle_Provisioning.tf
index 65ff395..5058a7e 100644
--- a/NA_PROD/slo/TP_Vehicle_Provisioning.tf
+++ b/NA_PROD/slo/TP_Vehicle_Provisioning.tf
@@ -102,11 +102,9 @@ type(~"SERVICE~"),entityName.in(
 ~"Queue: NOP_TRIGGER_INTERNAL-prod~"
 )"))))):splitBy()))
 EOT 
- 
 
     #if not set (removed) it's defaulted to "-1d" 
     timeframe                   = "-1d" 
-         
 
     #currently the only possible value
     evaluation                  = "AGGREGATE"