From 0f7267ef8d73649d609c3a257389bb0e9414b145 Mon Sep 17 00:00:00 2001 From: Markus Dlugi Date: Mon, 21 Mar 2022 09:51:19 +0100 Subject: [PATCH] COMFY-493: Fix validation errors --- .../calculated-metrics-service.yaml | 6 +++--- ...on => metric-request-attribute-number-2-attributes.json} | 4 ++-- ...t.json => metric-request-attribute-number-no-split.json} | 2 +- .../request-attribute-from-span-attribute-confidential.json | 5 ++--- .../request-attribute-from-span-attribute.json | 5 ++--- 5 files changed, 10 insertions(+), 12 deletions(-) rename BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/{metric-request-attribute-2-attributes.json => metric-request-attribute-number-2-attributes.json} (95%) rename BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/{metric-request-attribute-no-split.json => metric-request-attribute-number-no-split.json} (96%) diff --git 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 index d1a57bab..05bbc876 100644 --- 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 @@ -1,9 +1,9 @@ config: - - Comfy_ActionDuration: metric-request-attribute-2-attributes.json + - 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-no-split.json - - Comfy_RunningCampaigns: metric-request-attribute-no-split.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 diff --git a/BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/metric-request-attribute-2-attributes.json b/BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/metric-request-attribute-number-2-attributes.json similarity index 95% rename from BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/metric-request-attribute-2-attributes.json rename to BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/metric-request-attribute-number-2-attributes.json index 2e705327..f03f1460 100644 --- a/BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/metric-request-attribute-2-attributes.json +++ b/BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/metric-request-attribute-number-2-attributes.json @@ -9,7 +9,7 @@ "negate": false, "requestAttribute": "{{.requestAttribute}}", "source": null, - "type": "STRING_REQUEST_ATTRIBUTE", + "type": "NUMBER_REQUEST_ATTRIBUTE", "value": null } }, @@ -58,7 +58,7 @@ "name": "{{.dimensionName}}", "placeholders": [], "topX": 10, - "topXAggregation": "SINGLE_VALUE", + "topXAggregation": "SUM", "topXDirection": "DESCENDING" }, "enabled": true, diff --git a/BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/metric-request-attribute-no-split.json b/BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/metric-request-attribute-number-no-split.json similarity index 96% rename from BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/metric-request-attribute-no-split.json rename to BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/metric-request-attribute-number-no-split.json index c05dacfc..1e840894 100644 --- a/BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/metric-request-attribute-no-split.json +++ b/BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/metric-request-attribute-number-no-split.json @@ -9,7 +9,7 @@ "negate": false, "requestAttribute": "{{.requestAttribute}}", "source": null, - "type": "STRING_REQUEST_ATTRIBUTE", + "type": "NUMBER_REQUEST_ATTRIBUTE", "value": null } }, diff --git 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 index 56a4665f..4baae71d 100644 --- 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 @@ -3,8 +3,7 @@ "confidential": true, "dataSources": [ { - "attributeKey": "{{.spanAttributeKey}}", - "capturingAndStorageLocation": "CAPTURE_AND_STORE_ON_SERVER", + "spanAttributeKey": "{{.spanAttributeKey}}", "enabled": true, "scope": { "tagOfProcessGroup": "app-id:APP-29681" @@ -16,7 +15,7 @@ } } ], - "dataType": "{{.type}}", + "dataType": "{{.dataType}}", "enabled": true, "name": "{{.name}}", "normalization": "ORIGINAL", diff --git 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 index 3335f336..4895b37f 100644 --- 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 @@ -3,8 +3,7 @@ "confidential": false, "dataSources": [ { - "attributeKey": "{{.spanAttributeKey}}", - "capturingAndStorageLocation": "CAPTURE_AND_STORE_ON_SERVER", + "spanAttributeKey": "{{.spanAttributeKey}}", "enabled": true, "scope": { "tagOfProcessGroup": "app-id:APP-29681" @@ -16,7 +15,7 @@ } } ], - "dataType": "{{.type}}", + "dataType": "{{.dataType}}", "enabled": true, "name": "{{.name}}", "normalization": "ORIGINAL",