Pull request #326: Charging Sessions Update Alerting Configs

Merge in OPAPM/cd_e2e_monitoring_config from intangibles/charging-services-alerts-and-dashboard to master * commit '652974a1b5cd94f46a67c97e80dfc39e7b38fa60': adjusted notification.yaml reonboarding fix typos add NA/CN envs charging sessions
2023-02-27 14:07:43 +00:00 · 2023-02-27 14:07:43 +00:00 · e3809aed44
parent 66410016a0 652974a1b5
commit e3809aed44
34 changed files with 1358 additions and 195 deletions
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/alerting-profile/alerting-profile.yaml
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service/alerting-profile/alerting-profile.yaml
@ -0,0 +1,37 @@
+config:
+- CDnewComponentTag: default.json
+
+
+#Prod alerting profiles for EMEA/NA/CN
+CDnewComponentTag.EMEA-Prod:
+- name: CD_charging-sessions-service PROD
+- mzId: CD_charging-sessions-service/management-zone/CDnewComponentTag.id
+- env: PROD
+- skipDeployment: "false"
+CDnewComponentTag.NA-Prod:
+- name: CD_charging-sessions-service PROD
+- mzId: CD_charging-sessions-service/management-zone/CDnewComponentTag.id
+- env: PROD
+- skipDeployment: "false"
+CDnewComponentTag.CN-Prod:
+- name: CD_charging-sessions-service PROD
+- mzId: CD_charging-sessions-service/management-zone/CDnewComponentTag.id
+- env: PROD
+- skipDeployment: "false"
+
+#INT alerting profiles for EMEA/NA/CN
+CDnewComponentTag.EMEA-PreProd:
+- name: CD_charging-sessions-service INT
+- mzId: CD_charging-sessions-service/management-zone/CDnewComponentTag.id
+- env: INT
+- skipDeployment: "false"
+CDnewComponentTag.NA-PreProd:
+- name: CD_charging-sessions-service INT
+- mzId: CD_charging-sessions-service/management-zone/CDnewComponentTag.id
+- env: INT
+- skipDeployment: "false"
+CDnewComponentTag.CN-PreProd:
+- name: CD_charging-sessions-service INT
+- mzId: CD_charging-sessions-service/management-zone/CDnewComponentTag.id
+- env: INT
+- skipDeployment: "false"
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/alerting-profile/default.json
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service/alerting-profile/default.json
@ -0,0 +1,78 @@
+{
+ "displayName": "{{.name}}",
+ "eventTypeFilters": [],
+ "managementZoneId": "{{.mzId}}",
+ "mzId": "{{.mzId}}",
+ "rules": [
+  {
+   "delayInMinutes": 0,
+   "severityLevel": "AVAILABILITY",
+   "tagFilter": {
+    "includeMode": "INCLUDE_ALL",
+    "tagFilters": [
+	 {
+      "context": "CONTEXTLESS",
+      "key": "Environment",
+      "value": "{{.env}}"
+     }
+    ]
+   }
+  },
+  {
+   "delayInMinutes": 10,
+   "severityLevel": "ERROR",
+   "tagFilter": {
+    "includeMode": "INCLUDE_ALL",
+    "tagFilters": [
+	 {
+      "context": "CONTEXTLESS",
+      "key": "Environment",
+      "value": "{{.env}}"
+     }
+    ]
+   }
+  },
+  {
+   "delayInMinutes": 30,
+   "severityLevel": "PERFORMANCE",
+   "tagFilter": {
+    "includeMode": "INCLUDE_ALL",
+    "tagFilters": [
+	 {
+      "context": "CONTEXTLESS",
+      "key": "Environment",
+      "value": "{{.env}}"
+     }
+    ]
+   }
+  },
+  {
+   "delayInMinutes": 30,
+   "severityLevel": "RESOURCE_CONTENTION",
+   "tagFilter": {
+    "includeMode": "INCLUDE_ALL",
+    "tagFilters": [
+	 {
+      "context": "CONTEXTLESS",
+      "key": "Environment",
+      "value": "{{.env}}"
+     }
+    ]
+   }
+  },
+  {
+   "delayInMinutes": 10,
+   "severityLevel": "CUSTOM_ALERT",
+   "tagFilter": {
+    "includeMode": "INCLUDE_ALL",
+    "tagFilters": [
+	 {
+      "context": "CONTEXTLESS",
+      "key": "Environment",
+      "value": "{{.env}}"
+     }
+    ]
+   }
+  }
+ ]
+}
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/calculated-metrics-service/README.md
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service/calculated-metrics-service/README.md
@ -0,0 +1,4 @@
+
+### How to configure custom metrics?
+
+Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Calculated+Metrics) page to configure your custom metrics.
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-processgroup/README.md
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-processgroup/README.md
@ -0,0 +1,4 @@
+
+### How to configure process groups?
+
+Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
@ -0,0 +1,7 @@
+config:
+- CDnewComponentTag: template.json
+
+CDnewComponentTag:
+- name: MyProcessNamingRule
+- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
+- skipDeployment: "true"
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-processgroup/template.json
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-processgroup/template.json
@ -0,0 +1,29 @@
+{
+ "displayName": "{{.name}}",
+ "enabled": true,
+ "metadata": {
+  "clusterVersion": "1.214.107.20210407-223952",
+  "configurationVersions": [
+   0
+  ]
+ },
+ "nameFormat": "{{.nameFormat}}",
+ "rules": [
+  {
+   "comparisonInfo": {
+    "negate": false,
+    "operator": "EQUALS",
+    "type": "TAG",
+    "value": {
+     "context": "CONTEXTLESS",
+     "key": "Component",
+     "value": "{{.tag}}"
+    }
+   },
+   "key": {
+    "attribute": "PROCESS_GROUP_TAGS"
+   }
+  }
+ ],
+ "type": "PROCESS_GROUP"
+}
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-service/README.md
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-service/README.md
@ -0,0 +1,4 @@
+
+### How to configure service naming
+
+Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-service/conditional-naming-service.yaml
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-service/conditional-naming-service.yaml
@ -0,0 +1,7 @@
+config:
+- CDnewComponentTag: template.json
+
+CDnewComponentTag:
+- name: MyProcessNamingRule
+- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
+- skipDeployment: "true"
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-service/template.json
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-service/template.json
@ -0,0 +1,29 @@
+{
+ "displayName": "{{.name}}",
+ "enabled": true,
+ "metadata": {
+  "clusterVersion": "1.214.107.20210407-223952",
+  "configurationVersions": [
+   0
+  ]
+ },
+ "nameFormat": "{{.nameFormat}}",
+ "rules": [
+  {
+   "comparisonInfo": {
+    "negate": false,
+    "operator": "EQUALS",
+    "type": "TAG",
+    "value": {
+     "context": "CONTEXTLESS",
+     "key": "Component",
+     "value": "{{.tag}}"
+    }
+   },
+   "key": {
+    "attribute": "SERVICE_TAGS"
+   }
+  }
+ ],
+ "type": "SERVICE"
+}
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/custom-service-java/README.md
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service/custom-service-java/README.md
@ -0,0 +1,4 @@
+
+### How to configure custom services?
+
+Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service/custom-service-java/custom-service-java.yaml
@ -0,0 +1,10 @@
+config:
+- customService1: template-1-1.json
+
+customService1:
+- name: myJOYNRService 
+- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
+- methodName: exampleJoynrMethod
+- methodArgs: java.lang.Byte[],java.lang.String
+- returnType: void
+- skipDeployment: "true"
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/custom-service-java/template-1-1.json
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service/custom-service-java/template-1-1.json
@ -0,0 +1,23 @@
+{
+ "enabled": true,
+ "name": "{{.name}}",
+ "processGroups": [],
+ "queueEntryPoint": false,
+ "queueEntryPointType": null,
+ "rules": [
+  {
+   "annotations": [],
+   "className": "{{.className}}",
+   "enabled": true,
+   "fileName": "",
+   "matcher": "EQUALS",
+   "methodRules": [
+    {
+     "argumentTypes": ["{{.methodArgs}}"],
+     "methodName": "{{.methodName}}",
+     "returnType": "{{.returnType}}"
+    }
+   ]
+  }
+ ]
+}
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/dashboard/dashboard.yaml
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service/dashboard/dashboard.yaml
@ -1,125 +1,109 @@
 config:
