Adjusted the management zone.

Merge in OPAPM/cd_e2e_monitoring_config from feature/VDLM-changesManagmentZone to master

* commit 'e2dd202b5e4ded051ed18df7f863281e18c4a09f':
  Adjusted.
  Adjusted.
  Added supress options for main VDLM manage

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"

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

BMW-Dynatrace-config/CD_CSF/alerting-profile/alerting-profile.yaml

@@ -0,0 +1,18 @@
+config:
+- CD_CSF: default.json
+
+#Prod alerting profiles for EMEA
+CD_CSF.EMEA-Prod:
+- name: CD_CSF PROD
+- tag: charging-station-feedback-composite-service
+- mzId: CD_CSF/management-zone/CD_CSF.id
+- env: PROD
+- skipDeployment: "false"
+
+#INT alerting profiles for EMEA
+CD_CSF.EMEA-PreProd:
+- name: CD_CSF INT
+- tag: charging-station-feedback-composite-service
+- mzId: CD_CSF/management-zone/CD_CSF.id
+- env: INT
+- skipDeployment: "false"

BMW-Dynatrace-config/CD_CSF/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}}"
+     }
+    ]
+   }
+  }
+ ]
+}

BMW-Dynatrace-config/CD_CSF/dashboard/README.md

@@ -0,0 +1,4 @@
+
+### How to configure dashboards?
+
+Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Dashboards) page to configure your dashboards.

BMW-Dynatrace-config/CD_CSF/dashboard/dashboard.yaml

@@ -0,0 +1,125 @@
+config:
+- CD_CSF-PROD: default.json
+- CD_CSF-E2E: default.json
+- CD_CSF-INT: default.json
+- CD_CSF-TEST: default.json
+
+#PROD dashboards for EMEA/NA/CN Prod
+CD_CSF-PROD:
+- name: CD_CSF PROD
+- mzName: CD_CSF/management-zone/CD_CSF.name
+- mzId: CD_CSF/management-zone/CD_CSF.id
+- tag: charging-station-feedback-composite-service
+- env: PROD
+- skipDeployment: "false"
+CD_CSF-PROD.EMEA-Prod:
+- name: CD_CSF PROD
+- mzName: CD_CSF/management-zone/CD_CSF.name
+- mzId: CD_CSF/management-zone/CD_CSF.id
+- tag: charging-station-feedback-composite-service
+- env: PROD
+- skipDeployment: "false"
+CD_CSF-PROD.NA-Prod:
+- name: CD_CSF PROD
+- mzName: CD_CSF/management-zone/CD_CSF.name
+- mzId: CD_CSF/management-zone/CD_CSF.id
+- tag: charging-station-feedback-composite-service
+- env: PROD
+- skipDeployment: "false"
+CD_CSF-PROD.CN-Prod:
+- name: CD_CSF PROD
+- mzName: CD_CSF/management-zone/CD_CSF.name
+- mzId: CD_CSF/management-zone/CD_CSF.id
+- tag: charging-station-feedback-composite-service
+- env: PROD
+- skipDeployment: "false"
+
+#E2E dashboards for EMEA/NA/CN Prod
+CD_CSF-E2E:
+- name: CD_CSF E2E
+- mzName: CD_CSF/management-zone/CD_CSF.name
+- mzId: CD_CSF/management-zone/CD_CSF.id
+- tag: charging-station-feedback-composite-service
+- env: E2E
+- skipDeployment: "false"
+CD_CSF-E2E.EMEA-Prod:
+- name: CD_CSF E2E
+- mzName: CD_CSF/management-zone/CD_CSF.name
+- mzId: CD_CSF/management-zone/CD_CSF.id
+- tag: charging-station-feedback-composite-service
+- env: E2E
+- skipDeployment: "false"
+CD_CSF-E2E.NA-Prod:
+- name: CD_CSF E2E
+- mzName: CD_CSF/management-zone/CD_CSF.name
+- mzId: CD_CSF/management-zone/CD_CSF.id
+- tag: charging-station-feedback-composite-service
+- env: E2E
+- skipDeployment: "false"
+CD_CSF-E2E.CN-Prod:
+- name: CD_CSF E2E
+- mzName: CD_CSF/management-zone/CD_CSF.name
+- mzId: CD_CSF/management-zone/CD_CSF.id
+- tag: charging-station-feedback-composite-service
+- env: E2E
+- skipDeployment: "false"
+
+#INT dashboards for EMEA/NA/CN PreProd
+CD_CSF-INT:
+- name: CD_CSF INT
+- mzName: CD_CSF/management-zone/CD_CSF.name
+- mzId: CD_CSF/management-zone/CD_CSF.id
+- tag: charging-station-feedback-composite-service
+- env: INT
+- skipDeployment: "false"
+CD_CSF-INT.EMEA-PreProd:
+- name: CD_CSF INT
+- mzName: CD_CSF/management-zone/CD_CSF.name
+- mzId: CD_CSF/management-zone/CD_CSF.id
+- tag: charging-station-feedback-composite-service
+- env: INT
+- skipDeployment: "false"
+CD_CSF-INT.NA-PreProd:
+- name: CD_CSF INT
+- mzName: CD_CSF/management-zone/CD_CSF.name
+- mzId: CD_CSF/management-zone/CD_CSF.id
+- tag: charging-station-feedback-composite-service
+- env: INT
+- skipDeployment: "false"
+CD_CSF-INT.CN-PreProd:
+- name: CD_CSF INT
+- mzName: CD_CSF/management-zone/CD_CSF.name
+- mzId: CD_CSF/management-zone/CD_CSF.id
+- tag: charging-station-feedback-composite-service
+- env: INT
+- skipDeployment: "false"
+
+#TEST dashboards for EMEA/NA/CN PreProd
+CD_CSF-TEST:
+- name: CD_CSF TEST
+- mzName: CD_CSF/management-zone/CD_CSF.name
+- mzId: CD_CSF/management-zone/CD_CSF.id
+- tag: charging-station-feedback-composite-service
+- env: TEST
+- skipDeployment: "false"
+CD_CSF-TEST.EMEA-PreProd:
+- name: CD_CSF TEST
+- mzName: CD_CSF/management-zone/CD_CSF.name
+- mzId: CD_CSF/management-zone/CD_CSF.id
+- tag: charging-station-feedback-composite-service
+- env: TEST
+- skipDeployment: "false"
+CD_CSF-TEST.NA-PreProd:
+- name: CD_CSF TEST
+- mzName: CD_CSF/management-zone/CD_CSF.name
+- mzId: CD_CSF/management-zone/CD_CSF.id
+- tag: charging-station-feedback-composite-service
+- env: TEST
+- skipDeployment: "false"
+CD_CSF-TEST.CN-PreProd:
+- name: CD_CSF TEST
+- mzName: CD_CSF/management-zone/CD_CSF.name
+- mzId: CD_CSF/management-zone/CD_CSF.id
+- tag: charging-station-feedback-composite-service
+- env: TEST
+- skipDeployment: "false"

