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

---
 CN_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf  | 12 +++++
 CN_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf | 33 ++++++++++++++
 .../dashboard/CD_sfa_vdm_standard_E2E.tf      | 12 +++++
 .../dashboard/CD_sfa_vdm_standard_PROD.tf     | 44 +++++++++++++++++++
 NA_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf  | 12 +++++
 NA_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf | 31 +++++++++++++
 6 files changed, 144 insertions(+)
 create mode 100644 CN_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf
 create mode 100644 CN_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf
 create mode 100644 EMEA_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf
 create mode 100644 EMEA_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf
 create mode 100644 NA_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf
 create mode 100644 NA_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf

diff --git a/CN_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf b/CN_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf
new file mode 100644
index 00000000..d76fe394
--- /dev/null
+++ b/CN_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf
@@ -0,0 +1,12 @@
+# ID d347d638-f86b-4ccf-8b9e-2dd608a013ca
+module CD_nop_vdm_standard_E2E {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_SFA - CN E2E - VDM Standard Dashboard"
+  tag                = "sfa"
+  environment        = "E2E"
+  managementZoneName = "CD_vdm_sfa"
+  appId              = "APP-19383"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-SecureFeatureActivation(SFA)"
+}
\ No newline at end of file
diff --git a/CN_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf b/CN_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf
new file mode 100644
index 00000000..7a29c4e8
--- /dev/null
+++ b/CN_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf
@@ -0,0 +1,33 @@
+# ID ca6a4174-87f4-43d4-8d6e-7a7acfa70bb4
+module CD_nop_vdm_standard_PROD {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_SFA - CN PROD - VDM Standard Dashboard"
+  tag                = "sfa"
+  environment        = "PROD"
+  managementZoneName = "CD_vdm_sfa"
+  sloName            = "VDM - SFA - CN PROD"
+  appId              = "APP-19383"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-SecureFeatureActivation(SFA)"
+
+  reliabilityMetricSelector = <<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.in(
+                                    ~"PsdzResource - sfa - prod~",
+                                    ~"OrderHandlerResource - sfa - prod~",
+                                    ~"MQSession$FacadeMessageListener - sfa - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"generateTokenPackage~",
+                            ~"getPackageForOrder~",
+                            ~"generateTokenPackageForOrder~",
+                            ~"transferTokenStatusToEMEA~",
+                            ~"Queue: B2VCNSEC_P.BMW.LOGISTIK.SFA.W71.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VCNSEC_P.BMW.LOGISTIK.SFA.W72.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VCNSEC_P.BMW.LOGISTIK.SFA.W52.SFA_TOKEN_REQUEST_PROD~"
+                        )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(7))
+  EOT
+}
\ No newline at end of file
diff --git a/EMEA_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf b/EMEA_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf
new file mode 100644
index 00000000..6664c93e
--- /dev/null
+++ b/EMEA_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf
@@ -0,0 +1,12 @@
+# ID 36014662-d637-448b-bd7d-5a3711bbeb26
+module CD_nop_vdm_standard_E2E {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_SFA - EMEA E2E - VDM Standard Dashboard"
+  tag                = "sfa"
+  environment        = "E2E"
+  managementZoneName = "CD_vdm_sfa"
+  appId              = "APP-19383"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-SecureFeatureActivation(SFA)"
+}
\ No newline at end of file
diff --git a/EMEA_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf b/EMEA_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf
new file mode 100644
index 00000000..cfeedb19
--- /dev/null
+++ b/EMEA_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf
@@ -0,0 +1,44 @@
+# ID 2427aba1-07d9-4ae4-baf4-34a7320686a3
+module CD_nop_vdm_standard_PROD {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_SFA - EMEA PROD - VDM Standard Dashboard"
+  tag                = "sfa"
+  environment        = "PROD"
+  managementZoneName = "CD_vdm_sfa"
+  sloName            = "VDM - SFA - EMEA PROD"
+  appId              = "APP-19383"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-SecureFeatureActivation(SFA)"
+
+  reliabilityMetricSelector = <<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.in(
+                                    ~"PsdzResource - sfa - prod~",
+                                    ~"OrderHandlerResource - sfa - prod~",
+                                    ~"SfaOtaResource - sfa - prod~",
+                                    ~"RuleSynchronizationResource - sfa - prod~",
+                                    ~"MQSession$FacadeMessageListener - sfa - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"generateTokenPackage~",
+                            ~"getPackageForOrder~",
+                            ~"getNewestPackageForVehicle~",
+                            ~"generateTokenPackageForOrder~",
+                            ~"transferTokenStatusToEMEA~",
+                            ~"updateTokenStatus~",
+                            ~"generateTokenPackage~",
+                            ~"syncRules~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.RW61.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.LW71.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.DW24.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.MW11.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.MW15.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.BW31.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.PW18.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: temporary queue~"
+                        )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(16))
+  EOT
+}
\ No newline at end of file
diff --git a/NA_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf b/NA_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf
new file mode 100644
index 00000000..eec81011
--- /dev/null
+++ b/NA_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf
@@ -0,0 +1,12 @@
+# ID 06417140-4430-493b-86c3-ab25f2f384dc
+module CD_nop_vdm_standard_E2E {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_SFA - US E2E - VDM Standard Dashboard"
+  tag                = "sfa"
+  environment        = "E2E"
+  managementZoneName = "CD_vdm_sfa"
+  appId              = "APP-19383"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-SecureFeatureActivation(SFA)"
+}
\ No newline at end of file
diff --git a/NA_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf b/NA_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf
new file mode 100644
index 00000000..78da6386
--- /dev/null
+++ b/NA_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf
@@ -0,0 +1,31 @@
+# ID 5470fb1d-fd12-4a6a-9efd-cde26aeaf986
+module CD_nop_vdm_standard_PROD {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_SFA - US PROD - VDM Standard Dashboard"
+  tag                = "sfa"
+  environment        = "PROD"
+  managementZoneName = "CD_vdm_sfa"
+  sloName            = "VDM - SFA - US PROD"
+  appId              = "APP-19383"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-SecureFeatureActivation(SFA)"
+
+  reliabilityMetricSelector = <<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.in(
+                                    ~"PsdzResource - sfa - prod~",
+                                    ~"OrderHandlerResource - sfa - prod~",
+                                    ~"MQSession$FacadeMessageListener - sfa - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"generateTokenPackage~",
+                            ~"getPackageForOrder~",
+                            ~"generateTokenPackageForOrder~",
+                            ~"transferTokenStatusToEMEA~",
+                            ~"Queue: temporary queue~"
+                        )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(5))
+  EOT
+}
\ No newline at end of file

