OPMAAS-690 - Next try

2021-10-14 11:14:15 +02:00 · 2021-10-14 11:14:15 +02:00 · 74a627cafa
parent 0c88627355
commit 74a627cafa
8 changed files with 334 additions and 334 deletions
--- a/BMW-Dynatrace-config/CD_CustomerCentricInformationServices/alerting-profile/alerting-profile.yaml
+++ b/BMW-Dynatrace-config/CD_CustomerCentricInformationServices/alerting-profile/alerting-profile.yaml
@ -1,43 +1,43 @@
 config:
- CDCD_CustomerCentricInformationServices: default.json
+- CDCustomerCentricInformationServices: default.json


 #Prod alerting profiles for EMEA/NA/CN
-CDCD_CustomerCentricInformationServices.EMEA-Prod:
+CDCustomerCentricInformationServices.EMEA-Prod:
 - name: CD_CustomerCentricInformationServices PROD
- tag: CD_CustomerCentricInformationServices
- mzId: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
+- tag: CustomerCentricInformationServices
+- mzId: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
 - env: PROD
 - skipDeployment: "false"
-CDCD_CustomerCentricInformationServices.NA-Prod:
+CDCustomerCentricInformationServices.NA-Prod:
 - name: CD_CustomerCentricInformationServices PROD
- tag: CD_CustomerCentricInformationServices
- mzId: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
+- tag: CustomerCentricInformationServices
+- mzId: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
 - env: PROD
 - skipDeployment: "false"
-CDCD_CustomerCentricInformationServices.CN-Prod:
+CDCustomerCentricInformationServices.CN-Prod:
 - name: CD_CustomerCentricInformationServices PROD
- tag: CD_CustomerCentricInformationServices
- mzId: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
+- tag: CustomerCentricInformationServices
+- mzId: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
 - env: PROD
 - skipDeployment: "false"

 #INT alerting profiles for EMEA/NA/CN
-CDCD_CustomerCentricInformationServices.EMEA-PreProd:
+CDCustomerCentricInformationServices.EMEA-PreProd:
 - name: CD_CustomerCentricInformationServices INT
- tag: CD_CustomerCentricInformationServices
- mzId: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
+- tag: CustomerCentricInformationServices
+- mzId: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
 - env: INT
 - skipDeployment: "false"
-CDCD_CustomerCentricInformationServices.NA-PreProd:
+CDCustomerCentricInformationServices.NA-PreProd:
 - name: CD_CustomerCentricInformationServices INT
- tag: CD_CustomerCentricInformationServices
- mzId: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
+- tag: CustomerCentricInformationServices
+- mzId: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
 - env: INT
 - skipDeployment: "false"
-CDCD_CustomerCentricInformationServices.CN-PreProd:
+CDCustomerCentricInformationServices.CN-PreProd:
 - name: CD_CustomerCentricInformationServices INT
- tag: CD_CustomerCentricInformationServices
- mzId: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
+- tag: CustomerCentricInformationServices
+- mzId: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
 - env: INT
 - skipDeployment: "false"
--- a/BMW-Dynatrace-config/CD_CustomerCentricInformationServices/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ b/BMW-Dynatrace-config/CD_CustomerCentricInformationServices/conditional-naming-processgroup/conditional-naming-processgroup.yaml
@ -1,8 +1,8 @@
 config:
- CDCD_CustomerCentricInformationServices: template.json
+- CDCustomerCentricInformationServices: template.json

-CDCD_CustomerCentricInformationServices:
+CDCustomerCentricInformationServices:
 - name: MyProcessNamingRule
 - nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
- tag: CD_CustomerCentricInformationServices
+- tag: CustomerCentricInformationServices
 - skipDeployment: "true"
--- a/BMW-Dynatrace-config/CD_CustomerCentricInformationServices/conditional-naming-service/conditional-naming-service.yaml
+++ b/BMW-Dynatrace-config/CD_CustomerCentricInformationServices/conditional-naming-service/conditional-naming-service.yaml
@ -1,8 +1,8 @@
 config:
- CDCD_CustomerCentricInformationServices: template.json
+- CDCustomerCentricInformationServices: template.json

