From 62978f34804fede5c2e9cb60e06214c1dff70ca9 Mon Sep 17 00:00:00 2001
From: Markus Dlugi <markus.dlugi@bmw.de>
Date: Wed, 19 Apr 2023 17:33:18 +0200
Subject: [PATCH] COMFY-1088: Update VDM SLOs for NOTS after Orbit migration

---
 CN_PROD/slo/VDM_-_NOTS_-_CN_E2E.tf      | 66 ++++++++++++++++---------
 CN_PROD/slo/VDM_-_NOTS_-_CN_PROD.tf     | 64 ++++++++++++++++--------
 EMEA_PROD/slo/VDM_-_NOTS_-_EMEA_E2E.tf  | 66 ++++++++++++++++---------
 EMEA_PROD/slo/VDM_-_NOTS_-_EMEA_PROD.tf | 64 ++++++++++++++++--------
 NA_PROD/slo/VDM_-_NOTS_-_US_E2E.tf      | 66 ++++++++++++++++---------
 NA_PROD/slo/VDM_-_NOTS_-_US_PROD.tf     | 64 ++++++++++++++++--------
 6 files changed, 261 insertions(+), 129 deletions(-)

diff --git a/CN_PROD/slo/VDM_-_NOTS_-_CN_E2E.tf b/CN_PROD/slo/VDM_-_NOTS_-_CN_E2E.tf
index 23013e1..504509e 100644
--- a/CN_PROD/slo/VDM_-_NOTS_-_CN_E2E.tf
+++ b/CN_PROD/slo/VDM_-_NOTS_-_CN_E2E.tf
@@ -1,33 +1,55 @@
 module VDM_-_NOTS_-_CN_E2E {
-    
+
     source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "VDM - NOTS - CN E2E" 
 
-    description                 = "" 
 
-    
-    
-    #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-8E703EDEDA31BF8F\")" 
-            
+    name                        = "VDM - NOTS - CN E2E"
+
+    description                 = "Custom Vehicle Device Management (VDM) SLO for Notification Service (NOTS)"
+
+
+
+    #entity selector object
+    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(
+                                    ~"server (/nots) - provisioning - e2e~",
+                                    ~"NotificationApiResource - provisioning - e2e~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"/nots/poll~",
+                            ~"notifyVehicles~"
+                        )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"server (/nots) - provisioning - e2e~",
+                                    ~"NotificationApiResource - provisioning - e2e~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"/nots/poll~",
+                            ~"notifyVehicles~"
+                        )"))))):splitBy()))
+    EOT
+
+
+    #if not set (removed) it's defaulted to "-1d"
+    timeframe                   = "-1d"
 
-    #if not set (removed) it's defaulted to "-1d" 
-    timeframe                   = "-1d" 
-         
 
     #currently the only possible value
-    evaluation                  = "AGGREGATE"           
+    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
+    target                      = 98            #if not set(removed) it's defaulted to 98
+    warning                     = 99            #if not set(removed) it's defaulted to 99
+
+}y
\ No newline at end of file
diff --git a/CN_PROD/slo/VDM_-_NOTS_-_CN_PROD.tf b/CN_PROD/slo/VDM_-_NOTS_-_CN_PROD.tf
index b93ba7c..82f8b09 100644
--- a/CN_PROD/slo/VDM_-_NOTS_-_CN_PROD.tf
+++ b/CN_PROD/slo/VDM_-_NOTS_-_CN_PROD.tf
@@ -1,33 +1,55 @@
 module VDM_-_NOTS_-_CN_PROD {
-    
+
     source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "VDM - NOTS - CN PROD" 
 
-    description                 = "" 
 
-    
-    
-    #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-F6A5DC9D2F0F1F62\")" 
-            
+    name                        = "VDM - NOTS - CN PROD"
+
+    description                 = "Custom Vehicle Device Management (VDM) SLO for Notification Service (NOTS)"
+
+
+
+    #entity selector object
+    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(
+                                    ~"server (/nots) - provisioning - prod~",
+                                    ~"NotificationApiResource - provisioning - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"/nots/poll~",
+                            ~"notifyVehicles~"
+                        )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"server (/nots) - provisioning - prod~",
+                                    ~"NotificationApiResource - provisioning - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"/nots/poll~",
+                            ~"notifyVehicles~"
+                        )"))))):splitBy()))
+    EOT
+
+
+    #if not set (removed) it's defaulted to "-1d"
+    timeframe                   = "-1d"
 
