From 4a879e3bc67f5e12d6b31e9658e919ec13824a06 Mon Sep 17 00:00:00 2001 From: Mohammed Abadel Date: Fri, 14 Apr 2023 15:50:18 +0200 Subject: [PATCH] Adjustin SLO for Provisioning in CN. Both TP and Wirkkette --- CN_PROD/slo/TP_Vehicle_Provisioning.tf | 66 +++++++++---------- ...isioning__-_Reliability_of_key_requests.tf | 66 +++++++++---------- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/CN_PROD/slo/TP_Vehicle_Provisioning.tf b/CN_PROD/slo/TP_Vehicle_Provisioning.tf index b380d6e..ac60402 100644 --- a/CN_PROD/slo/TP_Vehicle_Provisioning.tf +++ b/CN_PROD/slo/TP_Vehicle_Provisioning.tf @@ -29,7 +29,7 @@ module TP_Vehicle_Provisioning { ~"NOP-Provisioning (/nop-prov) - provisioning - prod~", ~"ProvisioningService - provisioning - prod~", ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",)) - ,entityName.in( + ,entityName.in( ~"vpsObtainProvisioningSync~", ~"Queue: PROV_TRIGGER_ACK-prod~", ~"Queue: PROV_TRIGGER_INTERNAL-prod~", @@ -46,38 +46,38 @@ module TP_Vehicle_Provisioning { ~"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 - 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~", - ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", - ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", - ~"NOP-Provisioning (/nop-prov) - provisioning - prod~", - ~"ProvisioningService - provisioning - prod~", - ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",)) - ,entityName.in( - ~"vpsObtainProvisioningSync~", - ~"Queue: PROV_TRIGGER_ACK-prod~", - ~"Queue: PROV_TRIGGER_INTERNAL-prod~", - ~"Queue: PROV_Trigger_IN-prod~", - ~"Queue: PROV_ARCHIVE_IN-prod~", - ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~", - ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~", - ~"Queue: NOP_ARCHIVE_IN-prod~", - ~"Queue: NOP_Trigger_IN-prod~", - ~"Queue: NOP_TRIGGER_ACK-prod~", - ~"Queue: NOP_TRIGGER_INTERNAL-prod~", - ~"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 - 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~", + ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", + ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", + ~"NOP-Provisioning (/nop-prov) - provisioning - prod~", + ~"ProvisioningService - provisioning - prod~", + ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",)) + ,entityName.in( + ~"vpsObtainProvisioningSync~", + ~"Queue: PROV_TRIGGER_ACK-prod~", + ~"Queue: PROV_TRIGGER_INTERNAL-prod~", + ~"Queue: PROV_Trigger_IN-prod~", + ~"Queue: PROV_ARCHIVE_IN-prod~", + ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~", + ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~", + ~"Queue: NOP_ARCHIVE_IN-prod~", + ~"Queue: NOP_Trigger_IN-prod~", + ~"Queue: NOP_TRIGGER_ACK-prod~", + ~"Queue: NOP_TRIGGER_INTERNAL-prod~", + ~"getNOPProvisioningDataForVehicle~", + ~"acknowledgeNOPProvisioningDownload~", + ~"getNOPProvisioningDataForVehicleBase64~", + ~"/nop-prov/v2/mainprov/prov.do~", + )"))))):splitBy())) EOT #if not set (removed) it's defaulted to "-1d" 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 1f5ce11..69c3e60 100644 --- a/CN_PROD/slo/Wirkkette__Provisioning__-_Reliability_of_key_requests.tf +++ b/CN_PROD/slo/Wirkkette__Provisioning__-_Reliability_of_key_requests.tf @@ -29,7 +29,7 @@ module Wirkkette__Provisioning__-_Reliability_of_key_requests { ~"NOP-Provisioning (/nop-prov) - provisioning - prod~", ~"ProvisioningService - provisioning - prod~", ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",)) - ,entityName.in( + ,entityName.in( ~"vpsObtainProvisioningSync~", ~"Queue: PROV_TRIGGER_ACK-prod~", ~"Queue: PROV_TRIGGER_INTERNAL-prod~", @@ -46,38 +46,38 @@ module Wirkkette__Provisioning__-_Reliability_of_key_requests { ~"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 - 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~", - ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", - ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", - ~"NOP-Provisioning (/nop-prov) - provisioning - prod~", - ~"ProvisioningService - provisioning - prod~", - ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",)) - ,entityName.in( - ~"vpsObtainProvisioningSync~", - ~"Queue: PROV_TRIGGER_ACK-prod~", - ~"Queue: PROV_TRIGGER_INTERNAL-prod~", - ~"Queue: PROV_Trigger_IN-prod~", - ~"Queue: PROV_ARCHIVE_IN-prod~", - ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~", - ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~", - ~"Queue: NOP_ARCHIVE_IN-prod~", - ~"Queue: NOP_Trigger_IN-prod~", - ~"Queue: NOP_TRIGGER_ACK-prod~", - ~"Queue: NOP_TRIGGER_INTERNAL-prod~", - ~"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 - 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~", + ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", + ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~", + ~"NOP-Provisioning (/nop-prov) - provisioning - prod~", + ~"ProvisioningService - provisioning - prod~", + ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",)) + ,entityName.in( + ~"vpsObtainProvisioningSync~", + ~"Queue: PROV_TRIGGER_ACK-prod~", + ~"Queue: PROV_TRIGGER_INTERNAL-prod~", + ~"Queue: PROV_Trigger_IN-prod~", + ~"Queue: PROV_ARCHIVE_IN-prod~", + ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~", + ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~", + ~"Queue: NOP_ARCHIVE_IN-prod~", + ~"Queue: NOP_Trigger_IN-prod~", + ~"Queue: NOP_TRIGGER_ACK-prod~", + ~"Queue: NOP_TRIGGER_INTERNAL-prod~", + ~"getNOPProvisioningDataForVehicle~", + ~"acknowledgeNOPProvisioningDownload~", + ~"getNOPProvisioningDataForVehicleBase64~", + ~"/nop-prov/v2/mainprov/prov.do~", + )"))))):splitBy())) EOT