From c20e196d97fa64523e4b0130c2041da10dfdbe00 Mon Sep 17 00:00:00 2001
From: "SLW\\ARNAUA" <Arnel.Arnautovic@nttdata.com>
Date: Tue, 11 Oct 2022 13:54:44 +0200
Subject: [PATCH] OPMAAS-2596 - Adjusting deployment configuration file.

---
 .../CD_am-proxy/dashboard/default.json        | 62 +++++++++++++------
 .../CD_am-proxy/management-zone/default.json  | 20 +++++-
 .../management-zone/management-zone.yaml      |  1 +
 3 files changed, 64 insertions(+), 19 deletions(-)

diff --git a/BMW-Dynatrace-config/CD_am-proxy/dashboard/default.json b/BMW-Dynatrace-config/CD_am-proxy/dashboard/default.json
index 6c685810..189767ed 100644
--- a/BMW-Dynatrace-config/CD_am-proxy/dashboard/default.json
+++ b/BMW-Dynatrace-config/CD_am-proxy/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_am-proxy/management-zone/default.json b/BMW-Dynatrace-config/CD_am-proxy/management-zone/default.json
index bffa0c3b..34922872 100644
--- a/BMW-Dynatrace-config/CD_am-proxy/management-zone/default.json
+++ b/BMW-Dynatrace-config/CD_am-proxy/management-zone/default.json
@@ -1,7 +1,25 @@
 {
  "dimensionalRules": [],
  "name": "{{.name}}",
- "rules": [
+ "entitySelectorBasedRules": [
+    {
+      "enabled": true,
+      "entitySelector": "type(Service),tag({{.compassIDs}})"
+    },
+    {
+      "enabled": true,
+      "entitySelector": "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag({{.compassIDs}}))"
+    },
+    {
+      "enabled": true,
+      "entitySelector": "type(PROCESS_GROUP_INSTANCE),tag({{.compassIDs}})"
+    },
+    {
+      "enabled": true,
+      "entitySelector": "type(HOST),tag({{.compassIDs}})"
+    }
+  ],
+  "rules": [
   {
    "conditions": [
     {
diff --git a/BMW-Dynatrace-config/CD_am-proxy/management-zone/management-zone.yaml b/BMW-Dynatrace-config/CD_am-proxy/management-zone/management-zone.yaml
index 69b19133..0a6698ef 100644
--- a/BMW-Dynatrace-config/CD_am-proxy/management-zone/management-zone.yaml
+++ b/BMW-Dynatrace-config/CD_am-proxy/management-zone/management-zone.yaml
@@ -4,3 +4,4 @@ config:
 CDam-proxy:
 - name: CD_am-proxy
 - tag: am-proxy
+- compassIDs: \"compass-id:am-proxy\"
\ No newline at end of file