-CDCD_CustomerCentricInformationServices:
+CDCustomerCentricInformationServices:
 - name: MyProcessNamingRule
 - nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
- tag: CD_CustomerCentricInformationServices
+- tag: CustomerCentricInformationServices
 - skipDeployment: "true"
--- a/BMW-Dynatrace-config/CD_CustomerCentricInformationServices/dashboard/dashboard.yaml
+++ b/BMW-Dynatrace-config/CD_CustomerCentricInformationServices/dashboard/dashboard.yaml
@ -1,125 +1,125 @@
 config:
- CDCD_CustomerCentricInformationServices-PROD: default.json
- CDCD_CustomerCentricInformationServices-E2E: default.json
- CDCD_CustomerCentricInformationServices-INT: default.json
- CDCD_CustomerCentricInformationServices-TEST: default.json
+- CDCustomerCentricInformationServices-PROD: default.json
+- CDCustomerCentricInformationServices-E2E: default.json
+- CDCustomerCentricInformationServices-INT: default.json
+- CDCustomerCentricInformationServices-TEST: default.json

 #PROD dashboards for EMEA/NA/CN Prod
-CDCD_CustomerCentricInformationServices-PROD:
+CDCustomerCentricInformationServices-PROD:
 - name: CD_CustomerCentricInformationServices PROD
- mzName: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.name
- mzId: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
- tag: CD_CustomerCentricInformationServices
+- mzName: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.name
+- mzId: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
+- tag: CustomerCentricInformationServices
 - env: PROD
 - skipDeployment: "true"
-CDCD_CustomerCentricInformationServices-PROD.EMEA-Prod:
+CDCustomerCentricInformationServices-PROD.EMEA-Prod:
 - name: CD_CustomerCentricInformationServices PROD
- mzName: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.name
- mzId: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
- tag: CD_CustomerCentricInformationServices
+- mzName: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.name
+- mzId: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
+- tag: CustomerCentricInformationServices
 - env: PROD
 - skipDeployment: "false"
-CDCD_CustomerCentricInformationServices-PROD.NA-Prod:
+CDCustomerCentricInformationServices-PROD.NA-Prod:
 - name: CD_CustomerCentricInformationServices PROD
- mzName: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.name
- mzId: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
- tag: CD_CustomerCentricInformationServices
+- mzName: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.name
+- mzId: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
+- tag: CustomerCentricInformationServices
 - env: PROD
 - skipDeployment: "false"
-CDCD_CustomerCentricInformationServices-PROD.CN-Prod:
+CDCustomerCentricInformationServices-PROD.CN-Prod:
 - name: CD_CustomerCentricInformationServices PROD
- mzName: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.name
- mzId: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
- tag: CD_CustomerCentricInformationServices
+- mzName: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.name
+- mzId: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
+- tag: CustomerCentricInformationServices
 - env: PROD
 - skipDeployment: "false"

 #E2E dashboards for EMEA/NA/CN Prod
-CDCD_CustomerCentricInformationServices-E2E:
+CDCustomerCentricInformationServices-E2E:
 - name: CD_CustomerCentricInformationServices E2E
- mzName: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.name
- mzId: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
- tag: CD_CustomerCentricInformationServices
+- mzName: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.name
+- mzId: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
+- tag: CustomerCentricInformationServices
 - env: E2E
 - skipDeployment: "true"
-CDCD_CustomerCentricInformationServices-E2E.EMEA-Prod:
+CDCustomerCentricInformationServices-E2E.EMEA-Prod:
 - name: CD_CustomerCentricInformationServices E2E
- mzName: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.name
- mzId: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
- tag: CD_CustomerCentricInformationServices
+- mzName: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.name
+- mzId: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
+- tag: CustomerCentricInformationServices
 - env: E2E
 - skipDeployment: "false"
-CDCD_CustomerCentricInformationServices-E2E.NA-Prod:
+CDCustomerCentricInformationServices-E2E.NA-Prod:
 - name: CD_CustomerCentricInformationServices E2E
- mzName: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.name
- mzId: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
- tag: CD_CustomerCentricInformationServices
+- mzName: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.name
+- mzId: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
+- tag: CustomerCentricInformationServices
 - env: E2E
 - skipDeployment: "false"
