From 523745bdc686a57ddc15a6ed9f2bded4493ad93f Mon Sep 17 00:00:00 2001
From: Markus Dlugi <markus.dlugi@bmw.de>
Date: Tue, 16 May 2023 14:41:00 +0200
Subject: [PATCH] Switch management zone CD_rsu from Component to Namespace tag

---
 CN_PREPROD/management_zone/cd_rsu.tf   |  99 +++--------------
 CN_PROD/management_zone/cd_rsu.tf      |  99 +++--------------
 EMEA_PREPROD/management_zone/cd_rsu.tf | 141 +------------------------
 EMEA_PROD/management_zone/cd_rsu.tf    |  99 +++--------------
 NA_PREPROD/management_zone/cd_rsu.tf   |  99 +++--------------
 NA_PROD/management_zone/cd_rsu.tf      |  99 +++--------------
 6 files changed, 65 insertions(+), 571 deletions(-)

diff --git a/CN_PREPROD/management_zone/cd_rsu.tf b/CN_PREPROD/management_zone/cd_rsu.tf
index 29285c60..43b1e0d7 100644
--- a/CN_PREPROD/management_zone/cd_rsu.tf
+++ b/CN_PREPROD/management_zone/cd_rsu.tf
@@ -1,95 +1,20 @@
 # DEFINE dynatrace_management_zone.CD_rsu.id = -4691758522923968476
 resource "dynatrace_management_zone" "CD_rsu" {
   name = "CD_rsu"
-  rules {
-    type    = "CLOUD_APPLICATION"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "CLOUD_APPLICATION_NAME"
-      }
-      string {
-        case_sensitive = true
-        # negate       = false
-        operator       = "CONTAINS"
-        value          = "rsu"
-      }
-    }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"Namespace:rsu\")"
   }
-  rules {
-    type    = "CLOUD_APPLICATION_NAMESPACE"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "CLOUD_APPLICATION_NAMESPACE_NAME"
-      }
-      string {
-        case_sensitive = true
-        # negate       = false
-        operator       = "CONTAINS"
-        value          = "rsu"
-      }
-    }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"Namespace:rsu\")"
   }
-  rules {
-    type    = "HOST"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "HOST_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "rsu"
-        }
-      }
-    }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"Namespace:rsu\")"
   }
-  rules {
-    type              = "PROCESS_GROUP"
-    enabled           = true
-    propagation_types = [ "PROCESS_GROUP_TO_HOST" ]
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "PROCESS_GROUP_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "rsu"
-        }
-      }
-    }
-  }
-  rules {
-    type              = "SERVICE"
-    enabled           = true
-    propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ]
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "SERVICE_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "rsu"
-        }
-      }
-    }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"Namespace:rsu\"))"
   }
 }
diff --git a/CN_PROD/management_zone/cd_rsu.tf b/CN_PROD/management_zone/cd_rsu.tf
index 5788e9c1..f629f964 100644
--- a/CN_PROD/management_zone/cd_rsu.tf
+++ b/CN_PROD/management_zone/cd_rsu.tf
@@ -1,95 +1,20 @@
 # DEFINE dynatrace_management_zone.CD_rsu.id = -7774508837329205967
 resource "dynatrace_management_zone" "CD_rsu" {
   name = "CD_rsu"
-  rules {
-    type    = "CLOUD_APPLICATION"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "CLOUD_APPLICATION_NAME"
-      }
-      string {
-        case_sensitive = true
-        # negate       = false
-        operator       = "CONTAINS"
-        value          = "rsu"
-      }
-    }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"Namespace:rsu\")"
   }
-  rules {
-    type    = "CLOUD_APPLICATION_NAMESPACE"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "CLOUD_APPLICATION_NAMESPACE_NAME"
-      }
-      string {
-        case_sensitive = true
-        # negate       = false
-        operator       = "CONTAINS"
-        value          = "rsu"
-      }
-    }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"Namespace:rsu\")"
   }
-  rules {
-    type    = "HOST"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "HOST_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "rsu"
-        }
-      }
-    }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"Namespace:rsu\")"
   }
-  rules {
-    type              = "PROCESS_GROUP"
-    enabled           = true
-    propagation_types = [ "PROCESS_GROUP_TO_HOST" ]
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "PROCESS_GROUP_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "rsu"
-        }
-      }
-    }
-  }
-  rules {
-    type              = "SERVICE"
-    enabled           = true
-    propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ]
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "SERVICE_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "rsu"
-        }
-      }
-    }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"Namespace:rsu\"))"
   }
 }
