diff --git a/BMW-Dynatrace-config/CD_ASBC-SMACC/alerting-profile/alerting-profile.yaml b/BMW-Dynatrace-config/CD_ASBC-SMACC/alerting-profile/alerting-profile.yaml index e3c5478c..bcf41841 100644 --- a/BMW-Dynatrace-config/CD_ASBC-SMACC/alerting-profile/alerting-profile.yaml +++ b/BMW-Dynatrace-config/CD_ASBC-SMACC/alerting-profile/alerting-profile.yaml @@ -29,19 +29,19 @@ CD_ASBC-SMACC: #Prod alerting profiles for EMEA/NA/CN CD_ASBC-SMACC-PROD.EMEA-Prod: - name: CD_ASBC-SMACC PROD -- tag: CD_ASBC-SMACC +- tag: ASBC-SMACC - mzId: CD_ASBC-SMACC/management-zone/CDASBC-SMACC.id - env: PROD - skipDeployment: "false" CD_ASBC-SMACC-PROD.NA-Prod: - name: CD_ASBC-SMACC PROD -- tag: CD_ASBC-SMACC +- tag: ASBC-SMACC - mzId: CD_ASBC-SMACC/management-zone/CDASBC-SMACC.id - env: PROD - skipDeployment: "false" CD_ASBC-SMACC-PROD.CN-Prod: - name: CD_ASBC-SMACC PROD -- tag: CD_ASBC-SMACC +- tag: ASBC-SMACC - mzId: CD_ASBC-SMACC/management-zone/CDASBC-SMACC.id - env: PROD - skipDeployment: "false" @@ -50,19 +50,19 @@ CD_ASBC-SMACC-PROD.CN-Prod: #E2E alerting profiles for EMEA/NA/CN CD_ASBC-SMACC-E2E.EMEA-Prod: - name: CD_ASBC-SMACC E2E -- tag: CD_ASBC-SMACC +- tag: ASBC-SMACC - mzId: CD_ASBC-SMACC/management-zone/CDASBC-SMACC.id - env: E2E - skipDeployment: "false" CD_ASBC-SMACC-E2E.NA-Prod: - name: CD_ASBC-SMACC E2E -- tag: CD_ASBC-SMACC +- tag: ASBC-SMACC - mzId: CD_ASBC-SMACC/management-zone/CDASBC-SMACC.id - env: E2E - skipDeployment: "false" CD_ASBC-SMACC-E2E.CN-Prod: - name: CD_ASBC-SMACC E2E -- tag: CD_ASBC-SMACC +- tag: ASBC-SMACC - mzId: CD_ASBC-SMACC/management-zone/CDASBC-SMACC.id - env: E2E - skipDeployment: "false" diff --git a/BMW-Dynatrace-config/CD_ASBC-SMACC/notification/notification.yaml b/BMW-Dynatrace-config/CD_ASBC-SMACC/notification/notification.yaml index e675d0c9..9a44353e 100644 --- a/BMW-Dynatrace-config/CD_ASBC-SMACC/notification/notification.yaml +++ b/BMW-Dynatrace-config/CD_ASBC-SMACC/notification/notification.yaml @@ -8,7 +8,6 @@ CDASBC-SMACC-MSTeams: - alertingProfile: CD_ASBC-SMACC/alerting-profile/CD_ASBC-SMACC-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-SMACC-ITSM-PROD: - name: CD_ASBC-SMACC-ITSM-PROD - alertingProfile: CD_ASBC-SMACC/alerting-profile/CD_ASBC-SMACC-PROD.id @@ -17,8 +16,7 @@ CDASBC-SMACC-ITSM-PROD: - appdid: "APPD-150046" - mzName: CD_ASBC-SMACC/management-zone/CD_ASBC-SMACC.id - DTEnvironment: https://xxu26128.live.dynatrace.com -- skipDeployment: "true" - +- skipDeployment: "true" # Since skipdDeployment is set to true, we do not want to deploy this CDASBC-SMACC-ITSM-E2E: - name: CD_ASBC-SMACC-ITSM-PROD #Sollte hier nicht E2E stehen? - alertingProfile: CD_ASBC-SMACC/alerting-profile/CD_ASBC-SMACC-E2E.id @@ -47,10 +45,6 @@ CDASBC-SMACC-MSTeams.CN-Prod: - skipDeployment: "true" - - - - # Notification System for EMEA/NA/CN E2E msTeams CDASBC-SMACC-MSTeams.EMEA-Prod: - name: CD_ASBC-SMACC-MSTEAMS-E2E @@ -96,8 +90,7 @@ CDASBC-SMACC-ITSM-PROD.EMEA-Prod: - appdid: "APPD-150046" - mzName: CD_ASBC-SMACC/management-zone/CDASBC-SMACC.name - DTEnvironment: https://xxu26128.live.dynatrace.com -- skipDeployment: "false" - +- skipDeployment: "true" CDASBC-SMACC-ITSM-PROD.NA-Prod: - name: CD_ASBC-SMACC-ITSM-PROD - alertingProfile: CD_ASBC-SMACC/alerting-profile/CD_ASBC-SMACC-PROD.id @@ -106,9 +99,7 @@ CDASBC-SMACC-ITSM-PROD.NA-Prod: - appdid: "APPD-150121" - mzName: CD_ASBC-SMACC/management-zone/CDASBC-SMACC.name - DTEnvironment: https://wgv50241.live.dynatrace.com -- skipDeployment: "false" - - +- skipDeployment: "true" CDASBC-SMACC-ITSM-PROD.CN-Prod: - name: CD_ASBC-SMACC-ITSM-PROD - alertingProfile: CD_ASBC-SMACC/alerting-profile/CD_ASBC-SMACC-PROD.id @@ -117,7 +108,39 @@ CDASBC-SMACC-ITSM-PROD.CN-Prod: - appdid: "APPD-150146" - mzName: CD_ASBC-SMACC/management-zone/CDASBC-SMACC.name - DTEnvironment: https://xxu26128.live.dynatrace.com +- skipDeployment: "true" + + +# Notification System for EMEA/NA/CN PROD ITSM +# Requested in Ticket OPMAAS-1700 https://atc.bmwgroup.net/jira/browse/OPMAAS-1700 +CDASBC-SMACC-ITSM-PROD.EMEA-Prod: +- name: CD_ASBC-SMACC-ITSM-PROD +- alertingProfile: CD_ASBC-SMACC/alerting-profile/CD_ASBC-SMACC-PROD.id +- webhook: https://apim.bmwgroup.com/evtmgmt/eventproxy/v1 +- contractid: "10APP11764900" +- appdid: "APPD-150046" +- mzName: CD_ASBC-SMACC/management-zone/CDASBC-SMACC.name +- DTEnvironment: https://xxu26128.live.dynatrace.com - skipDeployment: "false" +CDASBC-SMACC-ITSM-PROD.NA-Prod: +- name: CD_ASBC-SMACC-ITSM-PROD +- alertingProfile: CD_ASBC-SMACC/alerting-profile/CD_ASBC-SMACC-PROD.id +- webhook: https://apim.bmwgroup.com/evtmgmt/eventproxy/v1 +- contractid: "20APP11764900" +- appdid: "APPD-150121" +- mzName: CD_ASBC-SMACC/management-zone/CDASBC-SMACC.name +- DTEnvironment: https://wgv50241.live.dynatrace.com +- skipDeployment: "false" +CDASBC-SMACC-ITSM-PROD.CN-Prod: +- name: CD_ASBC-SMACC-ITSM-PROD +- alertingProfile: CD_ASBC-SMACC/alerting-profile/CD_ASBC-SMACC-PROD.id +- webhook: https://apim.bmwgroup.com/evtmgmt/eventproxy/v1 +- contractid: "30APP11764905" +- appdid: "APPD-150146" +- mzName: CD_ASBC-SMACC/management-zone/CDASBC-SMACC.name +- DTEnvironment: https://dynatracemgd-tsp.bmwgroup.net/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b +- skipDeployment: "false" + # Notification System for EMEA/NA/CN E2E ITSM CDASBC-SMACC-ITSM-E2E.EMEA-Prod: @@ -129,7 +152,6 @@ CDASBC-SMACC-ITSM-E2E.EMEA-Prod: - mzName: CD_ASBC-SMACC/management-zone/CDASBC-SMACC.name - DTEnvironment: https://xxu26128.live.dynatrace.com - skipDeployment: "false" - CDASBC-SMACC-ITSM-E2E.NA-Prod: - name: CD_ASBC-SMACC-ITSM-E2E - alertingProfile: CD_ASBC-SMACC/alerting-profile/CD_ASBC-SMACC-E2E.id @@ -139,8 +161,6 @@ CDASBC-SMACC-ITSM-E2E.NA-Prod: - mzName: CD_ASBC-SMACC/management-zone/CDASBC-SMACC.name - DTEnvironment: https://wgv50241.live.dynatrace.com - skipDeployment: "false" - - CDASBC-SMACC-ITSM-E2E.CN-Prod: - name: CD_ASBC-SMACC-ITSM-E2E - alertingProfile: CD_ASBC-SMACC/alerting-profile/CD_ASBC-SMACC-E2E.id diff --git a/BMW-Dynatrace-config/CD_smc2-bl/alerting-profile/default.json b/BMW-Dynatrace-config/CD_smc2-bl/alerting-profile/default.json index 681a4c64..de613539 100644 --- a/BMW-Dynatrace-config/CD_smc2-bl/alerting-profile/default.json +++ b/BMW-Dynatrace-config/CD_smc2-bl/alerting-profile/default.json @@ -12,7 +12,7 @@ "tagFilters": [ { "context": "CONTEXTLESS", - "key": "Component", + "key": "ms-id", "value": "{{.tag}}" }, { @@ -31,7 +31,7 @@ "tagFilters": [ { "context": "CONTEXTLESS", - "key": "Component", + "key": "ms-id", "value": "{{.tag}}" }, { @@ -50,7 +50,7 @@ "tagFilters": [ { "context": "CONTEXTLESS", - "key": "Component", + "key": "ms-id", "value": "{{.tag}}" }, { @@ -69,7 +69,7 @@ "tagFilters": [ { "context": "CONTEXTLESS", - "key": "Component", + "key": "ms-id", "value": "{{.tag}}" }, { @@ -88,7 +88,7 @@ "tagFilters": [ { "context": "CONTEXTLESS", - "key": "Component", + "key": "ms-id", "value": "{{.tag}}" }, { diff --git a/BMW-Dynatrace-config/CD_smc2-bl/notification/notification.yaml b/BMW-Dynatrace-config/CD_smc2-bl/notification/notification.yaml index 4d9c1c3d..cc395724 100644 --- a/BMW-Dynatrace-config/CD_smc2-bl/notification/notification.yaml +++ b/BMW-Dynatrace-config/CD_smc2-bl/notification/notification.yaml @@ -19,6 +19,7 @@ CDsmc2-bl.CN-Prod: - webhook: https://empty - skipDeployment: "true" + # Notification System for EMEA/NA/CN PreProd msTeams CDsmc2-bl.EMEA-PreProd: - name: CD_smc2-bl INT @@ -39,35 +40,33 @@ CDsmc2-bl.CN-PreProd: # Notification System for EMEA/NA/CN Prod ITSM CDsmc2-blITSM.EMEA-Prod: -- name: CD_smc2-bl ITSM PROD +- name: "[ITSM] smc2-bl PROD" - alertingProfile: CD_smc2-bl/alerting-profile/CDsmc2-bl.id -- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 -- contractid: "10APP11906401" -- appdid: "TEST123" +- webhook: https://apim.bmwgroup.com/evtmgmt/eventproxy/v1 +- contractid: "10APP11770108" +- appdid: "APP-20673" - mzName: CD_smc2-bl/management-zone/CDsmc2-bl.id - DTEnvironment: https://xxu26128.live.dynatrace.com -- skipDeployment: "true" - +- skipDeployment: "false" CDsmc2-blITSM.NA-Prod: -- name: CD_smc2-bl ITSM PROD +- name: "[ITSM] smc2-bl PROD" - alertingProfile: CD_smc2-bl/alerting-profile/CDsmc2-bl.id -- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 -- contractid: "10APP11906401" -- appdid: "TEST123" +- webhook: https://apim.bmwgroup.com/evtmgmt/eventproxy/v1 +- contractid: "20APP11770107" +- appdid: "APP-20673" - mzName: CD_smc2-bl/management-zone/CDsmc2-bl.id -- DTEnvironment: https://xxu26128.live.dynatrace.com -- skipDeployment: "true" - - +- DTEnvironment: https://wgv50241.live.dynatrace.com +- skipDeployment: "false" CDsmc2-blITSM.CN-Prod: -- name: CD_smc2-bl ITSM PROD +- name: "[ITSM] smc2-bl PROD" - alertingProfile: CD_smc2-bl/alerting-profile/CDsmc2-bl.id -- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 -- contractid: "10APP11906401" -- appdid: "TEST123" +- webhook: https://apim.bmwgroup.com/evtmgmt/eventproxy/v1 +- contractid: "30APP11770107" +- appdid: "APP-20673" - mzName: CD_smc2-bl/management-zone/CDsmc2-bl.id -- DTEnvironment: https://xxu26128.live.dynatrace.com -- skipDeployment: "true" +- DTEnvironment: https://dynatracemgd-tsp.bmwgroup.net/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b +- skipDeployment: "false" + CDsmc2-blITSM.EMEA-PreProd: - name: CD_smc2-bl ITSM INT @@ -78,7 +77,6 @@ CDsmc2-blITSM.EMEA-PreProd: - mzName: CD_smc2-bl/management-zone/CDsmc2-bl.id - DTEnvironment: https://xxu26128.live.dynatrace.com - skipDeployment: "true" - CDsmc2-blITSM.NA-PreProd: - name: CD_smc2-bl ITSM INT - alertingProfile: CD_smc2-bl/alerting-profile/CDsmc2-bl.id @@ -88,8 +86,6 @@ CDsmc2-blITSM.NA-PreProd: - mzName: CD_smc2-bl/management-zone/CDsmc2-bl.id - DTEnvironment: https://xxu26128.live.dynatrace.com - skipDeployment: "true" - - CDsmc2-blITSM.CN-PreProd: - name: CD_smc2-bl ITSM INT - alertingProfile: CD_smc2-bl/alerting-profile/CDsmc2-bl.id diff --git a/BMW-Dynatrace-config/CD_smc2-key-trk/alerting-profile/default.json b/BMW-Dynatrace-config/CD_smc2-key-trk/alerting-profile/default.json index 681a4c64..de613539 100644 --- a/BMW-Dynatrace-config/CD_smc2-key-trk/alerting-profile/default.json +++ b/BMW-Dynatrace-config/CD_smc2-key-trk/alerting-profile/default.json @@ -12,7 +12,7 @@ "tagFilters": [ { "context": "CONTEXTLESS", - "key": "Component", + "key": "ms-id", "value": "{{.tag}}" }, { @@ -31,7 +31,7 @@ "tagFilters": [ { "context": "CONTEXTLESS", - "key": "Component", + "key": "ms-id", "value": "{{.tag}}" }, { @@ -50,7 +50,7 @@ "tagFilters": [ { "context": "CONTEXTLESS", - "key": "Component", + "key": "ms-id", "value": "{{.tag}}" }, { @@ -69,7 +69,7 @@ "tagFilters": [ { "context": "CONTEXTLESS", - "key": "Component", + "key": "ms-id", "value": "{{.tag}}" }, { @@ -88,7 +88,7 @@ "tagFilters": [ { "context": "CONTEXTLESS", - "key": "Component", + "key": "ms-id", "value": "{{.tag}}" }, { diff --git a/BMW-Dynatrace-config/CD_smc2-key-trk/notification/notification.yaml b/BMW-Dynatrace-config/CD_smc2-key-trk/notification/notification.yaml index c95e1ee2..4543c5f6 100644 --- a/BMW-Dynatrace-config/CD_smc2-key-trk/notification/notification.yaml +++ b/BMW-Dynatrace-config/CD_smc2-key-trk/notification/notification.yaml @@ -19,6 +19,7 @@ CDsmc2-key-trk.CN-Prod: - webhook: https://empty - skipDeployment: "true" + # Notification System for EMEA/NA/CN PreProd msTeams CDsmc2-key-trk.EMEA-PreProd: - name: CD_smc2-key-trk INT @@ -39,35 +40,33 @@ CDsmc2-key-trk.CN-PreProd: # Notification System for EMEA/NA/CN Prod ITSM CDsmc2-key-trkITSM.EMEA-Prod: -- name: CD_smc2-key-trk ITSM PROD +- name: "[ITSM] CD_smc2-key-trk PROD" - alertingProfile: CD_smc2-key-trk/alerting-profile/CDsmc2-key-trk.id -- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 -- contractid: "10APP11906401" -- appdid: "TEST123" +- webhook: https://apim.bmwgroup.com/evtmgmt/eventproxy/v1 +- contractid: "10APP11770110" +- appdid: "APP-20673" - mzName: CD_smc2-key-trk/management-zone/CDsmc2-key-trk.id - DTEnvironment: https://xxu26128.live.dynatrace.com -- skipDeployment: "true" - +- skipDeployment: "false" CDsmc2-key-trkITSM.NA-Prod: -- name: CD_smc2-key-trk ITSM PROD +- name: "[ITSM] CD_smc2-key-trk PROD" - alertingProfile: CD_smc2-key-trk/alerting-profile/CDsmc2-key-trk.id -- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 -- contractid: "10APP11906401" -- appdid: "TEST123" +- webhook: https://apim.bmwgroup.com/evtmgmt/eventproxy/v1 +- contractid: "20APP11770104" +- appdid: "APP-20673" - mzName: CD_smc2-key-trk/management-zone/CDsmc2-key-trk.id -- DTEnvironment: https://xxu26128.live.dynatrace.com -- skipDeployment: "true" - - +- DTEnvironment: https://wgv50241.live.dynatrace.com +- skipDeployment: "false" CDsmc2-key-trkITSM.CN-Prod: -- name: CD_smc2-key-trk ITSM PROD +- name: "[ITSM] CD_smc2-key-trk PROD" - alertingProfile: CD_smc2-key-trk/alerting-profile/CDsmc2-key-trk.id -- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 -- contractid: "10APP11906401" -- appdid: "TEST123" +- webhook: https://apim.bmwgroup.com/evtmgmt/eventproxy/v1 +- contractid: "30APP11770104" +- appdid: "APP-20673" - mzName: CD_smc2-key-trk/management-zone/CDsmc2-key-trk.id -- DTEnvironment: https://xxu26128.live.dynatrace.com -- skipDeployment: "true" +- DTEnvironment: https://dynatracemgd-tsp.bmwgroup.net/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b +- skipDeployment: "false" + CDsmc2-key-trkITSM.EMEA-PreProd: - name: CD_smc2-key-trk ITSM INT @@ -78,7 +77,6 @@ CDsmc2-key-trkITSM.EMEA-PreProd: - mzName: CD_smc2-key-trk/management-zone/CDsmc2-key-trk.id - DTEnvironment: https://xxu26128.live.dynatrace.com - skipDeployment: "true" - CDsmc2-key-trkITSM.NA-PreProd: - name: CD_smc2-key-trk ITSM INT - alertingProfile: CD_smc2-key-trk/alerting-profile/CDsmc2-key-trk.id @@ -88,8 +86,6 @@ CDsmc2-key-trkITSM.NA-PreProd: - mzName: CD_smc2-key-trk/management-zone/CDsmc2-key-trk.id - DTEnvironment: https://xxu26128.live.dynatrace.com - skipDeployment: "true" - - CDsmc2-key-trkITSM.CN-PreProd: - name: CD_smc2-key-trk ITSM INT - alertingProfile: CD_smc2-key-trk/alerting-profile/CDsmc2-key-trk.id