Pull request #151: Feature/COMFY-493

Merge in OPAPM/cd_e2e_monitoring_config from feature/COMFY-493 to master * commit '664303e4a3224df52760169d2ca0940e7900bcfe': COMFY-493: Fix total triggers and median duration data explorer graphs COMFY-493: Fix dashboard mz reference + remove ID from dashboard payload COMFY-493: Enclose dimensions in quotes to avoid breaking yaml unmarshalling COMFY-493: Remove left-over environment filter from calculated metrics COMFY-493: Fix validation errors COMFY-493: Simplify calculated metrics by properly filtering in dashboard COMFY-493: Add request attributes, calculated metrics, conditional naming rules and dashboards for Comfy Fix Comfy MZ definition after removal of Namespace tag
2022-04-06 12:50:24 +02:00 · 2022-04-06 12:50:24 +02:00 · 4291cdc68a
parent f9a7511488 664303e4a3
commit 4291cdc68a
17 changed files with 11880 additions and 61 deletions
--- a/BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/calculated-metrics-service.yaml
+++ b/BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/calculated-metrics-service.yaml
@ -0,0 +1,63 @@
+config:
+  - Comfy_ActionDuration: metric-request-attribute-number-2-attributes.json
+  - Comfy_AgentIdConsume: metric-request-count.json
+  - Comfy_AgentIdPublish: metric-request-count.json
+  - Comfy_CompletedCampaigns: metric-request-attribute-number-no-split.json
+  - Comfy_RunningCampaigns: metric-request-attribute-number-no-split.json
+  - Comfy_VehicleActionStatus: metric-request-count.json
+  - Comfy_VehicleActionStatus_AgentId: metric-request-count-2-attributes.json
+
+Comfy_ActionDuration:
+  - name: Comfy_ActionDuration
+  - metricKey: calc:service.comfy_actionduration
+  - unit: SECOND
+  - requestAttribute: Comfy_ActionDuration
+  - requestAttribute2: Comfy_AgentIdConsume
+  - msId: comfy-orchestration
+  - dimension: "{RequestAttribute:Comfy_AgentIdConsume}"
+  - dimensionName: Agent
+Comfy_AgentIdConsume:
+  - name: Comfy_AgentIdConsume
+  - metricKey: calc:service.comfy_agentidconsume
+  - unit: COUNT
+  - requestAttribute: Comfy_AgentIdConsume
+  - msId: comfy-orchestration
+  - dimension: "{RequestAttribute:Comfy_AgentIdConsume}"
+  - dimensionName: Agent
+Comfy_AgentIdPublish:
+  - name: Comfy_AgentIdPublish
+  - metricKey: calc:service.comfy_agentidpublish
+  - unit: COUNT
+  - requestAttribute: Comfy_AgentIdPublish
+  - msId: comfy-orchestration
+  - dimension: "{RequestAttribute:Comfy_AgentIdPublish}"
+  - dimensionName: Agent
+Comfy_CompletedCampaigns:
+  - name: Comfy_CompletedCampaigns
+  - metricKey: calc:service.comfy_completedcampaigns
+  - unit: COUNT
+  - requestAttribute: Comfy_CompletedCampaigns
+  - msId: comfy-orchestration
+Comfy_RunningCampaigns:
+  - name: Comfy_RunningCampaigns
+  - metricKey: calc:service.comfy_runningcampaigns
+  - unit: COUNT
+  - requestAttribute: Comfy_RunningCampaigns
+  - msId: comfy-management
+Comfy_VehicleActionStatus:
+  - name: Comfy_VehicleActionStatus
+  - metricKey: calc:service.comfy_vehicleactionstatus
+  - unit: COUNT
+  - requestAttribute: Comfy_VehicleActionStatus
+  - msId: comfy-orchestration
+  - dimension: "{RequestAttribute:Comfy_VehicleActionStatus}"
+  - dimensionName: Status
+Comfy_VehicleActionStatus_AgentId:
+  - name: Comfy_VehicleActionStatus_AgentId
+  - metricKey: calc:service.comfy_vehicleactionstatus_agentid
+  - unit: COUNT
+  - requestAttribute: Comfy_VehicleActionStatus
+  - requestAttribute2: Comfy_AgentIdConsume
+  - msId: comfy-orchestration
+  - dimension: "{RequestAttribute:Comfy_AgentIdConsume} : {RequestAttribute:Comfy_VehicleActionStatus}"
+  - dimensionName: "Agent : Status"
--- a/BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/metric-request-attribute-number-2-attributes.json
+++ b/BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/metric-request-attribute-number-2-attributes.json
@ -0,0 +1,64 @@
+{
+ "conditions": [
+  {
+   "attribute": "SERVICE_REQUEST_ATTRIBUTE",
+   "comparisonInfo": {
+    "caseSensitive": false,
+    "comparison": "EXISTS",
+    "matchOnChildCalls": false,
+    "negate": false,
+    "requestAttribute": "{{.requestAttribute}}",
+    "source": null,
+    "type": "NUMBER_REQUEST_ATTRIBUTE",
+    "value": null
+   }
+  },
+  {
+   "attribute": "SERVICE_REQUEST_ATTRIBUTE",
+   "comparisonInfo": {
+    "caseSensitive": false,
+    "comparison": "EXISTS",
+    "matchOnChildCalls": false,
+    "negate": false,
+    "requestAttribute": "{{.requestAttribute2}}",
+    "source": null,
+    "type": "STRING_REQUEST_ATTRIBUTE",
+    "value": null
+   }
+  },
+  {
+   "attribute": "SERVICE_TAG",
+   "comparisonInfo": {
+    "comparison": "EQUALS",
+    "negate": false,
+    "type": "TAG",
+    "value": {
+     "context": "CONTEXTLESS",
+     "key": "ms-id",
+     "value": "{{.msId}}"
+    }
+   }
+  }
+ ],
+ "dimensionDefinition": {
+  "dimension": "{{.dimension}}",
+  "name": "{{.dimensionName}}",
+  "placeholders": [],
+  "topX": 10,
+  "topXAggregation": "SUM",
+  "topXDirection": "DESCENDING"
+ },
+ "enabled": true,
+ "entityId": null,
+ "managementZones": [
+  "CD_comfy"
+ ],
+ "metricDefinition": {
+  "metric": "REQUEST_ATTRIBUTE",
+  "requestAttribute": "{{.requestAttribute}}"
+ },
+ "name": "{{.name}}",
+ "tsmMetricKey": "{{.metricKey}}",
+ "unit": "{{.unit}}",
+ "unitDisplayName": ""
+}
--- a/BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/metric-request-attribute-number-no-split.json
+++ b/BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/metric-request-attribute-number-no-split.json
@ -0,0 +1,44 @@
+{
+ "conditions": [
+  {
+   "attribute": "SERVICE_REQUEST_ATTRIBUTE",
+   "comparisonInfo": {
+    "caseSensitive": false,
+    "comparison": "EXISTS",
+    "matchOnChildCalls": false,
+    "negate": false,
+    "requestAttribute": "{{.requestAttribute}}",
+    "source": null,
+    "type": "NUMBER_REQUEST_ATTRIBUTE",
+    "value": null
+   }
+  },
+  {
+   "attribute": "SERVICE_TAG",
+   "comparisonInfo": {
+    "comparison": "EQUALS",
+    "negate": false,
+    "type": "TAG",
+    "value": {
+     "context": "CONTEXTLESS",
+     "key": "ms-id",
+     "value": "{{.msId}}"
+    }
+   }
+  }
+ ],
+ "dimensionDefinition": null,
+ "enabled": true,
+ "entityId": null,
+ "managementZones": [
+  "CD_comfy"
+ ],
+ "metricDefinition": {
+  "metric": "REQUEST_ATTRIBUTE",
+  "requestAttribute": "{{.requestAttribute}}"
+ },
+ "name": "{{.name}}",
+ "tsmMetricKey": "{{.metricKey}}",
+ "unit": "{{.unit}}",
+ "unitDisplayName": ""
+}
--- a/BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/metric-request-count-2-attributes.json
+++ b/BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/metric-request-count-2-attributes.json
@ -0,0 +1,64 @@
+{
+ "conditions": [
+  {
+   "attribute": "SERVICE_REQUEST_ATTRIBUTE",
+   "comparisonInfo": {
+    "caseSensitive": false,
+    "comparison": "EXISTS",
+    "matchOnChildCalls": false,
+    "negate": false,
+    "requestAttribute": "{{.requestAttribute}}",
+    "source": null,
+    "type": "STRING_REQUEST_ATTRIBUTE",
+    "value": null
+   }
+  },
+  {
+   "attribute": "SERVICE_REQUEST_ATTRIBUTE",
+   "comparisonInfo": {
+    "caseSensitive": false,
+    "comparison": "EXISTS",
+    "matchOnChildCalls": false,
+    "negate": false,
+    "requestAttribute": "{{.requestAttribute2}}",
+    "source": null,
+    "type": "STRING_REQUEST_ATTRIBUTE",
+    "value": null
+   }
+  },
+  {
+   "attribute": "SERVICE_TAG",
+   "comparisonInfo": {
+    "comparison": "EQUALS",
+    "negate": false,
+    "type": "TAG",
+    "value": {
+     "context": "CONTEXTLESS",
+     "key": "ms-id",
+     "value": "{{.msId}}"
+    }
+   }
+  }
+ ],
+ "dimensionDefinition": {
+  "dimension": "{{.dimension}}",
+  "name": "{{.dimensionName}}",
+  "placeholders": [],
+  "topX": 40,
+  "topXAggregation": "SINGLE_VALUE",
+  "topXDirection": "DESCENDING"
+ },
+ "enabled": true,
+ "entityId": null,
+ "managementZones": [
+  "CD_comfy"
+ ],
+ "metricDefinition": {
+  "metric": "REQUEST_COUNT",
+  "requestAttribute": null
+ },
+ "name": "{{.name}}",
+ "tsmMetricKey": "{{.metricKey}}",
+ "unit": "{{.unit}}",
+ "unitDisplayName": ""
+}
--- a/BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/metric-request-count.json
+++ b/BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/metric-request-count.json
@ -0,0 +1,51 @@
+{
+ "conditions": [
+  {
+   "attribute": "SERVICE_REQUEST_ATTRIBUTE",
+   "comparisonInfo": {
+    "caseSensitive": false,
+    "comparison": "EXISTS",
+    "matchOnChildCalls": false,
+    "negate": false,
+    "requestAttribute": "{{.requestAttribute}}",
+    "source": null,
+    "type": "STRING_REQUEST_ATTRIBUTE",
+    "value": null
+   }
+  },
+  {
+   "attribute": "SERVICE_TAG",
+   "comparisonInfo": {
+    "comparison": "EQUALS",
+    "negate": false,
+    "type": "TAG",
+    "value": {
+     "context": "CONTEXTLESS",
+     "key": "ms-id",
+     "value": "{{.msId}}"
+    }
+   }
+  }
+ ],
+ "dimensionDefinition": {
+  "dimension": "{{.dimension}}",
+  "name": "{{.dimensionName}}",
+  "placeholders": [],
+  "topX": 10,
+  "topXAggregation": "SINGLE_VALUE",
+  "topXDirection": "DESCENDING"
+ },
+ "enabled": true,
+ "entityId": null,
+ "managementZones": [
+  "CD_comfy"
+ ],
+ "metricDefinition": {
+  "metric": "REQUEST_COUNT",
+  "requestAttribute": null
+ },
+ "name": "{{.name}}",
+ "tsmMetricKey": "{{.metricKey}}",
+ "unit": "{{.unit}}",
+ "unitDisplayName": ""
+}
--- a/BMW-Dynatrace-config/CD_comfy/conditional-naming-service/comfy-conditional-naming.json
+++ b/BMW-Dynatrace-config/CD_comfy/conditional-naming-service/comfy-conditional-naming.json
@ -0,0 +1,54 @@
+{
+ "displayName": "{{.name}}",
+ "enabled": true,
+ "metadata": {
+  "clusterVersion": "1.214.107.20210407-223952",
+  "configurationVersions": [
+   0
+  ]
+ },
+ "nameFormat": "{{.nameFormat}}",
+ "rules": [
+  {
+   "comparisonInfo": {
+    "negate": false,
+    "operator": "EQUALS",
+    "type": "TAG",
+    "value": {
+     "context": "CONTEXTLESS",
+     "key": "app-id",
+     "value": "{{.appId}}"
+    }
+   },
+   "key": {
+    "attribute": "SERVICE_TAGS"
+   }
+  },
+  {
+   "key": {
+    "attribute": "PROCESS_GROUP_TECHNOLOGY"
+   },
+   "comparisonInfo": {
+    "type": "SIMPLE_TECH",
+    "operator": "EQUALS",
+    "value": {
+     "type": "{{.tech}}"
+    },
+    "negate": "false"
+   }
+  },
+  {
+   "comparisonInfo": {
+    "negate": false,
+    "operator": "EQUALS",
+    "type": "SERVICE_TYPE",
+    "value": "{{.serviceType}}"
+   },
+   "key": {
+    "attribute": "SERVICE_TYPE",
+    "type": "STATIC"
+   }
+  }
+ ],
+ "type": "SERVICE"
+}
--- a/BMW-Dynatrace-config/CD_comfy/conditional-naming-service/conditional-naming-service.yaml
+++ b/BMW-Dynatrace-config/CD_comfy/conditional-naming-service/conditional-naming-service.yaml
@ -1,8 +1,35 @@
 config:
- CDcomfy: template.json
+- CDcomfyWebRequestService: comfy-conditional-naming.json
+- CDcomfyBackgroundActivity: comfy-conditional-naming.json
+- CDcomfyWebService: comfy-conditional-naming.json

-CDcomfy:
- name: MyProcessNamingRule
- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
- tag: comfy
- skipDeployment: "true"
+
+# From: Netty on 0.0.0.0:8081
+# To:   Web requests at comfy-management e2e
+CDcomfyWebRequestService:
+- name: ComfyWebRequest
+- nameFormat: "Web requests at {ProcessGroup:Kubernetes:ms-id} {ProcessGroup:Environment:Environment}"
+- appId: APP-29681
+- tech: NETTY
+- serviceType: WEB_REQUEST_SERVICE
+- skipDeployment: "false"
+
+# From: Requests executed in background threads of orbitProduct=skynet Environment=e2e Region=eu-central-1 Hub=EMEA ClusterName=skynet-e2e_eu-central-
+# To:   Background requests at comfy-management e2e
+CDcomfyBackgroundActivity:
+  - name: ComfyBackgroundActivity
+  - nameFormat: "Background requests at {ProcessGroup:Kubernetes:ms-id} {ProcessGroup:Environment:Environment}"
+  - appId: APP-29681
+  - tech: NETTY
+  - serviceType: BACKGROUND_ACTIVITY
+  - skipDeployment: "false"
+
+# From: PingResource - comfy - e2e
+# To:   PingResource - comfy-agent-nautilus - e2e
+CDcomfyWebService:
+  - name: ComfyWebService
+  - nameFormat: "{Service:DetectedName} - {ProcessGroup:Kubernetes:ms-id} - {ProcessGroup:Environment:Environment}"
+  - appId: APP-29681
+  - tech: JAVA
+  - serviceType: WEB_SERVICE
+  - skipDeployment: "false"
--- a/BMW-Dynatrace-config/CD_comfy/conditional-naming-service/template.json
+++ b/BMW-Dynatrace-config/CD_comfy/conditional-naming-service/template.json
@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Namespace",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
--- a/BMW-Dynatrace-config/CD_comfy/dashboard/CDcomfyCampaignMonitoring.json
+++ b/BMW-Dynatrace-config/CD_comfy/dashboard/CDcomfyCampaignMonitoring.json
--- a/BMW-Dynatrace-config/CD_comfy/dashboard/CDvdmStandard.json
+++ b/BMW-Dynatrace-config/CD_comfy/dashboard/CDvdmStandard.json
--- a/BMW-Dynatrace-config/CD_comfy/dashboard/CDvdmStandardNoReliability.json
+++ b/BMW-Dynatrace-config/CD_comfy/dashboard/CDvdmStandardNoReliability.json
--- a/BMW-Dynatrace-config/CD_comfy/dashboard/dashboard.yaml
+++ b/BMW-Dynatrace-config/CD_comfy/dashboard/dashboard.yaml
@ -3,6 +3,20 @@ config:
 - CDcomfy-E2E: default.json
 - CDcomfy-INT: default.json
 - CDcomfy-TEST: default.json