BMW-Dynatrace-config/CD_CSF/dashboard/default.json

@@ -0,0 +1,308 @@
+{
+  "metadata": {
+    "configurationVersions": [
+      3
+    ],
+    "clusterVersion": "1.214.107.20210407-223952"
+  },
+  "dashboardMetadata": {
+    "name": "{{.name}}",
+    "shared": true,
+    "owner": "Ignacio.Goldman@partner.bmwgroup.com",
+    "dashboardFilter": {
+      "timeframe": "-24h to now"
+    },
+    "tags": [
+      "{{.tag}}"
+    ]
+  },
+  "tiles": [
+    {
+      "name": "Custom chart",
+      "tileType": "CUSTOM_CHARTING",
+      "configured": true,
+      "bounds": {
+        "top": 228,
+        "left": 38,
+        "width": 1064,
+        "height": 304
+      },
+      "tileFilter": {},
+      "filterConfig": {
+        "type": "MIXED",
+        "customName": "Failure rate (HTTP 4xx/5xx  errors)",
+        "defaultName": "Custom chart",
+        "chartConfig": {
+          "legendShown": true,
+          "type": "TIMESERIES",
+          "series": [
+            {
+              "metric": "builtin:service.errors.fourxx.rate",
+              "aggregation": "AVG",
+              "type": "BAR",
+              "entityType": "SERVICE",
+              "dimensions": [],
+              "sortAscending": false,
+              "sortColumn": false,
+              "aggregationRate": "TOTAL"
+            },
+            {
+              "metric": "builtin:service.errors.fivexx.rate",
+              "aggregation": "AVG",
+              "type": "BAR",
+              "entityType": "SERVICE",
+              "dimensions": [],
+              "sortAscending": false,
+              "sortColumn": true,
+              "aggregationRate": "TOTAL"
+            }
+          ],
+          "resultMetadata": {
+            "nullbuiltin:service.errors.fivexx.rate|AVG|TOTAL|BAR|SERVICE": {
+              "lastModified": 1617956393463,
+              "customColor": "#ff0000"
+            },
+            "nullbuiltin:service.errors.fourxx.rate|AVG|TOTAL|BAR|SERVICE": {
+              "lastModified": 1617956441725,
+              "customColor": "#fff29a"
+            }
+          }
+        },
+        "filtersPerEntityType": {
+          "SERVICE": {
+            "AUTO_TAGS": [
+              "Environment:{{.env}}",
+              "Component:{{.tag}}"
+            ]
+          }
+        }
+      }
+    },
+    {
+      "name": "Problems",
+      "tileType": "OPEN_PROBLEMS",
+      "configured": true,
+      "bounds": {
+        "top": 38,
+        "left": 950,
+        "width": 152,
+        "height": 152
+      },
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      }
+    },
+    {
+      "name": "Overall Health",
+      "tileType": "HEADER",
+      "configured": true,
+      "bounds": {
+        "top": 0,
+        "left": 38,
+        "width": 1064,
+        "height": 38
+      },
+      "tileFilter": {}
+    },
+    {
+      "name": "Markdown",
+      "tileType": "MARKDOWN",
+      "configured": true,
+      "bounds": {
+        "top": 532,
+        "left": 38,
+        "width": 1064,
+        "height": 38
+      },
+      "tileFilter": {},
+      "markdown": "---\n"
+    },
+    {
+      "name": "Custom chart",
+      "tileType": "CUSTOM_CHARTING",
+      "configured": true,
+      "bounds": {
+        "top": 570,
+        "left": 38,
+        "width": 1064,
+        "height": 304
+      },
+      "tileFilter": {},
+      "filterConfig": {
+        "type": "MIXED",
+        "customName": "Response time, Request Count and Number of Errors",
+        "defaultName": "Custom chart",
+        "chartConfig": {
+          "legendShown": true,
+          "type": "TIMESERIES",
+          "series": [
+            {
+              "metric": "builtin:service.response.time",
+              "aggregation": "AVG",
+              "type": "LINE",
+              "entityType": "SERVICE",
+              "dimensions": [],
+              "sortAscending": false,
+              "sortColumn": false,
+              "aggregationRate": "TOTAL"
+            },
+            {
+              "metric": "builtin:service.requestCount.total",
+              "aggregation": "NONE",
+              "type": "BAR",
+              "entityType": "SERVICE",
+              "dimensions": [],
+              "sortAscending": false,
+              "sortColumn": false,
+              "aggregationRate": "TOTAL"
+            },
+            {
+              "metric": "builtin:service.errors.total.count",
+              "aggregation": "NONE",
+              "type": "BAR",
+              "entityType": "SERVICE",
+              "dimensions": [],
+              "sortAscending": false,
+              "sortColumn": true,
+              "aggregationRate": "TOTAL"
+            }
+          ],
+          "resultMetadata": {
+            "nullbuiltin:service.requestCount.total|NONE|TOTAL|BAR|SERVICE": {
+              "lastModified": 1595275720776,
+              "customColor": "#008cdb"
+            },
+            "nullbuiltin:service.errors.total.count|NONE|TOTAL|BAR|SERVICE": {
+              "lastModified": 1595275955999,
+              "customColor": "#ef651f"
+            },
+            "nullbuiltin:service.response.time|AVG|TOTAL|LINE|SERVICE": {
+              "lastModified": 1595275686773,
+              "customColor": "#b4e5f9"
+            }
+          }
+        },
+        "filtersPerEntityType": {
+          "SERVICE": {
+            "AUTO_TAGS": [
+              "Environment:{{.env}}",
+              "Component:{{.tag}}"
+            ]
+          }
+        }
+      }
+    },
+    {
+      "name": "Markdown",
+      "tileType": "MARKDOWN",
+      "configured": true,
+      "bounds": {
+        "top": 190,
+        "left": 38,
+        "width": 1064,
+        "height": 38
+      },
+      "tileFilter": {},
+      "markdown": "---\n"
+    },
+    {
+      "name": "",
+      "tileType": "DATABASES_OVERVIEW",
+      "configured": true,
+      "bounds": {
+        "top": 38,
+        "left": 646,
+        "width": 190,
+        "height": 152
+      },
+      "tileFilter": {},
+      "filterConfig": {
+        "type": "DATABASE",
+        "customName": "Databases",
+        "defaultName": "Databases",
+        "chartConfig": {
+          "legendShown": true,
+          "type": "TIMESERIES",
+          "series": [],
+          "resultMetadata": {}
+        },
+        "filtersPerEntityType": {
+          "DATABASE": {
+            "AUTO_TAGS": [
+              "Environment:{{.env}}",
+              "Component:{{.tag}}"
+            ]
+          }
+        }
+      },
+      "chartVisible": true
+    },
+    {
+      "name": "",
+      "tileType": "SERVICES",
+      "configured": true,
+      "bounds": {
+        "top": 38,
+        "left": 342,
+        "width": 190,
+        "height": 152
+      },
+      "tileFilter": {},
+      "filterConfig": {
+        "type": "SERVICE",
+        "customName": "Services",
+        "defaultName": "Services",
+        "chartConfig": {
+          "legendShown": true,
+          "type": "TIMESERIES",
+          "series": [],
+          "resultMetadata": {}
+        },
+        "filtersPerEntityType": {
+          "SERVICE": {
+            "AUTO_TAGS": [
+              "Environment:{{.env}}",
+              "Component:{{.tag}}"
+            ]
+          }
+        }
+      },
+      "chartVisible": true
+    },
+    {
+      "name": "",
+      "tileType": "HOSTS",
+      "configured": true,
+      "bounds": {
+        "top": 38,
+        "left": 38,
+        "width": 190,
+        "height": 152
+      },
+      "tileFilter": {},
+      "filterConfig": {
+        "type": "HOST",
+        "customName": "Hosts",
+        "defaultName": "Hosts",
+        "chartConfig": {
+          "legendShown": true,
+          "type": "TIMESERIES",
+          "series": [],
+          "resultMetadata": {}
+        },
+        "filtersPerEntityType": {
+          "HOST": {
+            "AUTO_TAGS": [
+              "Environment:{{.env}}",
+              "Component:{{.tag}}"
+            ]
+          }
+        }
+      },
+      "chartVisible": true
+    }
+  ]
+}