- CDcharging-sessions-service-PROD: default.json
- CDcharging-sessions-service-E2E: default.json
- CDcharging-sessions-service-INT: default.json
- CDcharging-sessions-service-TEST: default.json
+- CDnewComponentTag-PROD: default.json
+- CDnewComponentTag-E2E: default.json
+- CDnewComponentTag-INT: default.json
+- CDnewComponentTag-TEST: default.json

 #PROD dashboards for EMEA/NA/CN Prod
-CDcharging-sessions-service-PROD:
+CDnewComponentTag-PROD:
 - name: CD_charging-sessions-service PROD
- mzName: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.name
- mzId: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.id
- tag: charging-sessions-service
+- mzName: CD_charging-sessions-service/management-zone/CDnewComponentTag.name
+- mzId: CD_charging-sessions-service/management-zone/CDnewComponentTag.id
 - env: PROD
 - skipDeployment: "true"
-CDcharging-sessions-service-PROD.EMEA-Prod:
+CDnewComponentTag-PROD.EMEA-Prod:
 - name: CD_charging-sessions-service PROD
- mzName: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.name
- mzId: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.id
- tag: charging-sessions-service
+- mzName: CD_charging-sessions-service/management-zone/CDnewComponentTag.name
+- mzId: CD_charging-sessions-service/management-zone/CDnewComponentTag.id
 - env: PROD
 - skipDeployment: "false"
-CDcharging-sessions-service-PROD.NA-Prod:
+CDnewComponentTag-PROD.NA-Prod:
 - name: CD_charging-sessions-service PROD
- mzName: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.name
- mzId: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.id
- tag: charging-sessions-service
+- mzName: CD_charging-sessions-service/management-zone/CDnewComponentTag.name
+- mzId: CD_charging-sessions-service/management-zone/CDnewComponentTag.id
 - env: PROD
 - skipDeployment: "false"
-CDcharging-sessions-service-PROD.CN-Prod:
+CDnewComponentTag-PROD.CN-Prod:
 - name: CD_charging-sessions-service PROD
- mzName: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.name
- mzId: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.id
- tag: charging-sessions-service
+- mzName: CD_charging-sessions-service/management-zone/CDnewComponentTag.name
+- mzId: CD_charging-sessions-service/management-zone/CDnewComponentTag.id
 - env: PROD
 - skipDeployment: "false"

 #E2E dashboards for EMEA/NA/CN Prod
-CDcharging-sessions-service-E2E:
+CDnewComponentTag-E2E:
 - name: CD_charging-sessions-service E2E
