From a6fb79e7b34426b61a5130274d9f327be23fb8fc Mon Sep 17 00:00:00 2001
From: "SLW\\ARNAUA" <Arnel.Arnautovic@nttdata.com>
Date: Thu, 12 Jan 2023 10:30:51 +0100
Subject: [PATCH] OPMAAS-3228 - Re-onboarding with compass-id.

---
 .../dashboard/dashboard.yaml                  | 120 +++----
 .../dashboard/default.json                    |  62 +++-
 .../management-zone/default.json              | 121 +------
 .../management-zone/management-zone.yaml      |   6 +-
 .../dashboard/README.md                       |   4 +
 .../dashboard/dashboard.yaml                  | 125 +++++++
 .../dashboard/default.json                    | 308 ++++++++++++++++++
 .../management-zone/README.md                 |   4 +
 .../management-zone/default.json              | 114 +++++++
 .../management-zone/management-zone.yaml      |   6 +
 10 files changed, 675 insertions(+), 195 deletions(-)
 create mode 100644 BMW-Dynatrace-config/CD_destination-composite-service_old/dashboard/README.md
 create mode 100644 BMW-Dynatrace-config/CD_destination-composite-service_old/dashboard/dashboard.yaml
 create mode 100644 BMW-Dynatrace-config/CD_destination-composite-service_old/dashboard/default.json
 create mode 100644 BMW-Dynatrace-config/CD_destination-composite-service_old/management-zone/README.md
 create mode 100644 BMW-Dynatrace-config/CD_destination-composite-service_old/management-zone/default.json
 create mode 100644 BMW-Dynatrace-config/CD_destination-composite-service_old/management-zone/management-zone.yaml

diff --git a/BMW-Dynatrace-config/CD_destination-composite-service/dashboard/dashboard.yaml b/BMW-Dynatrace-config/CD_destination-composite-service/dashboard/dashboard.yaml
index c4811e7a..000440b0 100644
--- a/BMW-Dynatrace-config/CD_destination-composite-service/dashboard/dashboard.yaml
+++ b/BMW-Dynatrace-config/CD_destination-composite-service/dashboard/dashboard.yaml
@@ -1,125 +1,109 @@
 config:
-- CDdestination-composite-service-PROD: default.json
-- CDdestination-composite-service-E2E: default.json
-- CDdestination-composite-service-INT: default.json
-- CDdestination-composite-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
-CDdestination-composite-service-PROD:
+CDnewComponentTag-PROD:
 - name: CD_destination-composite-service PROD
-- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
-- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
-- tag: destination-composite-service
+- mzName: CD_destination-composite-service/management-zone/CDnewComponentTag.name
+- mzId: CD_destination-composite-service/management-zone/CDnewComponentTag.id
 - env: PROD
 - skipDeployment: "true"
-CDdestination-composite-service-PROD.EMEA-Prod:
+CDnewComponentTag-PROD.EMEA-Prod:
 - name: CD_destination-composite-service PROD
-- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
-- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
-- tag: destination-composite-service
+- mzName: CD_destination-composite-service/management-zone/CDnewComponentTag.name
+- mzId: CD_destination-composite-service/management-zone/CDnewComponentTag.id
 - env: PROD
 - skipDeployment: "false"
-CDdestination-composite-service-PROD.NA-Prod:
+CDnewComponentTag-PROD.NA-Prod:
 - name: CD_destination-composite-service PROD
-- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
-- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
-- tag: destination-composite-service
+- mzName: CD_destination-composite-service/management-zone/CDnewComponentTag.name
+- mzId: CD_destination-composite-service/management-zone/CDnewComponentTag.id
 - env: PROD
 - skipDeployment: "false"
-CDdestination-composite-service-PROD.CN-Prod:
+CDnewComponentTag-PROD.CN-Prod:
 - name: CD_destination-composite-service PROD
-- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
-- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
-- tag: destination-composite-service
+- mzName: CD_destination-composite-service/management-zone/CDnewComponentTag.name
+- mzId: CD_destination-composite-service/management-zone/CDnewComponentTag.id
 - env: PROD
 - skipDeployment: "false"
 
 #E2E dashboards for EMEA/NA/CN Prod
-CDdestination-composite-service-E2E:
+CDnewComponentTag-E2E:
 - name: CD_destination-composite-service E2E
-- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
-- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
-- tag: destination-composite-service
+- mzName: CD_destination-composite-service/management-zone/CDnewComponentTag.name
+- mzId: CD_destination-composite-service/management-zone/CDnewComponentTag.id
 - env: E2E
 - skipDeployment: "true"
