Pull request #124: OPMAAS-226 OPMAAS-571 - Updated initial configuration of application SWLSEC2-Checker to Dynatrace

Merge in OPAPM/cd_e2e_monitoring_config from CD_SWLSEC2-Checker to master * commit 'ed4518c24df9d332ca7eab6b0546d7326b31c56e': OPMAAS-226 OPMAAS-571 - Add initial configuration of application SWLSEC2-Checker to Dynatrace OPMAAS-226 OPMAAS-571 - removed CD_SWLSEC2-Checker
2021-12-01 11:15:46 +01:00 · 2021-12-01 11:15:46 +01:00 · 339abf44d0
parent e8470ccc03 ed4518c24d
commit 339abf44d0
10 changed files with 167 additions and 281 deletions
--- a/BMW-Dynatrace-config/CD_SWLSEC2-Checker/alerting-profile/alerting-profile.yaml
+++ b/BMW-Dynatrace-config/CD_SWLSEC2-Checker/alerting-profile/alerting-profile.yaml
@ -1,43 +1,37 @@
 config:
- CDSWLSEC2-Checker: default.json
+- CDnewComponentTag: default.json


 #Prod alerting profiles for EMEA/NA/CN
-CDSWLSEC2-Checker.EMEA-Prod:
+CDnewComponentTag.EMEA-Prod:
 - name: CD_SWLSEC2-Checker PROD
- tag: SWLSEC2-Checker
- mzId: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
+- mzId: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - env: PROD
 - skipDeployment: "false"
-CDSWLSEC2-Checker.NA-Prod:
+CDnewComponentTag.NA-Prod:
 - name: CD_SWLSEC2-Checker PROD
- tag: SWLSEC2-Checker
- mzId: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
+- mzId: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - env: PROD
 - skipDeployment: "false"
-CDSWLSEC2-Checker.CN-Prod:
+CDnewComponentTag.CN-Prod:
 - name: CD_SWLSEC2-Checker PROD
- tag: SWLSEC2-Checker
- mzId: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
+- mzId: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - env: PROD
 - skipDeployment: "false"

 #INT alerting profiles for EMEA/NA/CN
-CDSWLSEC2-Checker.EMEA-PreProd:
+CDnewComponentTag.EMEA-PreProd:
 - name: CD_SWLSEC2-Checker INT
- tag: SWLSEC2-Checker
- mzId: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
+- mzId: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - env: INT
 - skipDeployment: "false"
-CDSWLSEC2-Checker.NA-PreProd:
+CDnewComponentTag.NA-PreProd:
 - name: CD_SWLSEC2-Checker INT
- tag: SWLSEC2-Checker
- mzId: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
+- mzId: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - env: INT
 - skipDeployment: "false"
-CDSWLSEC2-Checker.CN-PreProd:
+CDnewComponentTag.CN-PreProd:
 - name: CD_SWLSEC2-Checker INT
- tag: SWLSEC2-Checker
- mzId: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
+- mzId: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - env: INT
 - skipDeployment: "false"
