2 files changed, 2 insertions, 7 deletions
diff --git a/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/logs/AaiDmaapMetricLog.java b/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/logs/AaiDmaapMetricLog.java
index 0d3a573d..8190dd10 100644
--- a/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/logs/AaiDmaapMetricLog.java
+++ b/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/logs/AaiDmaapMetricLog.java
@@ -33,7 +33,7 @@ public class AaiDmaapMetricLog extends MDCSetup {
 
     protected static final Logger logger = LoggerFactory.getLogger(AaiDmaapMetricLog.class);
     private static final Marker INVOKE_RETURN = MarkerFactory.getMarker("INVOKE-RETURN");
-    private static final String TARGET_ENTITY = "DMaaP";
+    private static final String TARGET_ENTITY = "KAFKA";
 
     public AaiDmaapMetricLog() {
         if (MDC.get(ONAPLogConstants.MDCs.SERVER_FQDN) == null) {
diff --git a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/ONAPComponents.java b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/ONAPComponents.java
index 5465b7ce..b9cdd0e9 100644
--- a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/ONAPComponents.java
+++ b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/ONAPComponents.java
@@ -24,15 +24,12 @@ import java.util.EnumSet;
 import java.util.Set;
 
 public enum ONAPComponents implements ONAPComponentsList {
-    OPENSTACK_ADAPTER, BPMN, GRM, AAI, DMAAP, POLICY, CATALOG_DB, REQUEST_DB, SNIRO, SDC, EXTERNAL, VNF_ADAPTER, SDNC_ADAPTER, MULTICLOUD, CLAMP, PORTAL, VID, APPC, DCAE, HOLMES, SDNC, SO, VFC, ESR, DBC, DR, MR, OPTF;
+    OPENSTACK_ADAPTER, BPMN, GRM, AAI, POLICY, CATALOG_DB, REQUEST_DB, SNIRO, SDC, EXTERNAL, VNF_ADAPTER, SDNC_ADAPTER, MULTICLOUD, CLAMP, PORTAL, VID, APPC, DCAE, HOLMES, SDNC, SO, VFC, ESR, DBC, DR, MR, OPTF;
 
     public static Set<ONAPComponents> getSOInternalComponents() {
         return EnumSet.of(OPENSTACK_ADAPTER, BPMN, CATALOG_DB, REQUEST_DB, VNF_ADAPTER, SDNC_ADAPTER);
     }
 
-    public static Set<ONAPComponents> getDMAAPInternalComponents() {
-        return EnumSet.of(DBC, DR, MR);
-    }
 
     public static Set<ONAPComponents> getAAIInternalComponents() {
         return EnumSet.of(ESR);
@@ -42,8 +39,6 @@ public enum ONAPComponents implements ONAPComponentsList {
     public String toString() {
         if (getSOInternalComponents().contains(this))
             return SO + "." + this.name();
-        else if (getDMAAPInternalComponents().contains(this))
-            return DMAAP + "." + this.name();
         else if (getAAIInternalComponents().contains(this))
             return AAI + "." + this.name();
         else