-CDCD_CustomerCentricInformationServices-E2E.CN-Prod:
+CDCustomerCentricInformationServices-E2E.CN-Prod:
 - name: CD_CustomerCentricInformationServices E2E
- mzName: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.name
- mzId: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
- tag: CD_CustomerCentricInformationServices
+- mzName: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.name
+- mzId: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
+- tag: CustomerCentricInformationServices
 - env: E2E
 - skipDeployment: "false"

 #INT dashboards for EMEA/NA/CN PreProd
-CDCD_CustomerCentricInformationServices-INT:
+CDCustomerCentricInformationServices-INT:
 - name: CD_CustomerCentricInformationServices INT
- mzName: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.name
- mzId: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
- tag: CD_CustomerCentricInformationServices
+- mzName: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.name
+- mzId: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
+- tag: CustomerCentricInformationServices
 - env: INT
 - skipDeployment: "true"
-CDCD_CustomerCentricInformationServices-INT.EMEA-PreProd:
+CDCustomerCentricInformationServices-INT.EMEA-PreProd:
 - name: CD_CustomerCentricInformationServices INT
- mzName: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.name
- mzId: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
- tag: CD_CustomerCentricInformationServices
+- mzName: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.name
+- mzId: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
+- tag: CustomerCentricInformationServices
 - env: INT
 - skipDeployment: "false"
-CDCD_CustomerCentricInformationServices-INT.NA-PreProd:
+CDCustomerCentricInformationServices-INT.NA-PreProd:
 - name: CD_CustomerCentricInformationServices INT
- mzName: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.name
- mzId: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
- tag: CD_CustomerCentricInformationServices
+- mzName: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.name
+- mzId: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
+- tag: CustomerCentricInformationServices
 - env: INT
 - skipDeployment: "false"
-CDCD_CustomerCentricInformationServices-INT.CN-PreProd:
+CDCustomerCentricInformationServices-INT.CN-PreProd:
 - name: CD_CustomerCentricInformationServices INT
- mzName: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.name
- mzId: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
- tag: CD_CustomerCentricInformationServices
+- mzName: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.name
+- mzId: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
+- tag: CustomerCentricInformationServices
 - env: INT
 - skipDeployment: "false"

 #TEST dashboards for EMEA/NA/CN PreProd
-CDCD_CustomerCentricInformationServices-TEST:
+CDCustomerCentricInformationServices-TEST:
 - name: CD_CustomerCentricInformationServices TEST
- mzName: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.name
- mzId: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
- tag: CD_CustomerCentricInformationServices
+- mzName: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.name
+- mzId: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
+- tag: CustomerCentricInformationServices
 - env: TEST
 - skipDeployment: "true"
-CDCD_CustomerCentricInformationServices-TEST.EMEA-PreProd:
+CDCustomerCentricInformationServices-TEST.EMEA-PreProd:
 - name: CD_CustomerCentricInformationServices TEST
- mzName: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.name
- mzId: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
- tag: CD_CustomerCentricInformationServices
+- mzName: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.name
+- mzId: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
+- tag: CustomerCentricInformationServices
 - env: TEST
 - skipDeployment: "false"
-CDCD_CustomerCentricInformationServices-TEST.NA-PreProd:
+CDCustomerCentricInformationServices-TEST.NA-PreProd:
 - name: CD_CustomerCentricInformationServices TEST
- mzName: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.name
- mzId: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
- tag: CD_CustomerCentricInformationServices
+- mzName: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.name
+- mzId: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
+- tag: CustomerCentricInformationServices
 - env: TEST
 - skipDeployment: "false"
-CDCD_CustomerCentricInformationServices-TEST.CN-PreProd:
+CDCustomerCentricInformationServices-TEST.CN-PreProd:
 - name: CD_CustomerCentricInformationServices TEST
- mzName: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.name
- mzId: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
- tag: CD_CustomerCentricInformationServices
+- mzName: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.name
+- mzId: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
+- tag: CustomerCentricInformationServices
 - env: TEST
 - skipDeployment: "false"
