From 908a30c7379deca876deacb96a7afd4fa8590418 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Tue, 3 May 2022 07:58:32 +0200 Subject: [PATCH 1/2] - 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 2/2] 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