Merge remote-tracking branch 'remotes/origin/VDLM/rtchandler-poc' into CD_VDLM_rtchandler

# Conflicts:
#	BMW-Dynatrace-config/CD_VDLM_rtchandler/management-zone/default.json

BMW-Dynatrace-config/CD_CustomerCentricInformationServices/slo/nn.yaml

@@ -59,3 +59,59 @@ ExploreNews-EMEA-Prod.EMEA-Prod:
   - target: "98"
   - warning: "99"
   - skipDeployment: "false"
+
+PlayEpisode-US-Prod:
+  - name: "News-Next SLO Play Episode"
+  - sloFilter: "type(SERVICE_METHOD), entityId(\\\"SERVICE_METHOD-F2784BBB49B1D3E8\\\")"
+  - target: "98"
+  - warning: "99"
+  - skipDeployment: "true"
+
+PlayEpisode-US-Prod.US-Prod:
+  - name: "News-Next SLO Play Episode"
+  - sloFilter: "type(SERVICE_METHOD), entityId(\\\"SERVICE_METHOD-F2784BBB49B1D3E8\\\")"
+  - target: "98"
+  - warning: "99"
+  - skipDeployment: "false"
+
+SetPreferences-US-Prod:
+  - name: "News-Next SLO Set Preferences"
+  - sloFilter: "type(SERVICE_METHOD), entityId(\\\"SERVICE_METHOD-0B5905EDDEAC9DC9\\\",\\\"SERVICE_METHOD-8F6D90EA945AF1E9\\\")"
+  - target: "98"
+  - warning: "99"
+  - skipDeployment: "true"
+
+SetPreferences-US-Prod.US-Prod:
+  - name: "News-Next SLO Set Preferences"
+  - sloFilter: "type(SERVICE_METHOD), entityId(\\\"SERVICE_METHOD-0B5905EDDEAC9DC9\\\",\\\"SERVICE_METHOD-8F6D90EA945AF1E9\\\")"
+  - target: "98"
+  - warning: "99"
+  - skipDeployment: "false"
+
+LaunchApp-US-Prod:
+  - name: "News-Next SLO Launch App"
+  - sloFilter: "type(SERVICE_METHOD), entityId(\\\"SERVICE_METHOD-33C75D7B554EB498\\\",\\\"SERVICE_METHOD-ADAF1C4F58C2C719\\\",\\\"SERVICE_METHOD-05E895E75BA373CA\\\")"
+  - target: "98"
+  - warning: "99"
+  - skipDeployment: "true"
+
+LaunchApp-US-Prod.US-Prod:
+  - name: "News-Next SLO Launch App"
+  - sloFilter: "type(SERVICE_METHOD), entityId(\\\"SERVICE_METHOD-33C75D7B554EB498\\\",\\\"SERVICE_METHOD-ADAF1C4F58C2C719\\\",\\\"SERVICE_METHOD-05E895E75BA373CA\\\")"
+  - target: "98"
+  - warning: "99"
+  - skipDeployment: "false"
+
+ExploreNews-US-Prod:
+  - name: "News-Next SLO Explore News"
+  - sloFilter: "type(SERVICE_METHOD), entityId(\\\"SERVICE_METHOD-E01DC09FD6BD989B\\\",\\\"SERVICE_METHOD-424C1AEB63FE7855\\\",\\\"SERVICE_METHOD-F2784BBB49B1D3E8\\\")"
+  - target: "98"
+  - warning: "99"
+  - skipDeployment: "true"
+
+ExploreNews-US-Prod.US-Prod:
+  - name: "News-Next SLO Explore News"
+  - sloFilter: "type(SERVICE_METHOD), entityId(\\\"SERVICE_METHOD-E01DC09FD6BD989B\\\",\\\"SERVICE_METHOD-424C1AEB63FE7855\\\",\\\"SERVICE_METHOD-F2784BBB49B1D3E8\\\")"
+  - target: "98"
+  - warning: "99"
+  - skipDeployment: "false"

BMW-Dynatrace-config/CD_VDLM_rtchandler/conditional-naming-service/conditional-naming-service.yaml

@@ -3,5 +3,6 @@ config:
 
 CDnewComponentTag:
 - name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
+- nameFormat: "{ProcessGroup:Kubernetes:app-name} - {Service:DetectedName} - {ProcessGroup:Kubernetes:environment}"
-- skipDeployment: "true"
+- skipDeployment: "false"
+- tag: "vdlm"

BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/custom-service-java.yaml

@@ -1,17 +1,55 @@
 config:
-- customService1: template-1-1.json
+- customService1: template-2-1a.json
-- customService2: template-1-1.json
+- customService2: template-2-1b.json
+- customService3: template-1-1a.json
+- customService4: template-1-1b.json
+- customService5: template-1-1c.json
+- customService6: template-1-1d.json
 
 customService1:
-- name: vdlm-rtchandler-SQSRtcTeleXIn
+- name: "VDLM_rtchandler - ifs-010 (SQS) RtcTeleXIn/Out - IN/OUT"
-- className: com.bmw.cc.ts.rtchandler.bm.message
+- className1: com.bmw.cc.ts.rtchandler.bm.message.MessageServiceRTCBF
-- methodName: handleMessage
+- methodName1: processMessage
-- returnType: void
+- returnType1: void
+- className2: com.bmw.cc.ts.rtchandler.integration.tsmb.boundary.TeleXSqsESI
+- methodName2: sendMessage
+- returnType2: void
 - skipDeployment: "false"
 
 customService2:
-- name: vdlm-rtchandler-SQSNgtpRtcHandlerIn
+- name: "VDLM_rtchandler - ifs-008 (SQS) NgtpRtcHandlerIn/Out - IN/OUT"
-- className: com.bmw.cc.ts.rtchandler.integration.ngtp.v1.boundary
+- className1: com.bmw.cc.ts.rtchandler.api.ngtp.v1.boundary.NgtpSqsListener
-- methodName: sendMessage
+- methodName1: processMessage
+- returnType1: void
+- className2: com.bmw.cc.ts.rtchandler.integration.ngtp.v1.boundary.NgtpSqsESI
+- methodName2: sendMessage
+- returnType2: void
+- skipDeployment: "false"
+
+customService3:
+- name: "VDLM_rtchandler - ifs-009 (MQS) RtcHandlerIstaOut - OUT"
+- className: com.bmw.cc.ts.rtchandler.bm.common.control.classificationrequest.ClassificationRequestQueueSender
+- methodName: sendClassificationRequestMessage
+- returnType: void
+- skipDeployment: "false"
+
+customService4:
+- name: "VDLM_rtchandler - (Timer) timeout"
+- className: com.bmw.cc.ts.rtchandler.bm.common.timer.CallTimeoutTimerService
+- methodName: handleTimer
+- returnType: void
+- skipDeployment: "false"
+
+customService5:
+- name: "VDLM_rtchandler - (Timer) deletion"
+- className: com.bmw.cc.ts.rtchandler.bm.common.control.cleanup.DbCleanUpBA
+- methodName: cleanUp
+- returnType: void
+- skipDeployment: "false"
+
+customService6:
+- name: "VDLM_rtchandler - ifs-007 (REST) /rtchandler/rest/diag/v2 (/trigger)"
+- className: com.bmw.cc.ts.rtchandler.api.diag.v2.boundary.DiagRequestResponseV2
+- methodName: trigger
 - returnType: void
 - skipDeployment: "false"

BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1a.json

@@ -0,0 +1,25 @@
+{
+ "enabled": true,
+ "name": "{{.name}}",
+ "processGroups": [],
+ "queueEntryPoint": false,
+ "queueEntryPointType": null,
+ "rules": [
+  {
+   "annotations": [],
+   "className": "{{.className}}",
+   "enabled": true,
+   "fileName": "",
+   "matcher": "EQUALS",
+   "methodRules": [
+    {
+     "argumentTypes": [
+      "com.bmw.cc.ts.rtchandler.bm.common.model.classificationrequest.ClassificationRequest"
+     ],
+     "methodName": "{{.methodName}}",
+     "returnType": "{{.returnType}}"
+    }
+   ]
+  }
+ ]
+}

BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1c.json

@@ -0,0 +1,23 @@
+{
+ "enabled": true,
+ "name": "{{.name}}",
+ "processGroups": [],
+ "queueEntryPoint": false,
+ "queueEntryPointType": null,
+ "rules": [
+  {
+   "annotations": [],
+   "className": "{{.className}}",
+   "enabled": true,
+   "fileName": "",
+   "matcher": "EQUALS",
+   "methodRules": [
+    {
+     "argumentTypes": [ ],
+     "methodName": "{{.methodName}}",
+     "returnType": "{{.returnType}}"
+    }
+   ]
+  }
+ ]
+}

BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1d.json

@@ -0,0 +1,25 @@
+{
+ "enabled": true,
+ "name": "{{.name}}",
+ "processGroups": [],
+ "queueEntryPoint": false,
+ "queueEntryPointType": null,
+ "rules": [
+  {
+   "annotations": [],
+   "className": "{{.className}}",
+   "enabled": true,
+   "fileName": "",
+   "matcher": "EQUALS",
+   "methodRules": [
+    {
+     "argumentTypes": [
+      "com.bmw.cc.ts.rtchandler.api.diag.v2.entity.RTCTriggerRequest"
+     ],
+     "methodName": "{{.methodName}}",
+     "returnType": "{{.returnType}}"
+    }
+   ]
+  }
+ ]
+}

BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1a.json

@@ -0,0 +1,44 @@
+{
+  "enabled": true,
+  "name": "{{.name}}",
+  "processGroups": [],
+  "queueEntryPoint": false,
+  "queueEntryPointType": null,
+  "rules": [
+    {
+      "annotations": [],
+      "className": "{{.className1}}",
+      "enabled": true,
+      "fileName": "",
+      "matcher": "EQUALS",
+      "methodRules": [
+        {
+          "argumentTypes": [
+            "java.lang.String",
+            "java.util.Map",
+            "com.bmw.cc.ts.rtchandler.bm.common.util.RequestContext"
+          ],
+          "methodName": "{{.methodName1}}",
+          "returnType": "{{.returnType1}}"
+        }]
+    },
+    {
+      "annotations": [],
+      "className": "{{.className2}}",
+      "enabled": true,
+      "fileName": "",
+      "matcher": "EQUALS",
+      "methodRules": [
+        {
+          "argumentTypes": [
+            "java.lang.String",
+            "java.util.Map",
+            "com.bmw.cc.ts.rtchandler.bm.common.util.RequestContext"
+          ],
+          "methodName": "{{.methodName2}}",
+          "returnType": "{{.returnType2}}"
+        }
+      ]
+    }
+  ]
+}

BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1b.json

@@ -0,0 +1,43 @@
+{
+  "enabled": true,
+  "name": "{{.name}}",
+  "processGroups": [],
+  "queueEntryPoint": false,
+  "queueEntryPointType": null,
+  "rules": [
+    {
+      "annotations": [],
+      "className": "{{.className1}}",
+      "enabled": true,
+      "fileName": "",
+      "matcher": "EQUALS",
+      "methodRules": [
+        {
+          "argumentTypes": [
+            "com.bmw.cd.logging.CdllLoggingContext",
+            "software.amazon.awssdk.services.sqs.model.Message"
+          ],
+          "methodName": "{{.methodName1}}",
+          "returnType": "{{.returnType1}}"
+        }]
+    },
+    {
+      "annotations": [],
+      "className": "{{.className2}}",
+      "enabled": true,
+      "fileName": "",
+      "matcher": "EQUALS",
+      "methodRules": [
+        {
+          "argumentTypes": [
+            "java.lang.String",
+            "java.lang.String",
+            "com.bmw.cc.ts.rtchandler.bm.diag.entity.RTCTriggerType"
+          ],
+          "methodName": "{{.methodName2}}",
+          "returnType": "{{.returnType2}}"
+        }
+      ]
+    }
+  ]
+}

BMW-Dynatrace-config/CD_VDLM_rtchandler/management-zone/management-zone.yaml

@@ -3,4 +3,4 @@ config:
 
 CDnewComponentTag:
 - name: CD_VDLM_rtchandler
-- compassIDs: \"compass-id:rtchandler\"
+- compassIDs: rtchandler

BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml

@@ -2,8 +2,8 @@ config:
 - customService1: template-1-1.json
 
 customService1:
-- name: requestMaintenanceStatusService-vdlm
+- name: vdlm-scallservice-ifs-002-JOYNR-notifyMaintenanceStatus
 - className: com.bmw.cc.ts.scallservice.api.maintenancestatus.v1.boundary.MaintenanceStatusApiBF
 - methodName: processRequestMaintenanceStatus
 - returnType: void
-- skipDeployment: "true"
+- skipDeployment: "false"

BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/custom-service-java.yaml

@@ -2,8 +2,8 @@ config:
 - customService1: template-1-1.json
 
 customService1:
