From ac4bec81aa32a39a0b93c0896f25569ad6703585 Mon Sep 17 00:00:00 2001
From: Markus Dlugi <markus.dlugi@bmw.de>
Date: Fri, 28 Apr 2023 13:48:37 +0200
Subject: [PATCH 1/2] COMFY-1087: Add all VDM Standard Dashboards for AppD_OAP

---
 .../dashboard/CD_appd_oap_vdm_standard_E2E.tf | 27 +++++++++++++++++++
 .../CD_appd_oap_vdm_standard_PROD.tf          | 27 +++++++++++++++++++
 .../dashboard/CD_appd_oap_vdm_standard_E2E.tf | 27 +++++++++++++++++++
 .../CD_appd_oap_vdm_standard_PROD.tf          | 27 +++++++++++++++++++
 .../dashboard/CD_appd_oap_vdm_standard_E2E.tf | 27 +++++++++++++++++++
 .../CD_appd_oap_vdm_standard_PROD.tf          | 27 +++++++++++++++++++
 6 files changed, 162 insertions(+)
 create mode 100644 CN_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf
 create mode 100644 CN_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf
 create mode 100644 EMEA_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf
 create mode 100644 EMEA_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf
 create mode 100644 NA_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf
 create mode 100644 NA_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf

diff --git a/CN_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf b/CN_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf
new file mode 100644
index 00000000..f8360c7a
--- /dev/null
+++ b/CN_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf
@@ -0,0 +1,27 @@
+# ID 123458ed-18c5-4d5d-96fd-2d1dd03d0309
+module CD_appd_oap_vdm_standard_E2E {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_AppD_OAP - CN E2E - VDM Standard Dashboard"
+  tag                = "AppDOAP"
+  environment        = "E2E"
+  managementZoneName = "CD_AppD_OAP"
+  sloName            = "VDM - AppD_OAP - CN E2E"
+  appId              = "APP-18165"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-AppDistributionServices(OAP)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                    fromRelationship.isServiceMethodOfService(
+                        type(~"SERVICE~"),entityName.in(
+                            ~"AppVersionsResource - app-distribution - e2e~",
+							~"ReleaseNotesResource - app-distribution - e2e~"
+                        )
+                    )
+                    ,entityName.in(
+                        ~"getActiveVersionsForApp~",
+                        ~"getReleaseNotes~"
+                    )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(2))
+  EOT
+}
\ No newline at end of file
diff --git a/CN_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf b/CN_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf
new file mode 100644
index 00000000..68f6ad92
--- /dev/null
+++ b/CN_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf
@@ -0,0 +1,27 @@
+# ID 29f17a3b-e39f-482b-8977-ee4f7afb8db3
+module CD_appd_oap_vdm_standard_PROD {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_AppD_OAP - CN PROD - VDM Standard Dashboard"
+  tag                = "AppDOAP"
+  environment        = "PROD"
+  managementZoneName = "CD_AppD_OAP"
+  sloName            = "VDM - AppD_OAP - CN PROD"
+  appId              = "APP-18165"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-AppDistributionServices(OAP)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                    fromRelationship.isServiceMethodOfService(
+                        type(~"SERVICE~"),entityName.in(
+                            ~"AppVersionsResource - app-distribution - prod~",
+							~"ReleaseNotesResource - app-distribution - prod~"
+                        )
+                    )
+                    ,entityName.in(
+                        ~"getActiveVersionsForApp~",
+                        ~"getReleaseNotes~"
+                    )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(2))
+  EOT
+}
\ No newline at end of file
diff --git a/EMEA_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf b/EMEA_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf
new file mode 100644
index 00000000..ce5b2492
--- /dev/null
+++ b/EMEA_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf
@@ -0,0 +1,27 @@
+# ID ba9ef6a6-f102-483f-8d8c-0d4ee47b913d
+module CD_appd_oap_vdm_standard_E2E {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_AppD_OAP - EMEA E2E - VDM Standard Dashboard"
+  tag                = "AppDOAP"
+  environment        = "E2E"
+  managementZoneName = "CD_AppD_OAP"
+  sloName            = "VDM - AppD_OAP - EMEA E2E"
+  appId              = "APP-18165"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-AppDistributionServices(OAP)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                    fromRelationship.isServiceMethodOfService(
+                        type(~"SERVICE~"),entityName.in(
+                            ~"AppVersionsResource - app-distribution - e2e~",
+							~"ReleaseNotesResource - app-distribution - e2e~"
+                        )
+                    )
+                    ,entityName.in(
+                        ~"getActiveVersionsForApp~",
+                        ~"getReleaseNotes~"
+                    )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(2))
+  EOT
+}
\ No newline at end of file
diff --git a/EMEA_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf b/EMEA_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf
new file mode 100644
index 00000000..938fc674
--- /dev/null
+++ b/EMEA_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf
@@ -0,0 +1,27 @@
+# ID 3ef6d4bb-cc35-49d6-b9e8-6fe9e115f613
+module CD_appd_oap_vdm_standard_PROD {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_AppD_OAP - EMEA PROD - VDM Standard Dashboard"
+  tag                = "AppDOAP"
+  environment        = "PROD"
+  managementZoneName = "CD_AppD_OAP"
+  sloName            = "VDM - AppD_OAP - EMEA PROD"
+  appId              = "APP-18165"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-AppDistributionServices(OAP)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                    fromRelationship.isServiceMethodOfService(
+                        type(~"SERVICE~"),entityName.in(
+                            ~"AppVersionsResource - app-distribution - prod~",
+							~"ReleaseNotesResource - app-distribution - prod~"
+                        )
+                    )
+                    ,entityName.in(
+                        ~"getActiveVersionsForApp~",
+                        ~"getReleaseNotes~"
+                    )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(2))
+  EOT
+}
\ No newline at end of file
diff --git a/NA_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf b/NA_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf
new file mode 100644
index 00000000..04f5d161
--- /dev/null
+++ b/NA_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf
@@ -0,0 +1,27 @@
+# ID fb2e9b71-7dca-4f55-a3c8-9a9c7859e454
+module CD_appd_oap_vdm_standard_E2E {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_AppD_OAP - US E2E - VDM Standard Dashboard"
+  tag                = "AppDOAP"
+  environment        = "E2E"
+  managementZoneName = "CD_AppD_OAP"
+  sloName            = "VDM - AppD_OAP - US E2E"
+  appId              = "APP-18165"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-AppDistributionServices(OAP)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                    fromRelationship.isServiceMethodOfService(
+                        type(~"SERVICE~"),entityName.in(
+                            ~"AppVersionsResource - app-distribution - e2e~",
+							~"ReleaseNotesResource - app-distribution - e2e~"
+                        )
+                    )
+                    ,entityName.in(
+                        ~"getActiveVersionsForApp~",
+                        ~"getReleaseNotes~"
+                    )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(2))
+  EOT
+}
\ No newline at end of file
diff --git a/NA_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf b/NA_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf
new file mode 100644
index 00000000..73c37063
--- /dev/null
+++ b/NA_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf
@@ -0,0 +1,27 @@
+# ID 4455f503-9129-4165-b651-2427e0c9041a
+module CD_appd_oap_vdm_standard_PROD {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_AppD_OAP - US PROD - VDM Standard Dashboard"
+  tag                = "AppDOAP"
+  environment        = "PROD"
+  managementZoneName = "CD_AppD_OAP"
+  sloName            = "VDM - AppD_OAP - US PROD"
+  appId              = "APP-18165"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-AppDistributionServices(OAP)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                    fromRelationship.isServiceMethodOfService(
+                        type(~"SERVICE~"),entityName.in(
+                            ~"AppVersionsResource - app-distribution - prod~",
+							~"ReleaseNotesResource - app-distribution - prod~"
+                        )
+                    )
+                    ,entityName.in(
+                        ~"getActiveVersionsForApp~",
+                        ~"getReleaseNotes~"
+                    )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(2))
+  EOT
+}
\ No newline at end of file

