From 83ee389e76b52c7a960759ae3993050e69f3b236 Mon Sep 17 00:00:00 2001 From: Marko Pravdic Date: Fri, 10 Jun 2022 11:24:04 +0200 Subject: [PATCH 1/6] CD_AFW: Update APPD and MCID in notifications.yaml. --- BMW-Dynatrace-config/CD_AFW/notification/notification.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BMW-Dynatrace-config/CD_AFW/notification/notification.yaml b/BMW-Dynatrace-config/CD_AFW/notification/notification.yaml index bce03188..39aa4fda 100644 --- a/BMW-Dynatrace-config/CD_AFW/notification/notification.yaml +++ b/BMW-Dynatrace-config/CD_AFW/notification/notification.yaml @@ -73,8 +73,8 @@ CDnewComponentTagITSM.EMEA-PreProd: - name: CD_AFW ITSM INT - alertingProfile: CD_AFW/alerting-profile/CDnewComponentTag.id - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 -- contractid: "10APP11906401" -- appdid: "TEST123" +- contractid: "10APP11863401" +- appdid: "APPD-321427" - mzName: CD_AFW/management-zone/CDnewComponentTag.id - DTEnvironment: https://xxu26128.live.dynatrace.com - skipDeployment: "true" From 2d36128b4830c51c38ee65f89bf3e3765287e0dd Mon Sep 17 00:00:00 2001 From: Marko Pravdic Date: Fri, 10 Jun 2022 11:27:42 +0200 Subject: [PATCH 2/6] CD_AFW: Update DTEnvironment in notifications.yaml. --- BMW-Dynatrace-config/CD_AFW/notification/notification.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BMW-Dynatrace-config/CD_AFW/notification/notification.yaml b/BMW-Dynatrace-config/CD_AFW/notification/notification.yaml index 39aa4fda..4c4b3407 100644 --- a/BMW-Dynatrace-config/CD_AFW/notification/notification.yaml +++ b/BMW-Dynatrace-config/CD_AFW/notification/notification.yaml @@ -76,7 +76,7 @@ CDnewComponentTagITSM.EMEA-PreProd: - contractid: "10APP11863401" - appdid: "APPD-321427" - mzName: CD_AFW/management-zone/CDnewComponentTag.id -- DTEnvironment: https://xxu26128.live.dynatrace.com +- DTEnvironment: https://qqk70169.live.dynatrace.com - skipDeployment: "true" CDnewComponentTagITSM.NA-PreProd: From 41ffdec82e6ebda0eb6ba51b4741a1f3c365ae01 Mon Sep 17 00:00:00 2001 From: Marko Pravdic Date: Fri, 10 Jun 2022 11:43:51 +0200 Subject: [PATCH 3/6] CD_AFW: Fix APP in notifications.yaml. --- BMW-Dynatrace-config/CD_AFW/notification/notification.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BMW-Dynatrace-config/CD_AFW/notification/notification.yaml b/BMW-Dynatrace-config/CD_AFW/notification/notification.yaml index 4c4b3407..9eae8167 100644 --- a/BMW-Dynatrace-config/CD_AFW/notification/notification.yaml +++ b/BMW-Dynatrace-config/CD_AFW/notification/notification.yaml @@ -74,7 +74,7 @@ CDnewComponentTagITSM.EMEA-PreProd: - alertingProfile: CD_AFW/alerting-profile/CDnewComponentTag.id - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 - contractid: "10APP11863401" -- appdid: "APPD-321427" +- appdid: "APP-24654" - mzName: CD_AFW/management-zone/CDnewComponentTag.id - DTEnvironment: https://qqk70169.live.dynatrace.com - skipDeployment: "true" From 6722ae2f55c912ea2e94d2cd58be8ad43a061a03 Mon Sep 17 00:00:00 2001 From: ermisw Date: Fri, 10 Jun 2022 12:22:54 +0200 Subject: [PATCH 4/6] CD_Countly ITSM Integration --- .../CD_Countly/notification/notification.yaml | 14 ++++---- .../TemplateTest copy 2.json | 29 +++++++++++++++++ .../TemplateTest copy.json | 32 +++++++++++++++++++ .../custom-service-java/TemplateTest.json | 29 +++++++++++++++++ .../custom-service-java.yaml | 11 +++++++ 5 files changed, 108 insertions(+), 7 deletions(-) create mode 100644 BMW-Dynatrace-config/ew_test/custom-service-java/TemplateTest copy 2.json create mode 100644 BMW-Dynatrace-config/ew_test/custom-service-java/TemplateTest copy.json create mode 100644 BMW-Dynatrace-config/ew_test/custom-service-java/TemplateTest.json create mode 100644 BMW-Dynatrace-config/ew_test/custom-service-java/custom-service-java.yaml diff --git a/BMW-Dynatrace-config/CD_Countly/notification/notification.yaml b/BMW-Dynatrace-config/CD_Countly/notification/notification.yaml index 5e10c682..55342304 100644 --- a/BMW-Dynatrace-config/CD_Countly/notification/notification.yaml +++ b/BMW-Dynatrace-config/CD_Countly/notification/notification.yaml @@ -42,21 +42,21 @@ CDnewComponentTagITSM.EMEA-Prod: - name: CD_Countly ITSM PROD - alertingProfile: CD_Countly/alerting-profile/CDnewComponentTag.id - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 -- contractid: "10APP11906401" -- appdid: "TEST123" +- contractid: "10APP11899700" +- appdid: "APPD-253917" - mzName: CD_Countly/management-zone/CDnewComponentTag.id - DTEnvironment: https://xxu26128.live.dynatrace.com -- skipDeployment: "true" +- skipDeployment: "false" CDnewComponentTagITSM.NA-Prod: - name: CD_Countly ITSM PROD - alertingProfile: CD_Countly/alerting-profile/CDnewComponentTag.id - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 -- contractid: "10APP11906401" -- appdid: "TEST123" +- contractid: "20APP11899700" +- appdid: "APPD-253917" - mzName: CD_Countly/management-zone/CDnewComponentTag.id -- DTEnvironment: https://xxu26128.live.dynatrace.com -- skipDeployment: "true" +- DTEnvironment: https://wgv50241.live.dynatrace.com +- skipDeployment: "false" CDnewComponentTagITSM.CN-Prod: diff --git a/BMW-Dynatrace-config/ew_test/custom-service-java/TemplateTest copy 2.json b/BMW-Dynatrace-config/ew_test/custom-service-java/TemplateTest copy 2.json new file mode 100644 index 00000000..a4f0a2c1 --- /dev/null +++ b/BMW-Dynatrace-config/ew_test/custom-service-java/TemplateTest copy 2.json @@ -0,0 +1,29 @@ +{ + "enabled": true, + "metadata": { + "clusterVersion": "1.211.111.20210222-093946", + "configurationVersions": [ + 0 + ] + }, + "name": "{{.name}}", + "processGroups": [], + "queueEntryPoint": false, + "queueEntryPointType": null, + "rules": [ + { + "annotations": [], + "className": "com.bmw.cc.smc2.dkey.api.vehicle.v1.boundary.VehicleInboundBCI", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes":["{{.argumentTypes}}"], + "methodName": "sendKeyListToBackend", + "returnType": "void" + } + ] + } + ] + } \ No newline at end of file diff --git a/BMW-Dynatrace-config/ew_test/custom-service-java/TemplateTest copy.json b/BMW-Dynatrace-config/ew_test/custom-service-java/TemplateTest copy.json new file mode 100644 index 00000000..73619c10 --- /dev/null +++ b/BMW-Dynatrace-config/ew_test/custom-service-java/TemplateTest copy.json @@ -0,0 +1,32 @@ +{ + "enabled": true, + "metadata": { + "clusterVersion": "1.211.111.20210222-093946", + "configurationVersions": [ + 0 + ] + }, + "name": "{{.name}}", + "processGroups": [], + "queueEntryPoint": false, + "queueEntryPointType": null, + "rules": [ + { + "annotations": [], + "className": "com.bmw.cc.smc2.dkey.api.vehicle.v1.boundary.VehicleInboundBCI", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": [ + "java.lang.String", + "java.lang.Byte[]" + ], + "methodName": "sendKeyListToBackend", + "returnType": "void" + } + ] + } + ] + } \ No newline at end of file diff --git a/BMW-Dynatrace-config/ew_test/custom-service-java/TemplateTest.json b/BMW-Dynatrace-config/ew_test/custom-service-java/TemplateTest.json new file mode 100644 index 00000000..a4f0a2c1 --- /dev/null +++ b/BMW-Dynatrace-config/ew_test/custom-service-java/TemplateTest.json @@ -0,0 +1,29 @@ +{ + "enabled": true, + "metadata": { + "clusterVersion": "1.211.111.20210222-093946", + "configurationVersions": [ + 0 + ] + }, + "name": "{{.name}}", + "processGroups": [], + "queueEntryPoint": false, + "queueEntryPointType": null, + "rules": [ + { + "annotations": [], + "className": "com.bmw.cc.smc2.dkey.api.vehicle.v1.boundary.VehicleInboundBCI", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes":["{{.argumentTypes}}"], + "methodName": "sendKeyListToBackend", + "returnType": "void" + } + ] + } + ] + } \ No newline at end of file diff --git a/BMW-Dynatrace-config/ew_test/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/ew_test/custom-service-java/custom-service-java.yaml new file mode 100644 index 00000000..ea55785f --- /dev/null +++ b/BMW-Dynatrace-config/ew_test/custom-service-java/custom-service-java.yaml @@ -0,0 +1,11 @@ +config: +- TemplateTest: TemplateTest.json + +TemplateTest: +- name: EW_TEMPLATE_TEST +- skipDeployment: "true" +TemplateTest.EMEA-PreProd: +- name: EW_TEMPLATE_TEST +- argumentTypes: "" +- skipDeployment: "false" + From 68f72c6dce445a3802b2ab6fcfc4c474b210f5ad Mon Sep 17 00:00:00 2001 From: Marko Pravdic Date: Fri, 10 Jun 2022 14:01:21 +0200 Subject: [PATCH 5/6] CD_AFW: Fix skipDeployment (set to false). --- BMW-Dynatrace-config/CD_AFW/notification/notification.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BMW-Dynatrace-config/CD_AFW/notification/notification.yaml b/BMW-Dynatrace-config/CD_AFW/notification/notification.yaml index 9eae8167..6a9460af 100644 --- a/BMW-Dynatrace-config/CD_AFW/notification/notification.yaml +++ b/BMW-Dynatrace-config/CD_AFW/notification/notification.yaml @@ -77,7 +77,7 @@ CDnewComponentTagITSM.EMEA-PreProd: - appdid: "APP-24654" - mzName: CD_AFW/management-zone/CDnewComponentTag.id - DTEnvironment: https://qqk70169.live.dynatrace.com -- skipDeployment: "true" +- skipDeployment: "false" CDnewComponentTagITSM.NA-PreProd: - name: CD_AFW ITSM INT From a056cde3d813e3cae9835480192659e71408a5a0 Mon Sep 17 00:00:00 2001 From: "SLW\\ARNAUA" Date: Tue, 14 Jun 2022 17:03:19 +0200 Subject: [PATCH 6/6] Changed the contractids for PROD. --- .../CD_AudioVideoServices/notification/notification.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BMW-Dynatrace-config/CD_AudioVideoServices/notification/notification.yaml b/BMW-Dynatrace-config/CD_AudioVideoServices/notification/notification.yaml index 00a76888..a72a2d6c 100644 --- a/BMW-Dynatrace-config/CD_AudioVideoServices/notification/notification.yaml +++ b/BMW-Dynatrace-config/CD_AudioVideoServices/notification/notification.yaml @@ -43,7 +43,7 @@ CDAudioVideoServicesPRODITSM.EMEA-Prod: - name: CD_AudioVideoServices ITSM PROD - alertingProfile: CD_AudioVideoServices/alerting-profile/CDAudioVideoServices.id - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 -- contractid: "10APP10900711" +- contractid: "10APP10900712" - appdid: "188900" - mzName: CD_AudioVideoServices/management-zone/CDAudioVideoServices.id - DTEnvironment: https://xxu26128.live.dynatrace.com @@ -53,7 +53,7 @@ CDAudioVideoServicesPRODITSM.NA-Prod: - name: CD_AudioVideoServices ITSM PROD - alertingProfile: CD_AudioVideoServices/alerting-profile/CDAudioVideoServices.id - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 -- contractid: "20APP10900702" +- contractid: "20APP10900703" - appdid: "188900" - mzName: CD_AudioVideoServices/management-zone/CDAudioVideoServices.id - DTEnvironment: https://wgv50241.live.dynatrace.com @@ -64,7 +64,7 @@ CDAudioVideoServicesPRODITSM.CN-Prod: - name: CD_AudioVideoServices ITSM PROD - alertingProfile: CD_AudioVideoServices/alerting-profile/CDAudioVideoServices.id - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 -- contractid: "30APP10900706" +- contractid: "30APP10900707" - appdid: "189125" - mzName: CD_AudioVideoServices/management-zone/CDAudioVideoServices.id - DTEnvironment: https://dynatracemgd-tsp.bmwgroup.net/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b