From e391ed9104e88dc2dc0dfce75f2dfee78cef7210 Mon Sep 17 00:00:00 2001 From: Mohammed Abadel Date: Tue, 14 Jun 2022 16:56:32 +0200 Subject: [PATCH] changed SLO for the Wirkkette Call Service to use service names instead of ids --- ...y___MGU___-_Reliability_of_key_requests.tf | 76 ++++++++++++++++++- ...y___MGU___-_Reliability_of_key_requests.tf | 72 +++++++++++++++++- 2 files changed, 144 insertions(+), 4 deletions(-) diff --git a/EMEA_PROD/slo/Wirkkette__Call_Service__Legacy___MGU___-_Reliability_of_key_requests.tf b/EMEA_PROD/slo/Wirkkette__Call_Service__Legacy___MGU___-_Reliability_of_key_requests.tf index 031f1ac..4a75de7 100644 --- a/EMEA_PROD/slo/Wirkkette__Call_Service__Legacy___MGU___-_Reliability_of_key_requests.tf +++ b/EMEA_PROD/slo/Wirkkette__Call_Service__Legacy___MGU___-_Reliability_of_key_requests.tf @@ -10,11 +10,83 @@ module Wirkkette__Call_Service__Legacy___MGU___-_Reliability_of_key_requests { #entity selector object - filter = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-EC16A84165125CBB\",\"SERVICE_METHOD-4A14648517B731BD\",\"SERVICE_METHOD-1AB04BA86023E9C8\",\"SERVICE_METHOD-917FCFD59FA44E5B\",\"SERVICE_METHOD-1DD666207A7548BB\",\"SERVICE_METHOD-24348AAB4EA9BC93\",\"SERVICE_METHOD-9B0650778BE2B70A\",\"SERVICE_METHOD-0F06D49AB1D3947B\",\"SERVICE_METHOD-06231C0889206120\",\"SERVICE_METHOD-1B1B4A6D5552A079\",\"SERVICE_METHOD-8179FFD58382E60F\",\"SERVICE_METHOD-8268C0533638C43B\",\"SERVICE_METHOD-D55CA88611955FBB\",\"SERVICE_METHOD-52D701CA89D09A73\",\"SERVICE_METHOD-88BE374734D99107\",\"SERVICE_METHOD-917FCFD59FA44E5B\")" + 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( + ~"VoiceV2Resource - ngtp-cs - prod~", + ~"V1Api - PROD~", + ~"CallRoutingResource - crs - prod~", + ~"NgtpUplinkEventResource - ngtp-cs - prod~", + ~"NgtpApiController - base - prod~", + ~"ECS - CreateEvent - E2E - ecs - prod~", + ~"ISmsGatewayBF - ecs - prod~", + ~"CallMgmtApiResourceV1 - b2vvoice - prod~", + ~"EcsApiController - base - prod~", + ~"XcsApiController - base - prod~", + ~"VehicleCalledNumberV2BF - ecs - prod~", + ~"VehicleVinV2BF - ecs - prod~", + ~"XCS - JOYNR - xcs - prod~", + ~"V1Api - PROD~" + ) + ) + ,entityName.in( + ~"voiceInitatedCallSync~", + ~"callReceived~", + ~"getRoutingData~", + ~"notifyCsMessage~", + ~"notifyCallEventCreatedCall~", + ~"__EJB31_Generated__JoynrEventOperations__Intf____Bean__.createEvent~", + ~"message~", + ~"setupCall~", + ~"ecsEventReceived~", + ~"xcsEventReceived~", + ~"createEventByCallednumber~", + ~"createEventByvin~", + ~"$Proxy.notifyXCall~", + ~"$Proxy.terminateXCallFromVehicle~" + )"))))):splitBy()) + / + (builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), + fromRelationship.isServiceMethodOfService( + type(~"SERVICE~"),entityName.in( + ~"VoiceV2Resource - ngtp-cs - prod~", + ~"V1Api - PROD~", + ~"CallRoutingResource - crs - prod~", + ~"NgtpUplinkEventResource - ngtp-cs - prod~", + ~"NgtpApiController - base - prod~", + ~"ECS - CreateEvent - E2E - ecs - prod~", + ~"ISmsGatewayBF - ecs - prod~", + ~"CallMgmtApiResourceV1 - b2vvoice - prod~", + ~"EcsApiController - base - prod~", + ~"XcsApiController - base - prod~", + ~"VehicleCalledNumberV2BF - ecs - prod~", + ~"VehicleVinV2BF - ecs - prod~", + ~"XCS - JOYNR - xcs - prod~", + ~"V1Api - PROD~" + ) + ) + ,entityName.in( + ~"voiceInitatedCallSync~", + ~"callReceived~", + ~"getRoutingData~", + ~"notifyCsMessage~", + ~"notifyCallEventCreatedCall~", + ~"__EJB31_Generated__JoynrEventOperations__Intf____Bean__.createEvent~", + ~"message~", + ~"setupCall~", + ~"ecsEventReceived~", + ~"xcsEventReceived~", + ~"createEventByCallednumber~", + ~"createEventByvin~", + ~"$Proxy.notifyXCall~", + ~"$Proxy.terminateXCallFromVehicle~" + )"))))):splitBy())) + EOT #if not set (removed) it's defaulted to "-1d" diff --git a/NA_PROD/slo/Wirkkette__Call_Service__Legacy___MGU___-_Reliability_of_key_requests.tf b/NA_PROD/slo/Wirkkette__Call_Service__Legacy___MGU___-_Reliability_of_key_requests.tf index 6258432..213b60c 100644 --- a/NA_PROD/slo/Wirkkette__Call_Service__Legacy___MGU___-_Reliability_of_key_requests.tf +++ b/NA_PROD/slo/Wirkkette__Call_Service__Legacy___MGU___-_Reliability_of_key_requests.tf @@ -10,11 +10,79 @@ module Wirkkette__Call_Service__Legacy___MGU___-_Reliability_of_key_requests { #entity selector object - filter = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-47626D61D6301522\",\"SERVICE_METHOD-F5EF88F32CD9A0EC\",\"SERVICE_METHOD-58E93CB1AE6FC0AE\",\"SERVICE_METHOD-25F65A1900229992\",\"SERVICE_METHOD-C3361FDC239D1EDA\",\"SERVICE_METHOD-4C39A206A0789B37\",\"SERVICE_METHOD-EDE04832C6023C9E\",\"SERVICE_METHOD-53133E2F67B209C4\",\"SERVICE_METHOD-310229D74325A9E8\",\"SERVICE_METHOD-FF9E31C202B0F019\",\"SERVICE_METHOD-222E69D7EA09DAD8\",\"SERVICE_METHOD-05AB7651E2DD3F19\")" + 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( + ~"VoiceV2Resource - ngtp-cs - prod~", + ~"V1Api - PROD~", + ~"CallRoutingResource - crs - prod~", + ~"NgtpUplinkEventResource - ngtp-cs - prod~", + ~"NgtpApiController - base - prod~", + ~"ISmsGatewayBF - ecs - prod~", + ~"CallMgmtApiResourceV1 - b2vvoice - prod~", + ~"EcsApiController - base - prod~", + ~"XcsApiController - base - prod~", + ~"VehicleCalledNumberV2BF - ecs - prod~", + ~"VehicleVinV2BF - ecs - prod~", + ~"XCS - JOYNR - xcs - prod~", + ~"V1Api - PROD~" + ) + ) + ,entityName.in( + ~"voiceInitatedCallSync~", + ~"callReceived~", + ~"getRoutingData~", + ~"notifyCsMessage~", + ~"notifyCallEventCreatedCall~", + ~"message~", + ~"setupCall~", + ~"ecsEventReceived~", + ~"xcsEventReceived~", + ~"createEventByCallednumber~", + ~"createEventByvin~", + ~"$Proxy.notifyXCall~", + ~"$Proxy.terminateXCallFromVehicle~" + )"))))):splitBy()) + / + (builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), + fromRelationship.isServiceMethodOfService( + type(~"SERVICE~"),entityName.in( + ~"VoiceV2Resource - ngtp-cs - prod~", + ~"V1Api - PROD~", + ~"CallRoutingResource - crs - prod~", + ~"NgtpUplinkEventResource - ngtp-cs - prod~", + ~"NgtpApiController - base - prod~", + ~"ISmsGatewayBF - ecs - prod~", + ~"CallMgmtApiResourceV1 - b2vvoice - prod~", + ~"EcsApiController - base - prod~", + ~"XcsApiController - base - prod~", + ~"VehicleCalledNumberV2BF - ecs - prod~", + ~"VehicleVinV2BF - ecs - prod~", + ~"XCS - JOYNR - xcs - prod~", + ~"V1Api - PROD~" + ) + ) + ,entityName.in( + ~"voiceInitatedCallSync~", + ~"callReceived~", + ~"getRoutingData~", + ~"notifyCsMessage~", + ~"notifyCallEventCreatedCall~", + ~"message~", + ~"setupCall~", + ~"ecsEventReceived~", + ~"xcsEventReceived~", + ~"createEventByCallednumber~", + ~"createEventByvin~", + ~"$Proxy.notifyXCall~", + ~"$Proxy.terminateXCallFromVehicle~" + )"))))):splitBy())) + EOT #if not set (removed) it's defaulted to "-1d"