From 7b487932f0aa8cf011159efdfaa61b3cd3ce7387 Mon Sep 17 00:00:00 2001
From: "SLW\\ARNAUA" <Arnel.Arnautovic@nttdata.com>
Date: Thu, 20 Apr 2023 14:01:34 +0200
Subject: [PATCH] OPMAAS-3858: modified

---
 CN_PROD/slo/VDM_-_NOP_-_CN_E2E.tf      | 142 ++++++++++++-------------
 CN_PROD/slo/VDM_-_NOP_-_CN_PROD.tf     | 141 ++++++++++++------------
 EMEA_PROD/slo/VDM_-_NOP_-_EMEA_E2E.tf  | 142 ++++++++++++-------------
 EMEA_PROD/slo/VDM_-_NOP_-_EMEA_PROD.tf | 142 ++++++++++++-------------
 NA_PROD/slo/VDM_-_NOP_-_US_E2E.tf      | 142 ++++++++++++-------------
 NA_PROD/slo/VDM_-_NOP_-_US_PROD.tf     | 141 ++++++++++++------------
 6 files changed, 412 insertions(+), 438 deletions(-)

diff --git a/CN_PROD/slo/VDM_-_NOP_-_CN_E2E.tf b/CN_PROD/slo/VDM_-_NOP_-_CN_E2E.tf
index dd0093b..b472aea 100644
--- a/CN_PROD/slo/VDM_-_NOP_-_CN_E2E.tf
+++ b/CN_PROD/slo/VDM_-_NOP_-_CN_E2E.tf
@@ -15,79 +15,75 @@ module VDM_-_NOP_-_CN_E2E {
 
     #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(
-                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
-                                    ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
-                                    ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
-                                    ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
-                                    ~"ProvisioningService - provisioning - e2e~",
-                                    ~"NOP-Provisioning (/nop-prov) - provisioning - e2e~",
-
-                                    ~"MQSession$FacadeMessageListener - noptrigger - e2e~",
-                                    ~"MQSession$FacadeMessageListener - nopprov - e2e~",
-                                    ~"MQSession$FacadeMessageListener - noparchive - e2e~",
-                                    ~"ProvisioningService - nopprov - e2e~",
-                                    ~"NOP-Provisioning (/nop-prov) - nopprov - e2e~"
-                                )
-                        )
-                        ,entityName.in(
-                            ~"Queue: NOP_TRIGGER_INTERNAL-e2e~",
-                            ~"Queue: NOP_Trigger_IN-e2e~",
-                            ~"Queue: NOP_TRIGGER_ACK-e2e~",
-                            ~"Queue: NOP_ARCHIVE_IN-e2e~",
-                            ~"getNOPProvisioningDataForVehicle~",
-                            ~"getNOPProvisioningDataForVehicleBase64~",
-                            ~"acknowledgeNOPProvisioningDownload~",
-                            ~"/nop-prov/v2/mainprov/prov.do~",
-
-                            ~"Queue: B2VCNINT.BMW.B2VCN.NOP_TRIGGER_INTERNAL~",
-                            ~"Queue: B2VCNINT.BMW.B2VCN.NOP_TRIGGER_IN~",
-                            ~"Queue: B2VCNINT.BMW.B2VCN.NOP_TRIGGER_ACK_IN~",
-                            ~"Queue: B2VCNINT.BMW.B2VCN.NOP_ARCHIV_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(
-                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
-                                    ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
-                                    ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
-                                    ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
-                                    ~"ProvisioningService - provisioning - e2e~",
-                                    ~"NOP-Provisioning (/nop-prov) - provisioning - e2e~",
-
-                                    ~"MQSession$FacadeMessageListener - noptrigger - e2e~",
-                                    ~"MQSession$FacadeMessageListener - nopprov - e2e~",
-                                    ~"MQSession$FacadeMessageListener - noparchive - e2e~",
-                                    ~"ProvisioningService - nopprov - e2e~",
-                                    ~"NOP-Provisioning (/nop-prov) - nopprov - e2e~"
-                                )
-                        )
-                        ,entityName.in(
-                            ~"Queue: NOP_TRIGGER_INTERNAL-e2e~",
-                            ~"Queue: NOP_Trigger_IN-e2e~",
-                            ~"Queue: NOP_TRIGGER_ACK-e2e~",
-                            ~"Queue: NOP_ARCHIVE_IN-e2e~",
-                            ~"getNOPProvisioningDataForVehicle~",
-                            ~"getNOPProvisioningDataForVehicleBase64~",
-                            ~"acknowledgeNOPProvisioningDownload~",
-                            ~"/nop-prov/v2/mainprov/prov.do~",
-
-                            ~"Queue: B2VCNINT.BMW.B2VCN.NOP_TRIGGER_INTERNAL~",
-                            ~"Queue: B2VCNINT.BMW.B2VCN.NOP_TRIGGER_IN~",
-                            ~"Queue: B2VCNINT.BMW.B2VCN.NOP_TRIGGER_ACK_IN~",
-                            ~"Queue: B2VCNINT.BMW.B2VCN.NOP_ARCHIV_IN~",
-                            ~"getNOPProvisioningDataForVehicle~",
-                            ~"getNOPProvisioningDataForVehicleBase64~",
-                            ~"acknowledgeNOPProvisioningDownload~",
-                            ~"/nop-prov/v2/mainprov/prov.do~"
-                        )"))))):splitBy()))
+    (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(
+                                ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"ProvisioningService - provisioning - e2e~",
+                                ~"NOP-Provisioning (/nop-prov) - provisioning - e2e~",
+                                ~"MQSession$FacadeMessageListener - noptrigger - e2e~",
+                                ~"MQSession$FacadeMessageListener - nopprov - e2e~",
+                                ~"MQSession$FacadeMessageListener - noparchive - e2e~",
+                                ~"ProvisioningService - nopprov - e2e~",
+                                ~"NOP-Provisioning (/nop-prov) - nopprov - e2e~"
+                            )
+                    )
+                    ,entityName.in(
+                        ~"Queue: NOP_TRIGGER_INTERNAL-e2e~",
+                        ~"Queue: NOP_Trigger_IN-e2e~",
+                        ~"Queue: NOP_TRIGGER_ACK-e2e~",
+                        ~"Queue: NOP_ARCHIVE_IN-e2e~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~",
+                        ~"Queue: B2VCNINT.BMW.B2VCN.NOP_TRIGGER_INTERNAL~",
+                        ~"Queue: B2VCNINT.BMW.B2VCN.NOP_TRIGGER_IN~",
+                        ~"Queue: B2VCNINT.BMW.B2VCN.NOP_TRIGGER_ACK_IN~",
+                        ~"Queue: B2VCNINT.BMW.B2VCN.NOP_ARCHIV_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(
+                                ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"ProvisioningService - provisioning - e2e~",
+                                ~"NOP-Provisioning (/nop-prov) - provisioning - e2e~",
+                                ~"MQSession$FacadeMessageListener - noptrigger - e2e~",
+                                ~"MQSession$FacadeMessageListener - nopprov - e2e~",
+                                ~"MQSession$FacadeMessageListener - noparchive - e2e~",
+                                ~"ProvisioningService - nopprov - e2e~",
+                                ~"NOP-Provisioning (/nop-prov) - nopprov - e2e~"
+                            )
+                    )
+                    ,entityName.in(
+                        ~"Queue: NOP_TRIGGER_INTERNAL-e2e~",
+                        ~"Queue: NOP_Trigger_IN-e2e~",
+                        ~"Queue: NOP_TRIGGER_ACK-e2e~",
+                        ~"Queue: NOP_ARCHIVE_IN-e2e~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~",
+                        ~"Queue: B2VCNINT.BMW.B2VCN.NOP_TRIGGER_INTERNAL~",
+                        ~"Queue: B2VCNINT.BMW.B2VCN.NOP_TRIGGER_IN~",
+                        ~"Queue: B2VCNINT.BMW.B2VCN.NOP_TRIGGER_ACK_IN~",
+                        ~"Queue: B2VCNINT.BMW.B2VCN.NOP_ARCHIV_IN~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~"
+                    )"))))):splitBy()))
     EOT
 
 
