From 05ada812328446be49a4926a59bf10c8b3c15a84 Mon Sep 17 00:00:00 2001 From: Mohammed Abadel Date: Thu, 15 Jun 2023 14:27:03 +0200 Subject: [PATCH] OPMAAS-4413 and also Adjusting SLO for SmartRefuel in CN --- CN_PROD/slo/TP_Vehicle_AppDistribution.tf | 7 +++--- CN_PROD/slo/TP_Vehicle_SmartRefuel.tf | 26 +++++++-------------- EMEA_PROD/slo/TP_Vehicle_AppDistribution.tf | 7 +++--- NA_PROD/slo/TP_Vehicle_AppDistribution.tf | 7 +++--- 4 files changed, 21 insertions(+), 26 deletions(-) diff --git a/CN_PROD/slo/TP_Vehicle_AppDistribution.tf b/CN_PROD/slo/TP_Vehicle_AppDistribution.tf index f7b6184..6649a4d 100644 --- a/CN_PROD/slo/TP_Vehicle_AppDistribution.tf +++ b/CN_PROD/slo/TP_Vehicle_AppDistribution.tf @@ -20,14 +20,15 @@ module TP_Vehicle_AppDistribution { type(~"SERVICE~"),entityName.in( ~"AppsServiceV1 - id5-app - prod~", ~"AppVersionsResource - app-distribution - prod~", - ~"ReleaseNotesResource - app-distribution - prod~" + ~"ReleaseNotesResource - app-distribution - prod~", + ~"ViewRequestResource - app-distribution - prod~" ) ) ,entityName.in( - ~"getActiveVersionsForApp~", ~"getReleaseNotes~", ~"getAppV2~", - ~"getAppListV2~" + ~"getAppListV2~", + ~"viewPackage~" )"))))):splitBy()) EOT diff --git a/CN_PROD/slo/TP_Vehicle_SmartRefuel.tf b/CN_PROD/slo/TP_Vehicle_SmartRefuel.tf index cd8b6bc..2537b45 100644 --- a/CN_PROD/slo/TP_Vehicle_SmartRefuel.tf +++ b/CN_PROD/slo/TP_Vehicle_SmartRefuel.tf @@ -15,23 +15,15 @@ module TP_Vehicle_SmartRefuel { #metric expression of the calculation as done in data explorer ui 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.contains(~"omcsmtrflce20q3~"),mzName(~"CN_OMC_PROD~") - ) - ,entityName.in( - ~"/smtrfl/api/v1/order~", - ~"/smtrfl/api/v1/station/list~", - ~"/smtrfl/api/v1/station/detail~" - )") - ) - ))):splitBy():sum:auto:sort(value(sum,descending))) + (100)-(builtin:service.keyRequest.errors.server.rate:filter(in("dt.entity.service_method",entitySelector("type(~"SERVICE_METHOD~")"))):filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), + fromRelationship.isServiceMethodOfService( + type(~"SERVICE~"),entityName.in(~"omcsmtrflce20q3~",~"omcsmtrflce20q3__eb8a~") + ) + ,entityName.in( + ~"/smtrfl/api/v1/order~", + ~"/smtrfl/api/v1/station/list~", + ~"/smtrfl/api/v1/station/detail~" + )"))))):splitBy()) EOT diff --git a/EMEA_PROD/slo/TP_Vehicle_AppDistribution.tf b/EMEA_PROD/slo/TP_Vehicle_AppDistribution.tf index f7b6184..6649a4d 100644 --- a/EMEA_PROD/slo/TP_Vehicle_AppDistribution.tf +++ b/EMEA_PROD/slo/TP_Vehicle_AppDistribution.tf @@ -20,14 +20,15 @@ module TP_Vehicle_AppDistribution { type(~"SERVICE~"),entityName.in( ~"AppsServiceV1 - id5-app - prod~", ~"AppVersionsResource - app-distribution - prod~", - ~"ReleaseNotesResource - app-distribution - prod~" + ~"ReleaseNotesResource - app-distribution - prod~", + ~"ViewRequestResource - app-distribution - prod~" ) ) ,entityName.in( - ~"getActiveVersionsForApp~", ~"getReleaseNotes~", ~"getAppV2~", - ~"getAppListV2~" + ~"getAppListV2~", + ~"viewPackage~" )"))))):splitBy()) EOT diff --git a/NA_PROD/slo/TP_Vehicle_AppDistribution.tf b/NA_PROD/slo/TP_Vehicle_AppDistribution.tf index f7b6184..6649a4d 100644 --- a/NA_PROD/slo/TP_Vehicle_AppDistribution.tf +++ b/NA_PROD/slo/TP_Vehicle_AppDistribution.tf @@ -20,14 +20,15 @@ module TP_Vehicle_AppDistribution { type(~"SERVICE~"),entityName.in( ~"AppsServiceV1 - id5-app - prod~", ~"AppVersionsResource - app-distribution - prod~", - ~"ReleaseNotesResource - app-distribution - prod~" + ~"ReleaseNotesResource - app-distribution - prod~", + ~"ViewRequestResource - app-distribution - prod~" ) ) ,entityName.in( - ~"getActiveVersionsForApp~", ~"getReleaseNotes~", ~"getAppV2~", - ~"getAppListV2~" + ~"getAppListV2~", + ~"viewPackage~" )"))))):splitBy()) EOT