From 1ca0ba92f3844a212d670a24e1f6832d8abb87c3 Mon Sep 17 00:00:00 2001
From: Markus Dlugi <markus.dlugi@bmw.de>
Date: Fri, 28 Apr 2023 13:23:07 +0200
Subject: [PATCH 2/2] COMFY-1087: Fix dashboard module names

---
 CN_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf    | 2 +-
 CN_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf   | 2 +-
 EMEA_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf  | 2 +-
 EMEA_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf | 2 +-
 NA_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf    | 2 +-
 NA_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CN_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf b/CN_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf
index d76fe394..2c56a785 100644
--- a/CN_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf
+++ b/CN_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf
@@ -1,5 +1,5 @@
 # ID d347d638-f86b-4ccf-8b9e-2dd608a013ca
-module CD_nop_vdm_standard_E2E {
+module CD_sfa_vdm_standard_E2E {
 
   source = "../../_custom_modules/vdm_standard_dashboard"
 
diff --git a/CN_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf b/CN_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf
index 7a29c4e8..d138ef9b 100644
--- a/CN_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf
+++ b/CN_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf
@@ -1,5 +1,5 @@
 # ID ca6a4174-87f4-43d4-8d6e-7a7acfa70bb4
-module CD_nop_vdm_standard_PROD {
+module CD_sfa_vdm_standard_PROD {
 
   source = "../../_custom_modules/vdm_standard_dashboard"
 
diff --git a/EMEA_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf b/EMEA_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf
index 6664c93e..13927778 100644
--- a/EMEA_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf
+++ b/EMEA_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf
@@ -1,5 +1,5 @@
 # ID 36014662-d637-448b-bd7d-5a3711bbeb26
-module CD_nop_vdm_standard_E2E {
+module CD_sfa_vdm_standard_E2E {
 
   source = "../../_custom_modules/vdm_standard_dashboard"
 
diff --git a/EMEA_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf b/EMEA_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf
index cfeedb19..83412341 100644
--- a/EMEA_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf
+++ b/EMEA_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf
@@ -1,5 +1,5 @@
 # ID 2427aba1-07d9-4ae4-baf4-34a7320686a3
-module CD_nop_vdm_standard_PROD {
+module CD_sfa_vdm_standard_PROD {
 
   source = "../../_custom_modules/vdm_standard_dashboard"
 
diff --git a/NA_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf b/NA_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf
index eec81011..a8a6edd8 100644
--- a/NA_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf
+++ b/NA_PROD/dashboard/CD_sfa_vdm_standard_E2E.tf
@@ -1,5 +1,5 @@
 # ID 06417140-4430-493b-86c3-ab25f2f384dc
-module CD_nop_vdm_standard_E2E {
+module CD_sfa_vdm_standard_E2E {
 
   source = "../../_custom_modules/vdm_standard_dashboard"
 
diff --git a/NA_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf b/NA_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf
index 78da6386..1d4b61e0 100644
--- a/NA_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf
+++ b/NA_PROD/dashboard/CD_sfa_vdm_standard_PROD.tf
@@ -1,5 +1,5 @@
 # ID 5470fb1d-fd12-4a6a-9efd-cde26aeaf986
-module CD_nop_vdm_standard_PROD {
+module CD_sfa_vdm_standard_PROD {
 
   source = "../../_custom_modules/vdm_standard_dashboard"