diff --git a/EMEA_PREPROD/management_zone/cd_rsu.tf b/EMEA_PREPROD/management_zone/cd_rsu.tf
index ef786ca4..b1d39dde 100644
--- a/EMEA_PREPROD/management_zone/cd_rsu.tf
+++ b/EMEA_PREPROD/management_zone/cd_rsu.tf
@@ -2,150 +2,19 @@
 resource "dynatrace_management_zone" "CD_rsu" {
   name = "CD_rsu"
   entity_selector_based_rule {
-    # enabled = false
-    selector  = "type(HOST),tag('msid:RVS','msid:RCM','msid:RLM','msid:RVC','msid:RTS','msid:RVT','msid:RCS','msid:uvm','msid:vjm','msid:RES','msid:ZDI','msid:rwd','msid:RDH','msid:RVI','msid:FRE','msid:RVE','msid:FRS','msid:RPP','msid:RMO')"
-  }
-  entity_selector_based_rule {
-    # enabled = false
-    selector  = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag('ms-id:RVS','ms-id:RCM','ms-id:RLM','ms-id:RVC','ms-id:RTS','ms-id:RVT','ms-id:RCS','ms-id:uvm','ms-id:vjm','ms-id:RES','ms-id:ZDI','ms-id:rwd','ms-id:RDH','ms-id:RVI','ms-id:FRE','ms-id:RVE','ms-id:FRS','ms-id:RPP','ms-id:RMO'))"
-  }
-  entity_selector_based_rule {
-    # enabled = false
-    selector  = "type(PROCESS_GROUP_INSTANCE),tag('msid:RVS','msid:RCM','msid:RLM','msid:RVC','msid:RTS','msid:RVT','msid:RCS','msid:uvm','msid:vjm','msid:RES','msid:ZDI','msid:rwd','msid:RDH','msid:RVI','msid:FRE','msid:RVE','msid:FRS','msid:RPP','msid:RMO')"
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"Namespace:rsu\")"
   }
   entity_selector_based_rule {
     enabled  = true
-    selector =<<-EOT
-      type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag("ms-id:RVS","ms-id:RCM","ms-id:RLM","ms-id:RVC","ms-id:RTS","ms-id:RVT","ms-id:RCS","ms-id:uvm","ms-id:vjm","ms-id:RES","ms-id:ZDI","ms-id:rwd","ms-id:RDH","ms-id:RVI","ms-id:FRE","ms-id:RVE","ms-id:FRS","ms-id:RPP","ms-id:RMO"))
-    EOT
+    selector = "type(HOST),tag(\"Namespace:rsu\")"
   }
   entity_selector_based_rule {
     enabled  = true
-    selector =<<-EOT
-      type(PROCESS_GROUP_INSTANCE),tag("ms-id:RVS","ms-id:RCM","ms-id:RLM","ms-id:RVC","ms-id:RTS","ms-id:RVT","ms-id:RCS","ms-id:uvm","ms-id:vjm","ms-id:RES","ms-id:ZDI","ms-id:rwd","ms-id:RDH","ms-id:RVI","ms-id:FRE","ms-id:RVE","ms-id:FRS","ms-id:RPP","ms-id:RMO")
-    EOT
-  }
-  entity_selector_based_rule {
-    # enabled = false
-    selector  = "type(Service),tag('msid:RVS','msid:RCM','msid:RLM','msid:RVC','msid:RTS','msid:RVT','msid:RCS','msid:uvm','msid:vjm','msid:RES','msid:ZDI','msid:rwd','msid:RDH','msid:RVI','msid:FRE','msid:RVE','msid:FRS','msid:RPP','msid:RMO')"
+    selector = "type(Service),tag(\"Namespace:rsu\")"
   }
   entity_selector_based_rule {
     enabled  = true
-    selector =<<-EOT
-      type(HOST),tag("ms-id:RVS","ms-id:RCM","ms-id:RLM","ms-id:RVC","ms-id:RTS","ms-id:RVT","ms-id:RCS","ms-id:uvm","ms-id:vjm","ms-id:RES","ms-id:ZDI","ms-id:rwd","ms-id:RDH","ms-id:RVI","ms-id:FRE","ms-id:RVE","ms-id:FRS","ms-id:RPP","ms-id:RMO")
-    EOT
-  }
-  entity_selector_based_rule {
-    enabled  = true
-    selector =<<-EOT
-      type(Service),tag("ms-id:RVS","ms-id:RCM","ms-id:RLM","ms-id:RVC","ms-id:RTS","ms-id:RVT","ms-id:RCS","ms-id:uvm","ms-id:vjm","ms-id:RES","ms-id:ZDI","ms-id:rwd","ms-id:RDH","ms-id:RVI","ms-id:FRE","ms-id:RVE","ms-id:FRS","ms-id:RPP","ms-id:RMO")
-    EOT
-  }
-  entity_selector_based_rule {
-    # enabled = false
-    selector  = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag('msid:RVS','msid:RCM','msid:RLM','msid:RVC','msid:RTS','msid:RVT','msid:RCS','msid:uvm','msid:vjm','msid:RES','msid:ZDI','msid:rwd','msid:RDH','msid:RVI','msid:FRE','msid:RVE','msid:FRS','msid:RPP','msid:RMO'))"
-  }
-  entity_selector_based_rule {
-    # enabled = false
-    selector  = "type(PROCESS_GROUP_INSTANCE),tag('ms-id:RVS','ms-id:RCM','ms-id:RLM','ms-id:RVC','ms-id:RTS','ms-id:RVT','ms-id:RCS','ms-id:uvm','ms-id:vjm','ms-id:RES','ms-id:ZDI','ms-id:rwd','ms-id:RDH','ms-id:RVI','ms-id:FRE','ms-id:RVE','ms-id:FRS','ms-id:RPP','ms-id:RMO')"
-  }
-  entity_selector_based_rule {
-    # enabled = false
-    selector  = "type(Service),tag('ms-id:RVS','ms-id:RCM','ms-id:RLM','ms-id:RVC','ms-id:RTS','ms-id:RVT','ms-id:RCS','ms-id:uvm','ms-id:vjm','ms-id:RES','ms-id:ZDI','ms-id:rwd','ms-id:RDH','ms-id:RVI','ms-id:FRE','ms-id:RVE','ms-id:FRS','ms-id:RPP','ms-id:RMO')"
-  }
-  entity_selector_based_rule {
-    # enabled = false
-    selector  = "type(HOST),tag('ms-id:RVS','ms-id:RCM','ms-id:RLM','ms-id:RVC','ms-id:RTS','ms-id:RVT','ms-id:RCS','ms-id:uvm','ms-id:vjm','ms-id:RES','ms-id:ZDI','ms-id:rwd','ms-id:RDH','ms-id:RVI','ms-id:FRE','ms-id:RVE','ms-id:FRS','ms-id:RPP','ms-id:RMO')"
-  }
-  rules {
-    type    = "CLOUD_APPLICATION"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "CLOUD_APPLICATION_NAME"
-      }
-      string {
-        case_sensitive = true
-        # negate       = false
-        operator       = "CONTAINS"
-        value          = "rsu"
-      }
-    }
-  }
-  rules {
-    type    = "CLOUD_APPLICATION_NAMESPACE"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "CLOUD_APPLICATION_NAMESPACE_NAME"
-      }
-      string {
-        case_sensitive = true
-        # negate       = false
-        operator       = "CONTAINS"
-        value          = "rsu"
-      }
-    }
-  }
-  rules {
-    type    = "HOST"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "HOST_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "rsu"
-        }
-      }
-    }
-  }
-  rules {
-    type              = "PROCESS_GROUP"
-    enabled           = true
-    propagation_types = [ "PROCESS_GROUP_TO_HOST" ]
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "PROCESS_GROUP_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "rsu"
-        }
-      }
-    }
-  }
-  rules {
-    type              = "SERVICE"
-    enabled           = true
-    propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ]
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "SERVICE_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "rsu"
-        }
-      }
-    }
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"Namespace:rsu\"))"
   }
 }