--- a/BMW-Dynatrace-config/CD_CustomerCentricInformationServices/management-zone/default.json
+++ b/BMW-Dynatrace-config/CD_CustomerCentricInformationServices/management-zone/default.json
@ -1,214 +1,214 @@
 {
- "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"
-  },
-  {
+    "dimensionalRules": [],
+    "name": "{{.name}}",
+    "rules": [
+     {
      "conditions": [
-          {
-              "comparisonInfo": {
-                  "negate": false,
-                  "operator": "EQUALS",
-                  "type": "TAG",
-                  "value": {
-                      "context": "CONTEXTLESS",
-                      "key": "ms-id",
-                      "value": "geolocator"
-                  }
-              },
-              "key": {
-                  "attribute": "SERVICE_TAGS"
-              }
-          }
+       {
+        "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"
+       "SERVICE_TO_PROCESS_GROUP_LIKE",
+       "SERVICE_TO_HOST_LIKE"
      ],
      "type": "SERVICE"
-  },
-  {
+     },
+     {
      "conditions": [
-          {
-              "comparisonInfo": {
-                  "negate": false,
-                  "operator": "EQUALS",
-                  "type": "TAG",
-                  "value": {
-                      "context": "CONTEXTLESS",
-                      "key": "ms-id",
-                      "value": "news-next"
-                  }
-              },
-              "key": {
-                  "attribute": "SERVICE_TAGS"
-              }
-          }
+       {
+        "comparisonInfo": {
+         "negate": false,
+         "operator": "EQUALS",
+         "type": "TAG",
+         "value": {
+          "context": "CONTEXTLESS",
+          "key": "Component",
+          "value": "{{.tag}}"
+         }
+        },
+        "key": {
+         "attribute": "PROCESS_GROUP_TAGS"
+        }
+       }
      ],
      "enabled": true,
      "propagationTypes": [
-          "SERVICE_TO_PROCESS_GROUP_LIKE",
-          "SERVICE_TO_HOST_LIKE"
+       "PROCESS_GROUP_TO_HOST"
      ],
-      "type": "SERVICE"
-    },
-    {
-        "conditions": [
-            {
-                "comparisonInfo": {
-                    "negate": false,
-                    "operator": "EQUALS",
-                    "type": "TAG",
-                    "value": {
-                        "context": "CONTEXTLESS",
-                        "key": "ms-id",
-                        "value": "ccis-download"
-                    }
-                },
-                "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": "ms-id",
-                        "value": "digital-keyring"
-                    }
-                },
-                "key": {
-                    "attribute": "SERVICE_TAGS"
-                }
-            }
-        ],
-        "enabled": true,
-        "propagationTypes": [
-            "SERVICE_TO_PROCESS_GROUP_LIKE",
-            "SERVICE_TO_HOST_LIKE"
-        ],
-        "type": "SERVICE"
-    }
- ]
-}
+      "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"
+     },
+     {
+         "conditions": [
+             {
+                 "comparisonInfo": {
+                     "negate": false,
+                     "operator": "EQUALS",
+                     "type": "TAG",
+                     "value": {
+                         "context": "CONTEXTLESS",
+                         "key": "ms-id",
+                         "value": "geolocator"
+                     }
+                 },
+                 "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": "ms-id",
+                         "value": "news-next"
+                     }
+                 },
+                 "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": "ms-id",
+                           "value": "ccis-download"
+                       }
+                   },
+                   "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": "ms-id",
+                           "value": "digital-keyring"
+                       }
+                   },
+                   "key": {
+                       "attribute": "SERVICE_TAGS"
+                   }
+               }
+           ],
+           "enabled": true,
+           "propagationTypes": [
+               "SERVICE_TO_PROCESS_GROUP_LIKE",
+               "SERVICE_TO_HOST_LIKE"
+           ],
+           "type": "SERVICE"
+       }
+    ]
+   }
--- a/BMW-Dynatrace-config/CD_CustomerCentricInformationServices/management-zone/management-zone.yaml
+++ b/BMW-Dynatrace-config/CD_CustomerCentricInformationServices/management-zone/management-zone.yaml
@ -1,6 +1,6 @@
 config:
- CDCD_CustomerCentricInformationServices: default.json
+- CDCustomerCentricInformationServices: default.json