+- CDvdmStandard-EMEA-E2E: CDvdmStandardNoReliability.json
+- CDvdmStandard-EMEA-PROD: CDvdmStandardNoReliability.json
+- CDvdmStandard-US-E2E: CDvdmStandardNoReliability.json
+- CDvdmStandard-US-PROD: CDvdmStandardNoReliability.json
+- CDvdmStandard-CN-E2E: CDvdmStandardNoReliability.json
+- CDvdmStandard-CN-PROD: CDvdmStandardNoReliability.json
+- CDcomfyCampaignMonitoring-EMEA-TEST: CDcomfyCampaignMonitoring.json
+- CDcomfyCampaignMonitoring-EMEA-INT: CDcomfyCampaignMonitoring.json
+- CDcomfyCampaignMonitoring-EMEA-E2E: CDcomfyCampaignMonitoring.json
+- CDcomfyCampaignMonitoring-EMEA-PROD: CDcomfyCampaignMonitoring.json
+- CDcomfyCampaignMonitoring-US-E2E: CDcomfyCampaignMonitoring.json
+- CDcomfyCampaignMonitoring-US-PROD: CDcomfyCampaignMonitoring.json
+- CDcomfyCampaignMonitoring-CN-E2E: CDcomfyCampaignMonitoring.json
+- CDcomfyCampaignMonitoring-CN-PROD: CDcomfyCampaignMonitoring.json

 #PROD dashboards for EMEA/NA/CN Prod
 CDcomfy-PROD:
@ -122,4 +136,356 @@ CDcomfy-TEST.CN-PreProd:
 - mzId: CD_comfy/management-zone/CDcomfy.id
 - tag: comfy
 - env: TEST
- skipDeployment: "false"
+- skipDeployment: "false"
+  
+# VDM Standard Dashboards
+CDvdmStandard-EMEA-E2E:
+  - name: CD_Comfy - EMEA E2E - VDM Standard Dashboard
+  - mzName: CD_comfy/management-zone/CDcomfy.name
+  - mzId: CD_comfy/management-zone/CDcomfy.id
+  - tag: comfy
+  - env: E2E
+  - appId: APP-29681
+  - reliabilityLink: "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-CampaignManagement(Comfy)"
+  - skipDeployment: "true"
+CDvdmStandard-EMEA-E2E.EMEA-Prod:
+  - name: CD_Comfy - EMEA E2E - VDM Standard Dashboard
+  - mzName: CD_comfy/management-zone/CDcomfy.name
+  - mzId: CD_comfy/management-zone/CDcomfy.id
+  - tag: comfy
+  - env: E2E
+  - appId: APP-29681
+  - reliabilityLink: "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-CampaignManagement(Comfy)"
+  - skipDeployment: "false"
+CDvdmStandard-EMEA-PROD:
+  - name: CD_Comfy - EMEA PROD - VDM Standard Dashboard
+  - mzName: CD_comfy/management-zone/CDcomfy.name
+  - mzId: CD_comfy/management-zone/CDcomfy.id
+  - tag: comfy
+  - env: PROD
+  - appId: APP-29681
+  - reliabilityLink: "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-CampaignManagement(Comfy)"
+  - skipDeployment: "true"
+CDvdmStandard-EMEA-PROD.EMEA-Prod:
+  - name: CD_Comfy - EMEA PROD - VDM Standard Dashboard
+  - mzName: CD_comfy/management-zone/CDcomfy.name
+  - mzId: CD_comfy/management-zone/CDcomfy.id
+  - tag: comfy
+  - env: PROD
+  - appId: APP-29681
+  - reliabilityLink: "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-CampaignManagement(Comfy)"
+  - skipDeployment: "false"
+CDvdmStandard-US-E2E:
+  - name: CD_Comfy - US E2E - VDM Standard Dashboard
+  - mzName: CD_comfy/management-zone/CDcomfy.name
+  - mzId: CD_comfy/management-zone/CDcomfy.id
+  - tag: comfy
+  - env: E2E
+  - appId: APP-29681
+  - reliabilityLink: "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-CampaignManagement(Comfy)"
+  - skipDeployment: "true"
+CDvdmStandard-US-E2E.NA-Prod:
+  - name: CD_Comfy - US E2E - VDM Standard Dashboard
+  - mzName: CD_comfy/management-zone/CDcomfy.name
+  - mzId: CD_comfy/management-zone/CDcomfy.id
+  - tag: comfy
+  - env: E2E
+  - appId: APP-29681
+  - reliabilityLink: "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-CampaignManagement(Comfy)"
+  - skipDeployment: "false"
+CDvdmStandard-US-PROD:
+  - name: CD_Comfy - US PROD - VDM Standard Dashboard
+  - mzName: CD_comfy/management-zone/CDcomfy.name
+  - mzId: CD_comfy/management-zone/CDcomfy.id
+  - tag: comfy
+  - env: PROD
+  - appId: APP-29681
+  - reliabilityLink: "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-CampaignManagement(Comfy)"
+  - skipDeployment: "true"
+CDvdmStandard-US-PROD.NA-Prod:
+  - name: CD_Comfy - US PROD - VDM Standard Dashboard
+  - mzName: CD_comfy/management-zone/CDcomfy.name
+  - mzId: CD_comfy/management-zone/CDcomfy.id
+  - tag: comfy
+  - env: PROD
+  - appId: APP-29681
+  - reliabilityLink: "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-CampaignManagement(Comfy)"
+  - skipDeployment: "false"
+CDvdmStandard-CN-E2E:
+  - name: CD_Comfy - CN E2E - VDM Standard Dashboard
+  - mzName: CD_comfy/management-zone/CDcomfy.name
+  - mzId: CD_comfy/management-zone/CDcomfy.id
+  - tag: comfy
+  - env: E2E
+  - appId: APP-29681
+  - reliabilityLink: "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-CampaignManagement(Comfy)"
+  - skipDeployment: "true"
+CDvdmStandard-CN-E2E.CN-Prod:
+  - name: CD_Comfy - CN E2E - VDM Standard Dashboard
+  - mzName: CD_comfy/management-zone/CDcomfy.name
+  - mzId: CD_comfy/management-zone/CDcomfy.id
+  - tag: comfy
+  - env: E2E
+  - appId: APP-29681
+  - reliabilityLink: "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-CampaignManagement(Comfy)"
+  - skipDeployment: "false"
+CDvdmStandard-CN-PROD:
+  - name: CD_Comfy - CN PROD - VDM Standard Dashboard
+  - mzName: CD_comfy/management-zone/CDcomfy.name
+  - mzId: CD_comfy/management-zone/CDcomfy.id
+  - tag: comfy
+  - env: PROD
+  - appId: APP-29681
+  - reliabilityLink: "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-CampaignManagement(Comfy)"
+  - skipDeployment: "true"
+CDvdmStandard-CN-PROD.CN-Prod:
+  - name: CD_Comfy - CN PROD - VDM Standard Dashboard
+  - mzName: CD_comfy/management-zone/CDcomfy.name
+  - mzId: CD_comfy/management-zone/CDcomfy.id
+  - tag: comfy
+  - env: PROD
+  - appId: APP-29681
+  - reliabilityLink: "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-CampaignManagement(Comfy)"
+  - skipDeployment: "false"
+
+# Comfy Campaign & Health Monitoring Dashboards
+CDcomfyCampaignMonitoring-EMEA-TEST:
+  - name: Comfy Campaign & Health Monitoring EMEA TEST
+  - tag: comfy
+  - env: TEST
+  - envLower: test
+  - agent1: o11n
+  - agent1DisplayName: o11n
+  - agent1Health: "No actual service"
+  - agent2: o12n
+  - agent2DisplayName: o12n
+  - agent2Health: "No actual service"
+  - agent3: performance
+  - agent3DisplayName: performance
+  - agent3Health: "No actual service"
+  - skipDeployment: "true"
+CDcomfyCampaignMonitoring-EMEA-TEST.EMEA-PreProd:
+  - name: Comfy Campaign & Health Monitoring EMEA TEST
+  - tag: comfy
+  - env: TEST
+  - envLower: test
+  - agent1: o11n
+  - agent1DisplayName: o11n
+  - agent1Health: "No actual service"
+  - agent2: o12n
+  - agent2DisplayName: o12n
+  - agent2Health: "No actual service"
+  - agent3: performance
+  - agent3DisplayName: performance
+  - agent3Health: "No actual service"
+  - skipDeployment: "false"
+CDcomfyCampaignMonitoring-EMEA-INT:
+  - name: Comfy Campaign & Health Monitoring EMEA INT
+  - tag: comfy
+  - env: INT
+  - envLower: int
+  - agent1: nots
+  - agent1DisplayName: NOTS
+  - agent1Health: PrometheusResource - b2vnots-comfy-agent - int
+  - agent2: sputnik
+  - agent2DisplayName: Sputnik
+  - agent2Health: Web requests at comfy-agent-sputnik int
+  - agent3: nautilus
+  - agent3DisplayName: Nautilus
+  - agent3Health: PrometheusResource - comfy-agent-nautilus - int
+  - skipDeployment: "true"
+CDcomfyCampaignMonitoring-EMEA-INT.EMEA-PreProd:
+  - name: Comfy Campaign & Health Monitoring EMEA INT
+  - tag: comfy
+  - env: INT
+  - envLower: int
+  - agent1: nots
+  - agent1DisplayName: NOTS
+  - agent1Health: PrometheusResource - b2vnots-comfy-agent - int
+  - agent2: sputnik
+  - agent2DisplayName: Sputnik
+  - agent2Health: Web requests at comfy-agent-sputnik int
+  - agent3: nautilus
+  - agent3DisplayName: Nautilus
+  - agent3Health: PrometheusResource - comfy-agent-nautilus - int
+  - skipDeployment: "false"
+CDcomfyCampaignMonitoring-EMEA-E2E:
+  - name: Comfy Campaign & Health Monitoring EMEA E2E
+  - tag: comfy
+  - env: E2E
+  - envLower: e2e
+  - agent1: nots
+  - agent1DisplayName: NOTS
+  - agent1Health: PrometheusResource - b2vnots-comfy-agent - e2e
+  - agent2: sputnik
+  - agent2DisplayName: Sputnik
+  - agent2Health: Web requests at comfy-agent-sputnik e2e
+  - agent3: nautilus
+  - agent3DisplayName: Nautilus
+  - agent3Health: PrometheusResource - comfy-agent-nautilus - e2e
+  - skipDeployment: "true"
+CDcomfyCampaignMonitoring-EMEA-E2E.EMEA-Prod:
+  - name: Comfy Campaign & Health Monitoring EMEA E2E
+  - tag: comfy
+  - env: E2E
+  - envLower: e2e
+  - agent1: nots
+  - agent1DisplayName: NOTS
+  - agent1Health: PrometheusResource - b2vnots-comfy-agent - e2e
+  - agent2: sputnik
+  - agent2DisplayName: Sputnik
+  - agent2Health: Web requests at comfy-agent-sputnik e2e
+  - agent3: nautilus
+  - agent3DisplayName: Nautilus
+  - agent3Health: PrometheusResource - comfy-agent-nautilus - e2e
+  - skipDeployment: "false"
+CDcomfyCampaignMonitoring-EMEA-PROD:
+  - name: Comfy Campaign & Health Monitoring EMEA PROD
+  - tag: comfy
+  - env: PROD
+  - envLower: prod
+  - agent1: nots
+  - agent1DisplayName: NOTS
+  - agent1Health: PrometheusResource - b2vnots-comfy-agent - prod
+  - agent2: sputnik
+  - agent2DisplayName: Sputnik
+  - agent2Health: Web requests at comfy-agent-sputnik prod
+  - agent3: nautilus
+  - agent3DisplayName: Nautilus
+  - agent3Health: PrometheusResource - comfy-agent-nautilus - prod
+  - skipDeployment: "true"
+CDcomfyCampaignMonitoring-EMEA-PROD.EMEA-Prod:
+  - name: Comfy Campaign & Health Monitoring EMEA PROD
+  - tag: comfy
+  - env: PROD
+  - envLower: prod
+  - agent1: nots
+  - agent1DisplayName: NOTS
+  - agent1Health: PrometheusResource - b2vnots-comfy-agent - prod
+  - agent2: sputnik
+  - agent2DisplayName: Sputnik
+  - agent2Health: Web requests at comfy-agent-sputnik prod
+  - agent3: nautilus
+  - agent3DisplayName: Nautilus
+  - agent3Health: PrometheusResource - comfy-agent-nautilus - prod
+  - skipDeployment: "false"
+CDcomfyCampaignMonitoring-US-E2E:
+  - name: Comfy Campaign & Health Monitoring US E2E
+  - tag: comfy
+  - env: E2E
+  - envLower: e2e
+  - agent1: nots
+  - agent1DisplayName: NOTS
+  - agent1Health: PrometheusResource - b2vnots-comfy-agent - e2e
+  - agent2: sputnik
+  - agent2DisplayName: Sputnik
+  - agent2Health: Web requests at comfy-agent-sputnik e2e
+  - agent3: nautilus
+  - agent3DisplayName: Nautilus
+  - agent3Health: PrometheusResource - comfy-agent-nautilus - e2e
+  - skipDeployment: "true"
+CDcomfyCampaignMonitoring-US-E2E.NA-Prod:
+  - name: Comfy Campaign & Health Monitoring US E2E
+  - tag: comfy
+  - env: E2E
+  - envLower: e2e
+  - agent1: nots
+  - agent1DisplayName: NOTS
+  - agent1Health: PrometheusResource - b2vnots-comfy-agent - e2e
+  - agent2: sputnik
+  - agent2DisplayName: Sputnik
+  - agent2Health: Web requests at comfy-agent-sputnik e2e
+  - agent3: nautilus
+  - agent3DisplayName: Nautilus
+  - agent3Health: PrometheusResource - comfy-agent-nautilus - e2e
+  - skipDeployment: "false"
+CDcomfyCampaignMonitoring-US-PROD:
+  - name: Comfy Campaign & Health Monitoring US PROD
+  - tag: comfy
+  - env: PROD
+  - envLower: prod
+  - agent1: nots
+  - agent1DisplayName: NOTS
+  - agent1Health: PrometheusResource - b2vnots-comfy-agent - prod
+  - agent2: sputnik
+  - agent2DisplayName: Sputnik
+  - agent2Health: Web requests at comfy-agent-sputnik prod
+  - agent3: nautilus
+  - agent3DisplayName: Nautilus
+  - agent3Health: PrometheusResource - comfy-agent-nautilus - prod
+  - skipDeployment: "true"
+CDcomfyCampaignMonitoring-US-PROD.NA-Prod:
+  - name: Comfy Campaign & Health Monitoring US PROD
+  - tag: comfy
+  - env: PROD
+  - envLower: prod
+  - agent1: nots
+  - agent1DisplayName: NOTS
+  - agent1Health: PrometheusResource - b2vnots-comfy-agent - prod
+  - agent2: sputnik
+  - agent2DisplayName: Sputnik
+  - agent2Health: Web requests at comfy-agent-sputnik prod
+  - agent3: nautilus
+  - agent3DisplayName: Nautilus
+  - agent3Health: PrometheusResource - comfy-agent-nautilus - prod
+  - skipDeployment: "false"
+CDcomfyCampaignMonitoring-CN-E2E:
+  - name: Comfy Campaign & Health Monitoring CN E2E
+  - tag: comfy
+  - env: E2E
+  - envLower: e2e
+  - agent1: nots
+  - agent1DisplayName: NOTS
+  - agent1Health: PrometheusResource - b2vnots-comfy-agent - e2e
+  - agent2: sputnik
+  - agent2DisplayName: Sputnik
+  - agent2Health: Web requests at comfy-agent-sputnik e2e
+  - agent3: nautilus
+  - agent3DisplayName: Nautilus
+  - agent3Health: PrometheusResource - comfy-agent-nautilus - e2e
+  - skipDeployment: "true"
+CDcomfyCampaignMonitoring-CN-E2E.CN-Prod:
+  - name: Comfy Campaign & Health Monitoring CN E2E
+  - tag: comfy
+  - env: E2E
+  - envLower: e2e
+  - agent1: nots
+  - agent1DisplayName: NOTS
+  - agent1Health: PrometheusResource - b2vnots-comfy-agent - e2e
+  - agent2: sputnik
+  - agent2DisplayName: Sputnik
+  - agent2Health: Web requests at comfy-agent-sputnik e2e
+  - agent3: nautilus
+  - agent3DisplayName: Nautilus
+  - agent3Health: PrometheusResource - comfy-agent-nautilus - e2e
+  - skipDeployment: "false"
+CDcomfyCampaignMonitoring-CN-PROD:
+  - name: Comfy Campaign & Health Monitoring CN PROD
+  - tag: comfy
+  - env: PROD
+  - envLower: prod
+  - agent1: nots
+  - agent1DisplayName: NOTS
+  - agent1Health: PrometheusResource - b2vnots-comfy-agent - prod
+  - agent2: sputnik
+  - agent2DisplayName: Sputnik
+  - agent2Health: Web requests at comfy-agent-sputnik prod
+  - agent3: nautilus
+  - agent3DisplayName: Nautilus
+  - agent3Health: PrometheusResource - comfy-agent-nautilus - prod
+  - skipDeployment: "true"
+CDcomfyCampaignMonitoring-CN-PROD.CN-Prod:
+  - name: Comfy Campaign & Health Monitoring CN PROD
+  - tag: comfy
+  - env: PROD
+  - envLower: prod
+  - agent1: nots
+  - agent1DisplayName: NOTS
+  - agent1Health: PrometheusResource - b2vnots-comfy-agent - prod
+  - agent2: sputnik
+  - agent2DisplayName: Sputnik
+  - agent2Health: Web requests at comfy-agent-sputnik prod
+  - agent3: nautilus
+  - agent3DisplayName: Nautilus
+  - agent3Health: PrometheusResource - comfy-agent-nautilus - prod
+  - skipDeployment: "false"
--- a/BMW-Dynatrace-config/CD_comfy/management-zone/default.json
+++ b/BMW-Dynatrace-config/CD_comfy/management-zone/default.json
@ -11,8 +11,8 @@
      "type": "TAG",
      "value": {
       "context": "CONTEXTLESS",
-       "key": "Namespace",
-       "value": "{{.tag}}"
+       "key": "app-id",
+       "value": "{{.appId}}"
      }
     },
     "key": {
@ -36,8 +36,8 @@
      "type": "TAG",
      "value": {
       "context": "CONTEXTLESS",
-       "key": "Namespace",
-       "value": "{{.tag}}"
+       "key": "app-id",
+       "value": "{{.appId}}"
      }
     },
     "key": {
@ -51,27 +51,6 @@
   ],
   "type": "PROCESS_GROUP"
  },