BMW-Dynatrace-config/CD_CSF/management-zone/README.md

@@ -0,0 +1,4 @@
+
+### How to configure management zones?
+
+Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Management+Zones) page to configure your management zones.

BMW-Dynatrace-config/CD_CSF/management-zone/default.json

@@ -0,0 +1,114 @@
+{
+ "dimensionalRules": [],
+ "name": "{{.name}}",
+ "rules": [
+  {
+   "conditions": [
+    {
+     "comparisonInfo": {
+      "negate": false,
+      "operator": "EQUALS",
+      "type": "TAG",
+      "value": {
+       "context": "CONTEXTLESS",
+       "key": "Component",
+       "value": "{{.tag}}"
+      }
+     },
+     "key": {
+      "attribute": "SERVICE_TAGS"
+     }
+    }
+   ],
+   "enabled": true,
+   "propagationTypes": [
+    "SERVICE_TO_PROCESS_GROUP_LIKE",
+    "SERVICE_TO_HOST_LIKE"
+   ],
+   "type": "SERVICE"
+  },
+  {
+   "conditions": [
+    {
+     "comparisonInfo": {
+      "negate": false,
+      "operator": "EQUALS",
+      "type": "TAG",
+      "value": {
+       "context": "CONTEXTLESS",
+       "key": "Component",
+       "value": "{{.tag}}"
+      }
+     },
+     "key": {
+      "attribute": "PROCESS_GROUP_TAGS"
+     }
+    }
+   ],
+   "enabled": true,
+   "propagationTypes": [
+    "PROCESS_GROUP_TO_HOST"
+   ],
+   "type": "PROCESS_GROUP"
+  },
+  {
+   "conditions": [
+    {
+     "comparisonInfo": {
+      "negate": false,
+      "operator": "EQUALS",
+      "type": "TAG",
+      "value": {
+       "context": "CONTEXTLESS",
+       "key": "Component",
+       "value": "{{.tag}}"
+      }
+     },
+     "key": {
+      "attribute": "HOST_TAGS"
+     }
+    }
+   ],
+   "enabled": true,
+   "type": "HOST"
+  },
+  {
+   "conditions": [
+    {
+     "comparisonInfo": {
+      "caseSensitive": true,
+      "negate": false,
+      "operator": "CONTAINS",
+      "type": "STRING",
+      "value": "{{.tag}}"
+     },
+     "key": {
+      "attribute": "CLOUD_APPLICATION_NAMESPACE_NAME"
+     }
+    }
+   ],
+   "enabled": true,
+   "propagationTypes": [],
+   "type": "CLOUD_APPLICATION_NAMESPACE"
+  },
+  {
+   "conditions": [
+    {
+     "comparisonInfo": {
+      "caseSensitive": true,
+      "negate": false,
+      "operator": "CONTAINS",
+      "type": "STRING",
+      "value": "{{.tag}}"
+     },
+     "key": {
+      "attribute": "CLOUD_APPLICATION_NAME"
+     }
+    }
+   ],
+   "enabled": true,
+   "propagationTypes": [],
+   "type": "CLOUD_APPLICATION"
+  }
+ ]
+}

