From f58f6877bd89563c8ce89b2400d778634899d329 Mon Sep 17 00:00:00 2001 From: rforstner Date: Wed, 16 Jun 2021 18:57:56 +0200 Subject: [PATCH] ASBC-RSU updated --- .../alerting-profile/ASBC-RSU.json | 49 +++--- .../alerting-profile/alerting-profile.yaml | 91 ++++++++++- .../notification/CDRSU-MSTeams.json | 11 -- .../notification/notification.yaml | 153 +++++++++++++++++- 4 files changed, 266 insertions(+), 38 deletions(-) delete mode 100644 BMW-Dynatrace-config/CD_ASBC-RSU/notification/CDRSU-MSTeams.json diff --git a/BMW-Dynatrace-config/CD_ASBC-RSU/alerting-profile/ASBC-RSU.json b/BMW-Dynatrace-config/CD_ASBC-RSU/alerting-profile/ASBC-RSU.json index d10ad44a..6aeb044f 100644 --- a/BMW-Dynatrace-config/CD_ASBC-RSU/alerting-profile/ASBC-RSU.json +++ b/BMW-Dynatrace-config/CD_ASBC-RSU/alerting-profile/ASBC-RSU.json @@ -8,12 +8,17 @@ "delayInMinutes": 0, "severityLevel": "AVAILABILITY", "tagFilter": { - "includeMode": "INCLUDE_ANY", + "includeMode": "INCLUDE_ALL", "tagFilters": [ { "context": "CONTEXTLESS", "key": "Component", "value": "{{.tag}}" + }, + { + "context": "CONTEXTLESS", + "key": "Environment", + "value": "{{.env}}" } ] } @@ -22,12 +27,17 @@ "delayInMinutes": 10, "severityLevel": "ERROR", "tagFilter": { - "includeMode": "INCLUDE_ANY", + "includeMode": "INCLUDE_ALL", "tagFilters": [ { "context": "CONTEXTLESS", "key": "Component", "value": "{{.tag}}" + }, + { + "context": "CONTEXTLESS", + "key": "Environment", + "value": "{{.env}}" } ] } @@ -36,12 +46,17 @@ "delayInMinutes": 30, "severityLevel": "PERFORMANCE", "tagFilter": { - "includeMode": "INCLUDE_ANY", + "includeMode": "INCLUDE_ALL", "tagFilters": [ { "context": "CONTEXTLESS", "key": "Component", "value": "{{.tag}}" + }, + { + "context": "CONTEXTLESS", + "key": "Environment", + "value": "{{.env}}" } ] } @@ -50,12 +65,17 @@ "delayInMinutes": 30, "severityLevel": "RESOURCE_CONTENTION", "tagFilter": { - "includeMode": "INCLUDE_ANY", + "includeMode": "INCLUDE_ALL", "tagFilters": [ { "context": "CONTEXTLESS", "key": "Component", "value": "{{.tag}}" + }, + { + "context": "CONTEXTLESS", + "key": "Environment", + "value": "{{.env}}" } ] } @@ -64,29 +84,20 @@ "delayInMinutes": 10, "severityLevel": "CUSTOM_ALERT", "tagFilter": { - "includeMode": "INCLUDE_ANY", + "includeMode": "INCLUDE_ALL", "tagFilters": [ { "context": "CONTEXTLESS", "key": "Component", "value": "{{.tag}}" - } - ] - } - }, - { - "delayInMinutes": 0, - "severityLevel": "MONITORING_UNAVAILABLE", - "tagFilter": { - "includeMode": "INCLUDE_ANY", - "tagFilters": [ - { + }, + { "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" + "key": "Environment", + "value": "{{.env}}" } ] } } ] -} \ No newline at end of file +} diff --git a/BMW-Dynatrace-config/CD_ASBC-RSU/alerting-profile/alerting-profile.yaml b/BMW-Dynatrace-config/CD_ASBC-RSU/alerting-profile/alerting-profile.yaml index b60ff87b..67deacb4 100644 --- a/BMW-Dynatrace-config/CD_ASBC-RSU/alerting-profile/alerting-profile.yaml +++ b/BMW-Dynatrace-config/CD_ASBC-RSU/alerting-profile/alerting-profile.yaml @@ -1,6 +1,89 @@ -CDASBC-RSU: -- name: CD_ASBC-RSU/management-zone/CDASBC-RSU.name -- tag: ASBC-RSU -- mzId: CD_ASBC-RSU/management-zone/CDASBC-RSU.id config: +- CDASBC-RSU-PROD: ASBC-RSU.json +- CDASBC-RSU-E2E: ASBC-RSU.json - CDASBC-RSU: ASBC-RSU.json + +CDASBC-RSU-PROD: +- name: CD_ASBC-RSU PROD +- tag: CDASBC-RSU +- mzId: CD_ASBC-RSU/management-zone/CDASBC-RSU.id +- env: PROD +- skipDeployment: "true" + +CDASBC-RSU-E2E: +- name: CD_ASBC-RSU E2E +- tag: CDASBC-RSU +- mzId: CD_ASBC-RSU/management-zone/CDASBC-RSU.id +- env: E2E +- skipDeployment: "true" + + +CDASBC-RSU: +- name: CD_ASBC-RSU INT +- tag: CDASBC-RSU +- mzId: CD_ASBC-RSU/management-zone/CDASBC-RSU.id +- env: INT +- skipDeployment: "true" + + +#Prod alerting profiles for EMEA/NA/CN +CDASBC-RSU-PROD.EMEA-Prod: +- name: CD_ASBC-RSU PROD +- tag: CDASBC-RSU +- mzId: CD_ASBC-RSU/management-zone/CDASBC-RSU.id +- env: PROD +- skipDeployment: "false" +CDASBC-RSU-PROD.NA-Prod: +- name: CD_ASBC-RSU PROD +- tag: CDASBC-RSU +- mzId: CD_ASBC-RSU/management-zone/CDASBC-RSU.id +- env: PROD +- skipDeployment: "false" +CDASBC-RSU-PROD.CN-Prod: +- name: CD_ASBC-RSU PROD +- tag: CDASBC-RSU +- mzId: CD_ASBC-RSU/management-zone/CDASBC-RSU.id +- env: PROD +- skipDeployment: "false" + + +#E2E alerting profiles for EMEA/NA/CN +CDASBC-RSU-E2E.EMEA-Prod: +- name: CD_ASBC-RSU E2E +- tag: CDASBC-RSU +- mzId: CD_ASBC-RSU/management-zone/CDASBC-RSU.id +- env: E2E +- skipDeployment: "false" +CDASBC-RSU-E2E.NA-Prod: +- name: CD_ASBC-RSU E2E +- tag: CDASBC-RSU +- mzId: CD_ASBC-RSU/management-zone/CDASBC-RSU.id +- env: E2E +- skipDeployment: "false" +CDASBC-RSU-E2E.CN-Prod: +- name: CD_ASBC-RSU E2E +- tag: CDASBC-RSU +- mzId: CD_ASBC-RSU/management-zone/CDASBC-RSU.id +- env: E2E +- skipDeployment: "false" + + +#INT alerting profiles for EMEA/NA/CN +CDASBC-RSU.EMEA-PreProd: +- name: CD_ASBC-RSU INT +- tag: CDASBC-RSU +- mzId: CD_ASBC-RSU/management-zone/CDASBC-RSU.id +- env: INT +- skipDeployment: "false" +CDASBC-RSU.NA-PreProd: +- name: CD_ASBC-RSU INT +- tag: CDASBC-RSU +- mzId: CD_ASBC-RSU/management-zone/CDASBC-RSU.id +- env: INT +- skipDeployment: "false" +CDASBC-RSU.CN-PreProd: +- name: CD_ASBC-RSU INT +- tag: CDASBC-RSU +- mzId: CD_ASBC-RSU/management-zone/CDASBC-RSU.id +- env: INT +- skipDeployment: "false" diff --git a/BMW-Dynatrace-config/CD_ASBC-RSU/notification/CDRSU-MSTeams.json b/BMW-Dynatrace-config/CD_ASBC-RSU/notification/CDRSU-MSTeams.json deleted file mode 100644 index db37fa2e..00000000 --- a/BMW-Dynatrace-config/CD_ASBC-RSU/notification/CDRSU-MSTeams.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "acceptAnyCertificate": false, - "active": true, - "alertingProfile": "{{.apid}}", - "headers": [], - "name": "{{.name}}", - "notifyEventMergesEnabled": false, - "payload": "{\n\"title\":\"{ProblemTitle}\",\n\"text\":\"{ProblemDetailsHTML}\",\n\"themeColor\":\"EA4300\"\n}", - "type": "WEBHOOK", - "url": "https://msggroup.webhook.office.com/webhookb2/34087616-ed8c-4baa-919e-072ad089b4f8@763b2760-45c5-46d3-883e-29705bba49b7/IncomingWebhook/242b08e7351642fd9f8bc5a5fbb3ec9e/921a617b-5f49-4a91-9040-3772ee81fcbd" -} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_ASBC-RSU/notification/notification.yaml b/BMW-Dynatrace-config/CD_ASBC-RSU/notification/notification.yaml index 136a3f7b..00d6ba09 100644 --- a/BMW-Dynatrace-config/CD_ASBC-RSU/notification/notification.yaml +++ b/BMW-Dynatrace-config/CD_ASBC-RSU/notification/notification.yaml @@ -1,5 +1,150 @@ config: -- CDRSU-MSTeams: CDRSU-MSTeams.json -CDRSU-MSTeams: -- name: CD_RSU - MS Teams -- apid: "/CD_ASBC-RSU/alerting-profile/CDASBC-RSU.id" \ No newline at end of file +- CDASBC-RSU-MSTeams: msTeams.json +- CDASBC-RSU-ITSM-PROD: itsm.json +- CDASBC-RSU-ITSM-E2E: itsm.json + + +CDASBC-RSU-MSTeams: +- name: CD_ASBC-RSU-MSTEAMS-PROD +- alertingProfile: CD_ASBC-RSU/alerting-profile/CDASBC-RSU-PROD.id +- webhook: https://msggroup.webhook.office.com/webhookb2/34087616-ed8c-4baa-919e-072ad089b4f8@763b2760-45c5-46d3-883e-29705bba49b7/IncomingWebhook/242b08e7351642fd9f8bc5a5fbb3ec9e/921a617b-5f49-4a91-9040-3772ee81fcbd +- skipDeployment: "true" + + +CDASBC-RSU-ITSM-PROD: +- name: CD_ASBC-RSU-ITSM-PROD +- alertingProfile: CD_ASBC-RSU/alerting-profile/CDASBC-RSU-PROD.id +- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 +- contractid: "10APP11765000" +- appdid: "APPD-138971" +- mzName: CD_ASBC-RSU/management-zone/CDASBC-RSU.id +- DTEnvironment: https://xxu26128.live.dynatrace.com +- skipDeployment: "true" + +CDASBC-RSU-ITSM-E2E: +- name: CD_ASBC-RSU-ITSM-PROD +- alertingProfile: CD_ASBC-RSU/alerting-profile/CDASBC-RSU-E2E.id +- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 +- contractid: "10APP11765000" +- appdid: "APPD-138971" +- mzName: CD_ASBC-RSU/management-zone/CDASBC-RSU.id +- DTEnvironment: https://xxu26128.live.dynatrace.com +- skipDeployment: "true" + + +# Notification System for EMEA/NA/CN PROD msTeams +CDASBC-RSU-MSTeams.EMEA-Prod: +- name: CD_ASBC-RSU-MSTEAMS-PROD +- alertingProfile: CD_ASBC-RSU/alerting-profile/CDASBC-RSU-PROD.id +- webhook: https://msggroup.webhook.office.com/webhookb2/34087616-ed8c-4baa-919e-072ad089b4f8@763b2760-45c5-46d3-883e-29705bba49b7/IncomingWebhook/242b08e7351642fd9f8bc5a5fbb3ec9e/921a617b-5f49-4a91-9040-3772ee81fcbd +- skipDeployment: "true" +CDASBC-RSU-MSTeams.NA-Prod: +- name: CD_ASBC-RSU-MSTEAMS-PROD +- alertingProfile: CD_ASBC-RSU/alerting-profile/CDASBC-RSU-PROD.id +- webhook: https://msggroup.webhook.office.com/webhookb2/34087616-ed8c-4baa-919e-072ad089b4f8@763b2760-45c5-46d3-883e-29705bba49b7/IncomingWebhook/242b08e7351642fd9f8bc5a5fbb3ec9e/921a617b-5f49-4a91-9040-3772ee81fcbd +- skipDeployment: "true" +CDASBC-RSU-MSTeams.CN-Prod: +- name: CD_ASBC-RSU-MSTEAMS-PROD +- alertingProfile: CD_ASBC-RSU/alerting-profile/CDASBC-RSU-PROD.id +- webhook: https://msggroup.webhook.office.com/webhookb2/34087616-ed8c-4baa-919e-072ad089b4f8@763b2760-45c5-46d3-883e-29705bba49b7/IncomingWebhook/242b08e7351642fd9f8bc5a5fbb3ec9e/921a617b-5f49-4a91-9040-3772ee81fcbd +- skipDeployment: "true" + +# Notification System for EMEA/NA/CN E2E msTeams +CDASBC-RSU-MSTeams.EMEA-Prod: +- name: CD_ASBC-RSU-MSTEAMS-E2E +- alertingProfile: CD_ASBC-RSU/alerting-profile/CDASBC-RSU-E2E.id +- webhook: https://msggroup.webhook.office.com/webhookb2/34087616-ed8c-4baa-919e-072ad089b4f8@763b2760-45c5-46d3-883e-29705bba49b7/IncomingWebhook/242b08e7351642fd9f8bc5a5fbb3ec9e/921a617b-5f49-4a91-9040-3772ee81fcbd +- skipDeployment: "true" +CDASBC-RSU-MSTeams.NA-Prod: +- name: CD_ASBC-RSU-MSTEAMS-E2E +- alertingProfile: CD_ASBC-RSU/alerting-profile/CDASBC-RSU-E2E.id +- webhook: https://msggroup.webhook.office.com/webhookb2/34087616-ed8c-4baa-919e-072ad089b4f8@763b2760-45c5-46d3-883e-29705bba49b7/IncomingWebhook/242b08e7351642fd9f8bc5a5fbb3ec9e/921a617b-5f49-4a91-9040-3772ee81fcbd +- skipDeployment: "true" +CDASBC-RSU-MSTeams.CN-Prod: +- name: CD_ASBC-RSU-MSTEAMS-E2E +- alertingProfile: CD_ASBC-RSU/alerting-profile/CDASBC-RSU-E2E.id +- webhook: https://msggroup.webhook.office.com/webhookb2/34087616-ed8c-4baa-919e-072ad089b4f8@763b2760-45c5-46d3-883e-29705bba49b7/IncomingWebhook/242b08e7351642fd9f8bc5a5fbb3ec9e/921a617b-5f49-4a91-9040-3772ee81fcbd +- skipDeployment: "true" + + +# Notification System for EMEA/NA/CN PreProd msTeams +CDASBC-RSU-MSTeams.EMEA-PreProd: +- name: CD_ASBC-RSU INT +- alertingProfile: CD_ASBC-RSU/alerting-profile/CDASBC-RSU.id +- webhook: https://msggroup.webhook.office.com/webhookb2/34087616-ed8c-4baa-919e-072ad089b4f8@763b2760-45c5-46d3-883e-29705bba49b7/IncomingWebhook/242b08e7351642fd9f8bc5a5fbb3ec9e/921a617b-5f49-4a91-9040-3772ee81fcbd +- skipDeployment: "true" +CDASBC-RSU-MSTeams.NA-PreProd: +- name: CD_ASBC-RSU INT +- alertingProfile: CD_ASBC-RSU/alerting-profile/CDASBC-RSU.id +- webhook: https://msggroup.webhook.office.com/webhookb2/34087616-ed8c-4baa-919e-072ad089b4f8@763b2760-45c5-46d3-883e-29705bba49b7/IncomingWebhook/242b08e7351642fd9f8bc5a5fbb3ec9e/921a617b-5f49-4a91-9040-3772ee81fcbd +- skipDeployment: "true" +CDASBC-RSU-MSTeams.CN-PreProd: +- name: CD_ASBC-RSU INT +- alertingProfile: CD_ASBC-RSU/alerting-profile/CDASBC-RSU.id +- webhook: https://msggroup.webhook.office.com/webhookb2/34087616-ed8c-4baa-919e-072ad089b4f8@763b2760-45c5-46d3-883e-29705bba49b7/IncomingWebhook/242b08e7351642fd9f8bc5a5fbb3ec9e/921a617b-5f49-4a91-9040-3772ee81fcbd +- skipDeployment: "true" + + +# Notification System for EMEA/NA/CN PROD ITSM +CDASBC-RSU-ITSM-PROD.EMEA-Prod: +- name: CD_ASBC-RSU-ITSM-PROD +- alertingProfile: CD_ASBC-RSU/alerting-profile/CDASBC-RSU-PROD.id +- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 +- contractid: "10APP11765000" +- appdid: "APPD-138971" +- mzName: CD_ASBC-RSU/management-zone/CDASBC-RSU.name +- DTEnvironment: https://xxu26128.live.dynatrace.com +- skipDeployment: "false" + +CDASBC-RSU-ITSM-PROD.NA-Prod: +- name: CD_ASBC-RSU-ITSM-PROD +- alertingProfile: CD_ASBC-RSU/alerting-profile/CDASBC-RSU-PROD.id +- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 +- contractid: "20APP11765002" +- appdid: "APPD-139046" +- mzName: CD_ASBC-RSU/management-zone/CDASBC-RSU.name +- DTEnvironment: https://wgv50241.live.dynatrace.com +- skipDeployment: "false" + + +CDASBC-RSU-ITSM-PROD.CN-Prod: +- name: CD_ASBC-RSU-ITSM-PROD +- alertingProfile: CD_ASBC-RSU/alerting-profile/CDASBC-RSU-PROD.id +- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 +- contractid: "30APP11765001" +- appdid: "APPD-139121" +- mzName: CD_ASBC-RSU/management-zone/CDASBC-RSU.name +- DTEnvironment: https://xxu26128.live.dynatrace.com +- skipDeployment: "false" + +# Notification System for EMEA/NA/CN E2E ITSM +CDASBC-RSU-ITSM-E2E.EMEA-Prod: +- name: CD_ASBC-RSU-ITSM-E2E +- alertingProfile: CD_ASBC-RSU/alerting-profile/CDASBC-RSU-E2E.id +- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 +- contractid: "10APP11765002" +- appdid: "APPD-151846" +- mzName: CD_ASBC-RSU/management-zone/CDASBC-RSU.name +- DTEnvironment: https://xxu26128.live.dynatrace.com +- skipDeployment: "false" + +CDASBC-RSU-ITSM-E2E.NA-Prod: +- name: CD_ASBC-RSU-ITSM-E2E +- alertingProfile: CD_ASBC-RSU/alerting-profile/CDASBC-RSU-E2E.id +- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 +- contractid: "20APP11765001" +- appdid: "APPD-151896" +- mzName: CD_ASBC-RSU/management-zone/CDASBC-RSU.name +- DTEnvironment: https://wgv50241.live.dynatrace.com +- skipDeployment: "false" + + +CDASBC-RSU-ITSM-E2E.CN-Prod: +- name: CD_ASBC-RSU-ITSM-E2E +- alertingProfile: CD_ASBC-RSU/alerting-profile/CDASBC-RSU-E2E.id +- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 +- contractid: "30APP11765002" +- appdid: "APPD-151871" +- mzName: CD_ASBC-RSU/management-zone/CDASBC-RSU.name +- DTEnvironment: https://xxu26128.live.dynatrace.com +- skipDeployment: "false"