From 82056fe594bf204bd16e8d9afd8f3222d6af7a65 Mon Sep 17 00:00:00 2001
From: Bernd Brandl <bernd.brandl@bmw.de>
Date: Wed, 14 Sep 2022 15:55:58 +0200
Subject: [PATCH 1/5] added tsrd heartbeat + global

---
 .../custom-service-java.yaml                  | 37 ++++++++++++++
 .../custom-service-java/template-3-1.json     | 50 +++++++++++++++++++
 2 files changed, 87 insertions(+)
 create mode 100644 BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/template-3-1.json

diff --git a/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml
index 517f8d92..a5369310 100644
--- a/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml
@@ -5,6 +5,9 @@ config:
 - customService4: template-2-1.json
 - customService5: template-1-1.json
 - customService6: template-1-1.json
+- customService7: template-1-1.json
+- customService8: template-3-1.json
+- customService9: template-1-1.json
 
 customService1:
 - name: "ifs-006 (JOYNR) enable/disableFullDiagnosticsMode - OUT"
@@ -24,6 +27,7 @@ customService2:
 - methodName: publishCallToCallTopic
 - methodArgs: com.bmw.cc.ts.tsrd.bm.jms.calltopic.entity.CallStorageCallDO
 - returnType: void
+- skipDeployment: "false"
 
 customService3:
 - name: "ifs-007 (SQS) odfUpdateStatus - IN"
@@ -31,6 +35,7 @@ customService3:
 - methodName: processMessage
 - methodArgs: software.amazon.awssdk.services.sqs.model.Message
 - returnType: void
+- skipDeployment: "false"
 
 customService4:
 - name: "tsrd (Timer) deletion/timeout"
@@ -58,4 +63,36 @@ customService6:
 - methodName: publishNotification
 - methodArgs: com.bmw.cc.ts.tsrd.integration.aws.calltopic.CallStorageCallDO
 - returnType: void
+- skipDeployment: "false"
+
+customService7:
+- name: "tsrd: ifs-013 (JOYNR) GlobalCapabilitiesDirectory - OUT"
+- className: com.bmw.cc.ts.tsrd.integration.mgu.GlobalDiscoveryClient
+- methodName: lookup
+- methodArgs: java.lang.String
+- returnType: void
+- skipDeployment: "false"
+
+customService8:
+- name: "tsrd: ifs-010 (JOYNR) initiateHeartbeat/sendHeartbeatBackend/stopHeartbeat -OUT"
+- className1: com.bmw.cc.ts.tsrd.integration.mgu.HeartbeatClient
+- methodName1: initHeartbeatToVehicle
+- methodArgs1: joynr.de.bmw.infotainment.telematic.common.CommonTypes.RequestId","java.lang.String","java.lang.Boolean","com.bmw.cc.ts.tsrd.bm.remotediagnosis.entity.EnablePadDO","joynr.de.bmw.infotainment.telematic.teleservice.TeleserviceTypes.KeyValue
+- returnType1: void
+- className2: com.bmw.cc.ts.tsrd.integration.mgu.HeartbeatClient
+- methodName2: sendHeartbeat
+- methodArgs2: joynr.de.bmw.infotainment.telematic.common.CommonTypes.RequestId","java.lang.String
+- returnType2: void
+- className3: com.bmw.cc.ts.tsrd.integration.mgu.HeartbeatClient
+- methodName3: stopHeartbeat
+- methodArgs3: joynr.de.bmw.infotainment.telematic.common.CommonTypes.RequestId","java.lang.String
+- returnType3: void
+- skipDeployment: "false"
+
+customService9:
+- name: "tsrd: ifs-010 (JOYNR) sendHeartbeatVehicle - IN"
+- className: com.bmw.cc.ts.tsrd.bm.remotediagnosis.boundary.HeartbeatListener
+- methodName: sendHeartbeatVehicle
+- methodArgs: joynr.de.bmw.infotainment.telematic.common.CommonTypes.RequestId","java.lang.String","java.lang.Boolean","joynr.de.bmw.infotainment.telematic.teleservice.TeleserviceTypes.EventReason","joynr.de.bmw.infotainment.telematic.teleservice.TeleserviceTypes.PwfExtended","joynr.de.bmw.infotainment.telematic.teleservice.TeleserviceTypes.KeyValue
+- returnType: void
 - skipDeployment: "false"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/template-3-1.json b/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/template-3-1.json