BMW-Dynatrace-config/CD_CSF/management-zone/management-zone.yaml

@@ -0,0 +1,6 @@
+config:
+- CD_CSF: default.json
+
+CD_CSF:
+- name: CD_CSF
+- tag: charging-station-feedback-composite-service

BMW-Dynatrace-config/CD_CSF/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.

BMW-Dynatrace-config/CD_CSF/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"
+}

BMW-Dynatrace-config/CD_CSF/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}}"
+}

BMW-Dynatrace-config/CD_CSF/notification/notification.yaml

@@ -0,0 +1,29 @@
+config:
+- CD_CSF: msTeams.json
+- CD_CSF_email: email.json
+
+# Notification System for EMEA/NA/CN Prod msTeams
+CD_CSF.EMEA-Prod:
+- name: CD_CSF PROD
+- alertingProfile: CD_CSF/alerting-profile/CD_CSF.id
+- webhook: https://bmwgroup.webhook.office.com/webhookb2/24a237d4-ed59-476d-ae6a-8353d1a2f7ea@ce849bab-cc1c-465b-b62e-18f07c9ac198/IncomingWebhook/06db97446552455a91998b41ae8cb4a4/4d8ab66e-ec27-4bc7-8cff-5bd7abe02823
+- skipDeployment: "false"
+
+# Notification System for EMEA/NA/CN PreProd msTeams
+CD_CSF.EMEA-PreProd:
+- name: CD_CSF INT
+- alertingProfile: CD_CSF/alerting-profile/CD_CSF.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: "false"
+
+# Notification System for EMEA/NA/CN Prod Email
+CD_CSF_email.EMEA-Prod:
+  - name: CD_CSF_email PROD
+  - alertingProfile: CD_CSF/alerting-profile/CD_CSF.id
+  - receivers: intangibles@list.bmw.com
+
+# Notification System for EMEA/NA/CN PreProd Email
+CD_CSF_email.EMEA-PreProd:
+  - name: CD_CSF_email INT
+  - alertingProfile: CD_CSF/alerting-profile/CD_CSF.id
+  - receivers: intangibles@list.bmw.com

