From dc66c3fad75f6fb43084b2c6180ed9164ff8bb79 Mon Sep 17 00:00:00 2001 From: Andre Conceicao Date: Wed, 13 Apr 2022 16:14:37 +0100 Subject: [PATCH 01/20] CCIS News Next US SLOs. --- .../slo/{slo.yaml => nn.yaml} | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) rename BMW-Dynatrace-config/CD_CustomerCentricInformationServices/slo/{slo.yaml => nn.yaml} (51%) diff --git a/BMW-Dynatrace-config/CD_CustomerCentricInformationServices/slo/slo.yaml b/BMW-Dynatrace-config/CD_CustomerCentricInformationServices/slo/nn.yaml similarity index 51% rename from BMW-Dynatrace-config/CD_CustomerCentricInformationServices/slo/slo.yaml rename to BMW-Dynatrace-config/CD_CustomerCentricInformationServices/slo/nn.yaml index 8635f1a4..ac9875eb 100644 --- a/BMW-Dynatrace-config/CD_CustomerCentricInformationServices/slo/slo.yaml +++ b/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" From 7027dcdd78e09bde2a22d81ad5bb91bad2ad17b6 Mon Sep 17 00:00:00 2001 From: "Holomek Christopher; BMW Group" Date: Mon, 25 Apr 2022 17:12:39 +0200 Subject: [PATCH 02/20] fix bug in dashboard --- .../CD_comfy/dashboard/CDcomfyCampaignMonitoring.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BMW-Dynatrace-config/CD_comfy/dashboard/CDcomfyCampaignMonitoring.json b/BMW-Dynatrace-config/CD_comfy/dashboard/CDcomfyCampaignMonitoring.json index 0e24e4dc..67c7bcbb 100644 --- a/BMW-Dynatrace-config/CD_comfy/dashboard/CDcomfyCampaignMonitoring.json +++ b/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 } ], From 8d080f347e20fba26d1a52d3c6eb782753efa356 Mon Sep 17 00:00:00 2001 From: Muminovic Mersa Date: Tue, 26 Apr 2022 16:37:43 +0200 Subject: [PATCH 03/20] Added custom service for VDLM ts-asc and new process group --- .../custom-service-java/custom-service-java.yaml | 6 +++--- 1 file changed, 3 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 25f8a028..696f1a1e 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,8 +2,8 @@ config: - customService1: template-1-1.json customService1: -- name: myJOYNRService -- className: com.bmw.cc.conn.this.is.just.an.exampleClasss -- methodName: exampleJoynrMethod +- name: vdlm-ts-asc-ifs-001-SQSAscIn +- className: com.bmw.cc.asc.bm.boundary.TeleXBF +- methodName: handleTeleXMessage - returnType: void - skipDeployment: "true" \ No newline at end of file From 0076655a61f606f2d6c5186dc286797004cbca77 Mon Sep 17 00:00:00 2001 From: Muminovic Mersa Date: Tue, 26 Apr 2022 16:32:30 +0200 Subject: [PATCH 04/20] Changed custom service name and added process group --- .../custom-service-java/custom-service-java.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 68542af6..cdf6669c 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 @@ -2,7 +2,7 @@ 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 From 3b151d9b39e6ff3c5c43a9b6166a5a35205af566 Mon Sep 17 00:00:00 2001 From: Muminovic Mersa Date: Thu, 28 Apr 2022 11:51:27 +0200 Subject: [PATCH 05/20] Changed custom service vdlm ts-asc --- .../CD_VDLM_ts-asc/custom-service-java/custom-service-java.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 696f1a1e..86670370 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 @@ -6,4 +6,4 @@ customService1: - className: com.bmw.cc.asc.bm.boundary.TeleXBF - methodName: handleTeleXMessage - returnType: void -- skipDeployment: "true" \ No newline at end of file +- skipDeployment: "false" \ No newline at end of file From 3e59589e84644dc8b761f6cb167d288812848afe Mon Sep 17 00:00:00 2001 From: Muminovic Mersa Date: Thu, 28 Apr 2022 11:53:38 +0200 Subject: [PATCH 06/20] Changed custom service vdlm-scallservice --- .../custom-service-java/custom-service-java.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 cdf6669c..48fb3f76 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 @@ -6,4 +6,4 @@ customService1: - className: com.bmw.cc.ts.scallservice.api.maintenancestatus.v1.boundary.MaintenanceStatusApiBF - methodName: processRequestMaintenanceStatus - returnType: void -- skipDeployment: "true" \ No newline at end of file +- skipDeployment: "false" \ No newline at end of file From e9a9dea5e7bdc6419eb9d4a261d7ed66502fd135 Mon Sep 17 00:00:00 2001 From: "SLW\\ARNAUA" Date: Thu, 28 Apr 2022 12:22:52 +0200 Subject: [PATCH 07/20] CN env. url change. --- environment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yaml b/environment.yaml index f4440ef8..c75174c9 100644 --- a/environment.yaml +++ b/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" \ No newline at end of file From 95a79185f1d41ab6d85d60090f3c20d581450180 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Fri, 29 Apr 2022 11:26:48 +0200 Subject: [PATCH 08/20] 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 09/20] 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 10/20] 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 11/20] 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}}" } ] } From 908a30c7379deca876deacb96a7afd4fa8590418 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Tue, 3 May 2022 07:58:32 +0200 Subject: [PATCH 12/20] - management-zone/default.json with surpress noise services - takeover fixed custom-service-java/template-2-1.json --- .../custom-service-java/template-2-1.json | 25 ++-- .../management-zone/default.json | 131 +++++++++++++++--- 2 files changed, 126 insertions(+), 30 deletions(-) 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}}" } ] } diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/management-zone/default.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/management-zone/default.json index fc96de39..9cbec622 100644 --- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/management-zone/default.json +++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/management-zone/default.json @@ -1,23 +1,120 @@ { - "dimensionalRules": [], - "name": "{{.name}}", - "entitySelectorBasedRules": [ + "dimensionalRules": [], + "name": "{{.name}}", + "rules": [ { - "enabled": true, - "entitySelector": "type(Service),tag({{.compassIDs}})" + "type": "SERVICE", + "enabled": true, + "propagationTypes": [], + "conditions": [ + { + "key": { + "attribute": "SERVICE_TAGS", + "type": "STATIC" + }, + "comparisonInfo": { + "type": "TAG", + "operator": "EQUALS", + "value": { + "context": "CONTEXTLESS", + "key": "compass-id", + "value": "{{.compassIDs}}" + }, + "negate": false + } + }, + { + "key": { + "attribute": "SERVICE_NAME", + "type": "STATIC" + }, + "comparisonInfo": { + "type": "STRING", + "operator": "CONTAINS", + "value": "PingResource", + "negate": true, + "caseSensitive": true + } + }, + { + "key": { + "attribute": "SERVICE_NAME", + "type": "STATIC" + }, + "comparisonInfo": { + "type": "STRING", + "operator": "CONTAINS", + "value": "HealthResource", + "negate": true, + "caseSensitive": true + } + }, + { + "key": { + "attribute": "SERVICE_NAME", + "type": "STATIC" + }, + "comparisonInfo": { + "type": "STRING", + "operator": "CONTAINS", + "value": "PrometheusResource", + "negate": true, + "caseSensitive": true + } + } + ] }, + { + "type": "PROCESS_GROUP", + "enabled": true, + "propagationTypes": [], + "conditions": [ + { + "key": { + "attribute": "PROCESS_GROUP_TAGS", + "type": "STATIC" + }, + "comparisonInfo": { + "type": "TAG", + "operator": "EQUALS", + "value": { + "context": "CONTEXTLESS", + "key": "compass-id", + "value": "{{.compassIDs}}" + }, + "negate": false + } + } + ] + }, + { + "type": "HOST", + "enabled": true, + "propagationTypes": [], + "conditions": [ + { + "key": { + "attribute": "HOST_TAGS", + "type": "STATIC" + }, + "comparisonInfo": { + "type": "TAG", + "operator": "EQUALS", + "value": { + "context": "CONTEXTLESS", + "key": "compass-id", + "value": "{{.compassIDs}}" + }, + "negate": false + } + } + ] + } + ], + "entitySelectorBasedRules": [ { "enabled": true, - "entitySelector": "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag({{.compassIDs}}))" - }, - { - "enabled": true, - "entitySelector": "type(PROCESS_GROUP_INSTANCE),tag({{.compassIDs}})" - }, - { - "enabled": true, - "entitySelector": "type(HOST),tag({{.compassIDs}})" - } - ], - "rules": [] + "entitySelector": "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(compass-id:{{.compassIDs}}))" + } + ] } \ No newline at end of file From 9e357956df5ad04147eb1b10b096b78b68c7c376 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Tue, 3 May 2022 08:15:03 +0200 Subject: [PATCH 13/20] added additional custom services --- .../custom-service-java.yaml | 18 +++++++++- .../custom-service-java/template-1-2.json | 36 +++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) create 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/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/custom-service-java.yaml index 41bc7dec..818a93f6 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 @@ -2,6 +2,8 @@ config: - customService1: template-2-1.json - customService2: template-2-1.json - customService3: template-1-1.json +- customService4: template-1-1.json +- customService5: template-1-1.json customService1: - name: "VDLM_rtchandler - ifs-010 (SQS) RtcTeleXIn/Out - IN/OUT" @@ -28,4 +30,18 @@ customService3: - className: com.bmw.cc.ts.rtchandler.bm.common.control.classificationrequest.ClassificationRequestQueueSender - methodName: sendClassificationRequestMessage - returnType: void -- skipDeployment: "false" \ No newline at end of file +- 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" \ 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..b45f6b11 --- /dev/null +++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-2.json @@ -0,0 +1,36 @@ +{ + "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": "{{.returnType2}}" + } + ] + } + ] +} \ No newline at end of file From ee992b28d76e3e074b90e4c03eca41b4ec85e221 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Tue, 3 May 2022 10:45:21 +0200 Subject: [PATCH 14/20] skipDeployment=false --- .../conditional-naming-service/conditional-naming-service.yaml | 2 +- 1 file changed, 1 insertion(+), 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 467ab9b8..72c7ef15 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 @@ -4,5 +4,5 @@ config: CDnewComponentTag: - name: MyProcessNamingRule - nameFormat: "{ProcessGroup:Kubernetes:app-name} - {Service:DetectedName} - {ProcessGroup:KubernetesNamespace}" -- skipDeployment: "true" +- skipDeployment: "false" - tag: "vdlm" \ No newline at end of file From c105dbb794657eaae651a9ae5635e283151a3933 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Tue, 3 May 2022 16:00:24 +0200 Subject: [PATCH 15/20] fix management-zone compassid --- .../CD_VDLM_rtchandler/management-zone/management-zone.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/management-zone/management-zone.yaml b/BMW-Dynatrace-config/CD_VDLM_rtchandler/management-zone/management-zone.yaml index 05239101..ac9adeb0 100644 --- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/management-zone/management-zone.yaml +++ b/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\" From 34553bbb60704ebf6860cf4790cbf2a66689713c Mon Sep 17 00:00:00 2001 From: "Bernd Brandl (DE-722)" Date: Wed, 4 May 2022 14:55:20 +0200 Subject: [PATCH 16/20] [TR] fix management-zone --- .../CD_VDLM_rtchandler/management-zone/management-zone.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/management-zone/management-zone.yaml b/BMW-Dynatrace-config/CD_VDLM_rtchandler/management-zone/management-zone.yaml index ac9adeb0..c822a1a7 100644 --- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/management-zone/management-zone.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/management-zone/management-zone.yaml @@ -3,4 +3,4 @@ config: CDnewComponentTag: - name: CD_VDLM_rtchandler -- compassIDs: \"rtchandler\" +- compassIDs: rtchandler From c6ad84df2f82f52b1495243ea3748bae2972ce3e Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Thu, 5 May 2022 09:17:49 +0200 Subject: [PATCH 17/20] test with REST custom service... custom vs. auto detected.... --- .../custom-service-java/custom-service-java.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) 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 818a93f6..763e84a5 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.json - customService5: template-1-1.json +- customService6: template-1-1.json customService1: - name: "VDLM_rtchandler - ifs-010 (SQS) RtcTeleXIn/Out - IN/OUT" @@ -44,4 +45,11 @@ customService5: - 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" \ No newline at end of file From 4fd3e6315df477d5180e361775fc6ad3a9c8b62d Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Fri, 6 May 2022 14:21:19 +0200 Subject: [PATCH 18/20] fix custom-service-java templates --- .../custom-service-java.yaml | 30 +++++++++---------- .../custom-service-java/template-1-1.json | 5 +++- .../custom-service-java/template-1-2.json | 10 +++++-- .../custom-service-java/template-2-1.json | 10 +++++-- 4 files changed, 35 insertions(+), 20 deletions(-) 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 763e84a5..7416139d 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 @@ -34,22 +34,22 @@ customService3: - skipDeployment: "false" customService4: - - name: "VDLM_rtchandler - (Timer) timeout" - - className: com.bmw.cc.ts.rtchandler.bm.common.timer.CallTimeoutTimerService - - methodName: handleTimer - - returnType: void - - skipDeployment: "false" +- 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" +- 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" \ No newline at end of file +- 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" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1.json index b3003515..055ec8eb 100644 --- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1.json +++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1.json @@ -13,7 +13,10 @@ "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [], + "argumentTypes": [ + "java.lang.String", + "java.util.Map" + ], "methodName": "{{.methodName}}", "returnType": "{{.returnType}}" } 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 b45f6b11..3e2277c3 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 @@ -13,7 +13,10 @@ "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [], + "argumentTypes": [ + "java.lang.String", + "java.util.Map" + ], "methodName": "{{.methodName1}}", "returnType": "{{.returnType1}}" }] @@ -26,7 +29,10 @@ "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [], + "argumentTypes": [ + "java.lang.String", + "java.util.Map" + ], "methodName": "{{.methodName2}}", "returnType": "{{.returnType2}}" } 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 9c3c9300..8adf3cee 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 @@ -13,7 +13,10 @@ "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [], + "argumentTypes": [ + "java.lang.String", + "java.util.Map" + ], "methodName": "{{.methodName1}}", "returnType": "{{.returnType1}}" }] @@ -26,7 +29,10 @@ "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [], + "argumentTypes": [ + "java.lang.String", + "java.util.Map" + ], "methodName": "{{.methodName2}}", "returnType": "{{.returnType2}}" } From adaa50347a3408fbb274d360611148966532f527 Mon Sep 17 00:00:00 2001 From: "Bernd Brandl (DE-722)" Date: Mon, 9 May 2022 08:38:35 +0200 Subject: [PATCH 19/20] conditional-naming-service.yaml online editiert mit Bitbucket --- .../conditional-naming-service.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 72c7ef15..dda050cf 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,6 +3,6 @@ config: CDnewComponentTag: - name: MyProcessNamingRule -- nameFormat: "{ProcessGroup:Kubernetes:app-name} - {Service:DetectedName} - {ProcessGroup:KubernetesNamespace}" +- nameFormat: "{ProcessGroup:Kubernetes:app-name} - {Service:DetectedName} - {ProcessGroup:Kubernetes:environment}" - skipDeployment: "false" -- tag: "vdlm" \ No newline at end of file +- tag: "vdlm" From 4f2eb57c10ccd72f49d38f3e9b1341d701b1c04c Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Mon, 9 May 2022 10:14:42 +0200 Subject: [PATCH 20/20] added rtchandler argumenttypes --- .../custom-service-java.yaml | 12 ++++----- .../custom-service-java/template-1-1a.json | 25 +++++++++++++++++++ .../custom-service-java/template-1-1b.json | 23 +++++++++++++++++ .../custom-service-java/template-1-1c.json | 23 +++++++++++++++++ .../{template-1-1.json => template-1-1d.json} | 3 +-- .../{template-1-2.json => template-2-1a.json} | 10 +++++--- .../{template-2-1.json => template-2-1b.json} | 7 +++--- 7 files changed, 88 insertions(+), 15 deletions(-) create mode 100644 BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1a.json create mode 100644 BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1b.json create mode 100644 BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1c.json rename BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/{template-1-1.json => template-1-1d.json} (85%) rename BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/{template-1-2.json => template-2-1a.json} (74%) rename BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/{template-2-1.json => template-2-1b.json} (82%) 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 7416139d..57576014 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,10 +1,10 @@ config: -- customService1: template-2-1.json -- customService2: template-2-1.json -- customService3: template-1-1.json -- customService4: template-1-1.json -- customService5: template-1-1.json -- customService6: template-1-1.json +- customService1: template-2-1a.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 - ifs-010 (SQS) RtcTeleXIn/Out - IN/OUT" diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1a.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1a.json new file mode 100644 index 00000000..fb870862 --- /dev/null +++ b/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}}" + } + ] + } + ] +} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1b.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1b.json new file mode 100644 index 00000000..1fd760ba --- /dev/null +++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1b.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}}" + } + ] + } + ] +} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1c.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1c.json new file mode 100644 index 00000000..1fd760ba --- /dev/null +++ b/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}}" + } + ] + } + ] +} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1d.json similarity index 85% rename from BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1.json rename to BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1d.json index 055ec8eb..c817d637 100644 --- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1.json +++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1d.json @@ -14,8 +14,7 @@ "methodRules": [ { "argumentTypes": [ - "java.lang.String", - "java.util.Map" + "com.bmw.cc.ts.rtchandler.api.diag.v2.entity.RTCTriggerRequest" ], "methodName": "{{.methodName}}", "returnType": "{{.returnType}}" 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-2-1a.json similarity index 74% rename from BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-2.json rename to BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1a.json index 3e2277c3..62c8d7a4 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-2-1a.json @@ -7,7 +7,7 @@ "rules": [ { "annotations": [], - "className": "{{.className}}", + "className": "{{.className1}}", "enabled": true, "fileName": "", "matcher": "EQUALS", @@ -15,7 +15,8 @@ { "argumentTypes": [ "java.lang.String", - "java.util.Map" + "java.util.Map", + "com.bmw.cc.ts.rtchandler.bm.common.util.RequestContext" ], "methodName": "{{.methodName1}}", "returnType": "{{.returnType1}}" @@ -23,7 +24,7 @@ }, { "annotations": [], - "className": "{{.className}}", + "className": "{{.className2}}", "enabled": true, "fileName": "", "matcher": "EQUALS", @@ -31,7 +32,8 @@ { "argumentTypes": [ "java.lang.String", - "java.util.Map" + "java.util.Map", + "com.bmw.cc.ts.rtchandler.bm.common.util.RequestContext" ], "methodName": "{{.methodName2}}", "returnType": "{{.returnType2}}" 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-1b.json similarity index 82% rename from BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1.json rename to BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1b.json index 8adf3cee..f6873db3 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-1b.json @@ -14,8 +14,8 @@ "methodRules": [ { "argumentTypes": [ - "java.lang.String", - "java.util.Map" + "com.bmw.cd.logging.CdllLoggingContext", + "software.amazon.awssdk.services.sqs.model.Message" ], "methodName": "{{.methodName1}}", "returnType": "{{.returnType1}}" @@ -31,7 +31,8 @@ { "argumentTypes": [ "java.lang.String", - "java.util.Map" + "java.lang.String", + "com.bmw.cc.ts.rtchandler.bm.diag.entity.RTCTriggerType" ], "methodName": "{{.methodName2}}", "returnType": "{{.returnType2}}"