diff --git a/EMEA_PROD/management_zone/cd_rsu.tf b/EMEA_PROD/management_zone/cd_rsu.tf
index c0785653..f8b9b766 100644
--- a/EMEA_PROD/management_zone/cd_rsu.tf
+++ b/EMEA_PROD/management_zone/cd_rsu.tf
@@ -1,95 +1,20 @@
 # DEFINE dynatrace_management_zone.CD_rsu.id = -5249314341918312822
 resource "dynatrace_management_zone" "CD_rsu" {
   name = "CD_rsu"
-  rules {
-    type    = "CLOUD_APPLICATION"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "CLOUD_APPLICATION_NAME"
-      }
-      string {
-        case_sensitive = true
-        # negate       = false
-        operator       = "CONTAINS"
-        value          = "rsu"
-      }
-    }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"Namespace:rsu\")"
   }
-  rules {
-    type    = "CLOUD_APPLICATION_NAMESPACE"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "CLOUD_APPLICATION_NAMESPACE_NAME"
-      }
-      string {
-        case_sensitive = true
-        # negate       = false
-        operator       = "CONTAINS"
-        value          = "rsu"
-      }
-    }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"Namespace:rsu\")"
   }
-  rules {
-    type    = "HOST"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "HOST_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "rsu"
-        }
-      }
-    }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"Namespace:rsu\")"
   }