-CDCD_CustomerCentricInformationServices:
+CDCustomerCentricInformationServices:
 - name: CD_CustomerCentricInformationServices
- tag: CD_CustomerCentricInformationServices
+- tag: CustomerCentricInformationServices
--- a/BMW-Dynatrace-config/CD_CustomerCentricInformationServices/notification/notification.yaml
+++ b/BMW-Dynatrace-config/CD_CustomerCentricInformationServices/notification/notification.yaml
@ -1,102 +1,102 @@
 config:
- CDCD_CustomerCentricInformationServices: msTeams.json
- CDCD_CustomerCentricInformationServicesITSM: itsm.json
+- CDCustomerCentricInformationServices: msTeams.json
+- CDCustomerCentricInformationServicesITSM: itsm.json

 # Notification System for EMEA/NA/CN Prod msTeams
-CDCD_CustomerCentricInformationServices.EMEA-Prod:
+CDCustomerCentricInformationServices.EMEA-Prod:
 - name: CD_CustomerCentricInformationServices PROD
- alertingProfile: CD_CustomerCentricInformationServices/alerting-profile/CDCD_CustomerCentricInformationServices.id
+- alertingProfile: CD_CustomerCentricInformationServices/alerting-profile/CDCustomerCentricInformationServices.id
 - webhook: https://empty
 - skipDeployment: "true"
-CDCD_CustomerCentricInformationServices.NA-Prod:
+CDCustomerCentricInformationServices.NA-Prod:
 - name: CD_CustomerCentricInformationServices PROD
- alertingProfile: CD_CustomerCentricInformationServices/alerting-profile/CDCD_CustomerCentricInformationServices.id
+- alertingProfile: CD_CustomerCentricInformationServices/alerting-profile/CDCustomerCentricInformationServices.id
 - webhook: https://empty
 - skipDeployment: "true"
-CDCD_CustomerCentricInformationServices.CN-Prod:
+CDCustomerCentricInformationServices.CN-Prod:
 - name: CD_CustomerCentricInformationServices PROD
- alertingProfile: CD_CustomerCentricInformationServices/alerting-profile/CDCD_CustomerCentricInformationServices.id
+- alertingProfile: CD_CustomerCentricInformationServices/alerting-profile/CDCustomerCentricInformationServices.id
 - webhook: https://empty
 - skipDeployment: "true"

 # Notification System for EMEA/NA/CN PreProd msTeams
-CDCD_CustomerCentricInformationServices.EMEA-PreProd:
+CDCustomerCentricInformationServices.EMEA-PreProd:
 - name: CD_CustomerCentricInformationServices INT
- alertingProfile: CD_CustomerCentricInformationServices/alerting-profile/CDCD_CustomerCentricInformationServices.id
+- alertingProfile: CD_CustomerCentricInformationServices/alerting-profile/CDCustomerCentricInformationServices.id
 - webhook: https://empty
 - skipDeployment: "true"
-CDCD_CustomerCentricInformationServices.NA-PreProd:
+CDCustomerCentricInformationServices.NA-PreProd:
 - name: CD_CustomerCentricInformationServices INT
- alertingProfile: CD_CustomerCentricInformationServices/alerting-profile/CDCD_CustomerCentricInformationServices.id
+- alertingProfile: CD_CustomerCentricInformationServices/alerting-profile/CDCustomerCentricInformationServices.id
 - webhook: https://empty
 - skipDeployment: "true"
-CDCD_CustomerCentricInformationServices.CN-PreProd:
+CDCustomerCentricInformationServices.CN-PreProd:
 - name: CD_CustomerCentricInformationServices INT
- alertingProfile: CD_CustomerCentricInformationServices/alerting-profile/CDCD_CustomerCentricInformationServices.id
+- alertingProfile: CD_CustomerCentricInformationServices/alerting-profile/CDCustomerCentricInformationServices.id
 - webhook: https://empty
 - skipDeployment: "true"


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

-CDCD_CustomerCentricInformationServicesITSM.NA-Prod:
+CDCustomerCentricInformationServicesITSM.NA-Prod:
 - name: CD_CustomerCentricInformationServices ITSM PROD
