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

---
 .../dashboard/CD_appd_id5_vdm_standard_E2E.tf | 26 +++++++++++++++++++
 .../CD_appd_id5_vdm_standard_PROD.tf          | 26 +++++++++++++++++++
 .../dashboard/CD_appd_id5_vdm_standard_E2E.tf | 26 +++++++++++++++++++
 .../CD_appd_id5_vdm_standard_PROD.tf          | 26 +++++++++++++++++++
 .../dashboard/CD_appd_id5_vdm_standard_E2E.tf | 26 +++++++++++++++++++
 .../CD_appd_id5_vdm_standard_PROD.tf          | 26 +++++++++++++++++++
 6 files changed, 156 insertions(+)
 create mode 100644 CN_PROD/dashboard/CD_appd_id5_vdm_standard_E2E.tf
 create mode 100644 CN_PROD/dashboard/CD_appd_id5_vdm_standard_PROD.tf
 create mode 100644 EMEA_PROD/dashboard/CD_appd_id5_vdm_standard_E2E.tf
 create mode 100644 EMEA_PROD/dashboard/CD_appd_id5_vdm_standard_PROD.tf
 create mode 100644 NA_PROD/dashboard/CD_appd_id5_vdm_standard_E2E.tf
 create mode 100644 NA_PROD/dashboard/CD_appd_id5_vdm_standard_PROD.tf