BMW-Dynatrace-config/CD_InCarExperienceServices/management-zone/management-zone.yaml

@@ -4,6 +4,8 @@ config:
 - CD_ICES_FestivalMode: default.json
 - CD_ICES_MyModes: default.json
 - CD_ICES_CoreDataEngine: default.json
+- CD_ICES_Login: default.json
+- CD_ICES_ContentDelivery: default.json
 
 CD_InCarExperienceServices:
 - name: CD_InCarExperienceServices
@@ -15,7 +17,7 @@ CD_ICES_AmbientMusic:
 
 CD_ICES_FestivalMode:
 - name: CD_ICES_FestivalMode
-- compassIDs: \"compass-id:ices-festivalmode\",\"compass-id:ices-festivalmode-adminui\",\"compass-id:ices-contentdelivery\",\"compass-id:ices-login\"
+- compassIDs: \"compass-id:ices-festivalmode\",\"compass-id:ices-festivalmode-adminui\"
 
 CD_ICES_MyModes:
 - name: CD_ICES_MyModes
@@ -24,3 +26,12 @@ CD_ICES_MyModes:
 CD_ICES_CoreDataEngine:
 - name: CD_ICES_CoreDataEngine
 - compassIDs: \"compass-id:ices-cde\"
+
+CD_ICES_Login:
+- name: CD_ICES_Login
+- compassIDs: \"compass-id:ices-login\"
+
+CD_ICES_ContentDelivery:
+- name: CD_ICES_ContentDelivery
+- compassIDs: \"compass-id:ices-content-delivery\"
+

BMW-Dynatrace-config/CD_VDLM/dashboard/dashboard.yaml

@@ -1,8 +1,9 @@
 config:
-- CDnewComponentTag-PROD: default.json
-- CDnewComponentTag-E2E: default.json
-- CDnewComponentTag-INT: default.json
-- CDnewComponentTag-TEST: default.json
+- CDnewComponentTag-PROD: vdlm-overview.json
+- CDnewComponentTag-E2E: vdlm-overview.json
+- CDnewComponentTag-INT: vdlm-overview.json
+- CDnewComponentTag-TEST: vdlm-overview.json
+
 
 #PROD dashboards for EMEA/NA/CN Prod
 CDnewComponentTag-PROD:

BMW-Dynatrace-config/CD_VDLM/dashboard/vdlm-overview.json

