From 8929b66e880c095ca7438dd19edb807ec519d77d Mon Sep 17 00:00:00 2001 From: Mohammed Abadel Date: Wed, 10 Aug 2022 16:49:52 +0200 Subject: [PATCH] Adjusted SLOs for WK-Mapping (all Hubs) to use service names instead of ids --- ..._Mapping__-_Reliability_of_key_requests.tf | 66 +++++++++++++++++- ..._Mapping__-_Reliability_of_key_requests.tf | 67 ++++++++++++++++++- 2 files changed, 128 insertions(+), 5 deletions(-) diff --git a/EMEA_PROD/slo/Wirkkette__Mapping__-_Reliability_of_key_requests.tf b/EMEA_PROD/slo/Wirkkette__Mapping__-_Reliability_of_key_requests.tf index cc58515..8770eeb 100644 --- a/EMEA_PROD/slo/Wirkkette__Mapping__-_Reliability_of_key_requests.tf +++ b/EMEA_PROD/slo/Wirkkette__Mapping__-_Reliability_of_key_requests.tf @@ -10,12 +10,72 @@ module Wirkkette__Mapping__-_Reliability_of_key_requests { #entity selector object - filter = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-1AC76065E0B61FEB\",\"SERVICE_METHOD-CE63D366DB9BC737\",\"SERVICE_METHOD-1B322B1000BC6BB2\",\"SERVICE_METHOD-788BC4F666686871\",\"SERVICE_METHOD-1DB00C9EFA246205\",\"SERVICE_METHOD-7E6EFAB2B32CBF87\")" + 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( + ~"btc-user-composite-service - PROD~", + ~"vehicle-mapping-composite-service - PROD~" + ) + ) + ,entityName.in( + ~"GET /api/v2/presentation/users/validate~", + ~"POST /api/v2/vehicles//primary~", + ~"POST /api/v2/vehicles//primary/map~", + ~"POST /api/v1/vehicles//validate-security-code~", + ~"POST /api/v1/vehicles//resend-security-code~", + ~"DELETE /api/v1/vehicles/~", + ~"POST /api/v3/mappings/create~", + ~"POST /api/v3/mappings/continue~", + ~"POST /api/v3/mappings/validate-security-code~", + ~"POST /api/v3/mappings/resend-security-code~", + ~"GET /api/v3/images/~", + ~"DELETE /api/v3/mappings~" + )") + ) +))):splitBy()) +/ +(builtin:service.keyRequest.count.server:filter( + and( + or( + in( + "dt.entity.service_method", + entitySelector( + "type(service_method), + fromRelationship.isServiceMethodOfService( + type(~"SERVICE~"),entityName.in( + ~"btc-user-composite-service - PROD~", + ~"vehicle-mapping-composite-service - PROD~" + ) + ) + ,entityName.in( + ~"GET /api/v2/presentation/users/validate~", + ~"POST /api/v2/vehicles//primary~", + ~"POST /api/v2/vehicles//primary/map~", + ~"POST /api/v1/vehicles//validate-security-code~", + ~"POST /api/v1/vehicles//resend-security-code~", + ~"DELETE /api/v1/vehicles/~", + ~"POST /api/v3/mappings/create~", + ~"POST /api/v3/mappings/continue~", + ~"POST /api/v3/mappings/validate-security-code~", + ~"POST /api/v3/mappings/resend-security-code~", + ~"GET /api/v3/images/~", + ~"DELETE /api/v3/mappings~" + )") + ) +))):splitBy())) +EOT #if not set (removed) it's defaulted to "-1d" timeframe = "-1d" diff --git a/NA_PROD/slo/Wirkkette__Mapping__-_Reliability_of_key_requests.tf b/NA_PROD/slo/Wirkkette__Mapping__-_Reliability_of_key_requests.tf index 51280c7..c8946a9 100644 --- a/NA_PROD/slo/Wirkkette__Mapping__-_Reliability_of_key_requests.tf +++ b/NA_PROD/slo/Wirkkette__Mapping__-_Reliability_of_key_requests.tf @@ -10,11 +10,74 @@ module Wirkkette__Mapping__-_Reliability_of_key_requests { #entity selector object - filter = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-5014405A7F4AF528\",\"SERVICE_METHOD-2A26CA5A3F7DFBE5\",\"SERVICE_METHOD-C018287723FE0263\",\"SERVICE_METHOD-5014405A7F4AF528\",\"SERVICE_METHOD-EB3D681A54F87F56\",\"SERVICE_METHOD-AB72865C4C53C5D9\",\"SERVICE_METHOD-2A26CA5A3F7DFBE5\",\"SERVICE_METHOD-785B88837747B133\",\"SERVICE_METHOD-4B1B01398F001AA1\")" + 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( + ~"btc-user-composite-service - PROD~", + ~"vehicle-mapping-composite-service - PROD~" + ) + ) + ,entityName.in( + ~"GET /api/v2/presentation/users/validate~", + ~"POST /api/v2/vehicles//primary~", + ~"POST /api/v2/vehicles//primary/map~", + ~"POST /api/v1/vehicles//validate-security-code~", + ~"POST /api/v1/vehicles//resend-security-code~", + ~"DELETE /api/v1/vehicles/~", + ~"POST /api/v3/mappings/create~", + ~"POST /api/v3/mappings/continue~", + ~"POST /api/v3/mappings/validate-security-code~", + ~"POST /api/v3/mappings/resend-security-code~", + ~"GET /api/v3/images/~", + ~"DELETE /api/v3/mappings~", + ~"POST /api/v2/vehicles//secondary~" + )") + ) +))):splitBy()) +/ +(builtin:service.keyRequest.count.server:filter( + and( + or( + in( + "dt.entity.service_method", + entitySelector( + "type(service_method), + fromRelationship.isServiceMethodOfService( + type(~"SERVICE~"),entityName.in( + ~"btc-user-composite-service - PROD~", + ~"vehicle-mapping-composite-service - PROD~" + ) + ) + ,entityName.in( + ~"GET /api/v2/presentation/users/validate~", + ~"POST /api/v2/vehicles//primary~", + ~"POST /api/v2/vehicles//primary/map~", + ~"POST /api/v1/vehicles//validate-security-code~", + ~"POST /api/v1/vehicles//resend-security-code~", + ~"DELETE /api/v1/vehicles/~", + ~"POST /api/v3/mappings/create~", + ~"POST /api/v3/mappings/continue~", + ~"POST /api/v3/mappings/validate-security-code~", + ~"POST /api/v3/mappings/resend-security-code~", + ~"GET /api/v3/images/~", + ~"DELETE /api/v3/mappings~", + ~"POST /api/v2/vehicles//secondary~" + )") + ) +))):splitBy())) +EOT #if not set (removed) it's defaulted to "-1d"