diff --git a/CN_PROD/slo/VDM_-_NOP_-_CN_PROD.tf b/CN_PROD/slo/VDM_-_NOP_-_CN_PROD.tf
index df67f31..9c27867 100644
--- a/CN_PROD/slo/VDM_-_NOP_-_CN_PROD.tf
+++ b/CN_PROD/slo/VDM_-_NOP_-_CN_PROD.tf
@@ -15,79 +15,74 @@ module VDM_-_NOP_-_CN_PROD {
 
     #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(
-                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - 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~",
-
-                                    ~"MQSession$FacadeMessageListener - noptrigger - prod~",
-                                    ~"MQSession$FacadeMessageListener - nopprov - prod~",
-                                    ~"MQSession$FacadeMessageListener - noparchive - prod~",
-                                    ~"ProvisioningService - nopprov - prod~",
-                                    ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"
-                                )
-                        )
-                        ,entityName.in(
-                            ~"Queue: NOP_TRIGGER_INTERNAL-prod~",
-                            ~"Queue: NOP_Trigger_IN-prod~",
-                            ~"Queue: NOP_TRIGGER_ACK-prod~",
-                            ~"Queue: NOP_ARCHIVE_IN-prod~",
-                            ~"getNOPProvisioningDataForVehicle~",
-                            ~"getNOPProvisioningDataForVehicleBase64~",
-                            ~"acknowledgeNOPProvisioningDownload~",
-                            ~"/nop-prov/v2/mainprov/prov.do~",
-
-                            ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_INTERNAL~",
-                            ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_IN~",
-                            ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_ACK_IN~",
-                            ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_ARCHIV_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(
-                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - 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~",
-
-                                    ~"MQSession$FacadeMessageListener - noptrigger - prod~",
-                                    ~"MQSession$FacadeMessageListener - nopprov - prod~",
-                                    ~"MQSession$FacadeMessageListener - noparchive - prod~",
-                                    ~"ProvisioningService - nopprov - prod~",
-                                    ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"
-                                )
-                        )
-                        ,entityName.in(
-                            ~"Queue: NOP_TRIGGER_INTERNAL-prod~",
-                            ~"Queue: NOP_Trigger_IN-prod~",
-                            ~"Queue: NOP_TRIGGER_ACK-prod~",
-                            ~"Queue: NOP_ARCHIVE_IN-prod~",
-                            ~"getNOPProvisioningDataForVehicle~",
-                            ~"getNOPProvisioningDataForVehicleBase64~",
-                            ~"acknowledgeNOPProvisioningDownload~",
-                            ~"/nop-prov/v2/mainprov/prov.do~",
-
-                            ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_INTERNAL~",
-                            ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_IN~",
-                            ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_ACK_IN~",
-                            ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_ARCHIV_IN~",
-                            ~"getNOPProvisioningDataForVehicle~",
-                            ~"getNOPProvisioningDataForVehicleBase64~",
-                            ~"acknowledgeNOPProvisioningDownload~",
-                            ~"/nop-prov/v2/mainprov/prov.do~"
-                        )"))))):splitBy()))
+    (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(
+                                ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - 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~",
+                                ~"MQSession$FacadeMessageListener - noptrigger - prod~",
+                                ~"MQSession$FacadeMessageListener - nopprov - prod~",
+                                ~"MQSession$FacadeMessageListener - noparchive - prod~",
+                                ~"ProvisioningService - nopprov - prod~",
+                                ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"
+                            )
+                    )
+                    ,entityName.in(
+                        ~"Queue: NOP_TRIGGER_INTERNAL-prod~",
+                        ~"Queue: NOP_Trigger_IN-prod~",
+                        ~"Queue: NOP_TRIGGER_ACK-prod~",
+                        ~"Queue: NOP_ARCHIVE_IN-prod~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~",
+                        ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_INTERNAL~",
+                        ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_IN~",
+                        ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_ACK_IN~",
+                        ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_ARCHIV_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(
+                                ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - 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~",
+                                ~"MQSession$FacadeMessageListener - noptrigger - prod~",
+                                ~"MQSession$FacadeMessageListener - nopprov - prod~",
+                                ~"MQSession$FacadeMessageListener - noparchive - prod~",
+                                ~"ProvisioningService - nopprov - prod~",
+                                ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"
+                            )
+                    )
+                    ,entityName.in(
+                        ~"Queue: NOP_TRIGGER_INTERNAL-prod~",
+                        ~"Queue: NOP_Trigger_IN-prod~",
+                        ~"Queue: NOP_TRIGGER_ACK-prod~",
+                        ~"Queue: NOP_ARCHIVE_IN-prod~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~",
+                        ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_INTERNAL~",
+                        ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_IN~",
+                        ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_ACK_IN~",
+                        ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_ARCHIV_IN~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~")"))))):splitBy()))
     EOT
 
 