-    #if not set (removed) it's defaulted to "-1d" 
-    timeframe                   = "-1d" 
-         
 
     #currently the only possible value
-    evaluation                  = "AGGREGATE"           
+    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
-    
+    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/VDM_-_NOTS_-_EMEA_E2E.tf b/EMEA_PROD/slo/VDM_-_NOTS_-_EMEA_E2E.tf
index 54e5137..7d4afd4 100644
--- a/EMEA_PROD/slo/VDM_-_NOTS_-_EMEA_E2E.tf
+++ b/EMEA_PROD/slo/VDM_-_NOTS_-_EMEA_E2E.tf
@@ -1,33 +1,55 @@
 module VDM_-_NOTS_-_EMEA_E2E {
-    
+
     source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "VDM - NOTS - EMEA E2E" 
 
-    description                 = "" 
 
-    
-    
-    #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-DEDD62F697A3C372\")" 
-            
+    name                        = "VDM - NOTS - EMEA E2E"
+
+    description                 = "Custom Vehicle Device Management (VDM) SLO for Notification Service (NOTS)"
+
+
+
+    #entity selector object
+    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(
+                                    ~"server (/nots) - provisioning - e2e~",
+                                    ~"NotificationApiResource - provisioning - e2e~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"/nots/poll~",
+                            ~"notifyVehicles~"
+                        )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"server (/nots) - provisioning - e2e~",
+                                    ~"NotificationApiResource - provisioning - e2e~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"/nots/poll~",
+                            ~"notifyVehicles~"
+                        )"))))):splitBy()))
+    EOT
+
+
+    #if not set (removed) it's defaulted to "-1d"
+    timeframe                   = "-1d"
 
-    #if not set (removed) it's defaulted to "-1d" 
-    timeframe                   = "-1d" 
-         
 
     #currently the only possible value
-    evaluation                  = "AGGREGATE"           
+    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
+    target                      = 98            #if not set(removed) it's defaulted to 98
+    warning                     = 99            #if not set(removed) it's defaulted to 99
+
+}y
\ No newline at end of file
diff --git a/EMEA_PROD/slo/VDM_-_NOTS_-_EMEA_PROD.tf b/EMEA_PROD/slo/VDM_-_NOTS_-_EMEA_PROD.tf
index ef04bd2..a77a838 100644
--- a/EMEA_PROD/slo/VDM_-_NOTS_-_EMEA_PROD.tf
+++ b/EMEA_PROD/slo/VDM_-_NOTS_-_EMEA_PROD.tf
@@ -1,33 +1,55 @@
 module VDM_-_NOTS_-_EMEA_PROD {
-    
+
     source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "VDM - NOTS - EMEA PROD" 
 
-    description                 = "" 
 
-    
-    
-    #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-CE788B3AD8FD0282\",\"SERVICE_METHOD-3F987956036D78AC\",\"SERVICE_METHOD-05476CBC4E53F97B\")" 
-            
+    name                        = "VDM - NOTS - EMEA PROD"
+
+    description                 = "Custom Vehicle Device Management (VDM) SLO for Notification Service (NOTS)"
+
+
+
+    #entity selector object
+    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(
+                                    ~"server (/nots) - provisioning - prod~",
+                                    ~"NotificationApiResource - provisioning - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"/nots/poll~",
+                            ~"notifyVehicles~"
+                        )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"server (/nots) - provisioning - prod~",
+                                    ~"NotificationApiResource - provisioning - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"/nots/poll~",
+                            ~"notifyVehicles~"
+                        )"))))):splitBy()))
+    EOT
+
+
+    #if not set (removed) it's defaulted to "-1d"
+    timeframe                   = "-1d"
 