- mzName: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.name
- mzId: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.id
- tag: charging-sessions-service
+- mzName: CD_charging-sessions-service/management-zone/CDnewComponentTag.name
+- mzId: CD_charging-sessions-service/management-zone/CDnewComponentTag.id
 - env: E2E
 - skipDeployment: "true"
-CDcharging-sessions-service-E2E.EMEA-Prod:
+CDnewComponentTag-E2E.EMEA-Prod:
 - name: CD_charging-sessions-service E2E
- mzName: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.name
- mzId: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.id
- tag: charging-sessions-service
+- mzName: CD_charging-sessions-service/management-zone/CDnewComponentTag.name
+- mzId: CD_charging-sessions-service/management-zone/CDnewComponentTag.id
 - env: E2E
 - skipDeployment: "false"
-CDcharging-sessions-service-E2E.NA-Prod:
+CDnewComponentTag-E2E.NA-Prod:
 - name: CD_charging-sessions-service E2E
- mzName: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.name
- mzId: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.id
- tag: charging-sessions-service
+- mzName: CD_charging-sessions-service/management-zone/CDnewComponentTag.name
+- mzId: CD_charging-sessions-service/management-zone/CDnewComponentTag.id
 - env: E2E
 - skipDeployment: "false"
-CDcharging-sessions-service-E2E.CN-Prod:
+CDnewComponentTag-E2E.CN-Prod:
 - name: CD_charging-sessions-service E2E
- mzName: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.name
- mzId: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.id
- tag: charging-sessions-service
+- mzName: CD_charging-sessions-service/management-zone/CDnewComponentTag.name
+- mzId: CD_charging-sessions-service/management-zone/CDnewComponentTag.id
 - env: E2E
 - skipDeployment: "false"

 #INT dashboards for EMEA/NA/CN PreProd
-CDcharging-sessions-service-INT:
+CDnewComponentTag-INT:
 - name: CD_charging-sessions-service INT
- mzName: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.name
- mzId: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.id
- tag: charging-sessions-service
+- mzName: CD_charging-sessions-service/management-zone/CDnewComponentTag.name
+- mzId: CD_charging-sessions-service/management-zone/CDnewComponentTag.id
 - env: INT
 - skipDeployment: "true"
-CDcharging-sessions-service-INT.EMEA-PreProd:
+CDnewComponentTag-INT.EMEA-PreProd:
 - name: CD_charging-sessions-service INT
- mzName: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.name
- mzId: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.id
- tag: charging-sessions-service
+- mzName: CD_charging-sessions-service/management-zone/CDnewComponentTag.name
+- mzId: CD_charging-sessions-service/management-zone/CDnewComponentTag.id
 - env: INT
 - skipDeployment: "false"
-CDcharging-sessions-service-INT.NA-PreProd:
+CDnewComponentTag-INT.NA-PreProd:
 - name: CD_charging-sessions-service INT
- mzName: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.name
- mzId: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.id
- tag: charging-sessions-service
+- mzName: CD_charging-sessions-service/management-zone/CDnewComponentTag.name
+- mzId: CD_charging-sessions-service/management-zone/CDnewComponentTag.id
 - env: INT
 - skipDeployment: "false"
-CDcharging-sessions-service-INT.CN-PreProd:
+CDnewComponentTag-INT.CN-PreProd:
 - name: CD_charging-sessions-service INT
- mzName: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.name
- mzId: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.id
- tag: charging-sessions-service
+- mzName: CD_charging-sessions-service/management-zone/CDnewComponentTag.name
+- mzId: CD_charging-sessions-service/management-zone/CDnewComponentTag.id
 - env: INT
 - skipDeployment: "false"

 #TEST dashboards for EMEA/NA/CN PreProd
-CDcharging-sessions-service-TEST:
+CDnewComponentTag-TEST:
 - name: CD_charging-sessions-service TEST
- mzName: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.name
- mzId: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.id
- tag: charging-sessions-service
+- mzName: CD_charging-sessions-service/management-zone/CDnewComponentTag.name
+- mzId: CD_charging-sessions-service/management-zone/CDnewComponentTag.id
 - env: TEST
 - skipDeployment: "true"
-CDcharging-sessions-service-TEST.EMEA-PreProd:
+CDnewComponentTag-TEST.EMEA-PreProd:
 - name: CD_charging-sessions-service TEST
- mzName: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.name
- mzId: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.id
- tag: charging-sessions-service
+- mzName: CD_charging-sessions-service/management-zone/CDnewComponentTag.name
+- mzId: CD_charging-sessions-service/management-zone/CDnewComponentTag.id
 - env: TEST
 - skipDeployment: "false"
-CDcharging-sessions-service-TEST.NA-PreProd:
+CDnewComponentTag-TEST.NA-PreProd:
 - name: CD_charging-sessions-service TEST
- mzName: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.name
- mzId: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.id
- tag: charging-sessions-service
+- mzName: CD_charging-sessions-service/management-zone/CDnewComponentTag.name
+- mzId: CD_charging-sessions-service/management-zone/CDnewComponentTag.id
 - env: TEST
 - skipDeployment: "false"
-CDcharging-sessions-service-TEST.CN-PreProd:
+CDnewComponentTag-TEST.CN-PreProd:
 - name: CD_charging-sessions-service TEST