-- name: myJOYNRService 
+- name: vdlm-ts-asc-ifs-001-SQSAscIn
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
+- className: com.bmw.cc.asc.bm.boundary.TeleXBF
-- methodName: exampleJoynrMethod
+- methodName: handleTeleXMessage
 - returnType: void
-- skipDeployment: "true"
+- skipDeployment: "false"

BMW-Dynatrace-config/CD_comfy/dashboard/CDcomfyCampaignMonitoring.json

@@ -3371,21 +3371,21 @@
           "id": "A",
           "timeAggregation": "DEFAULT",
           "splitBy": [],
-          "metricSelector": "builtin:service.keyRequest.count.total:filter(and(in(\"dt.entity.service_method\",entitySelector(\"type(service_method),entityName.equals(~\"DispatcherBA.dispatchFastLaneTriggerAction~\")\")))):parents:filter(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:{{.env}}~\")\")))):merge(\"dt.entity.service\",\"dt.entity.service_method\"):sum:auto:sort(value(sum,descending)):limit(10)",
+          "metricSelector": "builtin:service.keyRequest.count.total:filter(and(in(\"dt.entity.service_method\",entitySelector(\"type(service_method),entityName.equals(~\"DispatcherBA.publishFastLaneActionToAgentQueue~\")\")))):parents:filter(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:{{.env}}~\")\")))):merge(\"dt.entity.service\",\"dt.entity.service_method\"):sum:auto:sort(value(sum,descending)):limit(10)",
           "enabled": true
         },
         {
           "id": "B",
           "timeAggregation": "DEFAULT",
           "splitBy": [],
-          "metricSelector": "builtin:service.keyRequest.errors.server.count:filter(and(in(\"dt.entity.service_method\",entitySelector(\"type(service_method),entityName.equals(~\"DispatcherBA.dispatchFastLaneTriggerAction~\")\")))):parents:filter(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:{{.env}}~\")\")))):merge(\"dt.entity.service\",\"dt.entity.service_method\"):sum:auto:sort(value(sum,descending)):limit(10)",
+          "metricSelector": "builtin:service.keyRequest.errors.server.count:filter(and(in(\"dt.entity.service_method\",entitySelector(\"type(service_method),entityName.equals(~\"DispatcherBA.publishFastLaneActionToAgentQueue~\")\")))):parents:filter(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:{{.env}}~\")\")))):merge(\"dt.entity.service\",\"dt.entity.service_method\"):sum:auto:sort(value(sum,descending)):limit(10)",
           "enabled": true
         },
         {
           "id": "C",
           "timeAggregation": "DEFAULT",
           "splitBy": [],
-          "metricSelector": "builtin:service.keyRequest.response.time:filter(and(in(\"dt.entity.service_method\",entitySelector(\"type(service_method),entityName.equals(~\"DispatcherBA.dispatchFastLaneTriggerAction~\")\")))):parents:filter(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:{{.env}}~\")\")))):merge(\"dt.entity.service\",\"dt.entity.service_method\"):avg:auto:sort(value(avg,descending)):limit(10)",
+          "metricSelector": "builtin:service.keyRequest.response.time:filter(and(in(\"dt.entity.service_method\",entitySelector(\"type(service_method),entityName.equals(~\"DispatcherBA.publishFastLaneActionToAgentQueue~\")\")))):parents:filter(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:{{.env}}~\")\")))):merge(\"dt.entity.service\",\"dt.entity.service_method\"):avg:auto:sort(value(avg,descending)):limit(10)",
           "enabled": true
         }
       ],

environment.yaml

@@ -20,10 +20,10 @@ NA-PreProd:
 
 CN-Prod:
     - name: "CN-Prod"
-    - env-url: "https://dynatracemgd-tsp.bmwgroup.net/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b@PROXY"
+    - env-url: "https://dyna-synth-cn.bmwgroup.com.cn/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b"
     - env-token-name: "CN_Prod_TOKEN"
 
 CN-PreProd:
     - name: "CN-PreProd"
-    - env-url: "https://dynatracemgd-tsp.bmwgroup.net/e/ab88c03b-b7fc-45f0-9115-9e9ecc0ced35@PROXY"
+    - env-url: "https://dyna-synth-cn.bmwgroup.com.cn/e/ab88c03b-b7fc-45f0-9115-9e9ecc0ced35"
     - env-token-name: "CN_PreProd_TOKEN"