new file mode 100644
index 00000000..81e6b72f
--- /dev/null
+++ b/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/template-3-1.json
@@ -0,0 +1,50 @@
+{
+  "enabled": true,
+  "name": "{{.name}}",
+  "processGroups": [],
+  "queueEntryPoint": false,
+  "queueEntryPointType": null,
+  "rules": [
+    {
+      "annotations": [],
+      "className": "{{.className1}}",
+      "enabled": true,
+      "fileName": "",
+      "matcher": "EQUALS",
+      "methodRules": [
+        {
+          "argumentTypes": ["{{.methodArgs1}}"],
+          "methodName": "{{.methodName1}}",
+          "returnType": "{{.returnType1}}"
+        }]
+    },
+    {
+      "annotations": [],
+      "className": "{{.className2}}",
+      "enabled": true,
+      "fileName": "",
+      "matcher": "EQUALS",
+      "methodRules": [
+        {
+          "argumentTypes": ["{{.methodArgs2}}"],
+          "methodName": "{{.methodName2}}",
+          "returnType": "{{.returnType2}}"
+        }
+      ]
+    },
+    {
+      "annotations": [],
+      "className": "{{.className3}}",
+      "enabled": true,
+      "fileName": "",
+      "matcher": "EQUALS",
+      "methodRules": [
+        {
+          "argumentTypes": ["{{.methodArgs3}}"],
+          "methodName": "{{.methodName3}}",
+          "returnType": "{{.returnType3}}"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file

From 02f4d9545d5105224549e6608fa62dfb9d0babce Mon Sep 17 00:00:00 2001
From: Bernd Brandl <bernd.brandl@bmw.de>
Date: Wed, 14 Sep 2022 15:57:23 +0200
Subject: [PATCH 2/5] redeploy diagservice

---
 .../custom-service-java/custom-service-java.yaml                 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/custom-service-java.yaml
index 8c312a35..03402ed2 100644
--- a/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/custom-service-java.yaml
@@ -7,6 +7,7 @@ config:
 - customService6: template-1-1.json
 - customService7: template-1-1.json
 
+
 customService1:
 - name: "ifs-007 (JOYNR) requestDiagResult/notifyDiagResult - IN/OUT"
 - className1: com.bmw.cc.ts.diagservice.joynr.consumer.boundary.DiagServiceV1Consumer

From 5ecfd01d59759a7ee916a7abd25b768a5b85897d Mon Sep 17 00:00:00 2001
From: Bernd Brandl <bernd.brandl@bmw.de>
Date: Wed, 14 Sep 2022 16:05:15 +0200
Subject: [PATCH 3/5] SLO Tiles only for PROD

---
 .../CD_VDLM/dashboard/dashboard.yaml                 | 12 +++++++++---
 .../CD_VDLM/dashboard/vdlm-overview.json             |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/BMW-Dynatrace-config/CD_VDLM/dashboard/dashboard.yaml b/BMW-Dynatrace-config/CD_VDLM/dashboard/dashboard.yaml
index 3083139f..906f3a9e 100644
--- a/BMW-Dynatrace-config/CD_VDLM/dashboard/dashboard.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM/dashboard/dashboard.yaml
@@ -1,8 +1,8 @@
 config:
 - CDnewComponentTag-PROD: vdlm-overview.json
-- CDnewComponentTag-E2E: vdlm-overview.json
-- CDnewComponentTag-INT: vdlm-overview.json
-- CDnewComponentTag-TEST: vdlm-overview.json
+- CDnewComponentTag-E2E: default.json
+- CDnewComponentTag-INT: default.json
+- CDnewComponentTag-TEST: default.json
 
 
 #PROD dashboards for EMEA/NA/CN Prod
@@ -57,6 +57,7 @@ CDnewComponentTag-E2E:
 - mzId: CD_VDLM/management-zone/CDnewComponentTag.id
 - env: E2E
 - skipDeployment: "true"
+
 CDnewComponentTag-E2E.EMEA-Prod:
 - name: CD_VDLM E2E
 - mzName: CD_VDLM/management-zone/CDnewComponentTag.name
@@ -64,6 +65,7 @@ CDnewComponentTag-E2E.EMEA-Prod:
 - env: E2E
 - KAI_SLO_id: 8c4a0631-7483-3a09-88d8-732e3f1a3dfd
 - skipDeployment: "false"
+
 CDnewComponentTag-E2E.NA-Prod:
 - name: CD_VDLM E2E
 - mzName: CD_VDLM/management-zone/CDnewComponentTag.name
@@ -71,6 +73,7 @@ CDnewComponentTag-E2E.NA-Prod:
 - env: E2E
 - KAI_SLO_id: 34aef7fa-be33-3640-b33a-8046a1c1951d
 - skipDeployment: "false"
+
 CDnewComponentTag-E2E.CN-Prod:
 - name: CD_VDLM E2E
 - mzName: CD_VDLM/management-zone/CDnewComponentTag.name
@@ -86,18 +89,21 @@ CDnewComponentTag-INT:
 - mzId: CD_VDLM/management-zone/CDnewComponentTag.id
 - env: INT
 - skipDeployment: "true"
+
 CDnewComponentTag-INT.EMEA-PreProd:
 - name: CD_VDLM INT
 - mzName: CD_VDLM/management-zone/CDnewComponentTag.name
 - mzId: CD_VDLM/management-zone/CDnewComponentTag.id
 - env: INT
 - skipDeployment: "false"
+
 CDnewComponentTag-INT.NA-PreProd:
 - name: CD_VDLM INT
 - mzName: CD_VDLM/management-zone/CDnewComponentTag.name
 - mzId: CD_VDLM/management-zone/CDnewComponentTag.id
 - env: INT
 - skipDeployment: "false"
+
 CDnewComponentTag-INT.CN-PreProd:
 - name: CD_VDLM INT
 - mzName: CD_VDLM/management-zone/CDnewComponentTag.name
diff --git a/BMW-Dynatrace-config/CD_VDLM/dashboard/vdlm-overview.json b/BMW-Dynatrace-config/CD_VDLM/dashboard/vdlm-overview.json
index 8de1a394..1aea66ea 100644
--- a/BMW-Dynatrace-config/CD_VDLM/dashboard/vdlm-overview.json
+++ b/BMW-Dynatrace-config/CD_VDLM/dashboard/vdlm-overview.json
@@ -424,7 +424,7 @@
       },
       "tileFilter": {},
       "assignedEntities": [
-        "6c92d4bd-f4b2-3423-8818-677836731bf9"
+        "e027bb44-99e1-35ed-ab73-06b0215421e4"
       ],
       "metric": "METRICS=false;LEGEND=false;PROBLEMS=false;decimals=2;customTitle=SEAM;"
     },

From 30d872601612227ed798076250fc1f354cecc78c Mon Sep 17 00:00:00 2001
From: Bernd Brandl <bernd.brandl@bmw.de>
Date: Wed, 14 Sep 2022 16:08:46 +0200
Subject: [PATCH 4/5] MQS has been decommissioned

---
 .../CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml
index a5369310..03254a61 100644
--- a/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml
@@ -21,13 +21,14 @@ customService1:
 - returnType2: void
 - skipDeployment: "false"
 
+# MQS has been decommissioned
 customService2:
 - name: "tsrd (MQS) CallTopic - OUT"
 - className: com.bmw.cc.ts.tsrd.bm.jms.calltopic.boundary.CallTopicJmsPublisherBA
 - methodName: publishCallToCallTopic
 - methodArgs: com.bmw.cc.ts.tsrd.bm.jms.calltopic.entity.CallStorageCallDO
 - returnType: void
-- skipDeployment: "false"
+- skipDeployment: "true"
 
 customService3:
 - name: "ifs-007 (SQS) odfUpdateStatus - IN"

From c7fff67ec31e09918e4dbf432aea289f0f6465d0 Mon Sep 17 00:00:00 2001
From: Bernd Brandl <bernd.brandl@bmw.de>
Date: Thu, 15 Sep 2022 08:55:24 +0200
Subject: [PATCH 5/5] fix name

---
 .../CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml
index 03254a61..c02778e2 100644
--- a/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml
@@ -75,7 +75,7 @@ customService7:
 - skipDeployment: "false"
 
 customService8:
-- name: "tsrd: ifs-010 (JOYNR) initiateHeartbeat/sendHeartbeatBackend/stopHeartbeat -OUT"
+- name: "tsrd: ifs-010 (JOYNR) initiateHeartbeat/sendHeartbeatBackend/stopHeartbeat - OUT"
 - className1: com.bmw.cc.ts.tsrd.integration.mgu.HeartbeatClient
 - methodName1: initHeartbeatToVehicle
 - methodArgs1: joynr.de.bmw.infotainment.telematic.common.CommonTypes.RequestId","java.lang.String","java.lang.Boolean","com.bmw.cc.ts.tsrd.bm.remotediagnosis.entity.EnablePadDO","joynr.de.bmw.infotainment.telematic.teleservice.TeleserviceTypes.KeyValue