- mzName: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.name
- mzId: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.id
- tag: charging-sessions-service
+- mzName: CD_charging-sessions-service/management-zone/CDnewComponentTag.name
+- mzId: CD_charging-sessions-service/management-zone/CDnewComponentTag.id
 - env: TEST
 - skipDeployment: "false"
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/dashboard/default.json
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service/dashboard/default.json
@ -13,8 +13,9 @@
      "timeframe": "-24h to now"
    },
    "tags": [
-      "{{.tag}}"
-    ]
+      "{{.mzName}}"
+    ],
+    "preset": true
  },
  "tiles": [
    {
@ -27,7 +28,12 @@
        "width": 1064,
        "height": 304
      },
-      "tileFilter": {},
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
      "filterConfig": {
        "type": "MIXED",
        "customName": "Failure rate (HTTP 4xx/5xx  errors)",
@ -71,8 +77,7 @@
        "filtersPerEntityType": {
          "SERVICE": {
            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Environment:{{.env}}"
            ]
          }
        }
@ -105,7 +110,12 @@
        "width": 1064,
        "height": 38
      },
-      "tileFilter": {}
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      }
    },
    {
      "name": "Markdown",
@ -130,7 +140,12 @@
        "width": 1064,
        "height": 304
      },
-      "tileFilter": {},
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
      "filterConfig": {
        "type": "MIXED",
        "customName": "Response time, Request Count and Number of Errors",
@ -188,8 +203,7 @@
        "filtersPerEntityType": {
          "SERVICE": {
            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Environment:{{.env}}"
            ]
          }
        }
@ -218,7 +232,12 @@
        "width": 190,
        "height": 152
      },
-      "tileFilter": {},
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
      "filterConfig": {
        "type": "DATABASE",
        "customName": "Databases",
@ -232,8 +251,7 @@
        "filtersPerEntityType": {
          "DATABASE": {
            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Environment:{{.env}}"
            ]
          }
        }
@ -250,7 +268,12 @@
        "width": 190,
        "height": 152
      },
-      "tileFilter": {},
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
      "filterConfig": {
        "type": "SERVICE",
        "customName": "Services",
@ -264,8 +287,7 @@
        "filtersPerEntityType": {
          "SERVICE": {
            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Environment:{{.env}}"
            ]
          }
        }
@ -282,7 +304,12 @@
        "width": 190,
        "height": 152
      },
-      "tileFilter": {},
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
      "filterConfig": {
        "type": "HOST",
        "customName": "Hosts",
@ -296,8 +323,7 @@
        "filtersPerEntityType": {
          "HOST": {
            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Environment:{{.env}}"
            ]
          }
        }
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/management-zone/default.json
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service/management-zone/default.json
@ -1,114 +1,23 @@
 {
 "dimensionalRules": [],
 "name": "{{.name}}",
- "rules": [
+ "entitySelectorBasedRules": [
    {
-   "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"
+     "entitySelector": "type(Service),tag({{.compassIDs}})"
    },
    {
-   "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"
+      "entitySelector": "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag({{.compassIDs}}))"
    },
    {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "negate": false,
-      "operator": "EQUALS",
-      "type": "TAG",
-      "value": {
-       "context": "CONTEXTLESS",
-       "key": "Component",
-       "value": "{{.tag}}"
-      }
-     },
-     "key": {
-      "attribute": "HOST_TAGS"
-     }
-    }
-   ],
        "enabled": true,
-   "type": "HOST"
+        "entitySelector": "type(PROCESS_GROUP_INSTANCE),tag({{.compassIDs}})"
       },
       {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "caseSensitive": true,
-      "negate": false,
-      "operator": "CONTAINS",
-      "type": "STRING",
-      "value": "{{.tag}}"
-     },
-     "key": {
-      "attribute": "CLOUD_APPLICATION_NAMESPACE_NAME"
-     }
+        "enabled": true,
+        "entitySelector": "type(HOST),tag({{.compassIDs}})"
       }
   ],
-   "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"
-  }
- ]
+ "rules": []
 }
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/management-zone/management-zone.yaml
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service/management-zone/management-zone.yaml
@ -1,6 +1,6 @@
 config:
- CDcharging-sessions-service: default.json
+- CDnewComponentTag: default.json

-CDcharging-sessions-service:
+CDnewComponentTag:
 - name: CD_charging-sessions-service