--- a/BMW-Dynatrace-config/CD_SWLSEC2-Checker/alerting-profile/default.json
+++ b/BMW-Dynatrace-config/CD_SWLSEC2-Checker/alerting-profile/default.json
@ -10,11 +10,6 @@
   "tagFilter": {
    "includeMode": "INCLUDE_ALL",
    "tagFilters": [
-     {
-      "context": "CONTEXTLESS",
-      "key": "Component",
-      "value": "{{.tag}}"
-     },
 	 {
      "context": "CONTEXTLESS",
      "key": "Environment",
@ -29,11 +24,6 @@
   "tagFilter": {
    "includeMode": "INCLUDE_ALL",
    "tagFilters": [
-     {
-      "context": "CONTEXTLESS",
-      "key": "Component",
-      "value": "{{.tag}}"
-     },
 	 {
      "context": "CONTEXTLESS",
      "key": "Environment",
@ -48,11 +38,6 @@
   "tagFilter": {
    "includeMode": "INCLUDE_ALL",
    "tagFilters": [
-     {
-      "context": "CONTEXTLESS",
-      "key": "Component",
-      "value": "{{.tag}}"
-     },
 	 {
      "context": "CONTEXTLESS",
      "key": "Environment",
@ -67,11 +52,6 @@
   "tagFilter": {
    "includeMode": "INCLUDE_ALL",
    "tagFilters": [
-     {
-      "context": "CONTEXTLESS",
-      "key": "Component",
-      "value": "{{.tag}}"
-     },
 	 {
      "context": "CONTEXTLESS",
      "key": "Environment",
@ -86,11 +66,6 @@
   "tagFilter": {
    "includeMode": "INCLUDE_ALL",
    "tagFilters": [
-     {
-      "context": "CONTEXTLESS",
-      "key": "Component",
-      "value": "{{.tag}}"
-     },
 	 {
      "context": "CONTEXTLESS",
      "key": "Environment",
--- a/BMW-Dynatrace-config/CD_SWLSEC2-Checker/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ b/BMW-Dynatrace-config/CD_SWLSEC2-Checker/conditional-naming-processgroup/conditional-naming-processgroup.yaml
@ -1,8 +1,7 @@
 config:
- CDSWLSEC2-Checker: template.json
+- CDnewComponentTag: template.json

-CDSWLSEC2-Checker:
+CDnewComponentTag:
 - name: MyProcessNamingRule
 - nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
- tag: SWLSEC2-Checker
 - skipDeployment: "true"
--- a/BMW-Dynatrace-config/CD_SWLSEC2-Checker/conditional-naming-service/conditional-naming-service.yaml
+++ b/BMW-Dynatrace-config/CD_SWLSEC2-Checker/conditional-naming-service/conditional-naming-service.yaml
@ -1,8 +1,7 @@
 config:
- CDSWLSEC2-Checker: template.json
+- CDnewComponentTag: template.json

-CDSWLSEC2-Checker:
+CDnewComponentTag:
 - name: MyProcessNamingRule
 - nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
- tag: SWLSEC2-Checker
 - skipDeployment: "true"
--- a/BMW-Dynatrace-config/CD_SWLSEC2-Checker/dashboard/dashboard.yaml
+++ b/BMW-Dynatrace-config/CD_SWLSEC2-Checker/dashboard/dashboard.yaml
@ -1,125 +1,109 @@
 config:
- CDSWLSEC2-Checker-PROD: default.json
- CDSWLSEC2-Checker-E2E: default.json
- CDSWLSEC2-Checker-INT: default.json
- CDSWLSEC2-Checker-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
-CDSWLSEC2-Checker-PROD:
+CDnewComponentTag-PROD:
 - name: CD_SWLSEC2-Checker PROD
- mzName: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.name
- mzId: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
- tag: SWLSEC2-Checker
+- mzName: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.name
+- mzId: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - env: PROD
 - skipDeployment: "true"
-CDSWLSEC2-Checker-PROD.EMEA-Prod:
+CDnewComponentTag-PROD.EMEA-Prod:
 - name: CD_SWLSEC2-Checker PROD
- mzName: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.name
- mzId: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
- tag: SWLSEC2-Checker
+- mzName: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.name
+- mzId: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - env: PROD
 - skipDeployment: "false"
-CDSWLSEC2-Checker-PROD.NA-Prod:
+CDnewComponentTag-PROD.NA-Prod:
 - name: CD_SWLSEC2-Checker PROD
- mzName: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.name
- mzId: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
- tag: SWLSEC2-Checker
+- mzName: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.name
+- mzId: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - env: PROD
 - skipDeployment: "false"
-CDSWLSEC2-Checker-PROD.CN-Prod:
+CDnewComponentTag-PROD.CN-Prod:
 - name: CD_SWLSEC2-Checker PROD
- mzName: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.name
- mzId: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
- tag: SWLSEC2-Checker
+- mzName: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.name
+- mzId: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - env: PROD
 - skipDeployment: "false"

 #E2E dashboards for EMEA/NA/CN Prod
-CDSWLSEC2-Checker-E2E:
+CDnewComponentTag-E2E:
 - name: CD_SWLSEC2-Checker E2E
- mzName: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.name
- mzId: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
- tag: SWLSEC2-Checker
+- mzName: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.name
+- mzId: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - env: E2E
 - skipDeployment: "true"
-CDSWLSEC2-Checker-E2E.EMEA-Prod:
+CDnewComponentTag-E2E.EMEA-Prod:
 - name: CD_SWLSEC2-Checker E2E
- mzName: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.name
- mzId: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
- tag: SWLSEC2-Checker
+- mzName: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.name
+- mzId: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - env: E2E
 - skipDeployment: "false"
-CDSWLSEC2-Checker-E2E.NA-Prod:
+CDnewComponentTag-E2E.NA-Prod:
 - name: CD_SWLSEC2-Checker E2E
- mzName: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.name
- mzId: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
- tag: SWLSEC2-Checker
+- mzName: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.name
+- mzId: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - env: E2E
 - skipDeployment: "false"
-CDSWLSEC2-Checker-E2E.CN-Prod:
+CDnewComponentTag-E2E.CN-Prod:
 - name: CD_SWLSEC2-Checker E2E
- mzName: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.name
- mzId: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
- tag: SWLSEC2-Checker
+- mzName: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.name
+- mzId: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - env: E2E
 - skipDeployment: "false"

 #INT dashboards for EMEA/NA/CN PreProd
-CDSWLSEC2-Checker-INT:
+CDnewComponentTag-INT:
 - name: CD_SWLSEC2-Checker INT
- mzName: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.name
- mzId: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
- tag: SWLSEC2-Checker
+- mzName: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.name
+- mzId: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - env: INT
 - skipDeployment: "true"
-CDSWLSEC2-Checker-INT.EMEA-PreProd:
+CDnewComponentTag-INT.EMEA-PreProd:
 - name: CD_SWLSEC2-Checker INT
- mzName: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.name
- mzId: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
- tag: SWLSEC2-Checker
+- mzName: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.name
+- mzId: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - env: INT
 - skipDeployment: "false"
-CDSWLSEC2-Checker-INT.NA-PreProd:
+CDnewComponentTag-INT.NA-PreProd:
 - name: CD_SWLSEC2-Checker INT
- mzName: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.name
- mzId: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
- tag: SWLSEC2-Checker
+- mzName: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.name
+- mzId: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - env: INT
 - skipDeployment: "false"
-CDSWLSEC2-Checker-INT.CN-PreProd:
+CDnewComponentTag-INT.CN-PreProd:
 - name: CD_SWLSEC2-Checker INT
- mzName: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.name
- mzId: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
- tag: SWLSEC2-Checker
+- mzName: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.name
+- mzId: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - env: INT
 - skipDeployment: "false"

 #TEST dashboards for EMEA/NA/CN PreProd
-CDSWLSEC2-Checker-TEST:
+CDnewComponentTag-TEST:
 - name: CD_SWLSEC2-Checker TEST
- mzName: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.name
- mzId: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
- tag: SWLSEC2-Checker
+- mzName: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.name
+- mzId: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - env: TEST
 - skipDeployment: "true"
-CDSWLSEC2-Checker-TEST.EMEA-PreProd:
+CDnewComponentTag-TEST.EMEA-PreProd:
 - name: CD_SWLSEC2-Checker TEST
- mzName: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.name
- mzId: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
- tag: SWLSEC2-Checker
+- mzName: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.name
+- mzId: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - env: TEST
 - skipDeployment: "false"
-CDSWLSEC2-Checker-TEST.NA-PreProd:
+CDnewComponentTag-TEST.NA-PreProd:
 - name: CD_SWLSEC2-Checker TEST
- mzName: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.name
- mzId: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
- tag: SWLSEC2-Checker
+- mzName: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.name
+- mzId: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - env: TEST
 - skipDeployment: "false"
-CDSWLSEC2-Checker-TEST.CN-PreProd:
+CDnewComponentTag-TEST.CN-PreProd:
 - name: CD_SWLSEC2-Checker TEST
- mzName: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.name
- mzId: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
- tag: SWLSEC2-Checker
+- mzName: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.name
+- mzId: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - env: TEST
 - skipDeployment: "false"
--- a/BMW-Dynatrace-config/CD_SWLSEC2-Checker/dashboard/default.json
+++ b/BMW-Dynatrace-config/CD_SWLSEC2-Checker/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_SWLSEC2-Checker/management-zone/default.json
+++ b/BMW-Dynatrace-config/CD_SWLSEC2-Checker/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": []
 }
--- a/BMW-Dynatrace-config/CD_SWLSEC2-Checker/management-zone/management-zone.yaml
+++ b/BMW-Dynatrace-config/CD_SWLSEC2-Checker/management-zone/management-zone.yaml
@ -1,6 +1,6 @@
 config:
- CDSWLSEC2-Checker: default.json
+- CDnewComponentTag: default.json

-CDSWLSEC2-Checker:
+CDnewComponentTag:
 - name: CD_SWLSEC2-Checker
- tag: SWLSEC2-Checker
+- compassIDs: \"compass-id:swlsec2checker\"
--- a/BMW-Dynatrace-config/CD_SWLSEC2-Checker/notification/notification.yaml
+++ b/BMW-Dynatrace-config/CD_SWLSEC2-Checker/notification/notification.yaml
@ -1,102 +1,102 @@
 config:
- CDSWLSEC2-Checker: msTeams.json
- CDSWLSEC2-CheckerITSM: itsm.json
+- CDnewComponentTag: msTeams.json
+- CDnewComponentTagITSM: itsm.json

 # Notification System for EMEA/NA/CN Prod msTeams
-CDSWLSEC2-Checker.EMEA-Prod:
+CDnewComponentTag.EMEA-Prod:
 - name: CD_SWLSEC2-Checker PROD
- alertingProfile: CD_SWLSEC2-Checker/alerting-profile/CDSWLSEC2-Checker.id
+- alertingProfile: CD_SWLSEC2-Checker/alerting-profile/CDnewComponentTag.id
 - webhook: https://empty
 - skipDeployment: "true"
-CDSWLSEC2-Checker.NA-Prod:
+CDnewComponentTag.NA-Prod:
 - name: CD_SWLSEC2-Checker PROD
- alertingProfile: CD_SWLSEC2-Checker/alerting-profile/CDSWLSEC2-Checker.id
+- alertingProfile: CD_SWLSEC2-Checker/alerting-profile/CDnewComponentTag.id
 - webhook: https://empty
 - skipDeployment: "true"
-CDSWLSEC2-Checker.CN-Prod:
+CDnewComponentTag.CN-Prod:
 - name: CD_SWLSEC2-Checker PROD
- alertingProfile: CD_SWLSEC2-Checker/alerting-profile/CDSWLSEC2-Checker.id
+- alertingProfile: CD_SWLSEC2-Checker/alerting-profile/CDnewComponentTag.id
 - webhook: https://empty
 - skipDeployment: "true"

 # Notification System for EMEA/NA/CN PreProd msTeams
-CDSWLSEC2-Checker.EMEA-PreProd:
+CDnewComponentTag.EMEA-PreProd:
 - name: CD_SWLSEC2-Checker INT
- alertingProfile: CD_SWLSEC2-Checker/alerting-profile/CDSWLSEC2-Checker.id
+- alertingProfile: CD_SWLSEC2-Checker/alerting-profile/CDnewComponentTag.id
 - webhook: https://empty
 - skipDeployment: "true"
-CDSWLSEC2-Checker.NA-PreProd:
+CDnewComponentTag.NA-PreProd:
 - name: CD_SWLSEC2-Checker INT
- alertingProfile: CD_SWLSEC2-Checker/alerting-profile/CDSWLSEC2-Checker.id
+- alertingProfile: CD_SWLSEC2-Checker/alerting-profile/CDnewComponentTag.id
 - webhook: https://empty
 - skipDeployment: "true"
-CDSWLSEC2-Checker.CN-PreProd:
+CDnewComponentTag.CN-PreProd:
 - name: CD_SWLSEC2-Checker INT
- alertingProfile: CD_SWLSEC2-Checker/alerting-profile/CDSWLSEC2-Checker.id
+- alertingProfile: CD_SWLSEC2-Checker/alerting-profile/CDnewComponentTag.id
 - webhook: https://empty
 - skipDeployment: "true"


 # Notification System for EMEA/NA/CN Prod ITSM
-CDSWLSEC2-CheckerITSM.EMEA-Prod:
+CDnewComponentTagITSM.EMEA-Prod:
 - name: CD_SWLSEC2-Checker ITSM PROD
- alertingProfile: CD_SWLSEC2-Checker/alerting-profile/CDSWLSEC2-Checker.id
+- alertingProfile: CD_SWLSEC2-Checker/alerting-profile/CDnewComponentTag.id
 - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1
 - contractid: "10APP11906401"
 - appdid: "TEST123"
- mzName: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
+- mzName: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - DTEnvironment: https://xxu26128.live.dynatrace.com
 - skipDeployment: "true"

-CDSWLSEC2-CheckerITSM.NA-Prod:
+CDnewComponentTagITSM.NA-Prod:
 - name: CD_SWLSEC2-Checker ITSM PROD
- alertingProfile: CD_SWLSEC2-Checker/alerting-profile/CDSWLSEC2-Checker.id
+- alertingProfile: CD_SWLSEC2-Checker/alerting-profile/CDnewComponentTag.id
 - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1
 - contractid: "10APP11906401"
 - appdid: "TEST123"
- mzName: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
+- mzName: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - DTEnvironment: https://xxu26128.live.dynatrace.com
 - skipDeployment: "true"


-CDSWLSEC2-CheckerITSM.CN-Prod:
+CDnewComponentTagITSM.CN-Prod:
 - name: CD_SWLSEC2-Checker ITSM PROD
- alertingProfile: CD_SWLSEC2-Checker/alerting-profile/CDSWLSEC2-Checker.id
+- alertingProfile: CD_SWLSEC2-Checker/alerting-profile/CDnewComponentTag.id
 - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1
 - contractid: "10APP11906401"
 - appdid: "TEST123"
- mzName: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
+- mzName: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - DTEnvironment: https://xxu26128.live.dynatrace.com
 - skipDeployment: "true"

-CDSWLSEC2-CheckerITSM.EMEA-PreProd:
+CDnewComponentTagITSM.EMEA-PreProd:
 - name: CD_SWLSEC2-Checker ITSM INT
- alertingProfile: CD_SWLSEC2-Checker/alerting-profile/CDSWLSEC2-Checker.id
+- alertingProfile: CD_SWLSEC2-Checker/alerting-profile/CDnewComponentTag.id
 - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1
 - contractid: "10APP11906401"
 - appdid: "TEST123"
- mzName: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
+- mzName: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - DTEnvironment: https://xxu26128.live.dynatrace.com
 - skipDeployment: "true"

-CDSWLSEC2-CheckerITSM.NA-PreProd:
+CDnewComponentTagITSM.NA-PreProd:
 - name: CD_SWLSEC2-Checker ITSM INT
- alertingProfile: CD_SWLSEC2-Checker/alerting-profile/CDSWLSEC2-Checker.id
+- alertingProfile: CD_SWLSEC2-Checker/alerting-profile/CDnewComponentTag.id
 - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1
 - contractid: "10APP11906401"
 - appdid: "TEST123"
- mzName: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
+- mzName: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - DTEnvironment: https://xxu26128.live.dynatrace.com
 - skipDeployment: "true"


-CDSWLSEC2-CheckerITSM.CN-PreProd:
+CDnewComponentTagITSM.CN-PreProd:
 - name: CD_SWLSEC2-Checker ITSM INT
- alertingProfile: CD_SWLSEC2-Checker/alerting-profile/CDSWLSEC2-Checker.id
+- alertingProfile: CD_SWLSEC2-Checker/alerting-profile/CDnewComponentTag.id
 - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1
 - contractid: "10APP11906401"
 - appdid: "TEST123"
- mzName: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
+- mzName: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - DTEnvironment: https://xxu26128.live.dynatrace.com
 - skipDeployment: "true"

--- a/BMW-Dynatrace-config/CD_SWLSEC2-Checker/synthetic-monitor/synthetic-monitor.yaml
+++ b/BMW-Dynatrace-config/CD_SWLSEC2-Checker/synthetic-monitor/synthetic-monitor.yaml
@ -1,10 +1,10 @@
 config:
- SWLSEC2-Checker: default.json
+- newComponentTag: default.json

-SWLSEC2-Checker:
+newComponentTag:
 - name: CD_SWLSEC2-Checker - <synthetic-name>
- mzName: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.name
- mzId: CD_SWLSEC2-Checker/management-zone/CDSWLSEC2-Checker.id
+- mzName: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.name
+- mzId: CD_SWLSEC2-Checker/management-zone/CDnewComponentTag.id
 - endpoint: <url>
 - location: <location>
 - skipDeployment: "true"