From 9f76e5726f748245e5b33ca53f8f6d4cbddbee10 Mon Sep 17 00:00:00 2001
From: Markus Dlugi <markus.dlugi@bmw.de>
Date: Wed, 22 Sep 2021 12:53:42 +0200
Subject: [PATCH] OPMAAS-600 - Use Namespace tag instead of Component tag for
 application comfy

---
 .../CD_comfy/alerting-profile/default.json             | 10 +++++-----
 .../conditional-naming-processgroup/template.json      |  2 +-
 .../CD_comfy/conditional-naming-service/template.json  |  2 +-
 BMW-Dynatrace-config/CD_comfy/dashboard/default.json   | 10 +++++-----
 .../CD_comfy/management-zone/default.json              |  6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/BMW-Dynatrace-config/CD_comfy/alerting-profile/default.json b/BMW-Dynatrace-config/CD_comfy/alerting-profile/default.json
index 681a4c64..e5408ef5 100644
--- a/BMW-Dynatrace-config/CD_comfy/alerting-profile/default.json
+++ b/BMW-Dynatrace-config/CD_comfy/alerting-profile/default.json
@@ -12,7 +12,7 @@
     "tagFilters": [
      {
       "context": "CONTEXTLESS",
-      "key": "Component",
+      "key": "Namespace",
       "value": "{{.tag}}"
      },
 	 {
@@ -31,7 +31,7 @@
     "tagFilters": [
      {
       "context": "CONTEXTLESS",
-      "key": "Component",
+      "key": "Namespace",
       "value": "{{.tag}}"
      },
 	 {
@@ -50,7 +50,7 @@
     "tagFilters": [
      {
       "context": "CONTEXTLESS",
-      "key": "Component",
+      "key": "Namespace",
       "value": "{{.tag}}"
      },
 	 {
@@ -69,7 +69,7 @@
     "tagFilters": [
      {
       "context": "CONTEXTLESS",
-      "key": "Component",
+      "key": "Namespace",
       "value": "{{.tag}}"
      },
 	 {
@@ -88,7 +88,7 @@
     "tagFilters": [
      {
       "context": "CONTEXTLESS",
-      "key": "Component",
+      "key": "Namespace",
       "value": "{{.tag}}"
      },
 	 {
diff --git a/BMW-Dynatrace-config/CD_comfy/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_comfy/conditional-naming-processgroup/template.json
index 7c039808..a3cc4d75 100644
--- a/BMW-Dynatrace-config/CD_comfy/conditional-naming-processgroup/template.json
+++ b/BMW-Dynatrace-config/CD_comfy/conditional-naming-processgroup/template.json
@@ -16,7 +16,7 @@
     "type": "TAG",
     "value": {
      "context": "CONTEXTLESS",
-     "key": "Component",
+     "key": "Namespace",
      "value": "{{.tag}}"
     }
    },
diff --git a/BMW-Dynatrace-config/CD_comfy/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_comfy/conditional-naming-service/template.json
index 5d4fac56..4d21953d 100644
--- a/BMW-Dynatrace-config/CD_comfy/conditional-naming-service/template.json
+++ b/BMW-Dynatrace-config/CD_comfy/conditional-naming-service/template.json
@@ -16,7 +16,7 @@
     "type": "TAG",
     "value": {
      "context": "CONTEXTLESS",
-     "key": "Component",
+     "key": "Namespace",
      "value": "{{.tag}}"
     }
    },
diff --git a/BMW-Dynatrace-config/CD_comfy/dashboard/default.json b/BMW-Dynatrace-config/CD_comfy/dashboard/default.json
index ef07d18c..1ca6da61 100644
--- a/BMW-Dynatrace-config/CD_comfy/dashboard/default.json
+++ b/BMW-Dynatrace-config/CD_comfy/dashboard/default.json
@@ -73,7 +73,7 @@
           "SERVICE": {
             "AUTO_TAGS": [
               "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Namespace:{{.tag}}"
             ]
           }
         }
@@ -190,7 +190,7 @@
           "SERVICE": {
             "AUTO_TAGS": [
               "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Namespace:{{.tag}}"
             ]
           }
         }
@@ -234,7 +234,7 @@
           "DATABASE": {
             "AUTO_TAGS": [
               "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Namespace:{{.tag}}"
             ]
           }
         }
@@ -266,7 +266,7 @@
           "SERVICE": {
             "AUTO_TAGS": [
               "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Namespace:{{.tag}}"
             ]
           }
         }
@@ -298,7 +298,7 @@
           "HOST": {
             "AUTO_TAGS": [
               "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Namespace:{{.tag}}"
             ]
           }
         }
diff --git a/BMW-Dynatrace-config/CD_comfy/management-zone/default.json b/BMW-Dynatrace-config/CD_comfy/management-zone/default.json
index bffa0c3b..f4281407 100644
--- a/BMW-Dynatrace-config/CD_comfy/management-zone/default.json
+++ b/BMW-Dynatrace-config/CD_comfy/management-zone/default.json
@@ -11,7 +11,7 @@
       "type": "TAG",
       "value": {
        "context": "CONTEXTLESS",
-       "key": "Component",
+       "key": "Namespace",
        "value": "{{.tag}}"
       }
      },
@@ -36,7 +36,7 @@
       "type": "TAG",
       "value": {
        "context": "CONTEXTLESS",
-       "key": "Component",
+       "key": "Namespace",
        "value": "{{.tag}}"
       }
      },
@@ -60,7 +60,7 @@
       "type": "TAG",
       "value": {
        "context": "CONTEXTLESS",
-       "key": "Component",
+       "key": "Namespace",
        "value": "{{.tag}}"
       }
      },