From 307a6d08daff52f558e9658fa78fef6790c5b358 Mon Sep 17 00:00:00 2001
From: Markus Dlugi <markus.dlugi@bmw.de>
Date: Mon, 21 Mar 2022 09:59:56 +0100
Subject: [PATCH] COMFY-493: Remove left-over environment filter from
 calculated metrics

---
 ...etric-request-attribute-number-2-attributes.json | 13 -------------
 .../metric-request-attribute-number-no-split.json   | 13 -------------
 .../metric-request-count-2-attributes.json          | 13 -------------
 .../metric-request-count.json                       | 13 -------------
 4 files changed, 52 deletions(-)

diff --git 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
index f03f1460..d98ec99d 100644
--- 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
@@ -38,19 +38,6 @@
      "value": "{{.msId}}"
     }
    }
-  },
-  {
-   "attribute": "SERVICE_TAG",
-   "comparisonInfo": {
-    "comparison": "EQUALS",
-    "negate": false,
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Environment",
-     "value": "{{.env}}"
-    }
-   }
   }
  ],
  "dimensionDefinition": {
diff --git 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
index 1e840894..579932cd 100644
--- 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
@@ -25,19 +25,6 @@
      "value": "{{.msId}}"
     }
    }
-  },
-  {
-   "attribute": "SERVICE_TAG",
-   "comparisonInfo": {
-    "comparison": "EQUALS",
-    "negate": false,
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Environment",
-     "value": "{{.env}}"
-    }
-   }
   }
  ],
  "dimensionDefinition": null,
diff --git 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
index cfe62fac..e116bb14 100644
--- 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
@@ -38,19 +38,6 @@
      "value": "{{.msId}}"
     }
    }
-  },
-  {
-   "attribute": "SERVICE_TAG",
-   "comparisonInfo": {
-    "comparison": "EQUALS",
-    "negate": false,
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Environment",
-     "value": "{{.env}}"
-    }
-   }
   }
  ],
  "dimensionDefinition": {
diff --git 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
index f286f090..4252ce25 100644
--- 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
@@ -25,19 +25,6 @@
      "value": "{{.msId}}"
     }
    }
-  },
-  {
-   "attribute": "SERVICE_TAG",
-   "comparisonInfo": {
-    "comparison": "EQUALS",
-    "negate": false,
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Environment",
-     "value": "{{.env}}"
-    }
-   }
   }
  ],
  "dimensionDefinition": {