diff --git a/EMEA_PROD/slo/VDM_-_NOP_-_EMEA_E2E.tf b/EMEA_PROD/slo/VDM_-_NOP_-_EMEA_E2E.tf
index bab50b8..125884f 100644
--- a/EMEA_PROD/slo/VDM_-_NOP_-_EMEA_E2E.tf
+++ b/EMEA_PROD/slo/VDM_-_NOP_-_EMEA_E2E.tf
@@ -15,79 +15,75 @@ module VDM_-_NOP_-_EMEA_E2E {
 
     #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(
-                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
-                                    ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
-                                    ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
-                                    ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
-                                    ~"ProvisioningService - provisioning - e2e~",
-                                    ~"NOP-Provisioning (/nop-prov) - provisioning - e2e~",
-
-                                    ~"MQSession$FacadeMessageListener - noptrigger - e2e~",
-                                    ~"MQSession$FacadeMessageListener - nopprov - e2e~",
-                                    ~"MQSession$FacadeMessageListener - noparchive - e2e~",
-                                    ~"ProvisioningService - nopprov - e2e~",
-                                    ~"NOP-Provisioning (/nop-prov) - nopprov - e2e~"
-                                )
-                        )
-                        ,entityName.in(
-                            ~"Queue: NOP_TRIGGER_INTERNAL-e2e~",
-                            ~"Queue: NOP_Trigger_IN-e2e~",
-                            ~"Queue: NOP_TRIGGER_ACK-e2e~",
-                            ~"Queue: NOP_ARCHIVE_IN-e2e~",
-                            ~"getNOPProvisioningDataForVehicle~",
-                            ~"getNOPProvisioningDataForVehicleBase64~",
-                            ~"acknowledgeNOPProvisioningDownload~",
-                            ~"/nop-prov/v2/mainprov/prov.do~",
-
-                            ~"Queue: B2VINT.BMW.B2V.NOP_TRIGGER_INTERNAL~",
-                            ~"Queue: B2VINT.BMW.B2V.NOP_TRIGGER_IN~",
-                            ~"Queue: B2VINT.BMW.B2V.NOP_TRIGGER_ACK_IN~",
-                            ~"Queue: B2VINT.BMW.B2V.NOP_ARCHIV_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(
-                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
-                                    ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
-                                    ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
-                                    ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
-                                    ~"ProvisioningService - provisioning - e2e~",
-                                    ~"NOP-Provisioning (/nop-prov) - provisioning - e2e~",
-
-                                    ~"MQSession$FacadeMessageListener - noptrigger - e2e~",
-                                    ~"MQSession$FacadeMessageListener - nopprov - e2e~",
-                                    ~"MQSession$FacadeMessageListener - noparchive - e2e~",
-                                    ~"ProvisioningService - nopprov - e2e~",
-                                    ~"NOP-Provisioning (/nop-prov) - nopprov - e2e~"
-                                )
-                        )
-                        ,entityName.in(
-                            ~"Queue: NOP_TRIGGER_INTERNAL-e2e~",
-                            ~"Queue: NOP_Trigger_IN-e2e~",
-                            ~"Queue: NOP_TRIGGER_ACK-e2e~",
-                            ~"Queue: NOP_ARCHIVE_IN-e2e~",
-                            ~"getNOPProvisioningDataForVehicle~",
-                            ~"getNOPProvisioningDataForVehicleBase64~",
-                            ~"acknowledgeNOPProvisioningDownload~",
-                            ~"/nop-prov/v2/mainprov/prov.do~",
-
-                            ~"Queue: B2VINT.BMW.B2V.NOP_TRIGGER_INTERNAL~",
-                            ~"Queue: B2VINT.BMW.B2V.NOP_TRIGGER_IN~",
-                            ~"Queue: B2VINT.BMW.B2V.NOP_TRIGGER_ACK_IN~",
-                            ~"Queue: B2VINT.BMW.B2V.NOP_ARCHIV_IN~",
-                            ~"getNOPProvisioningDataForVehicle~",
-                            ~"getNOPProvisioningDataForVehicleBase64~",
-                            ~"acknowledgeNOPProvisioningDownload~",
-                            ~"/nop-prov/v2/mainprov/prov.do~"
-                        )"))))):splitBy()))
+    (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(
+                                ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"ProvisioningService - provisioning - e2e~",
+                                ~"NOP-Provisioning (/nop-prov) - provisioning - e2e~",
+                                ~"MQSession$FacadeMessageListener - noptrigger - e2e~",
+                                ~"MQSession$FacadeMessageListener - nopprov - e2e~",
+                                ~"MQSession$FacadeMessageListener - noparchive - e2e~",
+                                ~"ProvisioningService - nopprov - e2e~",
+                                ~"NOP-Provisioning (/nop-prov) - nopprov - e2e~"
+                            )
+                    )
+                    ,entityName.in(
+                        ~"Queue: NOP_TRIGGER_INTERNAL-e2e~",
+                        ~"Queue: NOP_Trigger_IN-e2e~",
+                        ~"Queue: NOP_TRIGGER_ACK-e2e~",
+                        ~"Queue: NOP_ARCHIVE_IN-e2e~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~",
+                        ~"Queue: B2VINT.BMW.B2V.NOP_TRIGGER_INTERNAL~",
+                        ~"Queue: B2VINT.BMW.B2V.NOP_TRIGGER_IN~",
+                        ~"Queue: B2VINT.BMW.B2V.NOP_TRIGGER_ACK_IN~",
+                        ~"Queue: B2VINT.BMW.B2V.NOP_ARCHIV_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(
+                                ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"ProvisioningService - provisioning - e2e~",
+                                ~"NOP-Provisioning (/nop-prov) - provisioning - e2e~",
+                                ~"MQSession$FacadeMessageListener - noptrigger - e2e~",
+                                ~"MQSession$FacadeMessageListener - nopprov - e2e~",
+                                ~"MQSession$FacadeMessageListener - noparchive - e2e~",
+                                ~"ProvisioningService - nopprov - e2e~",
+                                ~"NOP-Provisioning (/nop-prov) - nopprov - e2e~"
+                            )
+                    )
+                    ,entityName.in(
+                        ~"Queue: NOP_TRIGGER_INTERNAL-e2e~",
+                        ~"Queue: NOP_Trigger_IN-e2e~",
+                        ~"Queue: NOP_TRIGGER_ACK-e2e~",
+                        ~"Queue: NOP_ARCHIVE_IN-e2e~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~",
+                        ~"Queue: B2VINT.BMW.B2V.NOP_TRIGGER_INTERNAL~",
+                        ~"Queue: B2VINT.BMW.B2V.NOP_TRIGGER_IN~",
+                        ~"Queue: B2VINT.BMW.B2V.NOP_TRIGGER_ACK_IN~",
+                        ~"Queue: B2VINT.BMW.B2V.NOP_ARCHIV_IN~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~"
+                    )"))))):splitBy()))
     EOT
 
 