-  rules {
-    type              = "PROCESS_GROUP"
-    enabled           = true
-    propagation_types = [ "PROCESS_GROUP_TO_HOST" ]
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "PROCESS_GROUP_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "rsu"
-        }
-      }
-    }
-  }
-  rules {
-    type              = "SERVICE"
-    enabled           = true
-    propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ]
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "SERVICE_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "rsu"
-        }
-      }
-    }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"Namespace:rsu\"))"
   }
 }
diff --git a/NA_PREPROD/management_zone/cd_rsu.tf b/NA_PREPROD/management_zone/cd_rsu.tf
index 1c1e0046..70340eb7 100644
--- a/NA_PREPROD/management_zone/cd_rsu.tf
+++ b/NA_PREPROD/management_zone/cd_rsu.tf
@@ -1,95 +1,20 @@
 # DEFINE dynatrace_management_zone.CD_rsu.id = -2830724422862041674
 resource "dynatrace_management_zone" "CD_rsu" {
   name = "CD_rsu"
-  rules {
-    type    = "CLOUD_APPLICATION"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "CLOUD_APPLICATION_NAME"
-      }
-      string {
-        case_sensitive = true
-        # negate       = false
-        operator       = "CONTAINS"
-        value          = "rsu"
-      }
-    }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"Namespace:rsu\")"
   }
-  rules {
-    type    = "CLOUD_APPLICATION_NAMESPACE"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "CLOUD_APPLICATION_NAMESPACE_NAME"
-      }
-      string {
-        case_sensitive = true
-        # negate       = false
-        operator       = "CONTAINS"
-        value          = "rsu"
-      }
-    }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"Namespace:rsu\")"
   }
-  rules {
-    type    = "HOST"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "HOST_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "rsu"
-        }
-      }
-    }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"Namespace:rsu\")"
   }
-  rules {
-    type              = "PROCESS_GROUP"
-    enabled           = true
-    propagation_types = [ "PROCESS_GROUP_TO_HOST" ]
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "PROCESS_GROUP_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "rsu"
-        }
-      }
-    }
-  }
-  rules {
-    type              = "SERVICE"
-    enabled           = true
-    propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ]
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "SERVICE_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "rsu"
-        }
-      }
-    }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"Namespace:rsu\"))"
   }
 }
diff --git a/NA_PROD/management_zone/cd_rsu.tf b/NA_PROD/management_zone/cd_rsu.tf
index 6899c487..de11a1b1 100644
--- a/NA_PROD/management_zone/cd_rsu.tf
+++ b/NA_PROD/management_zone/cd_rsu.tf
@@ -1,95 +1,20 @@
 # DEFINE dynatrace_management_zone.CD_rsu.id = 8679577042813657764
 resource "dynatrace_management_zone" "CD_rsu" {
   name = "CD_rsu"
-  rules {
-    type    = "CLOUD_APPLICATION"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "CLOUD_APPLICATION_NAME"
-      }
-      string {
-        case_sensitive = true
-        # negate       = false
-        operator       = "CONTAINS"
-        value          = "rsu"
-      }
-    }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(PROCESS_GROUP_INSTANCE),tag(\"Namespace:rsu\")"
   }
-  rules {
-    type    = "CLOUD_APPLICATION_NAMESPACE"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "CLOUD_APPLICATION_NAMESPACE_NAME"
-      }
-      string {
-        case_sensitive = true
-        # negate       = false
-        operator       = "CONTAINS"
-        value          = "rsu"
-      }
-    }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(HOST),tag(\"Namespace:rsu\")"
   }
-  rules {
-    type    = "HOST"
-    enabled = true
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "HOST_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "rsu"
-        }
-      }
-    }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(Service),tag(\"Namespace:rsu\")"
   }
-  rules {
-    type              = "PROCESS_GROUP"
-    enabled           = true
-    propagation_types = [ "PROCESS_GROUP_TO_HOST" ]
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "PROCESS_GROUP_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "rsu"
-        }
-      }
-    }
-  }
-  rules {
-    type              = "SERVICE"
-    enabled           = true
-    propagation_types = [ "SERVICE_TO_HOST_LIKE", "SERVICE_TO_PROCESS_GROUP_LIKE" ]
-    conditions {
-      key {
-        type      = "STATIC"
-        attribute = "SERVICE_TAGS"
-      }
-      tag {
-        # negate = false
-        operator = "EQUALS"
-        value {
-          context = "CONTEXTLESS"
-          key     = "Component"
-          value   = "rsu"
-        }
-      }
-    }
+  entity_selector_based_rule {
+    enabled  = true
+    selector = "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"Namespace:rsu\"))"
   }
 }