From 95a79185f1d41ab6d85d60090f3c20d581450180 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Fri, 29 Apr 2022 11:26:48 +0200 Subject: [PATCH 1/4] added SQS/MQS custom services --- .../custom-service-java.yaml | 32 ++++++++++++----- .../custom-service-java/template-1-2.json | 35 +++++++++++++++++++ .../custom-service-java/template-2-1.json | 35 +++++++++++++++++++ 3 files changed, 93 insertions(+), 9 deletions(-) create mode 100644 BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-2.json create mode 100644 BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1.json diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/custom-service-java.yaml index c80ce54d..41bc7dec 100644 --- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/custom-service-java.yaml @@ -1,17 +1,31 @@ config: -- customService1: template-1-1.json -- customService2: template-1-1.json +- customService1: template-2-1.json +- customService2: template-2-1.json +- customService3: template-1-1.json customService1: -- name: vdlm-rtchandler-SQSRtcTeleXIn -- className: com.bmw.cc.ts.rtchandler.bm.message -- methodName: handleMessage -- returnType: void +- name: "VDLM_rtchandler - ifs-010 (SQS) RtcTeleXIn/Out - IN/OUT" +- className1: com.bmw.cc.ts.rtchandler.bm.message.MessageServiceRTCBF +- methodName1: processMessage +- returnType1: void +- className2: com.bmw.cc.ts.rtchandler.integration.tsmb.boundary.TeleXSqsESI +- methodName2: sendMessage +- returnType2: void - skipDeployment: "false" customService2: -- name: vdlm-rtchandler-SQSNgtpRtcHandlerIn -- className: com.bmw.cc.ts.rtchandler.integration.ngtp.v1.boundary -- methodName: sendMessage +- name: "VDLM_rtchandler - ifs-008 (SQS) NgtpRtcHandlerIn/Out - IN/OUT" +- className1: com.bmw.cc.ts.rtchandler.api.ngtp.v1.boundary.NgtpSqsListener +- 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" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-2.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-2.json new file mode 100644 index 00000000..5ac80247 --- /dev/null +++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-2.json @@ -0,0 +1,35 @@ +{ + "enabled": true, + "name": "{{.name}}", + "processGroups": [], + "queueEntryPoint": false, + "queueEntryPointType": null, + "rules": [ + { + "annotations": [], + "className": "{{.className}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": [], + "methodName": "{{.methodName1}}", + "returnType": "{{.returnType1}}" + }, + { + "annotations": [], + "className": "{{.className}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": [], + "methodName": "{{.methodName2}}", + "returnType": "{{.returnType}}" + } + ] + } + ] +} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1.json new file mode 100644 index 00000000..82141811 --- /dev/null +++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1.json @@ -0,0 +1,35 @@ +{ + "enabled": true, + "name": "{{.name}}", + "processGroups": [], + "queueEntryPoint": false, + "queueEntryPointType": null, + "rules": [ + { + "annotations": [], + "className": "{{.className1}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": [], + "methodName": "{{.methodName1}}", + "returnType": "{{.returnType1}}" + }, + { + "annotations": [], + "className": "{{.className2}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": [], + "methodName": "{{.methodName2}}", + "returnType": "{{.returnType2}}" + } + ] + } + ] +} \ No newline at end of file From bc0d5ec94c382acbcce213e57a1f0e85e448daf4 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Fri, 29 Apr 2022 11:44:35 +0200 Subject: [PATCH 2/4] added conditional-naming-service --- .../conditional-naming-service/conditional-naming-service.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_VDLM_rtchandler/conditional-naming-service/conditional-naming-service.yaml index fb9502e8..467ab9b8 100644 --- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/conditional-naming-service/conditional-naming-service.yaml +++ b/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:KubernetesNamespace}" - skipDeployment: "true" +- tag: "vdlm" \ No newline at end of file From 67ab9c66b05837d079e98346ffcc809ea6a11cf0 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Fri, 29 Apr 2022 12:04:30 +0200 Subject: [PATCH 3/4] fix template json --- .../custom-service-java/template-1-2.json | 64 ++++++++++--------- .../custom-service-java/template-2-1.json | 64 ++++++++++--------- 2 files changed, 66 insertions(+), 62 deletions(-) diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-2.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-2.json index 5ac80247..201866ee 100644 --- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-2.json +++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-2.json @@ -1,35 +1,37 @@ { - "enabled": true, - "name": "{{.name}}", - "processGroups": [], - "queueEntryPoint": false, - "queueEntryPointType": null, - "rules": [ - { - "annotations": [], - "className": "{{.className}}", - "enabled": true, - "fileName": "", - "matcher": "EQUALS", - "methodRules": [ + "enabled": true, + "name": "{{.name}}", + "processGroups": [], + "queueEntryPoint": false, + "queueEntryPointType": null, + "rules": [ { - "argumentTypes": [], - "methodName": "{{.methodName1}}", - "returnType": "{{.returnType1}}" - }, - { - "annotations": [], - "className": "{{.className}}", - "enabled": true, - "fileName": "", - "matcher": "EQUALS", - "methodRules": [ - { - "argumentTypes": [], - "methodName": "{{.methodName2}}", - "returnType": "{{.returnType}}" + "annotations": [], + "className": "{{.className}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": [], + "methodName": "{{.methodName1}}", + "returnType": "{{.returnType1}}" + }, + { + "annotations": [], + "className": "{{.className}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": [], + "methodName": "{{.methodName2}}", + "returnType": "{{.returnType}}" + } + ] + } + ] } - ] - } - ] + ] } \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1.json index 82141811..0658d43e 100644 --- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1.json +++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1.json @@ -1,35 +1,37 @@ { - "enabled": true, - "name": "{{.name}}", - "processGroups": [], - "queueEntryPoint": false, - "queueEntryPointType": null, - "rules": [ - { - "annotations": [], - "className": "{{.className1}}", - "enabled": true, - "fileName": "", - "matcher": "EQUALS", - "methodRules": [ + "enabled": true, + "name": "{{.name}}", + "processGroups": [], + "queueEntryPoint": false, + "queueEntryPointType": null, + "rules": [ { - "argumentTypes": [], - "methodName": "{{.methodName1}}", - "returnType": "{{.returnType1}}" - }, - { - "annotations": [], - "className": "{{.className2}}", - "enabled": true, - "fileName": "", - "matcher": "EQUALS", - "methodRules": [ - { - "argumentTypes": [], - "methodName": "{{.methodName2}}", - "returnType": "{{.returnType2}}" + "annotations": [], + "className": "{{.className1}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": [], + "methodName": "{{.methodName1}}", + "returnType": "{{.returnType1}}" + }, + { + "annotations": [], + "className": "{{.className2}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": [], + "methodName": "{{.methodName2}}", + "returnType": "{{.returnType2}}" + } + ] + } + ] } - ] - } - ] + ] } \ No newline at end of file From 72cb341a77fc1ff7007a3b1feec25560fea87427 Mon Sep 17 00:00:00 2001 From: "SLW\\ARNAUA" Date: Mon, 2 May 2022 13:47:48 +0200 Subject: [PATCH 4/4] Fixed templates and deployed. --- .../custom-service-java/template-1-2.json | 37 ------------------- .../custom-service-java/template-2-1.json | 25 ++++++------- 2 files changed, 12 insertions(+), 50 deletions(-) delete mode 100644 BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-2.json diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-2.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-2.json deleted file mode 100644 index 201866ee..00000000 --- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-2.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "enabled": true, - "name": "{{.name}}", - "processGroups": [], - "queueEntryPoint": false, - "queueEntryPointType": null, - "rules": [ - { - "annotations": [], - "className": "{{.className}}", - "enabled": true, - "fileName": "", - "matcher": "EQUALS", - "methodRules": [ - { - "argumentTypes": [], - "methodName": "{{.methodName1}}", - "returnType": "{{.returnType1}}" - }, - { - "annotations": [], - "className": "{{.className}}", - "enabled": true, - "fileName": "", - "matcher": "EQUALS", - "methodRules": [ - { - "argumentTypes": [], - "methodName": "{{.methodName2}}", - "returnType": "{{.returnType}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1.json index 0658d43e..9c3c9300 100644 --- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1.json +++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1.json @@ -16,20 +16,19 @@ "argumentTypes": [], "methodName": "{{.methodName1}}", "returnType": "{{.returnType1}}" - }, + }] + }, + { + "annotations": [], + "className": "{{.className2}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ { - "annotations": [], - "className": "{{.className2}}", - "enabled": true, - "fileName": "", - "matcher": "EQUALS", - "methodRules": [ - { - "argumentTypes": [], - "methodName": "{{.methodName2}}", - "returnType": "{{.returnType2}}" - } - ] + "argumentTypes": [], + "methodName": "{{.methodName2}}", + "returnType": "{{.returnType2}}" } ] }