-    #if not set (removed) it's defaulted to "-1d" 
-    timeframe                   = "-1d" 
-         
 
     #currently the only possible value
-    evaluation                  = "AGGREGATE"           
+    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
-    
+    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/VDM_-_NOTS_-_US_E2E.tf b/NA_PROD/slo/VDM_-_NOTS_-_US_E2E.tf
index 3f9a7c3..b91d7c2 100644
--- a/NA_PROD/slo/VDM_-_NOTS_-_US_E2E.tf
+++ b/NA_PROD/slo/VDM_-_NOTS_-_US_E2E.tf
@@ -1,33 +1,55 @@
 module VDM_-_NOTS_-_US_E2E {
-    
+
     source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "VDM - NOTS - US E2E" 
 
-    description                 = "" 
 
-    
-    
-    #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-8E703EDEDA31BF8F\")" 
-            
+    name                        = "VDM - NOTS - US E2E"
+
+    description                 = "Custom Vehicle Device Management (VDM) SLO for Notification Service (NOTS)"
+
+
+
+    #entity selector object
+    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(
+                                    ~"server (/nots) - provisioning - e2e~",
+                                    ~"NotificationApiResource - provisioning - e2e~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"/nots/poll~",
+                            ~"notifyVehicles~"
+                        )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"server (/nots) - provisioning - e2e~",
+                                    ~"NotificationApiResource - provisioning - e2e~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"/nots/poll~",
+                            ~"notifyVehicles~"
+                        )"))))):splitBy()))
+    EOT
+
+
+    #if not set (removed) it's defaulted to "-1d"
+    timeframe                   = "-1d"
 
-    #if not set (removed) it's defaulted to "-1d" 
-    timeframe                   = "-1d" 
-         
 
     #currently the only possible value
-    evaluation                  = "AGGREGATE"           
+    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
+    target                      = 98            #if not set(removed) it's defaulted to 98
+    warning                     = 99            #if not set(removed) it's defaulted to 99
+
+}y
\ No newline at end of file
diff --git a/NA_PROD/slo/VDM_-_NOTS_-_US_PROD.tf b/NA_PROD/slo/VDM_-_NOTS_-_US_PROD.tf
index 7a089b6..71486b1 100644
--- a/NA_PROD/slo/VDM_-_NOTS_-_US_PROD.tf
+++ b/NA_PROD/slo/VDM_-_NOTS_-_US_PROD.tf
@@ -1,33 +1,55 @@
 module VDM_-_NOTS_-_US_PROD {
-    
+
     source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "VDM - NOTS - US PROD" 
 
-    description                 = "" 
 
-    
-    
-    #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-F6A5DC9D2F0F1F62\")" 
-            
+    name                        = "VDM - NOTS - US PROD"
+
+    description                 = "Custom Vehicle Device Management (VDM) SLO for Notification Service (NOTS)"
+
+
+
+    #entity selector object
+    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(
+                                    ~"server (/nots) - provisioning - prod~",
+                                    ~"NotificationApiResource - provisioning - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"/nots/poll~",
+                            ~"notifyVehicles~"
+                        )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"server (/nots) - provisioning - prod~",
+                                    ~"NotificationApiResource - provisioning - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"/nots/poll~",
+                            ~"notifyVehicles~"
+                        )"))))):splitBy()))
+    EOT
+
+
+    #if not set (removed) it's defaulted to "-1d"
+    timeframe                   = "-1d"
 
-    #if not set (removed) it's defaulted to "-1d" 
-    timeframe                   = "-1d" 
-         
 
     #currently the only possible value
-    evaluation                  = "AGGREGATE"           
+    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
-    
+    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