@@ -0,0 +1,492 @@
+{
+  "metadata": {
+    "configurationVersions": [
+      6
+    ],
+    "clusterVersion": "1.246.177.20220728-091541"
+  },
+  "dashboardMetadata":  {
+    "name": "{{.name}}",
+    "shared": true,
+    "owner": "Bernd.Brandl@bmw.de",
+    "dashboardFilter": {
+      "timeframe": "-24h to now"
+    },
+    "tags": [
+      "{{.mzName}}"
+    ],
+    "popularity": 1,
+    "hasConsistentColors": false
+  },
+  "tiles": [
+    {
+      "name": "Custom chart",
+      "tileType": "CUSTOM_CHARTING",
+      "configured": true,
+      "bounds": {
+        "top": 228,
+        "left": 38,
+        "width": 1064,
+        "height": 304
+      },
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
+      "filterConfig": {
+        "type": "MIXED",
+        "customName": "Failure rate (HTTP 4xx/5xx  errors)",
+        "defaultName": "Custom chart",
+        "chartConfig": {
+          "legendShown": true,
+          "type": "TIMESERIES",
+          "series": [
+            {
+              "metric": "builtin:service.errors.fourxx.rate",
+              "aggregation": "AVG",
+              "type": "BAR",
+              "entityType": "SERVICE",
+              "dimensions": [],
+              "sortAscending": false,
+              "sortColumn": false,
+              "aggregationRate": "TOTAL"
+            },
+            {
+              "metric": "builtin:service.errors.fivexx.rate",
+              "aggregation": "AVG",
+              "type": "BAR",
+              "entityType": "SERVICE",
+              "dimensions": [],
+              "sortAscending": false,
+              "sortColumn": true,
+              "aggregationRate": "TOTAL"
+            }
+          ],
+          "resultMetadata": {
+            "nullbuiltin:service.errors.fivexx.rate|AVG|TOTAL|BAR|SERVICE": {
+              "lastModified": 1617956393463,
+              "customColor": "#ff0000"
+            },
+            "nullbuiltin:service.errors.fourxx.rate|AVG|TOTAL|BAR|SERVICE": {
+              "lastModified": 1617956441725,
+              "customColor": "#fff29a"
+            }
+          }
+        },
+        "filtersPerEntityType": {
+          "SERVICE": {
+            "AUTO_TAGS": [
+              "Environment:{{.env}}"
+            ]
+          }
+        }
+      }
+    },
+    {
+      "name": "Problems",
+      "tileType": "OPEN_PROBLEMS",
+      "configured": true,
+      "bounds": {
+        "top": 38,
+        "left": 950,
+        "width": 152,
+        "height": 152
+      },
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      }
+    },
+    {
+      "name": "Overall Health",
+      "tileType": "HEADER",
+      "configured": true,
+      "bounds": {
+        "top": 0,
+        "left": 38,
+        "width": 1064,
+        "height": 38
+      },
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      }
+    },
+    {
+      "name": "Markdown",
+      "tileType": "MARKDOWN",
+      "configured": true,
+      "bounds": {
+        "top": 532,
+        "left": 38,
+        "width": 1064,
+        "height": 38
+      },
+      "tileFilter": {},
+      "markdown": "---\n"
+    },
+    {
+      "name": "Custom chart",
+      "tileType": "CUSTOM_CHARTING",
+      "configured": true,
+      "bounds": {
+        "top": 570,
+        "left": 38,
+        "width": 1064,
+        "height": 304
+      },
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
+      "filterConfig": {
+        "type": "MIXED",
+        "customName": "Response time, Request Count and Number of Errors",
+        "defaultName": "Custom chart",
+        "chartConfig": {
+          "legendShown": true,
+          "type": "TIMESERIES",
+          "series": [
+            {
+              "metric": "builtin:service.response.time",
+              "aggregation": "AVG",
+              "type": "LINE",
+              "entityType": "SERVICE",
+              "dimensions": [],
+              "sortAscending": false,
+              "sortColumn": false,
+              "aggregationRate": "TOTAL"
+            },
+            {
+              "metric": "builtin:service.requestCount.total",
+              "aggregation": "NONE",
+              "type": "BAR",
+              "entityType": "SERVICE",
+              "dimensions": [],
+              "sortAscending": false,
+              "sortColumn": false,
+              "aggregationRate": "TOTAL"
+            },
+            {
+              "metric": "builtin:service.errors.total.count",
+              "aggregation": "NONE",
+              "type": "BAR",
+              "entityType": "SERVICE",
+              "dimensions": [],
+              "sortAscending": false,
+              "sortColumn": true,
+              "aggregationRate": "TOTAL"
+            }
+          ],
+          "resultMetadata": {
+            "nullbuiltin:service.requestCount.total|NONE|TOTAL|BAR|SERVICE": {
+              "lastModified": 1595275720776,
+              "customColor": "#008cdb"
+            },
+            "nullbuiltin:service.errors.total.count|NONE|TOTAL|BAR|SERVICE": {
+              "lastModified": 1595275955999,
+              "customColor": "#ef651f"
+            },
+            "nullbuiltin:service.response.time|AVG|TOTAL|LINE|SERVICE": {
+              "lastModified": 1595275686773,
+              "customColor": "#b4e5f9"
+            }
+          }
+        },
+        "filtersPerEntityType": {
+          "SERVICE": {
+            "AUTO_TAGS": [
+              "Environment:{{.env}}"
+            ]
+          }
+        }
+      }
+    },
+    {
+      "name": "Markdown",
+      "tileType": "MARKDOWN",
+      "configured": true,
+      "bounds": {
+        "top": 190,
+        "left": 38,
+        "width": 1064,
+        "height": 38
+      },
+      "tileFilter": {},
+      "markdown": "---\n"
+    },
+    {
+      "name": "",
+      "tileType": "DATABASES_OVERVIEW",
+      "configured": true,
+      "bounds": {
+        "top": 38,
+        "left": 646,
+        "width": 190,
+        "height": 152
+      },
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
+      "filterConfig": {
+        "type": "DATABASE",
+        "customName": "Databases",
+        "defaultName": "Databases",
+        "chartConfig": {
+          "legendShown": true,
+          "type": "TIMESERIES",
+          "series": [],
+          "resultMetadata": {}
+        },
+        "filtersPerEntityType": {
+          "DATABASE": {
+            "AUTO_TAGS": [
+              "Environment:{{.env}}"
+            ]
+          }
+        }
+      },
+      "chartVisible": true
+    },
+    {
+      "name": "",
+      "tileType": "SERVICES",
+      "configured": true,
+      "bounds": {
+        "top": 38,
+        "left": 342,
+        "width": 190,
+        "height": 152
+      },
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
+      "filterConfig": {
+        "type": "SERVICE",
+        "customName": "Services",
+        "defaultName": "Services",
+        "chartConfig": {
+          "legendShown": true,
+          "type": "TIMESERIES",
+          "series": [],
+          "resultMetadata": {}
+        },
+        "filtersPerEntityType": {
+          "SERVICE": {
+            "AUTO_TAGS": [
+              "Environment:{{.env}}"
+            ]
+          }
+        }
+      },
+      "chartVisible": true
+    },
+    {
+      "name": "",
+      "tileType": "HOSTS",
+      "configured": true,
+      "bounds": {
+        "top": 38,
+        "left": 38,
+        "width": 190,
+        "height": 152
+      },
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
+      "filterConfig": {
+        "type": "HOST",
+        "customName": "Hosts",
+        "defaultName": "Hosts",
+        "chartConfig": {
+          "legendShown": true,
+          "type": "TIMESERIES",
+          "series": [],
+          "resultMetadata": {}
+        },
+        "filtersPerEntityType": {
+          "HOST": {
+            "AUTO_TAGS": [
+              "Environment:{{.env}}"
+            ]
+          }
+        }
+      },
+      "chartVisible": true
+    },
+    {
+      "name": "Service-level objective",
+      "tileType": "SLO",
+      "configured": true,
+      "bounds": {
+        "top": 1064,
+        "left": 38,
+        "width": 304,
+        "height": 152
+      },
+      "tileFilter": {},
+      "assignedEntities": [
+        "8c4a0631-7483-3a09-88d8-732e3f1a3dfd"
+      ],
+      "metric": "METRICS=false;LEGEND=false;PROBLEMS=false;decimals=2;customTitle=KAI;"
+    },
+    {
+      "name": "Service-level objective",
+      "tileType": "SLO",
+      "configured": true,
+      "bounds": {
+        "top": 1064,
+        "left": 342,
+        "width": 304,
+        "height": 152
+      },
+      "tileFilter": {},
+      "assignedEntities": [
+        "16e3be32-94d7-36ee-b86c-bb41913c0d77"
+      ],
+      "metric": "METRICS=false;LEGEND=false;PROBLEMS=false;decimals=2;customTitle=Kinesis;"
+    },
+    {
+      "name": "Service-level objective",
+      "tileType": "SLO",
+      "configured": true,
+      "bounds": {
+        "top": 1064,
+        "left": 646,
+        "width": 304,
+        "height": 152
+      },
+      "tileFilter": {},
+      "assignedEntities": [
+        "6edcef96-acc9-39d2-bc5e-70a3fd1d2d47"
+      ],
+      "metric": "METRICS=false;LEGEND=false;PROBLEMS=false;decimals=2;customTitle=MQS;"
+    },
+    {
+      "name": "Service-level objective",
+      "tileType": "SLO",
+      "configured": true,
+      "bounds": {
+        "top": 1216,
+        "left": 38,
+        "width": 304,
+        "height": 152
+      },
+      "tileFilter": {},
+      "assignedEntities": [
+        "566f359c-4e2d-3ffe-8119-fcfd01ae679d"
+      ],
+      "metric": "METRICS=false;LEGEND=false;PROBLEMS=false;decimals=2;customTitle=NGTP ASC, BCALL;"
+    },
+    {
+      "name": "Service-level objective",
+      "tileType": "SLO",
+      "configured": true,
+      "bounds": {
+        "top": 1216,
+        "left": 342,
+        "width": 304,
+        "height": 152
+      },
+      "tileFilter": {},
+      "assignedEntities": [
+        "9e82f3f8-63c3-313a-99e6-5161655a409a"
+      ],
+      "metric": "METRICS=false;LEGEND=false;PROBLEMS=false;decimals=2;customTitle=NGTP RTC;"
+    },
+    {
+      "name": "Service-level objective",
+      "tileType": "SLO",
+      "configured": true,
+      "bounds": {
+        "top": 1216,
+        "left": 646,
+        "width": 304,
+        "height": 152
+      },
+      "tileFilter": {},
+      "assignedEntities": [
+        "6c92d4bd-f4b2-3423-8818-677836731bf9"
+      ],
+      "metric": "METRICS=false;LEGEND=false;PROBLEMS=false;decimals=2;customTitle=SEAM;"
+    },
+    {
+      "name": "Service-level objective",
+      "tileType": "SLO",
+      "configured": true,
+      "bounds": {
+        "top": 912,
+        "left": 38,
+        "width": 1064,
+        "height": 152
+      },
+      "tileFilter": {},
+      "assignedEntities": [
+        "c0caae1e-6fbd-3960-abfd-33b7e61a2dea"
+      ],
+      "metric": "METRICS=false;LEGEND=false;PROBLEMS=false;decimals=2;customTitle=Wirkkette \"Teleservices\" - Reliability of key requests;"
+    },
+    {
+      "name": "Service-level objective",
+      "tileType": "SLO",
+      "configured": true,
+      "bounds": {
+        "top": 1368,
+        "left": 38,
+        "width": 304,
+        "height": 152
+      },
+      "tileFilter": {},
+      "assignedEntities": [
+        "a53c63b5-8cc8-3ae2-ba95-9c009eb9f269"
+      ],
+      "metric": "METRICS=false;LEGEND=false;PROBLEMS=false;decimals=2;customTitle=CallTopic;"
+    },
+    {
+      "name": "Service-level objective",
+      "tileType": "SLO",
+      "configured": true,
+      "bounds": {
+        "top": 1368,
+        "left": 342,
+        "width": 304,
+        "height": 152
+      },
+      "tileFilter": {},
+      "assignedEntities": [
+        "bdf7d72b-2d9a-3eb6-a1a6-6dece9f94b91"
+      ],
+      "metric": "METRICS=false;LEGEND=false;PROBLEMS=false;decimals=2;customTitle=Joynr;"
+    },
+    {
+      "name": "Markdown",
+      "tileType": "MARKDOWN",
+      "configured": true,
+      "bounds": {
+        "top": 874,
+        "left": 38,
+        "width": 1064,
+        "height": 38
+      },
+      "tileFilter": {},
+      "markdown": "---\n"
+    }
+  ]
+}

BMW-Dynatrace-config/CD_VDLM/management-zone/default.json

@@ -4,7 +4,7 @@
   "entitySelectorBasedRules": [
     {
       "enabled": true,
-     "entitySelector": "type(Service),tag({{.compassIDs}})"
+      "entitySelector": "type(Service),tag({{.compassIDs}}),not(entityName.contains(\"HealthResource\")),not(entityName.contains(\"PingResource\")),not(entityName.contains(\"PrometheusResource\"))"
     },
     {
       "enabled": true,

BMW-Dynatrace-config/CD_coco-hm/management-zone/management-zone.yaml

@@ -3,4 +3,4 @@ config:
 
 CDnewComponentTag:
 - name: CD_coco-hm
-- compassIDs: \"compass-id:coco-hm-rds-db-test\",\"compass-id:coco-hm-rds-db-int\",\"compass-id:coco-hm-rds-db-e2e\",\"compass-id:coco-hm-rds-db-prod\"
+- compassIDs: \"compass-id:coco-hm\"

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}}"
      },
 	 {

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

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}}"
      },
 	 {

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