diff --git a/EMEA_PROD/slo/VDM_-_NOP_-_EMEA_PROD.tf b/EMEA_PROD/slo/VDM_-_NOP_-_EMEA_PROD.tf
index 9b5273e..a5b8699 100644
--- a/EMEA_PROD/slo/VDM_-_NOP_-_EMEA_PROD.tf
+++ b/EMEA_PROD/slo/VDM_-_NOP_-_EMEA_PROD.tf
@@ -15,79 +15,75 @@ module VDM_-_NOP_-_EMEA_PROD {
 
     #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(
-                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - 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~",
-
-                                    ~"MQSession$FacadeMessageListener - noptrigger - prod~",
-                                    ~"MQSession$FacadeMessageListener - nopprov - prod~",
-                                    ~"MQSession$FacadeMessageListener - noparchive - prod~",
-                                    ~"ProvisioningService - nopprov - prod~",
-                                    ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"
-                                )
-                        )
-                        ,entityName.in(
-                            ~"Queue: NOP_TRIGGER_INTERNAL-prod~",
-                            ~"Queue: NOP_Trigger_IN-prod~",
-                            ~"Queue: NOP_TRIGGER_ACK-prod~",
-                            ~"Queue: NOP_ARCHIVE_IN-prod~",
-                            ~"getNOPProvisioningDataForVehicle~",
-                            ~"getNOPProvisioningDataForVehicleBase64~",
-                            ~"acknowledgeNOPProvisioningDownload~",
-                            ~"/nop-prov/v2/mainprov/prov.do~",
-
-                            ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_INTERNAL~",
-                            ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_IN~",
-                            ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_ACK_IN~",
-                            ~"Queue: B2VPROD.BMW.B2V.NOP_ARCHIV_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(
-                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - 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~",
-
-                                    ~"MQSession$FacadeMessageListener - noptrigger - prod~",
-                                    ~"MQSession$FacadeMessageListener - nopprov - prod~",
-                                    ~"MQSession$FacadeMessageListener - noparchive - prod~",
-                                    ~"ProvisioningService - nopprov - prod~",
-                                    ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"
-                                )
-                        )
-                        ,entityName.in(
-                            ~"Queue: NOP_TRIGGER_INTERNAL-prod~",
-                            ~"Queue: NOP_Trigger_IN-prod~",
-                            ~"Queue: NOP_TRIGGER_ACK-prod~",
-                            ~"Queue: NOP_ARCHIVE_IN-prod~",
-                            ~"getNOPProvisioningDataForVehicle~",
-                            ~"getNOPProvisioningDataForVehicleBase64~",
-                            ~"acknowledgeNOPProvisioningDownload~",
-                            ~"/nop-prov/v2/mainprov/prov.do~",
-
-                            ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_INTERNAL~",
-                            ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_IN~",
-                            ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_ACK_IN~",
-                            ~"Queue: B2VPROD.BMW.B2V.NOP_ARCHIV_IN~",
-                            ~"getNOPProvisioningDataForVehicle~",
-                            ~"getNOPProvisioningDataForVehicleBase64~",
-                            ~"acknowledgeNOPProvisioningDownload~",
-                            ~"/nop-prov/v2/mainprov/prov.do~"
-                        )"))))):splitBy()))
+    (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(
+                                ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - 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~",
+                                ~"MQSession$FacadeMessageListener - noptrigger - prod~",
+                                ~"MQSession$FacadeMessageListener - nopprov - prod~",
+                                ~"MQSession$FacadeMessageListener - noparchive - prod~",
+                                ~"ProvisioningService - nopprov - prod~",
+                                ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"
+                            )
+                    )
+                    ,entityName.in(
+                        ~"Queue: NOP_TRIGGER_INTERNAL-prod~",
+                        ~"Queue: NOP_Trigger_IN-prod~",
+                        ~"Queue: NOP_TRIGGER_ACK-prod~",
+                        ~"Queue: NOP_ARCHIVE_IN-prod~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~",
+                        ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_INTERNAL~",
+                        ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_IN~",
+                        ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_ACK_IN~",
+                        ~"Queue: B2VPROD.BMW.B2V.NOP_ARCHIV_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(
+                                ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - 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~",
+                                ~"MQSession$FacadeMessageListener - noptrigger - prod~",
+                                ~"MQSession$FacadeMessageListener - nopprov - prod~",
+                                ~"MQSession$FacadeMessageListener - noparchive - prod~",
+                                ~"ProvisioningService - nopprov - prod~",
+                                ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"
+                            )
+                    )
+                    ,entityName.in(
+                        ~"Queue: NOP_TRIGGER_INTERNAL-prod~",
+                        ~"Queue: NOP_Trigger_IN-prod~",
+                        ~"Queue: NOP_TRIGGER_ACK-prod~",
+                        ~"Queue: NOP_ARCHIVE_IN-prod~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~",
+                        ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_INTERNAL~",
+                        ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_IN~",
+                        ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_ACK_IN~",
+                        ~"Queue: B2VPROD.BMW.B2V.NOP_ARCHIV_IN~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~"
+                    )"))))):splitBy()))
     EOT
 
 