- alertingProfile: CD_CustomerCentricInformationServices/alerting-profile/CDCD_CustomerCentricInformationServices.id
+- alertingProfile: CD_CustomerCentricInformationServices/alerting-profile/CDCustomerCentricInformationServices.id
 - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1
 - contractid: "10APP11906401"
 - appdid: "TEST123"
- mzName: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
+- mzName: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
 - DTEnvironment: https://xxu26128.live.dynatrace.com
 - skipDeployment: "true"


-CDCD_CustomerCentricInformationServicesITSM.CN-Prod:
+CDCustomerCentricInformationServicesITSM.CN-Prod:
 - name: CD_CustomerCentricInformationServices ITSM PROD
- alertingProfile: CD_CustomerCentricInformationServices/alerting-profile/CDCD_CustomerCentricInformationServices.id
+- alertingProfile: CD_CustomerCentricInformationServices/alerting-profile/CDCustomerCentricInformationServices.id
 - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1
 - contractid: "10APP11906401"
 - appdid: "TEST123"
- mzName: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
+- mzName: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
 - DTEnvironment: https://xxu26128.live.dynatrace.com
 - skipDeployment: "true"

-CDCD_CustomerCentricInformationServicesITSM.EMEA-PreProd:
+CDCustomerCentricInformationServicesITSM.EMEA-PreProd:
 - name: CD_CustomerCentricInformationServices ITSM INT
- alertingProfile: CD_CustomerCentricInformationServices/alerting-profile/CDCD_CustomerCentricInformationServices.id
+- alertingProfile: CD_CustomerCentricInformationServices/alerting-profile/CDCustomerCentricInformationServices.id
 - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1
 - contractid: "10APP11906401"
 - appdid: "TEST123"
- mzName: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
+- mzName: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
 - DTEnvironment: https://xxu26128.live.dynatrace.com
 - skipDeployment: "true"

-CDCD_CustomerCentricInformationServicesITSM.NA-PreProd:
+CDCustomerCentricInformationServicesITSM.NA-PreProd:
 - name: CD_CustomerCentricInformationServices ITSM INT
- alertingProfile: CD_CustomerCentricInformationServices/alerting-profile/CDCD_CustomerCentricInformationServices.id
+- alertingProfile: CD_CustomerCentricInformationServices/alerting-profile/CDCustomerCentricInformationServices.id
 - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1
 - contractid: "10APP11906401"
 - appdid: "TEST123"
- mzName: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
+- mzName: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
 - DTEnvironment: https://xxu26128.live.dynatrace.com
 - skipDeployment: "true"


-CDCD_CustomerCentricInformationServicesITSM.CN-PreProd:
+CDCustomerCentricInformationServicesITSM.CN-PreProd:
 - name: CD_CustomerCentricInformationServices ITSM INT
- alertingProfile: CD_CustomerCentricInformationServices/alerting-profile/CDCD_CustomerCentricInformationServices.id
+- alertingProfile: CD_CustomerCentricInformationServices/alerting-profile/CDCustomerCentricInformationServices.id
 - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1
 - contractid: "10APP11906401"
 - appdid: "TEST123"
- mzName: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
+- mzName: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
 - DTEnvironment: https://xxu26128.live.dynatrace.com
 - skipDeployment: "true"

--- a/BMW-Dynatrace-config/CD_CustomerCentricInformationServices/synthetic-monitor/synthetic-monitor.yaml
+++ b/BMW-Dynatrace-config/CD_CustomerCentricInformationServices/synthetic-monitor/synthetic-monitor.yaml
@ -1,10 +1,10 @@
 config:
- CD_CustomerCentricInformationServices: default.json
+- CustomerCentricInformationServices: default.json

-CD_CustomerCentricInformationServices:
+CustomerCentricInformationServices:
 - name: CD_CustomerCentricInformationServices - <synthetic-name>
- mzName: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.name
- mzId: CD_CustomerCentricInformationServices/management-zone/CDCD_CustomerCentricInformationServices.id
+- mzName: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.name
+- mzId: CD_CustomerCentricInformationServices/management-zone/CDCustomerCentricInformationServices.id
 - endpoint: <url>
 - location: <location>
 - skipDeployment: "true"