From 4ea0c1b2824dde53bc9fc59beb723baf65c478b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Cadilha?= Date: Thu, 5 May 2022 14:45:31 +0100 Subject: [PATCH 1/3] - added msteams alerting to 2 bmw points push services, msteams + email to chargenowenabler --- .../alerting-profile/alerting-profile.yaml | 19 ++++ .../alerting-profile/default.json | 103 ++++++++++++++++++ .../notification/README.md | 4 + .../notification/email.json | 13 +++ .../notification/msTeams.json | 11 ++ .../notification/notification.yaml | 17 +++ .../alerting-profile/alerting-profile.yaml | 19 ++++ .../alerting-profile/default.json | 103 ++++++++++++++++++ .../notification/README.md | 4 + .../notification/email.json | 13 +++ .../notification/msTeams.json | 11 ++ .../notification/notification.yaml | 29 +++++ .../alerting-profile/alerting-profile.yaml | 19 ++++ .../alerting-profile/default.json | 103 ++++++++++++++++++ .../notification/README.md | 4 + .../notification/email.json | 13 +++ .../notification/msTeams.json | 11 ++ .../notification/notification.yaml | 16 +++ 18 files changed, 512 insertions(+) create mode 100644 BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/alerting-profile/alerting-profile.yaml create mode 100644 BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/alerting-profile/default.json create mode 100644 BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/notification/README.md create mode 100644 BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/notification/email.json create mode 100644 BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/notification/msTeams.json create mode 100644 BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/notification/notification.yaml create mode 100644 BMW-Dynatrace-config/CD_chargenow-enabler-service/alerting-profile/alerting-profile.yaml create mode 100644 BMW-Dynatrace-config/CD_chargenow-enabler-service/alerting-profile/default.json create mode 100644 BMW-Dynatrace-config/CD_chargenow-enabler-service/notification/README.md create mode 100644 BMW-Dynatrace-config/CD_chargenow-enabler-service/notification/email.json create mode 100644 BMW-Dynatrace-config/CD_chargenow-enabler-service/notification/msTeams.json create mode 100644 BMW-Dynatrace-config/CD_chargenow-enabler-service/notification/notification.yaml create mode 100644 BMW-Dynatrace-config/CD_push-notification-settings-composite-service/alerting-profile/alerting-profile.yaml create mode 100644 BMW-Dynatrace-config/CD_push-notification-settings-composite-service/alerting-profile/default.json create mode 100644 BMW-Dynatrace-config/CD_push-notification-settings-composite-service/notification/README.md create mode 100644 BMW-Dynatrace-config/CD_push-notification-settings-composite-service/notification/email.json create mode 100644 BMW-Dynatrace-config/CD_push-notification-settings-composite-service/notification/msTeams.json create mode 100644 BMW-Dynatrace-config/CD_push-notification-settings-composite-service/notification/notification.yaml diff --git a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/alerting-profile/alerting-profile.yaml b/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/alerting-profile/alerting-profile.yaml new file mode 100644 index 00000000..3c664c4c --- /dev/null +++ b/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/alerting-profile/alerting-profile.yaml @@ -0,0 +1,19 @@ +config: +- CDbmw-points-push-notifications-service: default.json + + +#Prod alerting profiles for EMEA +CDbmw-points-push-notifications-service.EMEA-Prod: +- name: CD_bmw-points-push-notifications-service PROD +- tag: bmw-points-push-notifications-service +- mzId: CD_bmw-points-push-notifications-service/management-zone/CDbmw-points-push-notifications-service.id +- env: PROD +- skipDeployment: "false" + +#INT alerting profiles for EMEA +CDbmw-points-push-notifications-service.EMEA-PreProd: +- name: CD_bmw-points-push-notifications-service INT +- tag: bmw-points-push-notifications-service +- mzId: CD_bmw-points-push-notifications-service/management-zone/CDbmw-points-push-notifications-service.id +- env: INT +- skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/alerting-profile/default.json b/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/alerting-profile/default.json new file mode 100644 index 00000000..681a4c64 --- /dev/null +++ b/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/alerting-profile/default.json @@ -0,0 +1,103 @@ +{ + "displayName": "{{.name}}", + "eventTypeFilters": [], + "managementZoneId": "{{.mzId}}", + "mzId": "{{.mzId}}", + "rules": [ + { + "delayInMinutes": 0, + "severityLevel": "AVAILABILITY", + "tagFilter": { + "includeMode": "INCLUDE_ALL", + "tagFilters": [ + { + "context": "CONTEXTLESS", + "key": "Component", + "value": "{{.tag}}" + }, + { + "context": "CONTEXTLESS", + "key": "Environment", + "value": "{{.env}}" + } + ] + } + }, + { + "delayInMinutes": 10, + "severityLevel": "ERROR", + "tagFilter": { + "includeMode": "INCLUDE_ALL", + "tagFilters": [ + { + "context": "CONTEXTLESS", + "key": "Component", + "value": "{{.tag}}" + }, + { + "context": "CONTEXTLESS", + "key": "Environment", + "value": "{{.env}}" + } + ] + } + }, + { + "delayInMinutes": 30, + "severityLevel": "PERFORMANCE", + "tagFilter": { + "includeMode": "INCLUDE_ALL", + "tagFilters": [ + { + "context": "CONTEXTLESS", + "key": "Component", + "value": "{{.tag}}" + }, + { + "context": "CONTEXTLESS", + "key": "Environment", + "value": "{{.env}}" + } + ] + } + }, + { + "delayInMinutes": 30, + "severityLevel": "RESOURCE_CONTENTION", + "tagFilter": { + "includeMode": "INCLUDE_ALL", + "tagFilters": [ + { + "context": "CONTEXTLESS", + "key": "Component", + "value": "{{.tag}}" + }, + { + "context": "CONTEXTLESS", + "key": "Environment", + "value": "{{.env}}" + } + ] + } + }, + { + "delayInMinutes": 10, + "severityLevel": "CUSTOM_ALERT", + "tagFilter": { + "includeMode": "INCLUDE_ALL", + "tagFilters": [ + { + "context": "CONTEXTLESS", + "key": "Component", + "value": "{{.tag}}" + }, + { + "context": "CONTEXTLESS", + "key": "Environment", + "value": "{{.env}}" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/notification/README.md b/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/notification/README.md new file mode 100644 index 00000000..5ba3825a --- /dev/null +++ b/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/notification/README.md @@ -0,0 +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 diff --git a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/notification/email.json b/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/notification/email.json new file mode 100644 index 00000000..486642a7 --- /dev/null +++ b/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/notification/email.json @@ -0,0 +1,13 @@ +{ + "active": true, + "alertingProfile": "{{.alertingProfile}}", + "bccReceivers": [], + "body": "{ProblemDetailsHTML}", + "ccReceivers": [], + "name": "{{.name}}", + "receivers": [ + "{{.receivers}}" + ], + "subject": "{State} Problem {ProblemID}: {ImpactedEntity}", + "type": "EMAIL" +} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/notification/msTeams.json b/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/notification/msTeams.json new file mode 100644 index 00000000..33e92cf6 --- /dev/null +++ b/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/notification/msTeams.json @@ -0,0 +1,11 @@ +{ + "acceptAnyCertificate": false, + "active": true, + "alertingProfile": "{{.alertingProfile}}", + "headers": [], + "name": "{{.name}}", + "notifyEventMergesEnabled": false, + "payload": "{\n\"title\":\"{ProblemTitle}\",\n\"text\":\"{ProblemDetailsHTML}\",\n\"themeColor\":\"EA4300\"\n}", + "type": "WEBHOOK", + "url": "{{.webhook}}" +} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/notification/notification.yaml b/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/notification/notification.yaml new file mode 100644 index 00000000..5033a3ef --- /dev/null +++ b/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/notification/notification.yaml @@ -0,0 +1,17 @@ +config: +- CDbmw-points-push-notifications-service: msTeams.json +- CDbmw-points-push-notifications-service_email: email.json + +# Notification System for EMEA/NA/CN Prod msTeams +CDbmw-points-push-notifications-service.EMEA-Prod: +- name: CD_bmw-points-push-notifications-service PROD +- alertingProfile: CD_bmw-points-push-notifications-service/alerting-profile/CDbmw-points-push-notifications-service.id +- webhook: https://criticaltechworks.webhook.office.com/webhookb2/b2de8193-24cf-4709-b1ad-d05f115fa08d@61f30b8e-4f6b-44fe-9bc2-041e3a9f7346/IncomingWebhook/0cf76894f7974aeaa28e5000a38d8d2c/66730f27-7257-45d8-8799-fdc7e4d4d178 +- skipDeployment: "true" + +# Notification System for EMEA/NA/CN PreProd msTeams +CDbmw-points-push-notifications-service.EMEA-PreProd: +- name: CD_bmw-points-push-notifications-service INT +- alertingProfile: CD_bmw-points-push-notifications-service/alerting-profile/CDbmw-points-push-notifications-service.id +- webhook: https://criticaltechworks.webhook.office.com/webhookb2/b2de8193-24cf-4709-b1ad-d05f115fa08d@61f30b8e-4f6b-44fe-9bc2-041e3a9f7346/IncomingWebhook/0cf76894f7974aeaa28e5000a38d8d2c/66730f27-7257-45d8-8799-fdc7e4d4d178 +- skipDeployment: "true" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_chargenow-enabler-service/alerting-profile/alerting-profile.yaml b/BMW-Dynatrace-config/CD_chargenow-enabler-service/alerting-profile/alerting-profile.yaml new file mode 100644 index 00000000..ee8535bf --- /dev/null +++ b/BMW-Dynatrace-config/CD_chargenow-enabler-service/alerting-profile/alerting-profile.yaml @@ -0,0 +1,19 @@ +config: +- CDchargenow-enabler-service: default.json + + +#Prod alerting profiles for EMEA +CDchargenow-enabler-service.EMEA-Prod: +- name: CD_chargenow-enabler-service PROD +- tag: chargenow-enabler-service +- mzId: CD_chargenow-enabler-service/management-zone/CDchargenow-enabler-service.id +- env: PROD +- skipDeployment: "false" + +#INT alerting profiles for EMEA +CDchargenow-enabler-service.EMEA-PreProd: +- name: CD_chargenow-enabler-service INT +- tag: chargenow-enabler-service +- mzId: CD_chargenow-enabler-service/management-zone/CDchargenow-enabler-service.id +- env: INT +- skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_chargenow-enabler-service/alerting-profile/default.json b/BMW-Dynatrace-config/CD_chargenow-enabler-service/alerting-profile/default.json new file mode 100644 index 00000000..681a4c64 --- /dev/null +++ b/BMW-Dynatrace-config/CD_chargenow-enabler-service/alerting-profile/default.json @@ -0,0 +1,103 @@ +{ + "displayName": "{{.name}}", + "eventTypeFilters": [], + "managementZoneId": "{{.mzId}}", + "mzId": "{{.mzId}}", + "rules": [ + { + "delayInMinutes": 0, + "severityLevel": "AVAILABILITY", + "tagFilter": { + "includeMode": "INCLUDE_ALL", + "tagFilters": [ + { + "context": "CONTEXTLESS", + "key": "Component", + "value": "{{.tag}}" + }, + { + "context": "CONTEXTLESS", + "key": "Environment", + "value": "{{.env}}" + } + ] + } + }, + { + "delayInMinutes": 10, + "severityLevel": "ERROR", + "tagFilter": { + "includeMode": "INCLUDE_ALL", + "tagFilters": [ + { + "context": "CONTEXTLESS", + "key": "Component", + "value": "{{.tag}}" + }, + { + "context": "CONTEXTLESS", + "key": "Environment", + "value": "{{.env}}" + } + ] + } + }, + { + "delayInMinutes": 30, + "severityLevel": "PERFORMANCE", + "tagFilter": { + "includeMode": "INCLUDE_ALL", + "tagFilters": [ + { + "context": "CONTEXTLESS", + "key": "Component", + "value": "{{.tag}}" + }, + { + "context": "CONTEXTLESS", + "key": "Environment", + "value": "{{.env}}" + } + ] + } + }, + { + "delayInMinutes": 30, + "severityLevel": "RESOURCE_CONTENTION", + "tagFilter": { + "includeMode": "INCLUDE_ALL", + "tagFilters": [ + { + "context": "CONTEXTLESS", + "key": "Component", + "value": "{{.tag}}" + }, + { + "context": "CONTEXTLESS", + "key": "Environment", + "value": "{{.env}}" + } + ] + } + }, + { + "delayInMinutes": 10, + "severityLevel": "CUSTOM_ALERT", + "tagFilter": { + "includeMode": "INCLUDE_ALL", + "tagFilters": [ + { + "context": "CONTEXTLESS", + "key": "Component", + "value": "{{.tag}}" + }, + { + "context": "CONTEXTLESS", + "key": "Environment", + "value": "{{.env}}" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_chargenow-enabler-service/notification/README.md b/BMW-Dynatrace-config/CD_chargenow-enabler-service/notification/README.md new file mode 100644 index 00000000..5ba3825a --- /dev/null +++ b/BMW-Dynatrace-config/CD_chargenow-enabler-service/notification/README.md @@ -0,0 +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 diff --git a/BMW-Dynatrace-config/CD_chargenow-enabler-service/notification/email.json b/BMW-Dynatrace-config/CD_chargenow-enabler-service/notification/email.json new file mode 100644 index 00000000..486642a7 --- /dev/null +++ b/BMW-Dynatrace-config/CD_chargenow-enabler-service/notification/email.json @@ -0,0 +1,13 @@ +{ + "active": true, + "alertingProfile": "{{.alertingProfile}}", + "bccReceivers": [], + "body": "{ProblemDetailsHTML}", + "ccReceivers": [], + "name": "{{.name}}", + "receivers": [ + "{{.receivers}}" + ], + "subject": "{State} Problem {ProblemID}: {ImpactedEntity}", + "type": "EMAIL" +} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_chargenow-enabler-service/notification/msTeams.json b/BMW-Dynatrace-config/CD_chargenow-enabler-service/notification/msTeams.json new file mode 100644 index 00000000..33e92cf6 --- /dev/null +++ b/BMW-Dynatrace-config/CD_chargenow-enabler-service/notification/msTeams.json @@ -0,0 +1,11 @@ +{ + "acceptAnyCertificate": false, + "active": true, + "alertingProfile": "{{.alertingProfile}}", + "headers": [], + "name": "{{.name}}", + "notifyEventMergesEnabled": false, + "payload": "{\n\"title\":\"{ProblemTitle}\",\n\"text\":\"{ProblemDetailsHTML}\",\n\"themeColor\":\"EA4300\"\n}", + "type": "WEBHOOK", + "url": "{{.webhook}}" +} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_chargenow-enabler-service/notification/notification.yaml b/BMW-Dynatrace-config/CD_chargenow-enabler-service/notification/notification.yaml new file mode 100644 index 00000000..b4af6549 --- /dev/null +++ b/BMW-Dynatrace-config/CD_chargenow-enabler-service/notification/notification.yaml @@ -0,0 +1,29 @@ +config: +- CDchargenow-enabler-service: msTeams.json +- CDchargenow-enabler-service_email: email.json + +# Notification System for EMEA/NA/CN Prod msTeams +CDchargenow-enabler-service.EMEA-Prod: +- name: CD_chargenow-enabler-service PROD +- alertingProfile: CD_chargenow-enabler-service/alerting-profile/CDchargenow-enabler-service.id +- webhook: https://criticaltechworks.webhook.office.com/webhookb2/b2de8193-24cf-4709-b1ad-d05f115fa08d@61f30b8e-4f6b-44fe-9bc2-041e3a9f7346/IncomingWebhook/0cf76894f7974aeaa28e5000a38d8d2c/66730f27-7257-45d8-8799-fdc7e4d4d178 +- skipDeployment: "true" + +# Notification System for EMEA/NA/CN PreProd msTeams +CDchargenow-enabler-service.EMEA-PreProd: +- name: CD_chargenow-enabler-service INT +- alertingProfile: CD_chargenow-enabler-service/alerting-profile/CDchargenow-enabler-service.id +- webhook: https://criticaltechworks.webhook.office.com/webhookb2/b2de8193-24cf-4709-b1ad-d05f115fa08d@61f30b8e-4f6b-44fe-9bc2-041e3a9f7346/IncomingWebhook/0cf76894f7974aeaa28e5000a38d8d2c/66730f27-7257-45d8-8799-fdc7e4d4d178 +- skipDeployment: "true" + +# Notification System for EMEA/NA/CN Prod Email +CDchargenow-enabler-service_email.EMEA-Prod: + - name: CD_chargenow-enabler-service_email PROD + - alertingProfile: CD_chargenow-enabler-service/alerting-profile/CDchargenow-enabler-service.id + - receivers: intangibles@list.bmw.com + +# Notification System for EMEA/NA/CN PreProd Email +CDchargenow-enabler-service_email.EMEA-PreProd: + - name: CD_chargenow-enabler-service_email INT + - alertingProfile: CD_chargenow-enabler-service/alerting-profile/CDchargenow-enabler-service.id + - receivers: intangibles@list.bmw.com \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/alerting-profile/alerting-profile.yaml b/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/alerting-profile/alerting-profile.yaml new file mode 100644 index 00000000..7eeb0c82 --- /dev/null +++ b/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/alerting-profile/alerting-profile.yaml @@ -0,0 +1,19 @@ +config: +- CDpush-notification-settings-composite-service: default.json + + +#Prod alerting profiles for EMEA +CDpush-notification-settings-composite-service.EMEA-Prod: +- name: CD_push-notification-settings-composite-service PROD +- tag: push-notification-settings-composite-service +- mzId: CD_push-notification-settings-composite-service/management-zone/CDPush-notification-settings-composite-service.id +- env: PROD +- skipDeployment: "false" + +#INT alerting profiles for EMEA +CDpush-notification-settings-composite-service.EMEA-PreProd: +- name: CD_push-notification-settings-composite-service INT +- tag: push-notification-settings-composite-service +- mzId: CD_push-notification-settings-composite-service/management-zone/CDPush-notification-settings-composite-service.id +- env: INT +- skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/alerting-profile/default.json b/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/alerting-profile/default.json new file mode 100644 index 00000000..681a4c64 --- /dev/null +++ b/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/alerting-profile/default.json @@ -0,0 +1,103 @@ +{ + "displayName": "{{.name}}", + "eventTypeFilters": [], + "managementZoneId": "{{.mzId}}", + "mzId": "{{.mzId}}", + "rules": [ + { + "delayInMinutes": 0, + "severityLevel": "AVAILABILITY", + "tagFilter": { + "includeMode": "INCLUDE_ALL", + "tagFilters": [ + { + "context": "CONTEXTLESS", + "key": "Component", + "value": "{{.tag}}" + }, + { + "context": "CONTEXTLESS", + "key": "Environment", + "value": "{{.env}}" + } + ] + } + }, + { + "delayInMinutes": 10, + "severityLevel": "ERROR", + "tagFilter": { + "includeMode": "INCLUDE_ALL", + "tagFilters": [ + { + "context": "CONTEXTLESS", + "key": "Component", + "value": "{{.tag}}" + }, + { + "context": "CONTEXTLESS", + "key": "Environment", + "value": "{{.env}}" + } + ] + } + }, + { + "delayInMinutes": 30, + "severityLevel": "PERFORMANCE", + "tagFilter": { + "includeMode": "INCLUDE_ALL", + "tagFilters": [ + { + "context": "CONTEXTLESS", + "key": "Component", + "value": "{{.tag}}" + }, + { + "context": "CONTEXTLESS", + "key": "Environment", + "value": "{{.env}}" + } + ] + } + }, + { + "delayInMinutes": 30, + "severityLevel": "RESOURCE_CONTENTION", + "tagFilter": { + "includeMode": "INCLUDE_ALL", + "tagFilters": [ + { + "context": "CONTEXTLESS", + "key": "Component", + "value": "{{.tag}}" + }, + { + "context": "CONTEXTLESS", + "key": "Environment", + "value": "{{.env}}" + } + ] + } + }, + { + "delayInMinutes": 10, + "severityLevel": "CUSTOM_ALERT", + "tagFilter": { + "includeMode": "INCLUDE_ALL", + "tagFilters": [ + { + "context": "CONTEXTLESS", + "key": "Component", + "value": "{{.tag}}" + }, + { + "context": "CONTEXTLESS", + "key": "Environment", + "value": "{{.env}}" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/notification/README.md b/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/notification/README.md new file mode 100644 index 00000000..5ba3825a --- /dev/null +++ b/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/notification/README.md @@ -0,0 +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 diff --git a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/notification/email.json b/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/notification/email.json new file mode 100644 index 00000000..486642a7 --- /dev/null +++ b/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/notification/email.json @@ -0,0 +1,13 @@ +{ + "active": true, + "alertingProfile": "{{.alertingProfile}}", + "bccReceivers": [], + "body": "{ProblemDetailsHTML}", + "ccReceivers": [], + "name": "{{.name}}", + "receivers": [ + "{{.receivers}}" + ], + "subject": "{State} Problem {ProblemID}: {ImpactedEntity}", + "type": "EMAIL" +} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/notification/msTeams.json b/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/notification/msTeams.json new file mode 100644 index 00000000..33e92cf6 --- /dev/null +++ b/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/notification/msTeams.json @@ -0,0 +1,11 @@ +{ + "acceptAnyCertificate": false, + "active": true, + "alertingProfile": "{{.alertingProfile}}", + "headers": [], + "name": "{{.name}}", + "notifyEventMergesEnabled": false, + "payload": "{\n\"title\":\"{ProblemTitle}\",\n\"text\":\"{ProblemDetailsHTML}\",\n\"themeColor\":\"EA4300\"\n}", + "type": "WEBHOOK", + "url": "{{.webhook}}" +} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/notification/notification.yaml b/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/notification/notification.yaml new file mode 100644 index 00000000..5060e151 --- /dev/null +++ b/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/notification/notification.yaml @@ -0,0 +1,16 @@ +config: +- CDpush-notification-settings-composite-service: msTeams.json + +# Notification System for EMEA/NA/CN Prod msTeams +CDpush-notification-settings-composite-service.EMEA-Prod: +- name: CD_push-notification-settings-composite-service PROD +- alertingProfile: CD_push-notification-settings-composite-service/alerting-profile/CDpush-notification-settings-composite-service.id +- webhook: https://criticaltechworks.webhook.office.com/webhookb2/b2de8193-24cf-4709-b1ad-d05f115fa08d@61f30b8e-4f6b-44fe-9bc2-041e3a9f7346/IncomingWebhook/0cf76894f7974aeaa28e5000a38d8d2c/66730f27-7257-45d8-8799-fdc7e4d4d178 +- skipDeployment: "true" + +# Notification System for EMEA/NA/CN PreProd msTeams +CDpush-notification-settings-composite-service.EMEA-PreProd: +- name: CD_push-notification-settings-composite-service INT +- alertingProfile: CD_push-notification-settings-composite-service/alerting-profile/CDpush-notification-settings-composite-service.id +- webhook: https://criticaltechworks.webhook.office.com/webhookb2/b2de8193-24cf-4709-b1ad-d05f115fa08d@61f30b8e-4f6b-44fe-9bc2-041e3a9f7346/IncomingWebhook/0cf76894f7974aeaa28e5000a38d8d2c/66730f27-7257-45d8-8799-fdc7e4d4d178 +- skipDeployment: "true" \ No newline at end of file From 8722dcd3e8fe87a0c59915d623a923c188b121b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Cadilha?= Date: Thu, 5 May 2022 15:33:42 +0100 Subject: [PATCH 2/3] removed uneccessary configs --- .../notification/email.json | 13 ------------- .../notification/notification.yaml | 1 - .../notification/email.json | 13 ------------- 3 files changed, 27 deletions(-) delete mode 100644 BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/notification/email.json delete mode 100644 BMW-Dynatrace-config/CD_push-notification-settings-composite-service/notification/email.json diff --git a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/notification/email.json b/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/notification/email.json deleted file mode 100644 index 486642a7..00000000 --- a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/notification/email.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "active": true, - "alertingProfile": "{{.alertingProfile}}", - "bccReceivers": [], - "body": "{ProblemDetailsHTML}", - "ccReceivers": [], - "name": "{{.name}}", - "receivers": [ - "{{.receivers}}" - ], - "subject": "{State} Problem {ProblemID}: {ImpactedEntity}", - "type": "EMAIL" -} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/notification/notification.yaml b/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/notification/notification.yaml index 5033a3ef..0e6be062 100644 --- a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/notification/notification.yaml +++ b/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/notification/notification.yaml @@ -1,6 +1,5 @@ config: - CDbmw-points-push-notifications-service: msTeams.json -- CDbmw-points-push-notifications-service_email: email.json # Notification System for EMEA/NA/CN Prod msTeams CDbmw-points-push-notifications-service.EMEA-Prod: diff --git a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/notification/email.json b/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/notification/email.json deleted file mode 100644 index 486642a7..00000000 --- a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/notification/email.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "active": true, - "alertingProfile": "{{.alertingProfile}}", - "bccReceivers": [], - "body": "{ProblemDetailsHTML}", - "ccReceivers": [], - "name": "{{.name}}", - "receivers": [ - "{{.receivers}}" - ], - "subject": "{State} Problem {ProblemID}: {ImpactedEntity}", - "type": "EMAIL" -} \ No newline at end of file From d851c5275c7074642d0775981e294d5b4f2d1a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Cadilha?= Date: Fri, 6 May 2022 12:23:25 +0100 Subject: [PATCH 3/3] - remove NA/CN configs --- .../dashboard/dashboard.yaml | 56 ------------------- 1 file changed, 56 deletions(-) diff --git a/BMW-Dynatrace-config/CD_chargenow-enabler-service/dashboard/dashboard.yaml b/BMW-Dynatrace-config/CD_chargenow-enabler-service/dashboard/dashboard.yaml index e5c0cdd8..c58deaa8 100644 --- a/BMW-Dynatrace-config/CD_chargenow-enabler-service/dashboard/dashboard.yaml +++ b/BMW-Dynatrace-config/CD_chargenow-enabler-service/dashboard/dashboard.yaml @@ -19,20 +19,6 @@ CDchargenow-enabler-service-PROD.EMEA-Prod: - tag: chargenow-enabler-service - env: PROD - skipDeployment: "false" -CDchargenow-enabler-service-PROD.NA-Prod: -- name: CD_chargenow-enabler-service PROD -- mzName: CD_chargenow-enabler-service/management-zone/CDchargenow-enabler-service.name -- mzId: CD_chargenow-enabler-service/management-zone/CDchargenow-enabler-service.id -- tag: chargenow-enabler-service -- env: PROD -- skipDeployment: "false" -CDchargenow-enabler-service-PROD.CN-Prod: -- name: CD_chargenow-enabler-service PROD -- mzName: CD_chargenow-enabler-service/management-zone/CDchargenow-enabler-service.name -- mzId: CD_chargenow-enabler-service/management-zone/CDchargenow-enabler-service.id -- tag: chargenow-enabler-service -- env: PROD -- skipDeployment: "false" #E2E dashboards for EMEA/NA/CN Prod CDchargenow-enabler-service-E2E: @@ -49,20 +35,6 @@ CDchargenow-enabler-service-E2E.EMEA-Prod: - tag: chargenow-enabler-service - env: E2E - skipDeployment: "false" -CDchargenow-enabler-service-E2E.NA-Prod: -- name: CD_chargenow-enabler-service E2E -- mzName: CD_chargenow-enabler-service/management-zone/CDchargenow-enabler-service.name -- mzId: CD_chargenow-enabler-service/management-zone/CDchargenow-enabler-service.id -- tag: chargenow-enabler-service -- env: E2E -- skipDeployment: "false" -CDchargenow-enabler-service-E2E.CN-Prod: -- name: CD_chargenow-enabler-service E2E -- mzName: CD_chargenow-enabler-service/management-zone/CDchargenow-enabler-service.name -- mzId: CD_chargenow-enabler-service/management-zone/CDchargenow-enabler-service.id -- tag: chargenow-enabler-service -- env: E2E -- skipDeployment: "false" #INT dashboards for EMEA/NA/CN PreProd CDchargenow-enabler-service-INT: @@ -79,20 +51,6 @@ CDchargenow-enabler-service-INT.EMEA-PreProd: - tag: chargenow-enabler-service - env: INT - skipDeployment: "false" -CDchargenow-enabler-service-INT.NA-PreProd: -- name: CD_chargenow-enabler-service INT -- mzName: CD_chargenow-enabler-service/management-zone/CDchargenow-enabler-service.name -- mzId: CD_chargenow-enabler-service/management-zone/CDchargenow-enabler-service.id -- tag: chargenow-enabler-service -- env: INT -- skipDeployment: "false" -CDchargenow-enabler-service-INT.CN-PreProd: -- name: CD_chargenow-enabler-service INT -- mzName: CD_chargenow-enabler-service/management-zone/CDchargenow-enabler-service.name -- mzId: CD_chargenow-enabler-service/management-zone/CDchargenow-enabler-service.id -- tag: chargenow-enabler-service -- env: INT -- skipDeployment: "false" #TEST dashboards for EMEA/NA/CN PreProd CDchargenow-enabler-service-TEST: @@ -108,18 +66,4 @@ CDchargenow-enabler-service-TEST.EMEA-PreProd: - mzId: CD_chargenow-enabler-service/management-zone/CDchargenow-enabler-service.id - tag: chargenow-enabler-service - env: TEST -- skipDeployment: "false" -CDchargenow-enabler-service-TEST.NA-PreProd: -- name: CD_chargenow-enabler-service TEST -- mzName: CD_chargenow-enabler-service/management-zone/CDchargenow-enabler-service.name -- mzId: CD_chargenow-enabler-service/management-zone/CDchargenow-enabler-service.id -- tag: chargenow-enabler-service -- env: TEST -- skipDeployment: "false" -CDchargenow-enabler-service-TEST.CN-PreProd: -- name: CD_chargenow-enabler-service TEST -- mzName: CD_chargenow-enabler-service/management-zone/CDchargenow-enabler-service.name -- mzId: CD_chargenow-enabler-service/management-zone/CDchargenow-enabler-service.id -- tag: chargenow-enabler-service -- env: TEST - skipDeployment: "false" \ No newline at end of file