diff --git a/NA_PROD/slo/VDM_-_NOP_-_US_E2E.tf b/NA_PROD/slo/VDM_-_NOP_-_US_E2E.tf
index 8422604..7787280 100644
--- a/NA_PROD/slo/VDM_-_NOP_-_US_E2E.tf
+++ b/NA_PROD/slo/VDM_-_NOP_-_US_E2E.tf
@@ -15,79 +15,75 @@ module VDM_-_NOP_-_US_E2E {
 
     #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(
-                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
-                                    ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
-                                    ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
-                                    ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
-                                    ~"ProvisioningService - provisioning - e2e~",
-                                    ~"NOP-Provisioning (/nop-prov) - provisioning - e2e~",
-
-                                    ~"MQSession$FacadeMessageListener - noptrigger - e2e~",
-                                    ~"MQSession$FacadeMessageListener - nopprov - e2e~",
-                                    ~"MQSession$FacadeMessageListener - noparchive - e2e~",
-                                    ~"ProvisioningService - nopprov - e2e~",
-                                    ~"NOP-Provisioning (/nop-prov) - nopprov - e2e~"
-                                )
-                        )
-                        ,entityName.in(
-                            ~"Queue: NOP_TRIGGER_INTERNAL-e2e~",
-                            ~"Queue: NOP_Trigger_IN-e2e~",
-                            ~"Queue: NOP_TRIGGER_ACK-e2e~",
-                            ~"Queue: NOP_ARCHIVE_IN-e2e~",
-                            ~"getNOPProvisioningDataForVehicle~",
-                            ~"getNOPProvisioningDataForVehicleBase64~",
-                            ~"acknowledgeNOPProvisioningDownload~",
-                            ~"/nop-prov/v2/mainprov/prov.do~",
-
-                            ~"Queue: B2VUSINT.BMW.B2VUS.NOP_TRIGGER_INTERNAL~",
-                            ~"Queue: B2VUSINT.BMW.B2VUS.NOP_TRIGGER_IN~",
-                            ~"Queue: B2VUSINT.BMW.B2VUS.NOP_TRIGGER_ACK_IN~",
-                            ~"Queue: B2VUSINT.BMW.B2VUS.NOP_ARCHIV_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(
-                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
-                                    ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
-                                    ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
-                                    ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
-                                    ~"ProvisioningService - provisioning - e2e~",
-                                    ~"NOP-Provisioning (/nop-prov) - provisioning - e2e~",
-
-                                    ~"MQSession$FacadeMessageListener - noptrigger - e2e~",
-                                    ~"MQSession$FacadeMessageListener - nopprov - e2e~",
-                                    ~"MQSession$FacadeMessageListener - noparchive - e2e~",
-                                    ~"ProvisioningService - nopprov - e2e~",
-                                    ~"NOP-Provisioning (/nop-prov) - nopprov - e2e~"
-                                )
-                        )
-                        ,entityName.in(
-                            ~"Queue: NOP_TRIGGER_INTERNAL-e2e~",
-                            ~"Queue: NOP_Trigger_IN-e2e~",
-                            ~"Queue: NOP_TRIGGER_ACK-e2e~",
-                            ~"Queue: NOP_ARCHIVE_IN-e2e~",
-                            ~"getNOPProvisioningDataForVehicle~",
-                            ~"getNOPProvisioningDataForVehicleBase64~",
-                            ~"acknowledgeNOPProvisioningDownload~",
-                            ~"/nop-prov/v2/mainprov/prov.do~",
-
-                            ~"Queue: B2VUSINT.BMW.B2VUS.NOP_TRIGGER_INTERNAL~",
-                            ~"Queue: B2VUSINT.BMW.B2VUS.NOP_TRIGGER_IN~",
-                            ~"Queue: B2VUSINT.BMW.B2VUS.NOP_TRIGGER_ACK_IN~",
-                            ~"Queue: B2VUSINT.BMW.B2VUS.NOP_ARCHIV_IN~",
-                            ~"getNOPProvisioningDataForVehicle~",
-                            ~"getNOPProvisioningDataForVehicleBase64~",
-                            ~"acknowledgeNOPProvisioningDownload~",
-                            ~"/nop-prov/v2/mainprov/prov.do~"
-                        )"))))):splitBy()))
+    (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(
+                                ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"ProvisioningService - provisioning - e2e~",
+                                ~"NOP-Provisioning (/nop-prov) - provisioning - e2e~",
+                                ~"MQSession$FacadeMessageListener - noptrigger - e2e~",
+                                ~"MQSession$FacadeMessageListener - nopprov - e2e~",
+                                ~"MQSession$FacadeMessageListener - noparchive - e2e~",
+                                ~"ProvisioningService - nopprov - e2e~",
+                                ~"NOP-Provisioning (/nop-prov) - nopprov - e2e~"
+                            )
+                    )
+                    ,entityName.in(
+                        ~"Queue: NOP_TRIGGER_INTERNAL-e2e~",
+                        ~"Queue: NOP_Trigger_IN-e2e~",
+                        ~"Queue: NOP_TRIGGER_ACK-e2e~",
+                        ~"Queue: NOP_ARCHIVE_IN-e2e~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~",
+                        ~"Queue: B2VUSINT.BMW.B2VUS.NOP_TRIGGER_INTERNAL~",
+                        ~"Queue: B2VUSINT.BMW.B2VUS.NOP_TRIGGER_IN~",
+                        ~"Queue: B2VUSINT.BMW.B2VUS.NOP_TRIGGER_ACK_IN~",
+                        ~"Queue: B2VUSINT.BMW.B2VUS.NOP_ARCHIV_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(
+                                ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"ProvisioningService - provisioning - e2e~",
+                                ~"NOP-Provisioning (/nop-prov) - provisioning - e2e~",
+                                ~"MQSession$FacadeMessageListener - noptrigger - e2e~",
+                                ~"MQSession$FacadeMessageListener - nopprov - e2e~",
+                                ~"MQSession$FacadeMessageListener - noparchive - e2e~",
+                                ~"ProvisioningService - nopprov - e2e~",
+                                ~"NOP-Provisioning (/nop-prov) - nopprov - e2e~"
+                            )
+                    )
+                    ,entityName.in(
+                        ~"Queue: NOP_TRIGGER_INTERNAL-e2e~",
+                        ~"Queue: NOP_Trigger_IN-e2e~",
+                        ~"Queue: NOP_TRIGGER_ACK-e2e~",
+                        ~"Queue: NOP_ARCHIVE_IN-e2e~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~",
+                        ~"Queue: B2VUSINT.BMW.B2VUS.NOP_TRIGGER_INTERNAL~",
+                        ~"Queue: B2VUSINT.BMW.B2VUS.NOP_TRIGGER_IN~",
+                        ~"Queue: B2VUSINT.BMW.B2VUS.NOP_TRIGGER_ACK_IN~",
+                        ~"Queue: B2VUSINT.BMW.B2VUS.NOP_ARCHIV_IN~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~"
+                    )"))))):splitBy()))
     EOT
 
 