- tag: charging-sessions-service
+- compassIDs: \"compass-id:mobile20-CSS\"
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/notification/email.json
+++ b/BMW-Dynatrace-config/CD_charging-sessions-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"
+}
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/notification/itsm.json
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service/notification/itsm.json
@ -0,0 +1,20 @@
+{
+ "acceptAnyCertificate": false,
+ "active": true,
+ "alertingProfile": "{{.alertingProfile}}",
+ "headers": [
+  {
+   "name": "Authorization",
+   "value": "{{.Env.SecretAuthHeader}}"
+  },
+  {
+   "name": "x-apikey",
+   "value": "{{.Env.SecretXAPIKey}}"
+  }
+ ],
+ "name": "{{.name}}",
+ "notifyEventMergesEnabled": false,
+ "payload": "[\n{\n        \"attributes\": {\n                \"CLASS\": \"BusinessTransaction\",\n                \"source\": \"MgmtZone: {{.mzName}}\",\n                \"severity\": \"MINOR\",\n                \"origin\": \"{{.appdid}}\",\n                \"sub_origin\": \"Dynatrace SaaS - {ImpactedEntity}\",\n                \"adapter_host\": \"{{ .DTEnvironment }}\",\n                \"msg\": \"{ProblemDetailsText}\",\n                \"contract_id\": \"{{.contractid}}\",\n                \"ars_esc\": \"Yes\",\n                \"ars_delay_time\": \"0\",\n                \"hostname\": \"test\",\n                \"sub_source\": \"Environment: CoCo_EMEA_Prod\",\n                \"server_loc\": \"\",\n                \"event_id\": \"AI001\",\n                \"dd_plus\": \"{ProblemSeverity}\",\n                \"dd1\": \"{ProblemURL}\",\n                \"dd2\": \"{PID}\"\n        }\n}\n]",
+ "type": "WEBHOOK",
+ "url": "{{.webhook}}"
+}
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/notification/msTeams.json
+++ b/BMW-Dynatrace-config/CD_charging-sessions-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}}"
+}
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/notification/notification.yaml
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service/notification/notification.yaml
@ -0,0 +1,72 @@
+config:
+- CDnewComponentTag: msTeams.json
+- CDnewComponentTagEMAIL: email.json
+
+# Notification System for EMEA/NA/CN Prod msTeams
+CDnewComponentTag.EMEA-Prod:
+- name: CD_charging-sessions-service PROD
+- alertingProfile: CD_charging-sessions-service/alerting-profile/CDnewComponentTag.id
+- webhook: https://bmwgroup.webhook.office.com/webhookb2/f371255b-2c20-491d-9b7d-002928ba9e7f@ce849bab-cc1c-465b-b62e-18f07c9ac198/IncomingWebhook/4c3a4ba5ef1e40338c52917c0bc29c09/4d8ab66e-ec27-4bc7-8cff-5bd7abe02823
+- skipDeployment: "false"
+CDnewComponentTag.NA-Prod:
+- name: CD_charging-sessions-service PROD
+- alertingProfile: CD_charging-sessions-service/alerting-profile/CDnewComponentTag.id
+- webhook: https://bmwgroup.webhook.office.com/webhookb2/f371255b-2c20-491d-9b7d-002928ba9e7f@ce849bab-cc1c-465b-b62e-18f07c9ac198/IncomingWebhook/4c3a4ba5ef1e40338c52917c0bc29c09/4d8ab66e-ec27-4bc7-8cff-5bd7abe02823
+- skipDeployment: "false"
+CDnewComponentTag.CN-Prod:
+- name: CD_charging-sessions-service PROD
+- alertingProfile: CD_charging-sessions-service/alerting-profile/CDnewComponentTag.id
+- webhook: https://bmwgroup.webhook.office.com/webhookb2/f371255b-2c20-491d-9b7d-002928ba9e7f@ce849bab-cc1c-465b-b62e-18f07c9ac198/IncomingWebhook/4c3a4ba5ef1e40338c52917c0bc29c09/4d8ab66e-ec27-4bc7-8cff-5bd7abe02823
+- skipDeployment: "false"
+
+# Notification System for EMEA/NA/CN PreProd msTeams
+CDnewComponentTag.EMEA-PreProd:
+- name: CD_charging-sessions-service INT
+- alertingProfile: CD_charging-sessions-service/alerting-profile/CDnewComponentTag.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"
+CDnewComponentTag.NA-PreProd:
+- name: CD_charging-sessions-service INT
+- alertingProfile: CD_charging-sessions-service/alerting-profile/CDnewComponentTag.id
+- webhook: https://criticaltechworks.webhook.office.com/webhookb2/b2de8193-24cf-4709-b1ad-d05f115fa08d@61f30b8e-4f6b-44fe-9bc2-041e3a9f7346/IncomingWebhook/3d1d2c96e86b403989794017c57ae4b0/e2c61882-45fd-43f0-abe7-c16eb6196aaa
+- skipDeployment: "false"
+CDnewComponentTag.CN-PreProd:
+- name: CD_charging-sessions-service INT
+- alertingProfile: CD_charging-sessions-service/alerting-profile/CDnewComponentTag.id
+- webhook: https://criticaltechworks.webhook.office.com/webhookb2/b2de8193-24cf-4709-b1ad-d05f115fa08d@61f30b8e-4f6b-44fe-9bc2-041e3a9f7346/IncomingWebhook/3d1d2c96e86b403989794017c57ae4b0/e2c61882-45fd-43f0-abe7-c16eb6196aaa
+- skipDeployment: "false"
+
+
+# Notification System for EMEA/NA/CN Prod Email
+CDnewComponentTagEMAIL.EMEA-Prod:
+- name: CD_charging-sessions-service EMAIL PROD
+- alertingProfile: CD_charging-sessions-service/alerting-profile/CDnewComponentTag.id
+- receivers: intangibles@list.bmw.com
+
+CDnewComponentTagEMAIL.NA-Prod:
+- name: CD_charging-sessions-service EMAIL PROD
+- alertingProfile: CD_charging-sessions-service/alerting-profile/CDnewComponentTag.id
+- receivers: intangibles@list.bmw.com
+
+
+CDnewComponentTagEMAIL.CN-Prod:
+- name: CD_charging-sessions-service EMAIL PROD
+- alertingProfile: CD_charging-sessions-service/alerting-profile/CDnewComponentTag.id
+- receivers: intangibles@list.bmw.com
+
+# Notification System for EMEA/NA/CN PreProd Email
+CDnewComponentTagEMAIL.EMEA-PreProd:
+- name: CD_charging-sessions-service EMAIL INT
+- alertingProfile: CD_charging-sessions-service/alerting-profile/CDnewComponentTag.id
+- receivers: intangibles@list.bmw.com
+
+CDnewComponentTagEMAIL.NA-PreProd:
+- name: CD_charging-sessions-service EMAIL INT
+- alertingProfile: CD_charging-sessions-service/alerting-profile/CDnewComponentTag.id
+- receivers: intangibles@list.bmw.com
+
+
+CDnewComponentTagEMAIL.CN-PreProd:
+- name: CD_charging-sessions-service EMAIL INT
+- alertingProfile: CD_charging-sessions-service/alerting-profile/CDnewComponentTag.id
+- receivers: intangibles@list.bmw.com
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/synthetic-monitor/README.md
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service/synthetic-monitor/README.md
@ -0,0 +1,4 @@
+
+### How to configure synthetics?
+
+Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Synthetic+Monitors) page to configure your synthetics.
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/synthetic-monitor/default.json
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service/synthetic-monitor/default.json
@ -0,0 +1,82 @@
+{
+ "anomalyDetection": {
+  "loadingTimeThresholds": {
+   "enabled": false,
+   "thresholds": [
+    {
+     "type": "TOTAL",
+     "valueMs": 0
+    }
+   ]
+  },
+  "outageHandling": {
+   "globalOutage": true,
+   "localOutage": false,
+   "localOutagePolicy": {
+    "affectedLocations": 1,
+    "consecutiveRuns": 3
+   }
+  }
+ },
+ "automaticallyAssignedApps": [],
+ "enabled": true,
+ "frequencyMin": 1,
+ "locations": [
+  "{{.location}}"
+ ],
+ "managementZones": [
+  {
+   "id": "{{.mzId}}",
+   "name": "{{.mzName}}"
+  }
+ ],
+ "manuallyAssignedApps": [],
+ "name": "{{.name}}",
+ "requests": [
+  {
+   "entityId": "HTTP_CHECK_STEP-0BA53EC80CD7EE5A",
+   "name": "{{.name}}",
+   "sequenceNumber": 1
+  }
+ ],
+ "script": {
+  "requests": [
+   {
+    "configuration": {
+     "acceptAnyCertificate": true,
+     "followRedirects": true,
+     "requestHeaders": [
+      {
+       "name": "accept",
+       "value": "application/json"
+      },
+      {
+       "name": "Content-Type",
+       "value": "application/json"
+      },
+      {
+       "name": "api_key",
+       "value": "355DE89C-7B72-4EA3-BDD8-157C79EB2C23"
+      }
+     ]
+    },
+    "description": "{{.name}}",
+    "method": "GET",
+    "url": "{{.endpoint}}",
+    "validation": {
+     "rules": [
+      {
+       "passIfFound": true,
+       "type": "httpStatusesList",
+       "value": "200"
+      }
+     ],
+     "rulesChaining": "or"
+    }
+   }
+  ],
+  "version": "1.0"
+ },
+ "tags": [],
+ "type": "HTTP"
+}
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/synthetic-monitor/synthetic-monitor.yaml
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service/synthetic-monitor/synthetic-monitor.yaml
@ -0,0 +1,10 @@
+config:
+- newComponentTag: default.json
+
+newComponentTag:
+- name: CD_charging-sessions-service - <synthetic-name>
+- mzName: CD_charging-sessions-service/management-zone/CDnewComponentTag.name
+- mzId: CD_charging-sessions-service/management-zone/CDnewComponentTag.id
+- endpoint: <url>
+- location: <location>
+- skipDeployment: "true"
--- a/BMW-Dynatrace-config/CD_charging-sessions-service_old/alerting-profile/alerting-profile.yaml
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service_old/alerting-profile/alerting-profile.yaml
@ -0,0 +1,42 @@
+config:
+- CD_charging-sessions-service: default.json
+
+#Prod alerting profiles for EMEA
+CD_charging-sessions-service.EMEA-Prod:
+  - name: CD_charging-sessions-service PROD
+  - tag: charging-sessions-service
+  - mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+  - env: PROD
+  - skipDeployment: "false"
+CD_charging-sessions-service.NA-Prod:
+  - name: CD_charging-sessions-service PROD
+  - tag: charging-sessions-service
+  - mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+  - env: PROD
+  - skipDeployment: "false"
+CD_charging-sessions-service.CN-Prod:
+  - name: CD_charging-sessions-service PROD
+  - tag: charging-sessions-service
+  - mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+  - env: PROD
+  - skipDeployment: "false"
+
+#INT alerting profiles for EMEA
+CD_charging-service.EMEA-PreProd:
+  - name: CD_charging-sessions-service INT
+  - tag: charging-sessions-service
+  - mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+  - env: INT
+  - skipDeployment: "false"
+CD_charging-sessions-service.NA-PreProd:
+  - name: CD_charging-sessions-service INT
+  - tag: charging-sessions-service
+  - mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+  - env: INT
+  - skipDeployment: "false"
+CD_charging-sessions-service.CN-PreProd:
+  - name: CD_charging-sessions-service INT
+  - tag: charging-sessions-service
+  - mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+  - env: INT
+  - skipDeployment: "false"
--- a/BMW-Dynatrace-config/CD_charging-sessions-service_old/alerting-profile/default.json
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service_old/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}}"
+     }
+    ]
+   }
+  }
+ ]
+}
--- a/BMW-Dynatrace-config/CD_charging-sessions-service_old/dashboard/README.md
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service_old/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.
--- a/BMW-Dynatrace-config/CD_charging-sessions-service_old/dashboard/dashboard.yaml
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service_old/dashboard/dashboard.yaml
@ -0,0 +1,125 @@
+config:
+- CD_charging-sessions-service-PROD: default.json
+- CD_charging-sessions-service-E2E: default.json
+- CD_charging-sessions-service-INT: default.json
+- CD_charging-sessions-service-TEST: default.json
+
+#PROD dashboards for EMEA/NA/CN Prod
+CD_charging-sessions-service-PROD:
+- name: CD_charging-sessions-service PROD
+- mzName: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.name
+- mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+- tag: charging-sessions-service
+- env: PROD
+- skipDeployment: "false"
+CD_charging-sessions-service-PROD.EMEA-Prod:
+- name: CD_charging-sessions-service PROD
+- mzName: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.name
+- mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+- tag: charging-sessions-service
+- env: PROD
+- skipDeployment: "false"
+CD_charging-sessions-service-PROD.NA-Prod:
+- name: CD_charging-sessions-service PROD
+- mzName: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.name
+- mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+- tag: charging-sessions-service
+- env: PROD
+- skipDeployment: "false"
+CD_charging-sessions-service-PROD.CN-Prod:
+- name: CD_charging-sessions-service PROD
+- mzName: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.name
+- mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+- tag: charging-sessions-service
+- env: PROD
+- skipDeployment: "false"
+
+#E2E dashboards for EMEA/NA/CN Prod
+CD_charging-sessions-service-E2E:
+- name: CD_charging-sessions-service E2E
+- mzName: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.name
+- mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+- tag: charging-sessions-service
+- env: E2E
+- skipDeployment: "false"
+CD_charging-sessions-service-E2E.EMEA-Prod:
+- name: CD_charging-sessions-service E2E
+- mzName: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.name
+- mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+- tag: charging-sessions-service
+- env: E2E
+- skipDeployment: "false"
+CD_charging-sessions-service-E2E.NA-Prod:
+- name: CD_charging-sessions-service E2E
+- mzName: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.name
+- mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+- tag: charging-sessions-service
+- env: E2E
+- skipDeployment: "false"
+CD_charging-sessions-service-E2E.CN-Prod:
+- name: CD_charging-sessions-service E2E
+- mzName: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.name
+- mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+- tag: charging-sessions-service
+- env: E2E
+- skipDeployment: "false"
+
+#INT dashboards for EMEA/NA/CN PreProd
+CD_charging-sessions-service-INT:
+- name: CD_charging-sessions-service INT
+- mzName: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.name
+- mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+- tag: charging-sessions-service
+- env: INT
+- skipDeployment: "false"
+CD_charging-sessions-service-INT.EMEA-PreProd:
+- name: CD_charging-sessions-service INT
+- mzName: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.name
+- mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+- tag: charging-sessions-service
+- env: INT
+- skipDeployment: "false"
+CD_charging-sessions-service-INT.NA-PreProd:
+- name: CD_charging-sessions-service INT
+- mzName: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.name
+- mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+- tag: charging-sessions-service
+- env: INT
+- skipDeployment: "false"
+CD_charging-sessions-service-INT.CN-PreProd:
+- name: CD_charging-sessions-service INT
+- mzName: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.name
+- mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+- tag: charging-sessions-service
+- env: INT
+- skipDeployment: "false"
+
+#TEST dashboards for EMEA/NA/CN PreProd
+CD_charging-sessions-service-TEST:
+- name: CD_charging-sessions-service TEST
+- mzName: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.name
+- mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+- tag: charging-sessions-service
+- env: TEST
+- skipDeployment: "false"
+CD_charging-sessions-service-TEST.EMEA-PreProd:
+- name: CD_charging-sessions-service TEST
+- mzName: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.name
+- mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+- tag: charging-sessions-service
+- env: TEST
+- skipDeployment: "false"
+CD_charging-sessions-service-TEST.NA-PreProd:
+- name: CD_charging-sessions-service TEST
+- mzName: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.name
+- mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+- tag: charging-sessions-service
+- env: TEST
+- skipDeployment: "false"
+CD_charging-sessions-service-TEST.CN-PreProd:
+- name: CD_charging-sessions-service TEST
+- mzName: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.name
+- mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+- tag: charging-sessions-service
+- env: TEST
+- skipDeployment: "false"
--- a/BMW-Dynatrace-config/CD_charging-sessions-service_old/dashboard/default.json
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service_old/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
+    }
+  ]
+}
--- a/BMW-Dynatrace-config/CD_charging-sessions-service_old/management-zone/README.md
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service_old/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.
--- a/BMW-Dynatrace-config/CD_charging-sessions-service_old/management-zone/default.json
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service_old/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"
+  }
+ ]
+}
--- a/BMW-Dynatrace-config/CD_charging-sessions-service_old/management-zone/management-zone.yaml
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service_old/management-zone/management-zone.yaml
@ -0,0 +1,6 @@
+config:
+- CD_charging-sessions-service: default.json
+
+CD_charging-sessions-service:
+- name: CD_charging-sessions-service
+- tag: charging-sessions-service
--- a/BMW-Dynatrace-config/CD_charging-sessions-service_old/notification/email.json
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service_old/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"
+}
--- a/BMW-Dynatrace-config/CD_charging-sessions-service_old/notification/msTeams.json
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service_old/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}}"
+}
--- a/BMW-Dynatrace-config/CD_charging-sessions-service_old/notification/notification.yaml
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service_old/notification/notification.yaml
@ -0,0 +1,66 @@
+config:
+- CD_charging-sessions-service: msTeams.json
+- CD_charging-sessions-service_email: email.json
+
+# Notification System for EMEA/NA/CN Prod msTeams
+CD_charging-sessions-service.EMEA-Prod:
+  - name: CD_charging-sessions-service PROD
+  - alertingProfile: CD_charging-sessions-service/alerting-profile/CD_charging-sessions-service.id
+  - webhook: https://bmwgroup.webhook.office.com/webhookb2/f371255b-2c20-491d-9b7d-002928ba9e7f@ce849bab-cc1c-465b-b62e-18f07c9ac198/IncomingWebhook/4c3a4ba5ef1e40338c52917c0bc29c09/4d8ab66e-ec27-4bc7-8cff-5bd7abe02823
+  - skipDeployment: "false"
+CD_charging-sessions-service.NA-Prod:
+  - name: CD_charging-sessions-service PROD
+  - alertingProfile: CD_charging-sessions-service/alerting-profile/CD_charging-sessions-service.id
+  - webhook: https://bmwgroup.webhook.office.com/webhookb2/f371255b-2c20-491d-9b7d-002928ba9e7f@ce849bab-cc1c-465b-b62e-18f07c9ac198/IncomingWebhook/4c3a4ba5ef1e40338c52917c0bc29c09/4d8ab66e-ec27-4bc7-8cff-5bd7abe02823
+  - skipDeployment: "false"
+CD_charging-sessions-service.CN-Prod:
+  - name: CD_charging-sessions-service PROD
+  - alertingProfile: CD_charging-sessions-service/alerting-profile/CD_charging-sessions-service.id
+  - webhook: https://bmwgroup.webhook.office.com/webhookb2/f371255b-2c20-491d-9b7d-002928ba9e7f@ce849bab-cc1c-465b-b62e-18f07c9ac198/IncomingWebhook/4c3a4ba5ef1e40338c52917c0bc29c09/4d8ab66e-ec27-4bc7-8cff-5bd7abe02823
+  - skipDeployment: "false"
+
+# Notification System for EMEA/NA/CN PreProd msTeams
+CD_charging-sessions-service.EMEA-PreProd:
+  - name: CD_charging-sessions-service INT
+  - alertingProfile: CD_charging-sessions-service/alerting-profile/CD_charging-sessions-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: "false"
+CD_charging-sessions-service.NA-PreProd:
+  - name: CD_charging-sessions-service INT
+  - alertingProfile: CD_charging-sessions-service/alerting-profile/CD_charging-sessions-service.id
+  - webhook: https://criticaltechworks.webhook.office.com/webhookb2/b2de8193-24cf-4709-b1ad-d05f115fa08d@61f30b8e-4f6b-44fe-9bc2-041e3a9f7346/IncomingWebhook/3d1d2c96e86b403989794017c57ae4b0/e2c61882-45fd-43f0-abe7-c16eb6196aaa
+  - skipDeployment: "false"
+CD_charging-sessions-service.CN-PreProd:
+  - name: CD_charging-sessions-service INT
+  - alertingProfile: CD_charging-sessions-service/alerting-profile/CD_charging-sessions-service.id
+  - webhook: https://criticaltechworks.webhook.office.com/webhookb2/b2de8193-24cf-4709-b1ad-d05f115fa08d@61f30b8e-4f6b-44fe-9bc2-041e3a9f7346/IncomingWebhook/3d1d2c96e86b403989794017c57ae4b0/e2c61882-45fd-43f0-abe7-c16eb6196aaa
+  - skipDeployment: "false"
+  
+  
+# Notification System for EMEA/NA/CN Prod Email
+CD_charging-sessions-service_email.EMEA-Prod:
+  - name: CD_charging-sessions-service_email PROD
+  - alertingProfile: CD_imiles-service/alerting-profile/CD_charging-sessions-service.id
+  - receivers: intangibles@list.bmw.com
+CD_charging-sessions-service_email.NA-Prod:
+  - name: CD_charging-sessions-service_email PROD
+  - alertingProfile: CD_charging-sessions-service/alerting-profile/CD_charging-sessions-service.id
+  - receivers: intangibles@list.bmw.com
+CD_charging-sessions-service_email.CN-Prod:
+  - name: CD_charging-sessions-service_email PROD
+  - alertingProfile: CD_charging-sessions-service/alerting-profile/CD_charging-sessions-service.id
+  - receivers: intangibles@list.bmw.com
+
+# Notification System for EMEA/NA/CN PreProd Email
+CD_charging-sessions-service_email.EMEA-PreProd:
+  - name: CD_charging-sessions-service_email INT
+  - alertingProfile: CD_charging-sessions-service/alerting-profile/CD_charging-sessions-service.id
+  - receivers: intangibles@list.bmw.com
+CD_charging-sessions-service_email.NA-PreProd:
+  - name: CD_charging-sessions-service_email INT
+  - alertingProfile: CD_charging-sessions-service/alerting-profile/CD_charging-sessions-service.id
+  - receivers: intangibles@list.bmw.com
+CD_charging-sessions-service_email.CN-PreProd:
+  - name: CD_charging-sessions-service_email INT
+  - alertingProfile: CD_charging-sessions-service/alerting-profile/CD_charging-sessions-service.id
+  - receivers: intangibles@list.bmw.com