diff --git a/CN_PROD/dashboard/CD_appd_id5_vdm_standard_E2E.tf b/CN_PROD/dashboard/CD_appd_id5_vdm_standard_E2E.tf
new file mode 100644
index 00000000..9ef7a38d
--- /dev/null
+++ b/CN_PROD/dashboard/CD_appd_id5_vdm_standard_E2E.tf
@@ -0,0 +1,26 @@
+# ID 4f336a7b-3385-4a51-8169-ee6995107339
+module CD_appd_id5_vdm_standard_E2E {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_AppD_ID5 - CN E2E - VDM Standard Dashboard"
+  tag                = "AppDID5"
+  environment        = "E2E"
+  managementZoneName = "CD_AppD_ID5"
+  sloName            = "VDM - AppD_ID5 - CN E2E"
+  appId              = "APP-18165"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-AppDistributionServices(ID5)"
+
+  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(
+                            ~"AppsServiceV1 - id5-app - e2e~"
+                        )
+                    )
+                    ,entityName.in(
+                        ~"getAppV2~",
+                        ~"getAppListV2~"
+                    )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(2))
+  EOT
+}
\ No newline at end of file
diff --git a/CN_PROD/dashboard/CD_appd_id5_vdm_standard_PROD.tf b/CN_PROD/dashboard/CD_appd_id5_vdm_standard_PROD.tf
new file mode 100644
index 00000000..ff53a0ec
--- /dev/null
+++ b/CN_PROD/dashboard/CD_appd_id5_vdm_standard_PROD.tf
@@ -0,0 +1,26 @@
+# ID ebcf729e-6700-4669-826c-a8d3d883a30f
+module CD_appd_id5_vdm_standard_PROD {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_AppD_ID5 - CN PROD - VDM Standard Dashboard"
+  tag                = "AppDID5"
+  environment        = "PROD"
+  managementZoneName = "CD_AppD_ID5"
+  sloName            = "VDM - AppD_ID5 - CN PROD"
+  appId              = "APP-18165"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-AppDistributionServices(ID5)"
+
+  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(
+                            ~"AppsServiceV1 - id5-app - prod~"
+                        )
+                    )
+                    ,entityName.in(
+                        ~"getAppV2~",
+                        ~"getAppListV2~"
+                    )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(2))
+  EOT
+}
\ No newline at end of file
diff --git a/EMEA_PROD/dashboard/CD_appd_id5_vdm_standard_E2E.tf b/EMEA_PROD/dashboard/CD_appd_id5_vdm_standard_E2E.tf
new file mode 100644
index 00000000..c9bc1d30
--- /dev/null
+++ b/EMEA_PROD/dashboard/CD_appd_id5_vdm_standard_E2E.tf
@@ -0,0 +1,26 @@
+# ID c1866373-c0e4-4e01-81cd-c2342fb114f0
+module CD_appd_id5_vdm_standard_E2E {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_AppD_ID5 - EMEA E2E - VDM Standard Dashboard"
+  tag                = "AppDID5"
+  environment        = "E2E"
+  managementZoneName = "CD_AppD_ID5"
+  sloName            = "VDM - AppD_ID5 - EMEA E2E"
+  appId              = "APP-18165"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-AppDistributionServices(ID5)"
+
+  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(
+                            ~"AppsServiceV1 - id5-app - e2e~"
+                        )
+                    )
+                    ,entityName.in(
+                        ~"getAppV2~",
+                        ~"getAppListV2~"
+                    )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(2))
+  EOT
+}
\ No newline at end of file
diff --git a/EMEA_PROD/dashboard/CD_appd_id5_vdm_standard_PROD.tf b/EMEA_PROD/dashboard/CD_appd_id5_vdm_standard_PROD.tf
new file mode 100644
index 00000000..f2c6a7ab
--- /dev/null
+++ b/EMEA_PROD/dashboard/CD_appd_id5_vdm_standard_PROD.tf
@@ -0,0 +1,26 @@
+# ID a7d30da1-32d2-4b86-a837-4df9c22591e6
+module CD_appd_id5_vdm_standard_PROD {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_AppD_ID5 - EMEA PROD - VDM Standard Dashboard"
+  tag                = "AppDID5"
+  environment        = "PROD"
+  managementZoneName = "CD_AppD_ID5"
+  sloName            = "VDM - AppD_ID5 - EMEA PROD"
+  appId              = "APP-18165"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-AppDistributionServices(ID5)"
+
+  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(
+                            ~"AppsServiceV1 - id5-app - prod~"
+                        )
+                    )
+                    ,entityName.in(
+                        ~"getAppV2~",
+                        ~"getAppListV2~"
+                    )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(2))
+  EOT
+}
\ No newline at end of file
diff --git a/NA_PROD/dashboard/CD_appd_id5_vdm_standard_E2E.tf b/NA_PROD/dashboard/CD_appd_id5_vdm_standard_E2E.tf
new file mode 100644
index 00000000..153e18c5
--- /dev/null
+++ b/NA_PROD/dashboard/CD_appd_id5_vdm_standard_E2E.tf
@@ -0,0 +1,26 @@
+# ID 755715c5-a96a-46d9-823b-99ab2698709f
+module CD_appd_id5_vdm_standard_E2E {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_AppD_ID5 - US E2E - VDM Standard Dashboard"
+  tag                = "AppDID5"
+  environment        = "E2E"
+  managementZoneName = "CD_AppD_ID5"
+  sloName            = "VDM - AppD_ID5 - US E2E"
+  appId              = "APP-18165"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-AppDistributionServices(ID5)"
+
+  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(
+                            ~"AppsServiceV1 - id5-app - e2e~"
+                        )
+                    )
+                    ,entityName.in(
+                        ~"getAppV2~",
+                        ~"getAppListV2~"
+                    )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(2))
+  EOT
+}
\ No newline at end of file
diff --git a/NA_PROD/dashboard/CD_appd_id5_vdm_standard_PROD.tf b/NA_PROD/dashboard/CD_appd_id5_vdm_standard_PROD.tf
new file mode 100644
index 00000000..dcd3b0cc
--- /dev/null
+++ b/NA_PROD/dashboard/CD_appd_id5_vdm_standard_PROD.tf
@@ -0,0 +1,26 @@
+# ID 9608b8a6-d1be-46b3-9b7b-9000f13a9bdb
+module CD_appd_id5_vdm_standard_PROD {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_AppD_ID5 - US PROD - VDM Standard Dashboard"
+  tag                = "AppDID5"
+  environment        = "PROD"
+  managementZoneName = "CD_AppD_ID5"
+  sloName            = "VDM - AppD_ID5 - US PROD"
+  appId              = "APP-18165"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-AppDistributionServices(ID5)"
+
+  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(
+                            ~"AppsServiceV1 - id5-app - prod~"
+                        )
+                    )
+                    ,entityName.in(
+                        ~"getAppV2~",
+                        ~"getAppListV2~"
+                    )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(2))
+  EOT
+}
\ No newline at end of file

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

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

