From 1933b35ec050a9e9d1b0fad11ae39f0c74d35592 Mon Sep 17 00:00:00 2001 From: Rui Vilares Date: Tue, 20 Sep 2022 15:53:22 +0100 Subject: [PATCH 1/3] Fix reference name --- .../dashboard/dashboard.yaml | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/BMW-Dynatrace-config/CD_emobility-hub-composite-service/dashboard/dashboard.yaml b/BMW-Dynatrace-config/CD_emobility-hub-composite-service/dashboard/dashboard.yaml index 5eda5c31..1840957f 100644 --- a/BMW-Dynatrace-config/CD_emobility-hub-composite-service/dashboard/dashboard.yaml +++ b/BMW-Dynatrace-config/CD_emobility-hub-composite-service/dashboard/dashboard.yaml @@ -1,32 +1,32 @@ config: -- CD_CSF-PROD: default.json -- CD_CSF-E2E: default.json -- CD_CSF-INT: default.json -- CD_CSF-TEST: default.json +- CD_emobility-hub-composite-service-PROD: default.json +- CD_emobility-hub-composite-service-E2E: default.json +- CD_emobility-hub-composite-service-INT: default.json +- CD_emobility-hub-composite-service-TEST: default.json #PROD dashboards for EMEA/NA/CN Prod -CD_CSF-PROD: +CD_emobility-hub-composite-service-PROD: - name: CD_emobility-hub-composite-service PROD - mzName: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.name - mzId: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.id - tag: emobility-hub-composite-service - env: PROD - skipDeployment: "false" -CD_CSF-PROD.EMEA-Prod: +CD_emobility-hub-composite-service-PROD.EMEA-Prod: - name: CD_emobility-hub-composite-service PROD - mzName: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.name - mzId: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.id - tag: emobility-hub-composite-service - env: PROD - skipDeployment: "false" -CD_CSF-PROD.NA-Prod: +CD_emobility-hub-composite-service-PROD.NA-Prod: - name: CD_emobility-hub-composite-service PROD - mzName: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.name - mzId: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.id - tag: emobility-hub-composite-service - env: PROD - skipDeployment: "false" -CD_CSF-PROD.CN-Prod: +CD_emobility-hub-composite-service-PROD.CN-Prod: - name: CD_emobility-hub-composite-service PROD - mzName: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.name - mzId: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.id @@ -35,28 +35,28 @@ CD_CSF-PROD.CN-Prod: - skipDeployment: "false" #E2E dashboards for EMEA/NA/CN Prod -CD_CSF-E2E: +CD_emobility-hub-composite-service-E2E: - name: CD_emobility-hub-composite-service E2E - mzName: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.name - mzId: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.id - tag: emobility-hub-composite-service - env: E2E - skipDeployment: "false" -CD_CSF-E2E.EMEA-Prod: +CD_emobility-hub-composite-service-E2E.EMEA-Prod: - name: CD_emobility-hub-composite-service E2E - mzName: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.name - mzId: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.id - tag: emobility-hub-composite-service - env: E2E - skipDeployment: "false" -CD_CSF-E2E.NA-Prod: +CD_emobility-hub-composite-service-E2E.NA-Prod: - name: CD_emobility-hub-composite-service E2E - mzName: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.name - mzId: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.id - tag: emobility-hub-composite-service - env: E2E - skipDeployment: "false" -CD_CSF-E2E.CN-Prod: +CD_emobility-hub-composite-service-E2E.CN-Prod: - name: CD_emobility-hub-composite-service E2E - mzName: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.name - mzId: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.id @@ -65,28 +65,28 @@ CD_CSF-E2E.CN-Prod: - skipDeployment: "false" #INT dashboards for EMEA/NA/CN PreProd -CD_CSF-INT: +CD_emobility-hub-composite-service-INT: - name: CD_emobility-hub-composite-service INT - mzName: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.name - mzId: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.id - tag: emobility-hub-composite-service - env: INT - skipDeployment: "false" -CD_CSF-INT.EMEA-PreProd: +CD_emobility-hub-composite-service-INT.EMEA-PreProd: - name: CD_emobility-hub-composite-service INT - mzName: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.name - mzId: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.id - tag: emobility-hub-composite-service - env: INT - skipDeployment: "false" -CD_CSF-INT.NA-PreProd: +CD_emobility-hub-composite-service-INT.NA-PreProd: - name: CD_emobility-hub-composite-service INT - mzName: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.name - mzId: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.id - tag: emobility-hub-composite-service - env: INT - skipDeployment: "false" -CD_CSF-INT.CN-PreProd: +CD_emobility-hub-composite-service-INT.CN-PreProd: - name: CD_emobility-hub-composite-service INT - mzName: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.name - mzId: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.id @@ -95,28 +95,28 @@ CD_CSF-INT.CN-PreProd: - skipDeployment: "false" #TEST dashboards for EMEA/NA/CN PreProd -CD_CSF-TEST: +CD_emobility-hub-composite-service-TEST: - name: CD_emobility-hub-composite-service TEST - mzName: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.name - mzId: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.id - tag: emobility-hub-composite-service - env: TEST - skipDeployment: "false" -CD_CSF-TEST.EMEA-PreProd: +CD_emobility-hub-composite-service-TEST.EMEA-PreProd: - name: CD_emobility-hub-composite-service TEST - mzName: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.name - mzId: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.id - tag: emobility-hub-composite-service - env: TEST - skipDeployment: "false" -CD_CSF-TEST.NA-PreProd: +CD_emobility-hub-composite-service-TEST.NA-PreProd: - name: CD_emobility-hub-composite-service TEST - mzName: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.name - mzId: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.id - tag: emobility-hub-composite-service - env: TEST - skipDeployment: "false" -CD_CSF-TEST.CN-PreProd: +CD_emobility-hub-composite-service-TEST.CN-PreProd: - name: CD_emobility-hub-composite-service TEST - mzName: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.name - mzId: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.id From b23ddc8a857419323ac07f725906e97afc246193 Mon Sep 17 00:00:00 2001 From: "SLW\\ARNAUA" Date: Wed, 21 Sep 2022 10:48:41 +0200 Subject: [PATCH 2/3] OPMAAS-2513 - Additional fixes due to deployment errors. --- .../alerting-profile/alerting-profile.yaml | 30 +++++++++++-- .../notification/notification.yaml | 42 +++++++++++++++++++ 2 files changed, 69 insertions(+), 3 deletions(-) diff --git a/BMW-Dynatrace-config/CD_emobility-hub-composite-service/alerting-profile/alerting-profile.yaml b/BMW-Dynatrace-config/CD_emobility-hub-composite-service/alerting-profile/alerting-profile.yaml index 7e623ec2..788809df 100644 --- a/BMW-Dynatrace-config/CD_emobility-hub-composite-service/alerting-profile/alerting-profile.yaml +++ b/BMW-Dynatrace-config/CD_emobility-hub-composite-service/alerting-profile/alerting-profile.yaml @@ -1,18 +1,42 @@ config: - CD_emobility-hub-composite-service: default.json -#Prod alerting profiles for EMEA +#Prod alerting profiles for EMEA/NA/CN CD_emobility-hub-composite-service.EMEA-Prod: - name: CD_emobility-hub-composite-service PROD - tag: emobility-hub-composite-service - mzId: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.id - env: PROD - skipDeployment: "false" +CD_emobility-hub-composite-service.NA-Prod: +- name: CD_emobility-hub-composite-service PROD +- tag: emobility-hub-composite-service +- mzId: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.id +- env: PROD +- skipDeployment: "true" +CD_emobility-hub-composite-service.CN-Prod: +- name: CD_emobility-hub-composite-service PROD +- tag: emobility-hub-composite-service +- mzId: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.id +- env: PROD +- skipDeployment: "true" -#INT alerting profiles for EMEA +#INT alerting profiles for EMEA/NA/CN CD_emobility-hub-composite-service.EMEA-PreProd: - name: CD_emobility-hub-composite-service INT - tag: emobility-hub-composite-service - mzId: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.id - env: INT -- skipDeployment: "false" \ No newline at end of file +- skipDeployment: "false" +CD_emobility-hub-composite-service.NA-PreProd: +- name: CD_emobility-hub-composite-service INT +- tag: emobility-hub-composite-service +- mzId: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.id +- env: INT +- skipDeployment: "true" +CD_emobility-hub-composite-service.CN-PreProd: +- name: CD_emobility-hub-composite-service INT +- tag: emobility-hub-composite-service +- mzId: CD_emobility-hub-composite-service/management-zone/CD_emobility-hub-composite-service.id +- env: INT +- skipDeployment: "true" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_emobility-hub-composite-service/notification/notification.yaml b/BMW-Dynatrace-config/CD_emobility-hub-composite-service/notification/notification.yaml index 1f9b51e6..a01a2f97 100644 --- a/BMW-Dynatrace-config/CD_emobility-hub-composite-service/notification/notification.yaml +++ b/BMW-Dynatrace-config/CD_emobility-hub-composite-service/notification/notification.yaml @@ -8,6 +8,16 @@ CD_emobility-hub-composite-service.EMEA-Prod: - alertingProfile: CD_emobility-hub-composite-service/alerting-profile/CD_emobility-hub-composite-service.id - webhook: https://criticaltechworks.webhook.office.com/webhookb2/b2de8193-24cf-4709-b1ad-d05f115fa08d@61f30b8e-4f6b-44fe-9bc2-041e3a9f7346/IncomingWebhook/3d1d2c96e86b403989794017c57ae4b0/e2c61882-45fd-43f0-abe7-c16eb6196aaa - skipDeployment: "false" +CD_emobility-hub-composite-service.NA-Prod: +- name: CD_emobility-hub-composite-service PROD +- alertingProfile: CD_emobility-hub-composite-service/alerting-profile/CD_emobility-hub-composite-service.id +- webhook: https://criticaltechworks.webhook.office.com/webhookb2/b2de8193-24cf-4709-b1ad-d05f115fa08d@61f30b8e-4f6b-44fe-9bc2-041e3a9f7346/IncomingWebhook/3d1d2c96e86b403989794017c57ae4b0/e2c61882-45fd-43f0-abe7-c16eb6196aaa +- skipDeployment: "true" +CD_emobility-hub-composite-service.CN-Prod: +- name: CD_emobility-hub-composite-service PROD +- alertingProfile: CD_emobility-hub-composite-service/alerting-profile/CD_emobility-hub-composite-service.id +- webhook: https://criticaltechworks.webhook.office.com/webhookb2/b2de8193-24cf-4709-b1ad-d05f115fa08d@61f30b8e-4f6b-44fe-9bc2-041e3a9f7346/IncomingWebhook/3d1d2c96e86b403989794017c57ae4b0/e2c61882-45fd-43f0-abe7-c16eb6196aaa +- skipDeployment: "true" # Notification System for EMEA/NA/CN PreProd msTeams CD_emobility-hub-composite-service.EMEA-PreProd: @@ -15,15 +25,47 @@ CD_emobility-hub-composite-service.EMEA-PreProd: - alertingProfile: CD_emobility-hub-composite-service/alerting-profile/CD_emobility-hub-composite-service.id - webhook: https://criticaltechworks.webhook.office.com/webhookb2/b2de8193-24cf-4709-b1ad-d05f115fa08d@61f30b8e-4f6b-44fe-9bc2-041e3a9f7346/IncomingWebhook/3d1d2c96e86b403989794017c57ae4b0/e2c61882-45fd-43f0-abe7-c16eb6196aaa - skipDeployment: "false" +CD_emobility-hub-composite-service.NA-PreProd: +- name: CD_emobility-hub-composite-service INT +- alertingProfile: CD_emobility-hub-composite-service/alerting-profile/CD_emobility-hub-composite-service.id +- webhook: https://criticaltechworks.webhook.office.com/webhookb2/b2de8193-24cf-4709-b1ad-d05f115fa08d@61f30b8e-4f6b-44fe-9bc2-041e3a9f7346/IncomingWebhook/3d1d2c96e86b403989794017c57ae4b0/e2c61882-45fd-43f0-abe7-c16eb6196aaa +- skipDeployment: "true" +CD_emobility-hub-composite-service.CN-PreProd: +- name: CD_emobility-hub-composite-service INT +- alertingProfile: CD_emobility-hub-composite-service/alerting-profile/CD_emobility-hub-composite-service.id +- webhook: https://criticaltechworks.webhook.office.com/webhookb2/b2de8193-24cf-4709-b1ad-d05f115fa08d@61f30b8e-4f6b-44fe-9bc2-041e3a9f7346/IncomingWebhook/3d1d2c96e86b403989794017c57ae4b0/e2c61882-45fd-43f0-abe7-c16eb6196aaa +- skipDeployment: "true" # Notification System for EMEA/NA/CN Prod Email CD_emobility-hub-composite-service_email.EMEA-Prod: - name: CD_emobility-hub-composite-service_email PROD - alertingProfile: CD_emobility-hub-composite-service/alerting-profile/CD_emobility-hub-composite-service.id - receivers: intangibles@list.bmw.com + - skipDeployment: "false" +CD_emobility-hub-composite-service_email.NA-Prod: + - name: CD_emobility-hub-composite-service_email PROD + - alertingProfile: CD_emobility-hub-composite-service/alerting-profile/CD_emobility-hub-composite-service.id + - receivers: intangibles@list.bmw.com + - skipDeployment: "true" +CD_emobility-hub-composite-service_email.CN-Prod: + - name: CD_emobility-hub-composite-service_email PROD + - alertingProfile: CD_emobility-hub-composite-service/alerting-profile/CD_emobility-hub-composite-service.id + - receivers: intangibles@list.bmw.com + - skipDeployment: "true" # Notification System for EMEA/NA/CN PreProd Email CD_emobility-hub-composite-service_email.EMEA-PreProd: - name: CD_emobility-hub-composite-service_email INT - alertingProfile: CD_emobility-hub-composite-service/alerting-profile/CD_emobility-hub-composite-service.id - receivers: intangibles@list.bmw.com + - skipDeployment: "false" +CD_emobility-hub-composite-service_email.NA-PreProd: + - name: CD_emobility-hub-composite-service_email INT + - alertingProfile: CD_emobility-hub-composite-service/alerting-profile/CD_emobility-hub-composite-service.id + - receivers: intangibles@list.bmw.com + - skipDeployment: "true" +CD_emobility-hub-composite-service_email.CN-PreProd: + - name: CD_emobility-hub-composite-service_email INT + - alertingProfile: CD_emobility-hub-composite-service/alerting-profile/CD_emobility-hub-composite-service.id + - receivers: intangibles@list.bmw.com + - skipDeployment: "true" \ No newline at end of file From 0dccfde80401383ddbb2ff0de83e1ba0d578eb5d Mon Sep 17 00:00:00 2001 From: "SLW\\ARNAUA" Date: Wed, 21 Sep 2022 10:54:53 +0200 Subject: [PATCH 3/3] Issue is linked to OPMAAS-2516 and not 2513. --- .../CD_emobility-hub-composite-service/notification/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BMW-Dynatrace-config/CD_emobility-hub-composite-service/notification/README.md b/BMW-Dynatrace-config/CD_emobility-hub-composite-service/notification/README.md index 5ba3825a..836e4d15 100644 --- a/BMW-Dynatrace-config/CD_emobility-hub-composite-service/notification/README.md +++ b/BMW-Dynatrace-config/CD_emobility-hub-composite-service/notification/README.md @@ -1,4 +1,4 @@ ### How to configure notification systems? -Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Problem+Notification+Integrations) page to configure your notification systems. \ No newline at end of file +Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Problem+Notification+Integrations) page to configure your notification systems \ No newline at end of file