-  {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "negate": false,
-      "operator": "EQUALS",
-      "type": "TAG",
-      "value": {
-       "context": "CONTEXTLESS",
-       "key": "Namespace",
-       "value": "{{.tag}}"
-      }
-     },
-     "key": {
-      "attribute": "HOST_TAGS"
-     }
-    }
-   ],
-   "enabled": true,
-   "type": "HOST"
-  },
  {
   "conditions": [
    {
--- a/BMW-Dynatrace-config/CD_comfy/management-zone/management-zone.yaml
+++ b/BMW-Dynatrace-config/CD_comfy/management-zone/management-zone.yaml
@ -4,3 +4,4 @@ config:
 CDcomfy:
 - name: CD_comfy
 - tag: comfy
+- appId: APP-29681
--- a/BMW-Dynatrace-config/CD_comfy/request-attributes/request-attribute-from-span-attribute-confidential.json
+++ b/BMW-Dynatrace-config/CD_comfy/request-attributes/request-attribute-from-span-attribute-confidential.json
@ -0,0 +1,23 @@
+{
+ "aggregation": "{{.aggregation}}",
+ "confidential": true,
+ "dataSources": [
+  {
+   "spanAttributeKey": "{{.spanAttributeKey}}",
+   "enabled": true,
+   "scope": {
+    "tagOfProcessGroup": "app-id:APP-29681"
+   },
+   "source": "SPAN_ATTRIBUTE",
+   "valueProcessing": {
+    "splitAt": "",
+    "trim": false
+   }
+  }
+ ],
+ "dataType": "{{.dataType}}",
+ "enabled": true,
+ "name": "{{.name}}",
+ "normalization": "ORIGINAL",
+ "skipPersonalDataMasking": false
+}
--- a/BMW-Dynatrace-config/CD_comfy/request-attributes/request-attribute-from-span-attribute.json
+++ b/BMW-Dynatrace-config/CD_comfy/request-attributes/request-attribute-from-span-attribute.json
@ -0,0 +1,23 @@
+{
+ "aggregation": "{{.aggregation}}",
+ "confidential": false,
+ "dataSources": [
+  {
+   "spanAttributeKey": "{{.spanAttributeKey}}",
+   "enabled": true,
+   "scope": {
+    "tagOfProcessGroup": "app-id:APP-29681"
+   },
+   "source": "SPAN_ATTRIBUTE",
+   "valueProcessing": {
+    "splitAt": "",
+    "trim": false
+   }
+  }
+ ],
+ "dataType": "{{.dataType}}",
+ "enabled": true,
+ "name": "{{.name}}",
+ "normalization": "ORIGINAL",
+ "skipPersonalDataMasking": false
+}
--- a/BMW-Dynatrace-config/CD_comfy/request-attributes/request-attributes.yaml
+++ b/BMW-Dynatrace-config/CD_comfy/request-attributes/request-attributes.yaml
@ -0,0 +1,57 @@
+config:
+- Comfy_ActionDuration: request-attribute-from-span-attribute.json
+- Comfy_ActionId: request-attribute-from-span-attribute.json
+- Comfy_AgentIdConsume: request-attribute-from-span-attribute.json
+- Comfy_AgentIdPublish: request-attribute-from-span-attribute.json
+- Comfy_CampaignId: request-attribute-from-span-attribute.json
+- Comfy_CompletedCampaigns: request-attribute-from-span-attribute.json
+- Comfy_RunningCampaigns: request-attribute-from-span-attribute.json
+- Comfy_VIN: request-attribute-from-span-attribute-confidential.json
+- Comfy_VehicleActionStatus: request-attribute-from-span-attribute.json
+
+
+Comfy_ActionDuration:
+  - name: Comfy_ActionDuration
+  - dataType: INTEGER
+  - aggregation: FIRST
+  - spanAttributeKey: comfy.request_attribute.action_duration
+Comfy_ActionId:
+  - name: Comfy_ActionId
+  - dataType: STRING
+  - aggregation: FIRST
+  - spanAttributeKey: comfy.action_id
+Comfy_AgentIdConsume:
+  - name: Comfy_AgentIdConsume
+  - dataType: STRING
+  - aggregation: FIRST
+  - spanAttributeKey: comfy.request_attribute.agent_id.consume
+Comfy_AgentIdPublish:
+  - name: Comfy_AgentIdPublish
+  - dataType: STRING
+  - aggregation: FIRST
+  - spanAttributeKey: comfy.request_attribute.agent_id.publish
+Comfy_CampaignId:
+  - name: Comfy_CampaignId
+  - dataType: STRING
+  - aggregation: FIRST
+  - spanAttributeKey: comfy.campaign_id
+Comfy_CompletedCampaigns:
+  - name: Comfy_CompletedCampaigns
+  - dataType: INTEGER
+  - aggregation: FIRST
+  - spanAttributeKey: comfy.request_attribute.completed_campaigns
+Comfy_RunningCampaigns:
+  - name: Comfy_RunningCampaigns
+  - dataType: INTEGER
+  - aggregation: FIRST
+  - spanAttributeKey: comfy.request_attribute.running_campaigns
+Comfy_VIN:
+  - name: Comfy_VIN
+  - dataType: STRING
+  - aggregation: FIRST
+  - spanAttributeKey: comfy.vin
+Comfy_VehicleActionStatus:
+  - name: Comfy_VehicleActionStatus
+  - dataType: STRING
+  - aggregation: FIRST
+  - spanAttributeKey: comfy.request_attribute.action_status