From 2decd5358b0ca54fb35b7eab33a6ebcebea609a4 Mon Sep 17 00:00:00 2001 From: "SLW\\YELGIM" Date: Wed, 23 Mar 2022 17:22:34 +0100 Subject: [PATCH 1/6] Login and VehicleList --- EMEA_PROD/slo/TP_Mobile_Login.tf | 26 ++++++++++++++++---------- EMEA_PROD/slo/TP_Mobile_VehicleList.tf | 24 ++++++++++++++---------- 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/EMEA_PROD/slo/TP_Mobile_Login.tf b/EMEA_PROD/slo/TP_Mobile_Login.tf index 10d72a4..a900d6d 100644 --- a/EMEA_PROD/slo/TP_Mobile_Login.tf +++ b/EMEA_PROD/slo/TP_Mobile_Login.tf @@ -14,16 +14,22 @@ module TP_Mobile_Login { metric_expression = <<-EOT (100)- (builtin:service.keyRequest.errors.server.rate:filter( - and( - or( - in( - "dt.entity.service_method", - entitySelector("type(service_method), - fromRelationship.isServiceMethodOfService( - type(~"SERVICE~"),entityName(~"btc-user-composite-service - PROD~") - ) - ") - ) + and( + or( + in( + "dt.entity.service_method", + entitySelector( + "type(service_method), + fromRelationship.isServiceMethodOfService( + type(~"SERVICE~"),entityName.in + (~"btc-user-composite-service - PROD~") + ) + ,entityName.in( + ~"GET /api/v1/presentation/oauth/config~", + ~"GET /api/v1/presentation/profile-tab~", + ~"POST /api/v1/oauth/token/identifier~" + )") + ) ))):splitBy():sum:auto:sort(value(sum,descending)))" EOT diff --git a/EMEA_PROD/slo/TP_Mobile_VehicleList.tf b/EMEA_PROD/slo/TP_Mobile_VehicleList.tf index 76215c0..6861812 100644 --- a/EMEA_PROD/slo/TP_Mobile_VehicleList.tf +++ b/EMEA_PROD/slo/TP_Mobile_VehicleList.tf @@ -14,16 +14,20 @@ module TP_Mobile_VehicleList { metric_expression = <<-EOT (100)- (builtin:service.keyRequest.errors.server.rate:filter( - and( - or( - in( - "dt.entity.service_method", - entitySelector("type(service_method), - fromRelationship.isServiceMethodOfService( - type(~"SERVICE~"),entityName(~"btc-vehicle-composite-service - PROD~") - ) - ") - ) + and( + or( + in( + "dt.entity.service_method", + entitySelector( + "type(service_method), + fromRelationship.isServiceMethodOfService( + type(~"SERVICE~"),entityName.in + (~"btc-vehicle-composite-service - PROD~") + ) + ,entityName.in( + ~"GET /api/v1/vehicles~" + )") + ) ))):splitBy():sum:auto:sort(value(sum,descending)))" EOT From 6f3eadcced50d9dca8b8ee4c31388c09c01a22c3 Mon Sep 17 00:00:00 2001 From: "SLW\\YELGIM" Date: Thu, 24 Mar 2022 12:32:44 +0100 Subject: [PATCH 2/6] adjusted TP_Mobile_Login EMEA PROD --- EMEA_PROD/slo/TP_Mobile_Login.tf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/EMEA_PROD/slo/TP_Mobile_Login.tf b/EMEA_PROD/slo/TP_Mobile_Login.tf index a900d6d..6a737a1 100644 --- a/EMEA_PROD/slo/TP_Mobile_Login.tf +++ b/EMEA_PROD/slo/TP_Mobile_Login.tf @@ -21,8 +21,10 @@ module TP_Mobile_Login { entitySelector( "type(service_method), fromRelationship.isServiceMethodOfService( - type(~"SERVICE~"),entityName.in - (~"btc-user-composite-service - PROD~") + type(~"SERVICE~"),entityName.in( + ~"btc-user-composite-service - PROD~", + ~"btc-connected-oauth-service - PROD~" + ) ) ,entityName.in( ~"GET /api/v1/presentation/oauth/config~", From d0d931d7b1a7a4f92c7923ffad058b1987f3e6aa Mon Sep 17 00:00:00 2001 From: "SLW\\YELGIM" Date: Thu, 24 Mar 2022 14:13:23 +0100 Subject: [PATCH 3/6] adjusted TP_Mobile_Mapping --- EMEA_PROD/slo/TP_Mobile_Mapping.tf | 31 ++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/EMEA_PROD/slo/TP_Mobile_Mapping.tf b/EMEA_PROD/slo/TP_Mobile_Mapping.tf index 8dbb4eb..fd1c86a 100644 --- a/EMEA_PROD/slo/TP_Mobile_Mapping.tf +++ b/EMEA_PROD/slo/TP_Mobile_Mapping.tf @@ -14,16 +14,27 @@ module TP_Mobile_Mapping { metric_expression = <<-EOT (100)- (builtin:service.keyRequest.errors.server.rate:filter( - and( - or( - in( - "dt.entity.service_method", - entitySelector("type(service_method), - fromRelationship.isServiceMethodOfService( - type(~"SERVICE~"),entityName(~"vehicle-mapping-composite-service - PROD~") - ) - ") - ) + 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/~" + )") + ) ))):splitBy():sum:auto:sort(value(sum,descending)))" EOT From 9707a2b73209ea2244d6841a7d419eeae0792e27 Mon Sep 17 00:00:00 2001 From: "SLW\\YELGIM" Date: Thu, 24 Mar 2022 14:13:23 +0100 Subject: [PATCH 4/6] adjusted TP_Mobile_Mapping EMEA PROD --- EMEA_PROD/slo/TP_Mobile_Mapping.tf | 31 ++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/EMEA_PROD/slo/TP_Mobile_Mapping.tf b/EMEA_PROD/slo/TP_Mobile_Mapping.tf index 8dbb4eb..fd1c86a 100644 --- a/EMEA_PROD/slo/TP_Mobile_Mapping.tf +++ b/EMEA_PROD/slo/TP_Mobile_Mapping.tf @@ -14,16 +14,27 @@ module TP_Mobile_Mapping { metric_expression = <<-EOT (100)- (builtin:service.keyRequest.errors.server.rate:filter( - and( - or( - in( - "dt.entity.service_method", - entitySelector("type(service_method), - fromRelationship.isServiceMethodOfService( - type(~"SERVICE~"),entityName(~"vehicle-mapping-composite-service - PROD~") - ) - ") - ) + 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/~" + )") + ) ))):splitBy():sum:auto:sort(value(sum,descending)))" EOT From 216ae57ad6c087e58321f1f7b93447caada84c79 Mon Sep 17 00:00:00 2001 From: "SLW\\YELGIM" Date: Thu, 24 Mar 2022 14:46:40 +0100 Subject: [PATCH 5/6] adjusted TP_Mobile_VehicleData EMEA PROD --- EMEA_PROD/slo/TP_Mobile_VehicleData.tf | 27 ++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/EMEA_PROD/slo/TP_Mobile_VehicleData.tf b/EMEA_PROD/slo/TP_Mobile_VehicleData.tf index 9542f55..351a284 100644 --- a/EMEA_PROD/slo/TP_Mobile_VehicleData.tf +++ b/EMEA_PROD/slo/TP_Mobile_VehicleData.tf @@ -14,16 +14,23 @@ module TP_Mobile_VehicleData { metric_expression = <<-EOT (100)- (builtin:service.keyRequest.errors.server.rate:filter( - and( - or( - in( - "dt.entity.service_method", - entitySelector("type(service_method), - fromRelationship.isServiceMethodOfService( - type(~"SERVICE~"),entityName(~"VehicleService - PROD~") - ) - ") - ) + and( + or( + in( + "dt.entity.service_method", + entitySelector( + "type(service_method), + fromRelationship.isServiceMethodOfService( + type(~"SERVICE~"),entityName.in( + ~"btc-vehicle-composite-service - PROD~", + ~"VehicleService - PROD~" + ) + ) + ,entityName.in( + ~"GET /api/v1/vehicles//state~", + ~"GET /v1/vehicle/~" + )") + ) ))):splitBy():sum:auto:sort(value(sum,descending)))" EOT From 4b735d104ac7b81b800d87c4a8a2a14942d042e0 Mon Sep 17 00:00:00 2001 From: "SLW\\YELGIM" Date: Thu, 24 Mar 2022 14:55:00 +0100 Subject: [PATCH 6/6] fixed splitBy in EMEA PROD --- EMEA_PROD/slo/TP_Mobile_Mapping.tf | 2 +- EMEA_PROD/slo/TP_Mobile_VehicleData.tf | 2 +- EMEA_PROD/slo/TP_Mobile_VehicleList.tf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/EMEA_PROD/slo/TP_Mobile_Mapping.tf b/EMEA_PROD/slo/TP_Mobile_Mapping.tf index fd1c86a..44a67ba 100644 --- a/EMEA_PROD/slo/TP_Mobile_Mapping.tf +++ b/EMEA_PROD/slo/TP_Mobile_Mapping.tf @@ -35,7 +35,7 @@ module TP_Mobile_Mapping { ~"DELETE /api/v1/vehicles/~" )") ) -))):splitBy():sum:auto:sort(value(sum,descending)))" +))):splitBy():auto:auto:sort(value(sum,descending)))" EOT #if not set (removed) it's defaulted to "-1d" diff --git a/EMEA_PROD/slo/TP_Mobile_VehicleData.tf b/EMEA_PROD/slo/TP_Mobile_VehicleData.tf index 351a284..a070262 100644 --- a/EMEA_PROD/slo/TP_Mobile_VehicleData.tf +++ b/EMEA_PROD/slo/TP_Mobile_VehicleData.tf @@ -31,7 +31,7 @@ module TP_Mobile_VehicleData { ~"GET /v1/vehicle/~" )") ) -))):splitBy():sum:auto:sort(value(sum,descending)))" +))):splitBy():auto:auto:sort(value(sum,descending)))" EOT #if not set (removed) it's defaulted to "-1d" diff --git a/EMEA_PROD/slo/TP_Mobile_VehicleList.tf b/EMEA_PROD/slo/TP_Mobile_VehicleList.tf index 6861812..4674716 100644 --- a/EMEA_PROD/slo/TP_Mobile_VehicleList.tf +++ b/EMEA_PROD/slo/TP_Mobile_VehicleList.tf @@ -28,7 +28,7 @@ module TP_Mobile_VehicleList { ~"GET /api/v1/vehicles~" )") ) -))):splitBy():sum:auto:sort(value(sum,descending)))" +))):splitBy():auto:auto:sort(value(sum,descending)))" EOT #if not set (removed) it's defaulted to "-1d"