diff --git a/CN_PROD/dashboard/CD_appd_id5_vdm_standard_E2E.tf b/CN_PROD/dashboard/CD_appd_id5_vdm_standard_E2E.tf
index 9ef7a38d..a8f97cb5 100644
--- a/CN_PROD/dashboard/CD_appd_id5_vdm_standard_E2E.tf
+++ b/CN_PROD/dashboard/CD_appd_id5_vdm_standard_E2E.tf
@@ -9,6 +9,7 @@ module CD_appd_id5_vdm_standard_E2E {
   managementZoneName = "CD_AppD_ID5"
   sloName            = "VDM - AppD_ID5 - CN E2E"
   appId              = "APP-18165"
+  appFilter          = "Namespace:id5-app"
   reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-AppDistributionServices(ID5)"
 
   reliabilityMetricSelector = <<EOT
diff --git a/CN_PROD/dashboard/CD_appd_id5_vdm_standard_PROD.tf b/CN_PROD/dashboard/CD_appd_id5_vdm_standard_PROD.tf
index ff53a0ec..d387e97a 100644
--- a/CN_PROD/dashboard/CD_appd_id5_vdm_standard_PROD.tf
+++ b/CN_PROD/dashboard/CD_appd_id5_vdm_standard_PROD.tf
@@ -9,6 +9,7 @@ module CD_appd_id5_vdm_standard_PROD {
   managementZoneName = "CD_AppD_ID5"
   sloName            = "VDM - AppD_ID5 - CN PROD"
   appId              = "APP-18165"
+  appFilter          = "Namespace:id5-app"
   reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-AppDistributionServices(ID5)"
 
   reliabilityMetricSelector = <<EOT
diff --git a/EMEA_PROD/dashboard/CD_appd_id5_vdm_standard_E2E.tf b/EMEA_PROD/dashboard/CD_appd_id5_vdm_standard_E2E.tf
index c9bc1d30..dd6728de 100644
--- a/EMEA_PROD/dashboard/CD_appd_id5_vdm_standard_E2E.tf
+++ b/EMEA_PROD/dashboard/CD_appd_id5_vdm_standard_E2E.tf
@@ -9,6 +9,7 @@ module CD_appd_id5_vdm_standard_E2E {
   managementZoneName = "CD_AppD_ID5"
   sloName            = "VDM - AppD_ID5 - EMEA E2E"
   appId              = "APP-18165"
+  appFilter          = "Namespace:id5-app"
   reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-AppDistributionServices(ID5)"
 
   reliabilityMetricSelector = <<EOT
diff --git a/EMEA_PROD/dashboard/CD_appd_id5_vdm_standard_PROD.tf b/EMEA_PROD/dashboard/CD_appd_id5_vdm_standard_PROD.tf
index f2c6a7ab..dfd55f77 100644
--- a/EMEA_PROD/dashboard/CD_appd_id5_vdm_standard_PROD.tf
+++ b/EMEA_PROD/dashboard/CD_appd_id5_vdm_standard_PROD.tf
@@ -9,6 +9,7 @@ module CD_appd_id5_vdm_standard_PROD {
   managementZoneName = "CD_AppD_ID5"
   sloName            = "VDM - AppD_ID5 - EMEA PROD"
   appId              = "APP-18165"
+  appFilter          = "Namespace:id5-app"
   reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-AppDistributionServices(ID5)"
 
   reliabilityMetricSelector = <<EOT
diff --git a/NA_PROD/dashboard/CD_appd_id5_vdm_standard_E2E.tf b/NA_PROD/dashboard/CD_appd_id5_vdm_standard_E2E.tf
index 153e18c5..4cbc30dd 100644
--- a/NA_PROD/dashboard/CD_appd_id5_vdm_standard_E2E.tf
+++ b/NA_PROD/dashboard/CD_appd_id5_vdm_standard_E2E.tf
@@ -9,6 +9,7 @@ module CD_appd_id5_vdm_standard_E2E {
   managementZoneName = "CD_AppD_ID5"
   sloName            = "VDM - AppD_ID5 - US E2E"
   appId              = "APP-18165"
+  appFilter          = "Namespace:id5-app"
   reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-AppDistributionServices(ID5)"
 
   reliabilityMetricSelector = <<EOT
diff --git a/NA_PROD/dashboard/CD_appd_id5_vdm_standard_PROD.tf b/NA_PROD/dashboard/CD_appd_id5_vdm_standard_PROD.tf
index dcd3b0cc..57bea9e3 100644
--- a/NA_PROD/dashboard/CD_appd_id5_vdm_standard_PROD.tf
+++ b/NA_PROD/dashboard/CD_appd_id5_vdm_standard_PROD.tf
@@ -9,6 +9,7 @@ module CD_appd_id5_vdm_standard_PROD {
   managementZoneName = "CD_AppD_ID5"
   sloName            = "VDM - AppD_ID5 - US PROD"
   appId              = "APP-18165"
+  appFilter          = "Namespace:id5-app"
   reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-AppDistributionServices(ID5)"
 
   reliabilityMetricSelector = <<EOT