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" 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..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,5 +3,6 @@ config: CDnewComponentTag: - name: MyProcessNamingRule -- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}" -- skipDeployment: "true" +- nameFormat: "{ProcessGroup:Kubernetes:app-name} - {Service:DetectedName} - {ProcessGroup:Kubernetes:environment}" +- skipDeployment: "false" +- tag: "vdlm" 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..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,17 +1,55 @@ config: -- customService1: template-1-1.json -- customService2: 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-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" + +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" + +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 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-1.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1b.json similarity index 93% 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-1b.json index b3003515..1fd760ba 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-1b.json @@ -13,7 +13,7 @@ "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [], + "argumentTypes": [ ], "methodName": "{{.methodName}}", "returnType": "{{.returnType}}" } 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-1d.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1d.json new file mode 100644 index 00000000..c817d637 --- /dev/null +++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1d.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.api.diag.v2.entity.RTCTriggerRequest" + ], + "methodName": "{{.methodName}}", + "returnType": "{{.returnType}}" + } + ] + } + ] +} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1a.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1a.json new file mode 100644 index 00000000..62c8d7a4 --- /dev/null +++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1a.json @@ -0,0 +1,44 @@ +{ + "enabled": true, + "name": "{{.name}}", + "processGroups": [], + "queueEntryPoint": false, + "queueEntryPointType": null, + "rules": [ + { + "annotations": [], + "className": "{{.className1}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": [ + "java.lang.String", + "java.util.Map", + "com.bmw.cc.ts.rtchandler.bm.common.util.RequestContext" + ], + "methodName": "{{.methodName1}}", + "returnType": "{{.returnType1}}" + }] + }, + { + "annotations": [], + "className": "{{.className2}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": [ + "java.lang.String", + "java.util.Map", + "com.bmw.cc.ts.rtchandler.bm.common.util.RequestContext" + ], + "methodName": "{{.methodName2}}", + "returnType": "{{.returnType2}}" + } + ] + } + ] +} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1b.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1b.json new file mode 100644 index 00000000..f6873db3 --- /dev/null +++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1b.json @@ -0,0 +1,43 @@ +{ + "enabled": true, + "name": "{{.name}}", + "processGroups": [], + "queueEntryPoint": false, + "queueEntryPointType": null, + "rules": [ + { + "annotations": [], + "className": "{{.className1}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": [ + "com.bmw.cd.logging.CdllLoggingContext", + "software.amazon.awssdk.services.sqs.model.Message" + ], + "methodName": "{{.methodName1}}", + "returnType": "{{.returnType1}}" + }] + }, + { + "annotations": [], + "className": "{{.className2}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": [ + "java.lang.String", + "java.lang.String", + "com.bmw.cc.ts.rtchandler.bm.diag.entity.RTCTriggerType" + ], + "methodName": "{{.methodName2}}", + "returnType": "{{.returnType2}}" + } + ] + } + ] +} \ No newline at end of file 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 33677a8f..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,8 +1,8 @@ { - "dimensionalRules": [], - "name": "{{.name}}", - "rules": [ - { + "dimensionalRules": [], + "name": "{{.name}}", + "rules": [ + { "type": "SERVICE", "enabled": true, "propagationTypes": [], @@ -35,7 +35,7 @@ "negate": true, "caseSensitive": true } - }, + }, { "key": { "attribute": "SERVICE_NAME", @@ -48,8 +48,8 @@ "negate": true, "caseSensitive": true } - }, - { + }, + { "key": { "attribute": "SERVICE_NAME", "type": "STATIC" @@ -111,10 +111,10 @@ ] } ], - "entitySelectorBasedRules": [ + "entitySelectorBasedRules": [ { "enabled": true, "entitySelector": "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(compass-id:{{.compassIDs}}))" } - ] + ] } \ No newline at end of file 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..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: \"compass-id:rtchandler\" +- compassIDs: rtchandler 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..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 @@ -2,8 +2,8 @@ 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 -- skipDeployment: "true" \ No newline at end of file +- skipDeployment: "false" \ No newline at end of file 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..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 @@ -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 +- skipDeployment: "false" \ No newline at end of file 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 } ], 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