From 1895f59951dc085d7962abb254434f9f8ad6fa90 Mon Sep 17 00:00:00 2001 From: Antonio Canelas Date: Mon, 12 Dec 2022 13:55:32 +0000 Subject: [PATCH 1/2] INFOTAIN-30320: Remove deleted endpoint, created getFestivalNotification. Update tag/name FestivalMode to FestiveMode. --- ...valModeAPI.tf => ICES_-_FestiveModeAPI.tf} | 6 +-- CN_PROD/slo/ICES_FestivalModeAPI_getIcon.tf | 50 ------------------- CN_PROD/slo/ICES_FestivalModeAPI_getVideo.tf | 50 ------------------- .../slo/ICES_FestiveModeAPI_getFestival.tf | 8 +-- ..._FestiveModeAPI_getFestivalNotification.tf | 50 +++++++++++++++++++ .../slo/ICES_FestiveModeAPI_getFestivals.tf | 8 +-- .../slo/ICES_-_FestiveModeAPI.tf | 6 +-- EMEA_PROD/slo/ICES_FestivalModeAPI_getIcon.tf | 50 ------------------- .../slo/ICES_FestivalModeAPI_getVideo.tf | 50 ------------------- .../slo/ICES_FestiveModeAPI_getFestival.tf | 8 +-- ..._FestiveModeAPI_getFestivalNotification.tf | 50 +++++++++++++++++++ .../slo/ICES_FestiveModeAPI_getFestivals.tf | 8 +-- .../slo/ICES_-_FestiveModeAPI.tf | 6 +-- NA_PROD/slo/ICES_FestivalModeAPI_getIcon.tf | 50 ------------------- NA_PROD/slo/ICES_FestivalModeAPI_getVideo.tf | 50 ------------------- .../slo/ICES_FestiveModeAPI_getFestival.tf | 8 +-- ..._FestiveModeAPI_getFestivalNotification.tf | 50 +++++++++++++++++++ .../slo/ICES_FestiveModeAPI_getFestivals.tf | 8 +-- 18 files changed, 183 insertions(+), 333 deletions(-) rename CN_PROD/slo/{ICES_-_FestivalModeAPI.tf => ICES_-_FestiveModeAPI.tf} (86%) delete mode 100644 CN_PROD/slo/ICES_FestivalModeAPI_getIcon.tf delete mode 100644 CN_PROD/slo/ICES_FestivalModeAPI_getVideo.tf rename NA_PROD/slo/ICES_FestivalModeAPI_getFestival.tf => CN_PROD/slo/ICES_FestiveModeAPI_getFestival.tf (88%) create mode 100644 CN_PROD/slo/ICES_FestiveModeAPI_getFestivalNotification.tf rename NA_PROD/slo/ICES_FestivalModeAPI_getFestivals.tf => CN_PROD/slo/ICES_FestiveModeAPI_getFestivals.tf (88%) rename NA_PROD/slo/ICES_-_FestivalModeAPI.tf => EMEA_PROD/slo/ICES_-_FestiveModeAPI.tf (86%) delete mode 100644 EMEA_PROD/slo/ICES_FestivalModeAPI_getIcon.tf delete mode 100644 EMEA_PROD/slo/ICES_FestivalModeAPI_getVideo.tf rename CN_PROD/slo/ICES_FestivalModeAPI_getFestival.tf => EMEA_PROD/slo/ICES_FestiveModeAPI_getFestival.tf (88%) create mode 100644 EMEA_PROD/slo/ICES_FestiveModeAPI_getFestivalNotification.tf rename CN_PROD/slo/ICES_FestivalModeAPI_getFestivals.tf => EMEA_PROD/slo/ICES_FestiveModeAPI_getFestivals.tf (88%) rename EMEA_PROD/slo/ICES_-_FestivalModeAPI.tf => NA_PROD/slo/ICES_-_FestiveModeAPI.tf (86%) delete mode 100644 NA_PROD/slo/ICES_FestivalModeAPI_getIcon.tf delete mode 100644 NA_PROD/slo/ICES_FestivalModeAPI_getVideo.tf rename EMEA_PROD/slo/ICES_FestivalModeAPI_getFestival.tf => NA_PROD/slo/ICES_FestiveModeAPI_getFestival.tf (88%) create mode 100644 NA_PROD/slo/ICES_FestiveModeAPI_getFestivalNotification.tf rename EMEA_PROD/slo/ICES_FestivalModeAPI_getFestivals.tf => NA_PROD/slo/ICES_FestiveModeAPI_getFestivals.tf (88%) diff --git a/CN_PROD/slo/ICES_-_FestivalModeAPI.tf b/CN_PROD/slo/ICES_-_FestiveModeAPI.tf similarity index 86% rename from CN_PROD/slo/ICES_-_FestivalModeAPI.tf rename to CN_PROD/slo/ICES_-_FestiveModeAPI.tf index 25da055..9db57d3 100644 --- a/CN_PROD/slo/ICES_-_FestivalModeAPI.tf +++ b/CN_PROD/slo/ICES_-_FestiveModeAPI.tf @@ -3,14 +3,14 @@ module ICES_-_FestiveModeAPI { source = "../../_dynatrace-base-modules/dynatrace-service-level-objective" - name = "ICES - FestivalModeApi" + name = "ICES - FestiveModeApi" - description = "FestivalModeApi" + description = "FestiveModeApi" #entity selector object - filter = "type(\"SERVICE\"),entityName(\"FestivalModeApi\"),tag(\"Environment:PROD\")" + filter = "type(\"SERVICE\"),entityName(\"FestiveModeApi\"),tag(\"Environment:PROD\")" #metric expression of the calculation as done in data explorer ui diff --git a/CN_PROD/slo/ICES_FestivalModeAPI_getIcon.tf b/CN_PROD/slo/ICES_FestivalModeAPI_getIcon.tf deleted file mode 100644 index 4abd42a..0000000 --- a/CN_PROD/slo/ICES_FestivalModeAPI_getIcon.tf +++ /dev/null @@ -1,50 +0,0 @@ -module ICES_FestiveModeAPI_getIcon { - - source = "../../_dynatrace-base-modules/dynatrace-service-level-objective" - - - name = "ICES - FestiveModeAPI - getIcon" - description = "FestivalModeAPI_getIcon_success_rate" - - - #entity selector object - filter = "" - - #metric expression of the calculation as done in data explorer ui - metric_expression = <<-EOT - -(100)*((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), - fromRelationship.isServiceMethodOfService( - type(~"SERVICE~"),entityName.in( - ~"FestivalModeApi~" - ), - tag(~"Environment:PROD~") - ) - ,entityName.in( - ~"getIcon~" - )"))))):splitBy()) - / - (builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), - fromRelationship.isServiceMethodOfService( - type(~"SERVICE~"),entityName.in( - ~"FestivalModeApi~" - ), - tag(~"Environment:PROD~") - ) - ,entityName.in( - ~"getIcon~" - )"))))):splitBy())) - -EOT - -#if not set (removed) it's defaulted to "-1d" -timeframe = "-1d" - -#currently the only possible value -evaluation = "AGGREGATE" - -#Target and warning percentage of the SLO as double -target = 98 #if not set(removed) it's defaulted to 98 -warning = 99 #if not set(removed) it's defaulted to 99 - -} \ No newline at end of file diff --git a/CN_PROD/slo/ICES_FestivalModeAPI_getVideo.tf b/CN_PROD/slo/ICES_FestivalModeAPI_getVideo.tf deleted file mode 100644 index 2602599..0000000 --- a/CN_PROD/slo/ICES_FestivalModeAPI_getVideo.tf +++ /dev/null @@ -1,50 +0,0 @@ -module ICES_FestiveModeAPI_getVideo { - - source = "../../_dynatrace-base-modules/dynatrace-service-level-objective" - - - name = "ICES - FestiveModeAPI - getVideo" - description = "FestivalModeAPI_getVideo_success_rate" - - - #entity selector object - filter = "" - - #metric expression of the calculation as done in data explorer ui - metric_expression = <<-EOT - -(100)*((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), - fromRelationship.isServiceMethodOfService( - type(~"SERVICE~"),entityName.in( - ~"FestivalModeApi~" - ), - tag(~"Environment:PROD~") - ) - ,entityName.in( - ~"getVideo~" - )"))))):splitBy()) - / - (builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), - fromRelationship.isServiceMethodOfService( - type(~"SERVICE~"),entityName.in( - ~"FestivalModeApi~" - ), - tag(~"Environment:PROD~") - ) - ,entityName.in( - ~"getVideo~" - )"))))):splitBy())) - -EOT - -#if not set (removed) it's defaulted to "-1d" -timeframe = "-1d" - -#currently the only possible value -evaluation = "AGGREGATE" - -#Target and warning percentage of the SLO as double -target = 98 #if not set(removed) it's defaulted to 98 -warning = 99 #if not set(removed) it's defaulted to 99 - -} \ No newline at end of file diff --git a/NA_PROD/slo/ICES_FestivalModeAPI_getFestival.tf b/CN_PROD/slo/ICES_FestiveModeAPI_getFestival.tf similarity index 88% rename from NA_PROD/slo/ICES_FestivalModeAPI_getFestival.tf rename to CN_PROD/slo/ICES_FestiveModeAPI_getFestival.tf index cd537a6..bc83cf8 100644 --- a/NA_PROD/slo/ICES_FestivalModeAPI_getFestival.tf +++ b/CN_PROD/slo/ICES_FestiveModeAPI_getFestival.tf @@ -3,8 +3,8 @@ module ICES_FestiveModeAPI_getFestival { source = "../../_dynatrace-base-modules/dynatrace-service-level-objective" - name = "ICES - FestivalModeApi - getFestival" - description = "FestivalModeApi_getFestival_success_rate" + name = "ICES - FestiveModeApi - getFestival" + description = "FestiveModeApi_getFestival_success_rate" #entity selector object @@ -16,7 +16,7 @@ module ICES_FestiveModeAPI_getFestival { (100)*((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), fromRelationship.isServiceMethodOfService( type(~"SERVICE~"),entityName.in( - ~"FestivalModeApi~" + ~"FestiveModeApi~" ), tag(~"Environment:PROD~") ) @@ -27,7 +27,7 @@ module ICES_FestiveModeAPI_getFestival { (builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), fromRelationship.isServiceMethodOfService( type(~"SERVICE~"),entityName.in( - ~"FestivalModeApi~" + ~"FestiveModeApi~" ), tag(~"Environment:PROD~") ) diff --git a/CN_PROD/slo/ICES_FestiveModeAPI_getFestivalNotification.tf b/CN_PROD/slo/ICES_FestiveModeAPI_getFestivalNotification.tf new file mode 100644 index 0000000..820ba28 --- /dev/null +++ b/CN_PROD/slo/ICES_FestiveModeAPI_getFestivalNotification.tf @@ -0,0 +1,50 @@ +module ICES_FestiveModeAPI_getFestivalNotification { + + source = "../../_dynatrace-base-modules/dynatrace-service-level-objective" + + + name = "ICES - FestiveModeApi - getFestivalNotification" + description = "FestiveModeApi_getFestivalNotification_success_rate" + + + #entity selector object + filter = "" + + #metric expression of the calculation as done in data explorer ui + metric_expression = <<-EOT + +(100)*((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), + fromRelationship.isServiceMethodOfService( + type(~"SERVICE~"),entityName.in( + ~"FestiveModeApi~" + ), + tag(~"Environment:PROD~") + ) + ,entityName.in( + ~"getFestivalNotification~" + )"))))):splitBy()) + / + (builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), + fromRelationship.isServiceMethodOfService( + type(~"SERVICE~"),entityName.in( + ~"FestiveModeApi~" + ), + tag(~"Environment:PROD~") + ) + ,entityName.in( + ~"getFestivalNotification~" + )"))))):splitBy())) + +EOT + +#if not set (removed) it's defaulted to "-1d" +timeframe = "-1d" + +#currently the only possible value +evaluation = "AGGREGATE" + +#Target and warning percentage of the SLO as double +target = 98 #if not set(removed) it's defaulted to 98 +warning = 99 #if not set(removed) it's defaulted to 99 + +} diff --git a/NA_PROD/slo/ICES_FestivalModeAPI_getFestivals.tf b/CN_PROD/slo/ICES_FestiveModeAPI_getFestivals.tf similarity index 88% rename from NA_PROD/slo/ICES_FestivalModeAPI_getFestivals.tf rename to CN_PROD/slo/ICES_FestiveModeAPI_getFestivals.tf index 4fe2a38..43377cc 100644 --- a/NA_PROD/slo/ICES_FestivalModeAPI_getFestivals.tf +++ b/CN_PROD/slo/ICES_FestiveModeAPI_getFestivals.tf @@ -3,8 +3,8 @@ module ICES_FestiveModeAPI_getFestivals { source = "../../_dynatrace-base-modules/dynatrace-service-level-objective" - name = "ICES - FestivalModeApi - getFestivals" - description = "FestivalModeApi_getFestivals_success_rate" + name = "ICES - FestiveModeApi - getFestivals" + description = "FestiveModeApi_getFestivals_success_rate" #entity selector object @@ -16,7 +16,7 @@ module ICES_FestiveModeAPI_getFestivals { (100)*((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), fromRelationship.isServiceMethodOfService( type(~"SERVICE~"),entityName.in( - ~"FestivalModeApi~" + ~"FestiveModeApi~" ), tag(~"Environment:PROD~") ) @@ -27,7 +27,7 @@ module ICES_FestiveModeAPI_getFestivals { (builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), fromRelationship.isServiceMethodOfService( type(~"SERVICE~"),entityName.in( - ~"FestivalModeApi~" + ~"FestiveModeApi~" ), tag(~"Environment:PROD~") ) diff --git a/NA_PROD/slo/ICES_-_FestivalModeAPI.tf b/EMEA_PROD/slo/ICES_-_FestiveModeAPI.tf similarity index 86% rename from NA_PROD/slo/ICES_-_FestivalModeAPI.tf rename to EMEA_PROD/slo/ICES_-_FestiveModeAPI.tf index 25da055..9db57d3 100644 --- a/NA_PROD/slo/ICES_-_FestivalModeAPI.tf +++ b/EMEA_PROD/slo/ICES_-_FestiveModeAPI.tf @@ -3,14 +3,14 @@ module ICES_-_FestiveModeAPI { source = "../../_dynatrace-base-modules/dynatrace-service-level-objective" - name = "ICES - FestivalModeApi" + name = "ICES - FestiveModeApi" - description = "FestivalModeApi" + description = "FestiveModeApi" #entity selector object - filter = "type(\"SERVICE\"),entityName(\"FestivalModeApi\"),tag(\"Environment:PROD\")" + filter = "type(\"SERVICE\"),entityName(\"FestiveModeApi\"),tag(\"Environment:PROD\")" #metric expression of the calculation as done in data explorer ui diff --git a/EMEA_PROD/slo/ICES_FestivalModeAPI_getIcon.tf b/EMEA_PROD/slo/ICES_FestivalModeAPI_getIcon.tf deleted file mode 100644 index 4abd42a..0000000 --- a/EMEA_PROD/slo/ICES_FestivalModeAPI_getIcon.tf +++ /dev/null @@ -1,50 +0,0 @@ -module ICES_FestiveModeAPI_getIcon { - - source = "../../_dynatrace-base-modules/dynatrace-service-level-objective" - - - name = "ICES - FestiveModeAPI - getIcon" - description = "FestivalModeAPI_getIcon_success_rate" - - - #entity selector object - filter = "" - - #metric expression of the calculation as done in data explorer ui - metric_expression = <<-EOT - -(100)*((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), - fromRelationship.isServiceMethodOfService( - type(~"SERVICE~"),entityName.in( - ~"FestivalModeApi~" - ), - tag(~"Environment:PROD~") - ) - ,entityName.in( - ~"getIcon~" - )"))))):splitBy()) - / - (builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), - fromRelationship.isServiceMethodOfService( - type(~"SERVICE~"),entityName.in( - ~"FestivalModeApi~" - ), - tag(~"Environment:PROD~") - ) - ,entityName.in( - ~"getIcon~" - )"))))):splitBy())) - -EOT - -#if not set (removed) it's defaulted to "-1d" -timeframe = "-1d" - -#currently the only possible value -evaluation = "AGGREGATE" - -#Target and warning percentage of the SLO as double -target = 98 #if not set(removed) it's defaulted to 98 -warning = 99 #if not set(removed) it's defaulted to 99 - -} \ No newline at end of file diff --git a/EMEA_PROD/slo/ICES_FestivalModeAPI_getVideo.tf b/EMEA_PROD/slo/ICES_FestivalModeAPI_getVideo.tf deleted file mode 100644 index 2602599..0000000 --- a/EMEA_PROD/slo/ICES_FestivalModeAPI_getVideo.tf +++ /dev/null @@ -1,50 +0,0 @@ -module ICES_FestiveModeAPI_getVideo { - - source = "../../_dynatrace-base-modules/dynatrace-service-level-objective" - - - name = "ICES - FestiveModeAPI - getVideo" - description = "FestivalModeAPI_getVideo_success_rate" - - - #entity selector object - filter = "" - - #metric expression of the calculation as done in data explorer ui - metric_expression = <<-EOT - -(100)*((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), - fromRelationship.isServiceMethodOfService( - type(~"SERVICE~"),entityName.in( - ~"FestivalModeApi~" - ), - tag(~"Environment:PROD~") - ) - ,entityName.in( - ~"getVideo~" - )"))))):splitBy()) - / - (builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), - fromRelationship.isServiceMethodOfService( - type(~"SERVICE~"),entityName.in( - ~"FestivalModeApi~" - ), - tag(~"Environment:PROD~") - ) - ,entityName.in( - ~"getVideo~" - )"))))):splitBy())) - -EOT - -#if not set (removed) it's defaulted to "-1d" -timeframe = "-1d" - -#currently the only possible value -evaluation = "AGGREGATE" - -#Target and warning percentage of the SLO as double -target = 98 #if not set(removed) it's defaulted to 98 -warning = 99 #if not set(removed) it's defaulted to 99 - -} \ No newline at end of file diff --git a/CN_PROD/slo/ICES_FestivalModeAPI_getFestival.tf b/EMEA_PROD/slo/ICES_FestiveModeAPI_getFestival.tf similarity index 88% rename from CN_PROD/slo/ICES_FestivalModeAPI_getFestival.tf rename to EMEA_PROD/slo/ICES_FestiveModeAPI_getFestival.tf index cd537a6..bc83cf8 100644 --- a/CN_PROD/slo/ICES_FestivalModeAPI_getFestival.tf +++ b/EMEA_PROD/slo/ICES_FestiveModeAPI_getFestival.tf @@ -3,8 +3,8 @@ module ICES_FestiveModeAPI_getFestival { source = "../../_dynatrace-base-modules/dynatrace-service-level-objective" - name = "ICES - FestivalModeApi - getFestival" - description = "FestivalModeApi_getFestival_success_rate" + name = "ICES - FestiveModeApi - getFestival" + description = "FestiveModeApi_getFestival_success_rate" #entity selector object @@ -16,7 +16,7 @@ module ICES_FestiveModeAPI_getFestival { (100)*((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), fromRelationship.isServiceMethodOfService( type(~"SERVICE~"),entityName.in( - ~"FestivalModeApi~" + ~"FestiveModeApi~" ), tag(~"Environment:PROD~") ) @@ -27,7 +27,7 @@ module ICES_FestiveModeAPI_getFestival { (builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), fromRelationship.isServiceMethodOfService( type(~"SERVICE~"),entityName.in( - ~"FestivalModeApi~" + ~"FestiveModeApi~" ), tag(~"Environment:PROD~") ) diff --git a/EMEA_PROD/slo/ICES_FestiveModeAPI_getFestivalNotification.tf b/EMEA_PROD/slo/ICES_FestiveModeAPI_getFestivalNotification.tf new file mode 100644 index 0000000..820ba28 --- /dev/null +++ b/EMEA_PROD/slo/ICES_FestiveModeAPI_getFestivalNotification.tf @@ -0,0 +1,50 @@ +module ICES_FestiveModeAPI_getFestivalNotification { + + source = "../../_dynatrace-base-modules/dynatrace-service-level-objective" + + + name = "ICES - FestiveModeApi - getFestivalNotification" + description = "FestiveModeApi_getFestivalNotification_success_rate" + + + #entity selector object + filter = "" + + #metric expression of the calculation as done in data explorer ui + metric_expression = <<-EOT + +(100)*((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), + fromRelationship.isServiceMethodOfService( + type(~"SERVICE~"),entityName.in( + ~"FestiveModeApi~" + ), + tag(~"Environment:PROD~") + ) + ,entityName.in( + ~"getFestivalNotification~" + )"))))):splitBy()) + / + (builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), + fromRelationship.isServiceMethodOfService( + type(~"SERVICE~"),entityName.in( + ~"FestiveModeApi~" + ), + tag(~"Environment:PROD~") + ) + ,entityName.in( + ~"getFestivalNotification~" + )"))))):splitBy())) + +EOT + +#if not set (removed) it's defaulted to "-1d" +timeframe = "-1d" + +#currently the only possible value +evaluation = "AGGREGATE" + +#Target and warning percentage of the SLO as double +target = 98 #if not set(removed) it's defaulted to 98 +warning = 99 #if not set(removed) it's defaulted to 99 + +} diff --git a/CN_PROD/slo/ICES_FestivalModeAPI_getFestivals.tf b/EMEA_PROD/slo/ICES_FestiveModeAPI_getFestivals.tf similarity index 88% rename from CN_PROD/slo/ICES_FestivalModeAPI_getFestivals.tf rename to EMEA_PROD/slo/ICES_FestiveModeAPI_getFestivals.tf index 4fe2a38..43377cc 100644 --- a/CN_PROD/slo/ICES_FestivalModeAPI_getFestivals.tf +++ b/EMEA_PROD/slo/ICES_FestiveModeAPI_getFestivals.tf @@ -3,8 +3,8 @@ module ICES_FestiveModeAPI_getFestivals { source = "../../_dynatrace-base-modules/dynatrace-service-level-objective" - name = "ICES - FestivalModeApi - getFestivals" - description = "FestivalModeApi_getFestivals_success_rate" + name = "ICES - FestiveModeApi - getFestivals" + description = "FestiveModeApi_getFestivals_success_rate" #entity selector object @@ -16,7 +16,7 @@ module ICES_FestiveModeAPI_getFestivals { (100)*((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), fromRelationship.isServiceMethodOfService( type(~"SERVICE~"),entityName.in( - ~"FestivalModeApi~" + ~"FestiveModeApi~" ), tag(~"Environment:PROD~") ) @@ -27,7 +27,7 @@ module ICES_FestiveModeAPI_getFestivals { (builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), fromRelationship.isServiceMethodOfService( type(~"SERVICE~"),entityName.in( - ~"FestivalModeApi~" + ~"FestiveModeApi~" ), tag(~"Environment:PROD~") ) diff --git a/EMEA_PROD/slo/ICES_-_FestivalModeAPI.tf b/NA_PROD/slo/ICES_-_FestiveModeAPI.tf similarity index 86% rename from EMEA_PROD/slo/ICES_-_FestivalModeAPI.tf rename to NA_PROD/slo/ICES_-_FestiveModeAPI.tf index 25da055..9db57d3 100644 --- a/EMEA_PROD/slo/ICES_-_FestivalModeAPI.tf +++ b/NA_PROD/slo/ICES_-_FestiveModeAPI.tf @@ -3,14 +3,14 @@ module ICES_-_FestiveModeAPI { source = "../../_dynatrace-base-modules/dynatrace-service-level-objective" - name = "ICES - FestivalModeApi" + name = "ICES - FestiveModeApi" - description = "FestivalModeApi" + description = "FestiveModeApi" #entity selector object - filter = "type(\"SERVICE\"),entityName(\"FestivalModeApi\"),tag(\"Environment:PROD\")" + filter = "type(\"SERVICE\"),entityName(\"FestiveModeApi\"),tag(\"Environment:PROD\")" #metric expression of the calculation as done in data explorer ui diff --git a/NA_PROD/slo/ICES_FestivalModeAPI_getIcon.tf b/NA_PROD/slo/ICES_FestivalModeAPI_getIcon.tf deleted file mode 100644 index 4abd42a..0000000 --- a/NA_PROD/slo/ICES_FestivalModeAPI_getIcon.tf +++ /dev/null @@ -1,50 +0,0 @@ -module ICES_FestiveModeAPI_getIcon { - - source = "../../_dynatrace-base-modules/dynatrace-service-level-objective" - - - name = "ICES - FestiveModeAPI - getIcon" - description = "FestivalModeAPI_getIcon_success_rate" - - - #entity selector object - filter = "" - - #metric expression of the calculation as done in data explorer ui - metric_expression = <<-EOT - -(100)*((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), - fromRelationship.isServiceMethodOfService( - type(~"SERVICE~"),entityName.in( - ~"FestivalModeApi~" - ), - tag(~"Environment:PROD~") - ) - ,entityName.in( - ~"getIcon~" - )"))))):splitBy()) - / - (builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), - fromRelationship.isServiceMethodOfService( - type(~"SERVICE~"),entityName.in( - ~"FestivalModeApi~" - ), - tag(~"Environment:PROD~") - ) - ,entityName.in( - ~"getIcon~" - )"))))):splitBy())) - -EOT - -#if not set (removed) it's defaulted to "-1d" -timeframe = "-1d" - -#currently the only possible value -evaluation = "AGGREGATE" - -#Target and warning percentage of the SLO as double -target = 98 #if not set(removed) it's defaulted to 98 -warning = 99 #if not set(removed) it's defaulted to 99 - -} \ No newline at end of file diff --git a/NA_PROD/slo/ICES_FestivalModeAPI_getVideo.tf b/NA_PROD/slo/ICES_FestivalModeAPI_getVideo.tf deleted file mode 100644 index 2602599..0000000 --- a/NA_PROD/slo/ICES_FestivalModeAPI_getVideo.tf +++ /dev/null @@ -1,50 +0,0 @@ -module ICES_FestiveModeAPI_getVideo { - - source = "../../_dynatrace-base-modules/dynatrace-service-level-objective" - - - name = "ICES - FestiveModeAPI - getVideo" - description = "FestivalModeAPI_getVideo_success_rate" - - - #entity selector object - filter = "" - - #metric expression of the calculation as done in data explorer ui - metric_expression = <<-EOT - -(100)*((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), - fromRelationship.isServiceMethodOfService( - type(~"SERVICE~"),entityName.in( - ~"FestivalModeApi~" - ), - tag(~"Environment:PROD~") - ) - ,entityName.in( - ~"getVideo~" - )"))))):splitBy()) - / - (builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), - fromRelationship.isServiceMethodOfService( - type(~"SERVICE~"),entityName.in( - ~"FestivalModeApi~" - ), - tag(~"Environment:PROD~") - ) - ,entityName.in( - ~"getVideo~" - )"))))):splitBy())) - -EOT - -#if not set (removed) it's defaulted to "-1d" -timeframe = "-1d" - -#currently the only possible value -evaluation = "AGGREGATE" - -#Target and warning percentage of the SLO as double -target = 98 #if not set(removed) it's defaulted to 98 -warning = 99 #if not set(removed) it's defaulted to 99 - -} \ No newline at end of file diff --git a/EMEA_PROD/slo/ICES_FestivalModeAPI_getFestival.tf b/NA_PROD/slo/ICES_FestiveModeAPI_getFestival.tf similarity index 88% rename from EMEA_PROD/slo/ICES_FestivalModeAPI_getFestival.tf rename to NA_PROD/slo/ICES_FestiveModeAPI_getFestival.tf index cd537a6..bc83cf8 100644 --- a/EMEA_PROD/slo/ICES_FestivalModeAPI_getFestival.tf +++ b/NA_PROD/slo/ICES_FestiveModeAPI_getFestival.tf @@ -3,8 +3,8 @@ module ICES_FestiveModeAPI_getFestival { source = "../../_dynatrace-base-modules/dynatrace-service-level-objective" - name = "ICES - FestivalModeApi - getFestival" - description = "FestivalModeApi_getFestival_success_rate" + name = "ICES - FestiveModeApi - getFestival" + description = "FestiveModeApi_getFestival_success_rate" #entity selector object @@ -16,7 +16,7 @@ module ICES_FestiveModeAPI_getFestival { (100)*((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), fromRelationship.isServiceMethodOfService( type(~"SERVICE~"),entityName.in( - ~"FestivalModeApi~" + ~"FestiveModeApi~" ), tag(~"Environment:PROD~") ) @@ -27,7 +27,7 @@ module ICES_FestiveModeAPI_getFestival { (builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), fromRelationship.isServiceMethodOfService( type(~"SERVICE~"),entityName.in( - ~"FestivalModeApi~" + ~"FestiveModeApi~" ), tag(~"Environment:PROD~") ) diff --git a/NA_PROD/slo/ICES_FestiveModeAPI_getFestivalNotification.tf b/NA_PROD/slo/ICES_FestiveModeAPI_getFestivalNotification.tf new file mode 100644 index 0000000..820ba28 --- /dev/null +++ b/NA_PROD/slo/ICES_FestiveModeAPI_getFestivalNotification.tf @@ -0,0 +1,50 @@ +module ICES_FestiveModeAPI_getFestivalNotification { + + source = "../../_dynatrace-base-modules/dynatrace-service-level-objective" + + + name = "ICES - FestiveModeApi - getFestivalNotification" + description = "FestiveModeApi_getFestivalNotification_success_rate" + + + #entity selector object + filter = "" + + #metric expression of the calculation as done in data explorer ui + metric_expression = <<-EOT + +(100)*((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), + fromRelationship.isServiceMethodOfService( + type(~"SERVICE~"),entityName.in( + ~"FestiveModeApi~" + ), + tag(~"Environment:PROD~") + ) + ,entityName.in( + ~"getFestivalNotification~" + )"))))):splitBy()) + / + (builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), + fromRelationship.isServiceMethodOfService( + type(~"SERVICE~"),entityName.in( + ~"FestiveModeApi~" + ), + tag(~"Environment:PROD~") + ) + ,entityName.in( + ~"getFestivalNotification~" + )"))))):splitBy())) + +EOT + +#if not set (removed) it's defaulted to "-1d" +timeframe = "-1d" + +#currently the only possible value +evaluation = "AGGREGATE" + +#Target and warning percentage of the SLO as double +target = 98 #if not set(removed) it's defaulted to 98 +warning = 99 #if not set(removed) it's defaulted to 99 + +} diff --git a/EMEA_PROD/slo/ICES_FestivalModeAPI_getFestivals.tf b/NA_PROD/slo/ICES_FestiveModeAPI_getFestivals.tf similarity index 88% rename from EMEA_PROD/slo/ICES_FestivalModeAPI_getFestivals.tf rename to NA_PROD/slo/ICES_FestiveModeAPI_getFestivals.tf index 4fe2a38..43377cc 100644 --- a/EMEA_PROD/slo/ICES_FestivalModeAPI_getFestivals.tf +++ b/NA_PROD/slo/ICES_FestiveModeAPI_getFestivals.tf @@ -3,8 +3,8 @@ module ICES_FestiveModeAPI_getFestivals { source = "../../_dynatrace-base-modules/dynatrace-service-level-objective" - name = "ICES - FestivalModeApi - getFestivals" - description = "FestivalModeApi_getFestivals_success_rate" + name = "ICES - FestiveModeApi - getFestivals" + description = "FestiveModeApi_getFestivals_success_rate" #entity selector object @@ -16,7 +16,7 @@ module ICES_FestiveModeAPI_getFestivals { (100)*((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), fromRelationship.isServiceMethodOfService( type(~"SERVICE~"),entityName.in( - ~"FestivalModeApi~" + ~"FestiveModeApi~" ), tag(~"Environment:PROD~") ) @@ -27,7 +27,7 @@ module ICES_FestiveModeAPI_getFestivals { (builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), fromRelationship.isServiceMethodOfService( type(~"SERVICE~"),entityName.in( - ~"FestivalModeApi~" + ~"FestiveModeApi~" ), tag(~"Environment:PROD~") ) From dddcebba572c87dae1ff70ed6da802eadeed85a1 Mon Sep 17 00:00:00 2001 From: "SLW\\ARNAUA" Date: Fri, 13 Jan 2023 11:27:52 +0100 Subject: [PATCH 2/2] OPMAAS-3267 - Minor changes to entityName. --- CN_PROD/slo/ICES_-_FestiveModeAPI.tf | 4 ++-- EMEA_PROD/slo/ICES_-_FestiveModeAPI.tf | 4 ++-- NA_PROD/slo/ICES_-_FestiveModeAPI.tf | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CN_PROD/slo/ICES_-_FestiveModeAPI.tf b/CN_PROD/slo/ICES_-_FestiveModeAPI.tf index 9db57d3..c9dfd3f 100644 --- a/CN_PROD/slo/ICES_-_FestiveModeAPI.tf +++ b/CN_PROD/slo/ICES_-_FestiveModeAPI.tf @@ -10,11 +10,11 @@ module ICES_-_FestiveModeAPI { #entity selector object - filter = "type(\"SERVICE\"),entityName(\"FestiveModeApi\"),tag(\"Environment:PROD\")" + filter = "type(\"SERVICE\"),entityName.in(\"FestiveModeApi\"),tag(\"Environment:PROD\")" #metric expression of the calculation as done in data explorer ui - metric_expression = "(100)*((1)-( builtin:service.errors.fivexx.rate:splitBy():avg:auto:sort(value(avg,descending)):limit(10))/( builtin:service.requestCount.total:splitBy():sum:auto:sort(value(sum,descending)):limit(10)))" + metric_expression = "(100)*((1)-(builtin:service.errors.fivexx.rate:splitBy():avg:auto:sort(value(avg,descending)):limit(10))/(builtin:service.requestCount.total:splitBy():sum:auto:sort(value(sum,descending)):limit(10)))" #if not set (removed) it's defaulted to "-1d" diff --git a/EMEA_PROD/slo/ICES_-_FestiveModeAPI.tf b/EMEA_PROD/slo/ICES_-_FestiveModeAPI.tf index 9db57d3..c9dfd3f 100644 --- a/EMEA_PROD/slo/ICES_-_FestiveModeAPI.tf +++ b/EMEA_PROD/slo/ICES_-_FestiveModeAPI.tf @@ -10,11 +10,11 @@ module ICES_-_FestiveModeAPI { #entity selector object - filter = "type(\"SERVICE\"),entityName(\"FestiveModeApi\"),tag(\"Environment:PROD\")" + filter = "type(\"SERVICE\"),entityName.in(\"FestiveModeApi\"),tag(\"Environment:PROD\")" #metric expression of the calculation as done in data explorer ui - metric_expression = "(100)*((1)-( builtin:service.errors.fivexx.rate:splitBy():avg:auto:sort(value(avg,descending)):limit(10))/( builtin:service.requestCount.total:splitBy():sum:auto:sort(value(sum,descending)):limit(10)))" + metric_expression = "(100)*((1)-(builtin:service.errors.fivexx.rate:splitBy():avg:auto:sort(value(avg,descending)):limit(10))/(builtin:service.requestCount.total:splitBy():sum:auto:sort(value(sum,descending)):limit(10)))" #if not set (removed) it's defaulted to "-1d" diff --git a/NA_PROD/slo/ICES_-_FestiveModeAPI.tf b/NA_PROD/slo/ICES_-_FestiveModeAPI.tf index 9db57d3..c9dfd3f 100644 --- a/NA_PROD/slo/ICES_-_FestiveModeAPI.tf +++ b/NA_PROD/slo/ICES_-_FestiveModeAPI.tf @@ -10,11 +10,11 @@ module ICES_-_FestiveModeAPI { #entity selector object - filter = "type(\"SERVICE\"),entityName(\"FestiveModeApi\"),tag(\"Environment:PROD\")" + filter = "type(\"SERVICE\"),entityName.in(\"FestiveModeApi\"),tag(\"Environment:PROD\")" #metric expression of the calculation as done in data explorer ui - metric_expression = "(100)*((1)-( builtin:service.errors.fivexx.rate:splitBy():avg:auto:sort(value(avg,descending)):limit(10))/( builtin:service.requestCount.total:splitBy():sum:auto:sort(value(sum,descending)):limit(10)))" + metric_expression = "(100)*((1)-(builtin:service.errors.fivexx.rate:splitBy():avg:auto:sort(value(avg,descending)):limit(10))/(builtin:service.requestCount.total:splitBy():sum:auto:sort(value(sum,descending)):limit(10)))" #if not set (removed) it's defaulted to "-1d"