From 38903c276363334d36b95c30df8f80db69bab42f Mon Sep 17 00:00:00 2001
From: Markus Dlugi <markus.dlugi@bmw.de>
Date: Fri, 28 Apr 2023 15:18:00 +0200
Subject: [PATCH 2/2] COMFY-1087: Add Namespace appFilter to filter only to OAP
 services

---
 CN_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf    | 1 +
 CN_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf   | 1 +
 EMEA_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf  | 1 +
 EMEA_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf | 1 +
 NA_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf    | 1 +
 NA_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf   | 1 +
 6 files changed, 6 insertions(+)

diff --git a/CN_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf b/CN_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf
index f8360c7a..d039cf97 100644
--- a/CN_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf
+++ b/CN_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf
@@ -9,6 +9,7 @@ module CD_appd_oap_vdm_standard_E2E {
   managementZoneName = "CD_AppD_OAP"
   sloName            = "VDM - AppD_OAP - CN E2E"
   appId              = "APP-18165"
+  appFilter          = "Namespace:app-distribution"
   reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-AppDistributionServices(OAP)"
 
   reliabilityMetricSelector = <<EOT
diff --git a/CN_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf b/CN_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf
index 68f6ad92..e6ebd977 100644
--- a/CN_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf
+++ b/CN_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf
@@ -9,6 +9,7 @@ module CD_appd_oap_vdm_standard_PROD {
   managementZoneName = "CD_AppD_OAP"
   sloName            = "VDM - AppD_OAP - CN PROD"
   appId              = "APP-18165"
+  appFilter          = "Namespace:app-distribution"
   reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-AppDistributionServices(OAP)"
 
   reliabilityMetricSelector = <<EOT
diff --git a/EMEA_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf b/EMEA_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf
index ce5b2492..912615fe 100644
--- a/EMEA_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf
+++ b/EMEA_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf
@@ -9,6 +9,7 @@ module CD_appd_oap_vdm_standard_E2E {
   managementZoneName = "CD_AppD_OAP"
   sloName            = "VDM - AppD_OAP - EMEA E2E"
   appId              = "APP-18165"
+  appFilter          = "Namespace:app-distribution"
   reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-AppDistributionServices(OAP)"
 
   reliabilityMetricSelector = <<EOT
diff --git a/EMEA_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf b/EMEA_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf
index 938fc674..767f82bd 100644
--- a/EMEA_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf
+++ b/EMEA_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf
@@ -9,6 +9,7 @@ module CD_appd_oap_vdm_standard_PROD {
   managementZoneName = "CD_AppD_OAP"
   sloName            = "VDM - AppD_OAP - EMEA PROD"
   appId              = "APP-18165"
+  appFilter          = "Namespace:app-distribution"
   reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-AppDistributionServices(OAP)"
 
   reliabilityMetricSelector = <<EOT
diff --git a/NA_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf b/NA_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf
index 04f5d161..b6474b2f 100644
--- a/NA_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf
+++ b/NA_PROD/dashboard/CD_appd_oap_vdm_standard_E2E.tf
@@ -9,6 +9,7 @@ module CD_appd_oap_vdm_standard_E2E {
   managementZoneName = "CD_AppD_OAP"
   sloName            = "VDM - AppD_OAP - US E2E"
   appId              = "APP-18165"
+  appFilter          = "Namespace:app-distribution"
   reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-AppDistributionServices(OAP)"
 
   reliabilityMetricSelector = <<EOT
diff --git a/NA_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf b/NA_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf
index 73c37063..0c17ccd3 100644
--- a/NA_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf
+++ b/NA_PROD/dashboard/CD_appd_oap_vdm_standard_PROD.tf
@@ -9,6 +9,7 @@ module CD_appd_oap_vdm_standard_PROD {
   managementZoneName = "CD_AppD_OAP"
   sloName            = "VDM - AppD_OAP - US PROD"
   appId              = "APP-18165"
+  appFilter          = "Namespace:app-distribution"
   reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-AppDistributionServices(OAP)"
 
   reliabilityMetricSelector = <<EOT