Pull request #185: VDLM/rtchandler poc

Merge in OPAPM/cd_e2e_monitoring_config from VDLM/rtchandler-poc to master

* commit '9e357956df5ad04147eb1b10b096b78b68c7c376':
  added additional custom services
  - management-zone/default.json with surpress noise services - takeover fixed custom-service-java/template-2-1.json

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"
+- 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"

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}}"
+        }
+      ]
+    }
+  ]
+}

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}}))"
+    }
+  ]
 }