diff --git a/NA_PROD/slo/VDM_-_NOP_-_US_PROD.tf b/NA_PROD/slo/VDM_-_NOP_-_US_PROD.tf
index 238954b..6c0a0d0 100644
--- a/NA_PROD/slo/VDM_-_NOP_-_US_PROD.tf
+++ b/NA_PROD/slo/VDM_-_NOP_-_US_PROD.tf
@@ -15,79 +15,74 @@ module VDM_-_NOP_-_US_PROD {
 
     #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(
-                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - 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~",
-
-                                    ~"MQSession$FacadeMessageListener - noptrigger - prod~",
-                                    ~"MQSession$FacadeMessageListener - nopprov - prod~",
-                                    ~"MQSession$FacadeMessageListener - noparchive - prod~",
-                                    ~"ProvisioningService - nopprov - prod~",
-                                    ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"
-                                )
-                        )
-                        ,entityName.in(
-                            ~"Queue: NOP_TRIGGER_INTERNAL-prod~",
-                            ~"Queue: NOP_Trigger_IN-prod~",
-                            ~"Queue: NOP_TRIGGER_ACK-prod~",
-                            ~"Queue: NOP_ARCHIVE_IN-prod~",
-                            ~"getNOPProvisioningDataForVehicle~",
-                            ~"getNOPProvisioningDataForVehicleBase64~",
-                            ~"acknowledgeNOPProvisioningDownload~",
-                            ~"/nop-prov/v2/mainprov/prov.do~",
-
-                            ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_INTERNAL~",
-                            ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_IN~",
-                            ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_ACK_IN~",
-                            ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_ARCHIV_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(
-                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - 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~",
-
-                                    ~"MQSession$FacadeMessageListener - noptrigger - prod~",
-                                    ~"MQSession$FacadeMessageListener - nopprov - prod~",
-                                    ~"MQSession$FacadeMessageListener - noparchive - prod~",
-                                    ~"ProvisioningService - nopprov - prod~",
-                                    ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"
-                                )
-                        )
-                        ,entityName.in(
-                            ~"Queue: NOP_TRIGGER_INTERNAL-prod~",
-                            ~"Queue: NOP_Trigger_IN-prod~",
-                            ~"Queue: NOP_TRIGGER_ACK-prod~",
-                            ~"Queue: NOP_ARCHIVE_IN-prod~",
-                            ~"getNOPProvisioningDataForVehicle~",
-                            ~"getNOPProvisioningDataForVehicleBase64~",
-                            ~"acknowledgeNOPProvisioningDownload~",
-                            ~"/nop-prov/v2/mainprov/prov.do~",
-
-                            ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_INTERNAL~",
-                            ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_IN~",
-                            ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_ACK_IN~",
-                            ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_ARCHIV_IN~",
-                            ~"getNOPProvisioningDataForVehicle~",
-                            ~"getNOPProvisioningDataForVehicleBase64~",
-                            ~"acknowledgeNOPProvisioningDownload~",
-                            ~"/nop-prov/v2/mainprov/prov.do~"
-                        )"))))):splitBy()))
+    (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(
+                                ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - 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~",
+                                ~"MQSession$FacadeMessageListener - noptrigger - prod~",
+                                ~"MQSession$FacadeMessageListener - nopprov - prod~",
+                                ~"MQSession$FacadeMessageListener - noparchive - prod~",
+                                ~"ProvisioningService - nopprov - prod~",
+                                ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"
+                            )
+                    )
+                    ,entityName.in(
+                        ~"Queue: NOP_TRIGGER_INTERNAL-prod~",
+                        ~"Queue: NOP_Trigger_IN-prod~",
+                        ~"Queue: NOP_TRIGGER_ACK-prod~",
+                        ~"Queue: NOP_ARCHIVE_IN-prod~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~",
+                        ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_INTERNAL~",
+                        ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_IN~",
+                        ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_ACK_IN~",
+                        ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_ARCHIV_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(
+                                ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - 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~",
+                                ~"MQSession$FacadeMessageListener - noptrigger - prod~",
+                                ~"MQSession$FacadeMessageListener - nopprov - prod~",
+                                ~"MQSession$FacadeMessageListener - noparchive - prod~",
+                                ~"ProvisioningService - nopprov - prod~",
+                                ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"
+                            )
+                    )
+                    ,entityName.in(
+                        ~"Queue: NOP_TRIGGER_INTERNAL-prod~",
+                        ~"Queue: NOP_Trigger_IN-prod~",
+                        ~"Queue: NOP_TRIGGER_ACK-prod~",
+                        ~"Queue: NOP_ARCHIVE_IN-prod~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~",
+                        ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_INTERNAL~",
+                        ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_IN~",
+                        ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_ACK_IN~",
+                        ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_ARCHIV_IN~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~")"))))):splitBy()))
     EOT