-CDdestination-composite-service-E2E.EMEA-Prod:
+CDnewComponentTag-E2E.EMEA-Prod:
 - name: CD_destination-composite-service E2E
-- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
-- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
-- tag: destination-composite-service
+- mzName: CD_destination-composite-service/management-zone/CDnewComponentTag.name
+- mzId: CD_destination-composite-service/management-zone/CDnewComponentTag.id
 - env: E2E
 - skipDeployment: "false"
-CDdestination-composite-service-E2E.NA-Prod:
+CDnewComponentTag-E2E.NA-Prod:
 - name: CD_destination-composite-service E2E
-- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
-- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
-- tag: destination-composite-service
+- mzName: CD_destination-composite-service/management-zone/CDnewComponentTag.name
+- mzId: CD_destination-composite-service/management-zone/CDnewComponentTag.id
 - env: E2E
 - skipDeployment: "false"
-CDdestination-composite-service-E2E.CN-Prod:
+CDnewComponentTag-E2E.CN-Prod:
 - name: CD_destination-composite-service E2E
-- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
-- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
-- tag: destination-composite-service
+- mzName: CD_destination-composite-service/management-zone/CDnewComponentTag.name
+- mzId: CD_destination-composite-service/management-zone/CDnewComponentTag.id
 - env: E2E
 - skipDeployment: "false"
 
 #INT dashboards for EMEA/NA/CN PreProd
-CDdestination-composite-service-INT:
+CDnewComponentTag-INT:
 - name: CD_destination-composite-service INT
-- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
-- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
-- tag: destination-composite-service
+- mzName: CD_destination-composite-service/management-zone/CDnewComponentTag.name
+- mzId: CD_destination-composite-service/management-zone/CDnewComponentTag.id
 - env: INT
 - skipDeployment: "true"
-CDdestination-composite-service-INT.EMEA-PreProd:
+CDnewComponentTag-INT.EMEA-PreProd:
 - name: CD_destination-composite-service INT
-- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
-- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
-- tag: destination-composite-service
+- mzName: CD_destination-composite-service/management-zone/CDnewComponentTag.name
+- mzId: CD_destination-composite-service/management-zone/CDnewComponentTag.id
 - env: INT
 - skipDeployment: "false"
-CDdestination-composite-service-INT.NA-PreProd:
+CDnewComponentTag-INT.NA-PreProd:
 - name: CD_destination-composite-service INT
-- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
-- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
-- tag: destination-composite-service
+- mzName: CD_destination-composite-service/management-zone/CDnewComponentTag.name
+- mzId: CD_destination-composite-service/management-zone/CDnewComponentTag.id
 - env: INT
 - skipDeployment: "false"
-CDdestination-composite-service-INT.CN-PreProd:
+CDnewComponentTag-INT.CN-PreProd:
 - name: CD_destination-composite-service INT
-- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
-- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
-- tag: destination-composite-service
+- mzName: CD_destination-composite-service/management-zone/CDnewComponentTag.name
+- mzId: CD_destination-composite-service/management-zone/CDnewComponentTag.id
 - env: INT
 - skipDeployment: "false"
 
 #TEST dashboards for EMEA/NA/CN PreProd
-CDdestination-composite-service-TEST:
+CDnewComponentTag-TEST:
 - name: CD_destination-composite-service TEST
-- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
-- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
-- tag: destination-composite-service
+- mzName: CD_destination-composite-service/management-zone/CDnewComponentTag.name
+- mzId: CD_destination-composite-service/management-zone/CDnewComponentTag.id
 - env: TEST
 - skipDeployment: "true"
-CDdestination-composite-service-TEST.EMEA-PreProd:
+CDnewComponentTag-TEST.EMEA-PreProd:
 - name: CD_destination-composite-service TEST
-- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
-- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
-- tag: destination-composite-service
+- mzName: CD_destination-composite-service/management-zone/CDnewComponentTag.name
+- mzId: CD_destination-composite-service/management-zone/CDnewComponentTag.id
 - env: TEST
 - skipDeployment: "false"
-CDdestination-composite-service-TEST.NA-PreProd:
+CDnewComponentTag-TEST.NA-PreProd:
 - name: CD_destination-composite-service TEST
-- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
-- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
-- tag: destination-composite-service
+- mzName: CD_destination-composite-service/management-zone/CDnewComponentTag.name
+- mzId: CD_destination-composite-service/management-zone/CDnewComponentTag.id
 - env: TEST
 - skipDeployment: "false"
-CDdestination-composite-service-TEST.CN-PreProd:
+CDnewComponentTag-TEST.CN-PreProd:
 - name: CD_destination-composite-service TEST
-- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
-- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
-- tag: destination-composite-service
+- mzName: CD_destination-composite-service/management-zone/CDnewComponentTag.name
+- mzId: CD_destination-composite-service/management-zone/CDnewComponentTag.id
 - env: TEST
 - skipDeployment: "false"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_destination-composite-service/dashboard/default.json b/BMW-Dynatrace-config/CD_destination-composite-service/dashboard/default.json
index 6c685810..189767ed 100644
--- a/BMW-Dynatrace-config/CD_destination-composite-service/dashboard/default.json
+++ b/BMW-Dynatrace-config/CD_destination-composite-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}}"
             ]
           }
         }
diff --git a/BMW-Dynatrace-config/CD_destination-composite-service/management-zone/default.json b/BMW-Dynatrace-config/CD_destination-composite-service/management-zone/default.json
index bffa0c3b..fc96de39 100644
--- a/BMW-Dynatrace-config/CD_destination-composite-service/management-zone/default.json
+++ b/BMW-Dynatrace-config/CD_destination-composite-service/management-zone/default.json
@@ -1,114 +1,23 @@
 {
  "dimensionalRules": [],
  "name": "{{.name}}",
- "rules": [
-  {
-   "conditions": [
+ "entitySelectorBasedRules": [
     {
-     "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": [
+     "enabled": true,
+     "entitySelector": "type(Service),tag({{.compassIDs}})"
+    },
     {
-     "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": [
+      "enabled": true,
+      "entitySelector": "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag({{.compassIDs}}))"
+    },
     {
-     "comparisonInfo": {
-      "negate": false,
-      "operator": "EQUALS",
-      "type": "TAG",
-      "value": {
-       "context": "CONTEXTLESS",
-       "key": "Component",
-       "value": "{{.tag}}"
-      }
-     },
-     "key": {
-      "attribute": "HOST_TAGS"
-     }
-    }
+        "enabled": true,
+        "entitySelector": "type(PROCESS_GROUP_INSTANCE),tag({{.compassIDs}})"
+       },
+       {
+        "enabled": true,
+        "entitySelector": "type(HOST),tag({{.compassIDs}})"
+       }
    ],
-   "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"
-  }
- ]
+ "rules": []
 }
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_destination-composite-service/management-zone/management-zone.yaml b/BMW-Dynatrace-config/CD_destination-composite-service/management-zone/management-zone.yaml
index 19ec6bc7..52e2a6af 100644
--- a/BMW-Dynatrace-config/CD_destination-composite-service/management-zone/management-zone.yaml
+++ b/BMW-Dynatrace-config/CD_destination-composite-service/management-zone/management-zone.yaml
@@ -1,6 +1,6 @@
 config:
-- CDdestination-composite-service: default.json
+- CDnewComponentTag: default.json
 
-CDdestination-composite-service:
+CDnewComponentTag:
 - name: CD_destination-composite-service
-- tag: destination-composite-service
+- compassIDs: \"compass-id:destination-composite-service\"
diff --git a/BMW-Dynatrace-config/CD_destination-composite-service_old/dashboard/README.md b/BMW-Dynatrace-config/CD_destination-composite-service_old/dashboard/README.md
new file mode 100644
index 00000000..2b6d5717
--- /dev/null
+++ b/BMW-Dynatrace-config/CD_destination-composite-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.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_destination-composite-service_old/dashboard/dashboard.yaml b/BMW-Dynatrace-config/CD_destination-composite-service_old/dashboard/dashboard.yaml
new file mode 100644
index 00000000..c4811e7a
--- /dev/null
+++ b/BMW-Dynatrace-config/CD_destination-composite-service_old/dashboard/dashboard.yaml
@@ -0,0 +1,125 @@
+config:
+- CDdestination-composite-service-PROD: default.json
+- CDdestination-composite-service-E2E: default.json
+- CDdestination-composite-service-INT: default.json
+- CDdestination-composite-service-TEST: default.json
+
+#PROD dashboards for EMEA/NA/CN Prod
+CDdestination-composite-service-PROD:
+- name: CD_destination-composite-service PROD
+- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
+- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
+- tag: destination-composite-service
+- env: PROD
+- skipDeployment: "true"
+CDdestination-composite-service-PROD.EMEA-Prod:
+- name: CD_destination-composite-service PROD
+- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
+- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
+- tag: destination-composite-service
+- env: PROD
+- skipDeployment: "false"
+CDdestination-composite-service-PROD.NA-Prod:
+- name: CD_destination-composite-service PROD
+- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
+- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
+- tag: destination-composite-service
+- env: PROD
+- skipDeployment: "false"
+CDdestination-composite-service-PROD.CN-Prod:
+- name: CD_destination-composite-service PROD
+- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
+- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
+- tag: destination-composite-service
+- env: PROD
+- skipDeployment: "false"
+
+#E2E dashboards for EMEA/NA/CN Prod
+CDdestination-composite-service-E2E:
+- name: CD_destination-composite-service E2E
+- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
+- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
+- tag: destination-composite-service
+- env: E2E
+- skipDeployment: "true"
+CDdestination-composite-service-E2E.EMEA-Prod:
+- name: CD_destination-composite-service E2E
+- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
+- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
+- tag: destination-composite-service
+- env: E2E
+- skipDeployment: "false"
+CDdestination-composite-service-E2E.NA-Prod:
+- name: CD_destination-composite-service E2E
+- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
+- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
+- tag: destination-composite-service
+- env: E2E
+- skipDeployment: "false"
+CDdestination-composite-service-E2E.CN-Prod:
+- name: CD_destination-composite-service E2E
+- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
+- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
+- tag: destination-composite-service
+- env: E2E
+- skipDeployment: "false"
+
+#INT dashboards for EMEA/NA/CN PreProd
+CDdestination-composite-service-INT:
+- name: CD_destination-composite-service INT
+- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
+- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
+- tag: destination-composite-service
+- env: INT
+- skipDeployment: "true"
+CDdestination-composite-service-INT.EMEA-PreProd:
+- name: CD_destination-composite-service INT
+- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
+- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
+- tag: destination-composite-service
+- env: INT
+- skipDeployment: "false"
+CDdestination-composite-service-INT.NA-PreProd:
+- name: CD_destination-composite-service INT
+- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
+- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
+- tag: destination-composite-service
+- env: INT
+- skipDeployment: "false"
+CDdestination-composite-service-INT.CN-PreProd:
+- name: CD_destination-composite-service INT
+- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
+- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
+- tag: destination-composite-service
+- env: INT
+- skipDeployment: "false"
+
+#TEST dashboards for EMEA/NA/CN PreProd
+CDdestination-composite-service-TEST:
+- name: CD_destination-composite-service TEST
+- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
+- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
+- tag: destination-composite-service
+- env: TEST
+- skipDeployment: "true"
+CDdestination-composite-service-TEST.EMEA-PreProd:
+- name: CD_destination-composite-service TEST
+- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
+- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
+- tag: destination-composite-service
+- env: TEST
+- skipDeployment: "false"
+CDdestination-composite-service-TEST.NA-PreProd:
+- name: CD_destination-composite-service TEST
+- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
+- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
+- tag: destination-composite-service
+- env: TEST
+- skipDeployment: "false"
+CDdestination-composite-service-TEST.CN-PreProd:
+- name: CD_destination-composite-service TEST
+- mzName: CD_destination-composite-service/management-zone/CDdestination-composite-service.name
+- mzId: CD_destination-composite-service/management-zone/CDdestination-composite-service.id
+- tag: destination-composite-service
+- env: TEST
+- skipDeployment: "false"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_destination-composite-service_old/dashboard/default.json b/BMW-Dynatrace-config/CD_destination-composite-service_old/dashboard/default.json
new file mode 100644
index 00000000..6c685810
--- /dev/null
+++ b/BMW-Dynatrace-config/CD_destination-composite-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
+    }
+  ]
+}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_destination-composite-service_old/management-zone/README.md b/BMW-Dynatrace-config/CD_destination-composite-service_old/management-zone/README.md
new file mode 100644
index 00000000..ffe9d6e3
--- /dev/null
+++ b/BMW-Dynatrace-config/CD_destination-composite-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.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_destination-composite-service_old/management-zone/default.json b/BMW-Dynatrace-config/CD_destination-composite-service_old/management-zone/default.json
new file mode 100644
index 00000000..bffa0c3b
--- /dev/null
+++ b/BMW-Dynatrace-config/CD_destination-composite-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"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_destination-composite-service_old/management-zone/management-zone.yaml b/BMW-Dynatrace-config/CD_destination-composite-service_old/management-zone/management-zone.yaml
new file mode 100644
index 00000000..19ec6bc7
--- /dev/null
+++ b/BMW-Dynatrace-config/CD_destination-composite-service_old/management-zone/management-zone.yaml
@@ -0,0 +1,6 @@
+config:
+- CDdestination-composite-service: default.json
+
+CDdestination-composite-service:
+- name: CD_destination-composite-service
+- tag: destination-composite-service