From 278fbe4735983b629d4c6639938bc25d31b90f4f Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Fri, 17 Jun 2022 07:57:57 +0200 Subject: [PATCH 1/9] fix template-1-1.json --- .../custom-service-java.yaml | 32 +++++++-------- .../custom-service-java/template-1-1.json | 40 +++++++++---------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/BMW-Dynatrace-config/CD_VDLM_tsdd/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_tsdd/custom-service-java/custom-service-java.yaml index 194ddb38..07c2986b 100644 --- a/BMW-Dynatrace-config/CD_VDLM_tsdd/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_tsdd/custom-service-java/custom-service-java.yaml @@ -6,29 +6,29 @@ config: customService1: - name: "ifs-006 (SQS) TsddCallTopic - IN" -- className1: com.bmw.cc.ts.datadispatch.integration.aws.CallTopicSqsListener -- methodName1: processMessage -- methodArgs1: com.bmw.cd.logging.CdllLoggingContext,software.amazon.awssdk.services.sqs.model.Message -- returnType1: void +- className: com.bmw.cc.ts.datadispatch.integration.aws.CallTopicSqsListener +- methodName: processMessage +- methodArgs: com.bmw.cd.logging.CdllLoggingContext,software.amazon.awssdk.services.sqs.model.Message +- returnType: void customService2: - name: "ifs-005 (SQS) EVNS2EventQueue - OUT" -- className1: com.bmw.cc.ts.datadispatch.integration.evns2.boundary.Evns2ESI -- methodName1: send -- methodArgs1: java.lang.String -- returnType1: void +- className: com.bmw.cc.ts.datadispatch.integration.evns2.boundary.Evns2ESI +- methodName: send +- methodArgs: java.lang.String +- returnType: void customService3: - name: "ifs-003 (SQS) FbmQueue - OUT" -- className1: com.bmw.cc.ts.datadispatch.integration.fbm.boundary.FbmESI -- methodName1: send -- methodArgs1: com.bmw.fbm.SendKeyDataFBM -- returnType1: void +- className: com.bmw.cc.ts.datadispatch.integration.fbm.boundary.FbmESI +- methodName: send +- methodArgs: com.bmw.fbm.SendKeyDataFBM +- returnType: void customService4: - name: "ifs (Kinesis) vhs_ts_diagnostic_kinesis_stream - OUT" -- className1: com.bmw.cc.ts.datadispatch.integration.vhs.boundary.VhsClientESI -- methodName1: dispatch -- methodArgs1: com.bmw.cc.ts.datadispatch.bm.data.VhsPushData -- returnType1: void +- className: com.bmw.cc.ts.datadispatch.integration.vhs.boundary.VhsClientESI +- methodName: dispatch +- methodArgs: com.bmw.cc.ts.datadispatch.bm.data.VhsPushData +- returnType: void diff --git a/BMW-Dynatrace-config/CD_VDLM_tsdd/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_tsdd/custom-service-java/template-1-1.json index 8823cd24..ebe95097 100644 --- a/BMW-Dynatrace-config/CD_VDLM_tsdd/custom-service-java/template-1-1.json +++ b/BMW-Dynatrace-config/CD_VDLM_tsdd/custom-service-java/template-1-1.json @@ -1,23 +1,23 @@ { - "enabled": true, - "name": "{{.name}}", - "processGroups": [], - "queueEntryPoint": false, - "queueEntryPointType": null, - "rules": [ + "enabled": true, + "name": "{{.name}}", + "processGroups": [], + "queueEntryPoint": false, + "queueEntryPointType": null, + "rules": [ + { + "annotations": [], + "className": "{{.className}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ { - "annotations": [], - "className": "{{.className1}}", - "enabled": true, - "fileName": "", - "matcher": "EQUALS", - "methodRules": [ - { - "argumentTypes": ["{{.methodArgs1}}"], - "methodName": "{{.methodName1}}", - "returnType": "{{.returnType1}}" - } - ] + "argumentTypes": ["{{.methodArgs}}"], + "methodName": "{{.methodName}}", + "returnType": "{{.returnType}}" } - ] -} + ] + } + ] +} \ No newline at end of file From df57e5e4f15934becf50f4e628247a7081c095f9 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Fri, 17 Jun 2022 12:57:32 +0200 Subject: [PATCH 2/9] added ts-asc (SQS) CallTopic - OUT --- .../custom-service-java/custom-service-java.yaml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/custom-service-java.yaml index c7e31b68..a3d71c73 100644 --- a/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/custom-service-java.yaml @@ -2,9 +2,10 @@ config: - customService1: template-2-2-without-methodargs.json - customService2: template-2-1.json - customService3: template-1-1.json +- customService4: template-1-1.json customService1: -- name: (Timer) deletion/timeout +- name: "(Timer) deletion/timeout" - className1: com.bmw.cc.asc.bm.boundary.TimerBF - methodName1: executeDeletionJob - returnType1: void @@ -14,7 +15,7 @@ customService1: - skipDeployment: "false" customService2: -- name: ifs-001 (SQS) AscIn/Out - IN/OUT +- name: "ifs-001 (SQS) AscIn/Out - IN/OUT" - className1: com.bmw.cc.asc.integration.sqs.boundary.TeleXSqsListener - methodName1: onSqsMessage - returnType1: void @@ -26,9 +27,17 @@ customService2: - skipDeployment: "false" customService3: -- name: (MQS) CallTopic - OUT +- name: "(MQS) CallTopic - OUT" - className: com.bmw.cc.asc.integration.jms.boundry.CallTopicJmsESI - methodName: send - returnType: void - methodArgs: java.lang.String,com.bmw.cc.tscs.enums.CallState,com.bmw.cc.asc.bm.entity.Call - skipDeployment: "false" + +customService4: +- name: "(SQS) CallTopic - OUT" +- className: com.bmw.cc.asc.integration.sns.CallTopicSnsESI +- methodName: send +- returnType: void +- methodArgs: java.lang.String,com.bmw.cc.tscs.enums.CallState,com.bmw.cc.asc.bm.entity.Call +- skipDeployment: "false" From 824111303d2a0dff8c6566c75615da85b9d086f5 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Fri, 17 Jun 2022 13:04:50 +0200 Subject: [PATCH 3/9] added scallservice (SQS) CallTopic - OUT --- .../custom-service-java/custom-service-java.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml index 2c090151..debb3da5 100644 --- a/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml @@ -1,6 +1,7 @@ config: - customService1: template-1-2.json - customService2: template-1-1.json +- customService3: template-1-1.json customService1: - name: "ifs-002 (JOYNR) requestMaintenanceStatus/confirmMaintenanceStatus - OUT" @@ -22,3 +23,10 @@ customService2: - returnType: void - skipDeployment: "false" +customService3: +- name: "(SQS) CallTopic - OUT" +- className: com.bmw.cc.ts.scallservice.api.consumer.external.callstorage.CallStorageSnsPublisher +- methodName: createTicket +- returnType: void +- methodArgs: com.bmw.cc.ts.scallservice.api.consumer.entity.CallStorageModel +- skipDeployment: "false" From 18e1709af3210f8d9fc383a43a77758453d42b5d Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Fri, 17 Jun 2022 13:14:56 +0200 Subject: [PATCH 4/9] fix SQS->SNS + rtchandler callstorage --- .../custom-service-java/custom-service-java.yaml | 2 +- .../custom-service-java/custom-service-java.yaml | 11 ++++++++++- .../custom-service-java/custom-service-java.yaml | 2 +- .../custom-service-java/custom-service-java.yaml | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/BMW-Dynatrace-config/CD_VDLM_rsurservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_rsurservice/custom-service-java/custom-service-java.yaml index 633d2678..fd8f7eb9 100644 --- a/BMW-Dynatrace-config/CD_VDLM_rsurservice/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_rsurservice/custom-service-java/custom-service-java.yaml @@ -20,7 +20,7 @@ customService2: - skipDeployment: "false" customService3: -- name: "(SQS) CallTopic - OUT" +- name: "(SNS) CallTopic - OUT" - className: com.bmw.cc.ts.rsurservice.api.consumer.external.callstorage.CallStorageSnsPublisher - methodName: createTicket - methodArgs: com.bmw.cc.ts.rsurservice.api.consumer.entity.CallStorageModel 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 a04c1013..a7cf0623 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 @@ -4,6 +4,7 @@ config: - customService3: template-1-1.json - customService4: template-1-1-without-methodargs.json - customService5: template-1-1-without-methodargs.json +- customService6: template-1-1.json customService1: - name: "ifs-010 (SQS) RtcTeleXIn/Out - IN/OUT" @@ -49,4 +50,12 @@ customService5: - className: com.bmw.cc.ts.rtchandler.bm.common.control.cleanup.DbCleanUpBA - methodName: cleanUp - returnType: void -- skipDeployment: "false" \ No newline at end of file +- skipDeployment: "false" + +customService6: +- name: "(SNS) CallTopic - OUT" +- className: com.bmw.cc.ts.rtchandler.integration.callstorage.CallStorageNotificationESI +- methodName: publishNotification +- returnType: void +- methodArgs: java.lang.String,java.util.Map +- skipDeployment: "false" diff --git a/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml index debb3da5..843f6dc2 100644 --- a/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml @@ -24,7 +24,7 @@ customService2: - skipDeployment: "false" customService3: -- name: "(SQS) CallTopic - OUT" +- name: "(SNS) CallTopic - OUT" - className: com.bmw.cc.ts.scallservice.api.consumer.external.callstorage.CallStorageSnsPublisher - methodName: createTicket - returnType: void diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/custom-service-java.yaml index a3d71c73..d30a6710 100644 --- a/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/custom-service-java.yaml @@ -35,7 +35,7 @@ customService3: - skipDeployment: "false" customService4: -- name: "(SQS) CallTopic - OUT" +- name: "(SNS) CallTopic - OUT" - className: com.bmw.cc.asc.integration.sns.CallTopicSnsESI - methodName: send - returnType: void From 675d76373c439c1e445e6054e78ddc2e344346af Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Fri, 17 Jun 2022 13:15:58 +0200 Subject: [PATCH 5/9] fix SQS->SNS --- .../custom-service-java/custom-service-java.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BMW-Dynatrace-config/CD_VDLM_rtcservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_rtcservice/custom-service-java/custom-service-java.yaml index 61b0cdf0..192a0493 100644 --- a/BMW-Dynatrace-config/CD_VDLM_rtcservice/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_rtcservice/custom-service-java/custom-service-java.yaml @@ -24,7 +24,7 @@ customService2: - skipDeployment: "false" customService3: -- name: "(SQS) CallTopic - OUT" +- name: "(SNS) CallTopic - OUT" - className: com.bmw.cc.ts.rtcservice.api.consumer.external.callstorage.CallStorageSnsPublisher - methodName: createTicket - methodArgs: com.bmw.cc.ts.rtcservice.api.consumer.entity.CallStorageModel From eb9e096acf9ed0629549ea7ad17c577d35a086d7 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Fri, 17 Jun 2022 13:25:42 +0200 Subject: [PATCH 6/9] fix bcallhandler IN JMS ISTA --- .../custom-service-java/custom-service-java.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-bcallhandler/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_ts-bcallhandler/custom-service-java/custom-service-java.yaml index 08439e73..3aa94432 100644 --- a/BMW-Dynatrace-config/CD_VDLM_ts-bcallhandler/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_ts-bcallhandler/custom-service-java/custom-service-java.yaml @@ -17,7 +17,7 @@ customService1: customService2: - name: "ifs-005 (MQS) BCallHandlerIstaIn/Out - IN/OUT" -- className1: com.bmw.cc.tsbcallhandler.integration.jms.boundary.IstaTsNextJmsESI +- className1: com.bmw.cc.tsbcallhandler.integration.jms.boundary.IstaTsNextJmsListenerMF - methodName1: onMessage - returnType1: void - methodArgs1: java.lang.String From 8723c5a0d47c5ae4559d2513b9dc58e24e29e325 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Fri, 17 Jun 2022 13:41:33 +0200 Subject: [PATCH 7/9] fix template-1-1.json tsbgservice and added Kinesis --- .../custom-service-java.yaml | 20 +++++++- .../custom-service-java/template-1-1.json | 51 +++++++------------ .../custom-service-java/template-2-1.json | 36 +++++++++++++ 3 files changed, 74 insertions(+), 33 deletions(-) create mode 100644 BMW-Dynatrace-config/CD_VDLM_tsbgservice/custom-service-java/template-2-1.json diff --git a/BMW-Dynatrace-config/CD_VDLM_tsbgservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_tsbgservice/custom-service-java/custom-service-java.yaml index b9e7ac12..9846060a 100644 --- a/BMW-Dynatrace-config/CD_VDLM_tsbgservice/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_tsbgservice/custom-service-java/custom-service-java.yaml @@ -1,5 +1,7 @@ config: -- customService1: template-1-1.json +- customService1: template-2-1.json +- customService2: template-1-1.json +- customService3: template-1-1.json customService1: - name: "ifs-005 (JOYNR) notify/confirmBatteryStatus - IN/OUT" @@ -11,4 +13,20 @@ customService1: - methodName2: confirmBatteryStatus - methodArgs2: joynr.de.bmw.infotainment.telematic.common.CommonTypes.RequestId,joynr.de.bmw.infotainment.telematic.common.CommonTypes.ResultCode,long,java.lang.String - returnType2: void +- skipDeployment: "false" + +customService2: +- name: "ifs-007 (Kinesis) TsbgKinesisStream - IN" +- className: com.bmw.cc.ts.tsbgservice.api.vehicleshadow.v1.boundary.VehicleShadowRecordProcessorBF +- methodName: processRecords +- methodArgs: software.amazon.kinesis.lifecycle.events.ProcessRecordsInput +- returnType: void +- skipDeployment: "false" + +customService3: +- name: "ifs (Kinesis) BatteryKinesisStream - OUT" +- className: com.bmw.cc.ts.tsbgservice.integration.vehicleshadow.boundary.VehicleShadowKinesisESI +- methodName: sendUpdateToVehicleShadow +- methodArgs: com.bmw.cc.ts.tsbgservice.integration.vehicleshadow.entity.vhs.VehicleShadowUpdateMessage +- returnType: void - skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_tsbgservice/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_tsbgservice/custom-service-java/template-1-1.json index f0077b0c..ebe95097 100644 --- a/BMW-Dynatrace-config/CD_VDLM_tsbgservice/custom-service-java/template-1-1.json +++ b/BMW-Dynatrace-config/CD_VDLM_tsbgservice/custom-service-java/template-1-1.json @@ -1,36 +1,23 @@ { - "enabled": true, - "name": "{{.name}}", - "processGroups": [], - "queueEntryPoint": false, - "queueEntryPointType": null, - "rules": [ + "enabled": true, + "name": "{{.name}}", + "processGroups": [], + "queueEntryPoint": false, + "queueEntryPointType": null, + "rules": [ + { + "annotations": [], + "className": "{{.className}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ { - "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}}" - } - ] + "argumentTypes": ["{{.methodArgs}}"], + "methodName": "{{.methodName}}", + "returnType": "{{.returnType}}" } - ] + ] + } + ] } \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_tsbgservice/custom-service-java/template-2-1.json b/BMW-Dynatrace-config/CD_VDLM_tsbgservice/custom-service-java/template-2-1.json new file mode 100644 index 00000000..f0077b0c --- /dev/null +++ b/BMW-Dynatrace-config/CD_VDLM_tsbgservice/custom-service-java/template-2-1.json @@ -0,0 +1,36 @@ +{ + "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}}" + } + ] + } + ] +} \ No newline at end of file From 881314ae8d9336a11dc3d0c402d5b2d5374a92c9 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Fri, 17 Jun 2022 13:42:34 +0200 Subject: [PATCH 8/9] SQS->SNS --- .../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 2f0ee7b4..79bdb6f6 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 @@ -53,7 +53,7 @@ customService5: - skipDeployment: "false" customService6: -- name: "(SQS) CallTopic - OUT" +- name: "(SNS) CallTopic - OUT" - className: com.bmw.cc.ts.tsrd.integration.aws.calltopic.CallTopicNotificationESI - methodName: publishNotification - methodArgs: com.bmw.cc.ts.tsrd.integration.aws.calltopic.CallStorageCallDO From e89b825a99b6a820cb6bcddaa3b730bb0bde243f Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Fri, 17 Jun 2022 13:51:06 +0200 Subject: [PATCH 9/9] added lambda OUT --- .../custom-service-java/custom-service-java.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-tyredi/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_ts-tyredi/custom-service-java/custom-service-java.yaml index ffb4fc62..fb9c96c2 100644 --- a/BMW-Dynatrace-config/CD_VDLM_ts-tyredi/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_ts-tyredi/custom-service-java/custom-service-java.yaml @@ -1,6 +1,7 @@ config: - customService1: template-1-1.json - customService2: template-1-1.json +- customService3: template-1-1.json customService1: - name: "ifs-003 (SQS) TyrediLambdaIn - IN" @@ -17,3 +18,11 @@ customService2: - methodArgs: software.amazon.kinesis.lifecycle.events.ProcessRecordsInput - returnType: void - skipDeployment: "false" + +customService3: +- name: "(Lambda) TyreData - OUT" +- className: com.bmw.cc.tstyredi.integration.lambda.control.lambda.LambdaESI +- methodName: invokeLambdaFunction +- methodArgs: java.lang.String,java.lang.String,java.lang.String +- returnType: void +- skipDeployment: "false"