Merge "[AAI] Helm changes for DMaaP deprecation"

1 files changed, 17 insertions, 17 deletions

diff --git a/kubernetes/aai/components/aai-traversal/resources/config/logback.xml b/kubernetes/aai/components/aai-traversal/resources/config/logback.xml
index acdc893f55..21f48f7c93 100644
--- a/kubernetes/aai/components/aai-traversal/resources/config/logback.xml
+++ b/kubernetes/aai/components/aai-traversal/resources/config/logback.xml
@@ -208,13 +208,13 @@
         <includeCallerData>true</includeCallerData>
         <appender-ref ref="translog" />
       </appender>
-      <appender name="dmaapAAIEventConsumer" class="ch.qos.logback.core.rolling.RollingFileAppender">
+      <appender name="kafkaAAIEventConsumer" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
           <level>WARN</level>
         </filter>
-        <File>${logDirectory}/dmaapAAIEventConsumer/error.log</File>
+        <File>${logDirectory}/kafkaAAIEventConsumer/error.log</File>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-          <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/error.log.%d{yyyy-MM-dd}
+          <fileNamePattern>${logDirectory}/kafkaAAIEventConsumer/error.log.%d{yyyy-MM-dd}
           </fileNamePattern>
           <maxHistory>${maxHistory}</maxHistory>
           <totalSizeCap>${totalSizeCap}</totalSizeCap>
@@ -223,15 +223,15 @@
           <pattern>${errorPattern}</pattern>
         </encoder>
       </appender>
-      <appender name="dmaapAAIEventConsumerDebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+      <appender name="kafkaAAIEventConsumerDebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
           <level>DEBUG</level>
           <onMatch>ACCEPT</onMatch>
           <onMismatch>DENY</onMismatch>
         </filter>
-        <File>${logDirectory}/dmaapAAIEventConsumer/debug.log</File>
+        <File>${logDirectory}/kafkaAAIEventConsumer/debug.log</File>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-          <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/debug.log.%d{yyyy-MM-dd}
+          <fileNamePattern>${logDirectory}/kafkaAAIEventConsumer/debug.log.%d{yyyy-MM-dd}
           </fileNamePattern>
           <maxHistory>${maxHistory}</maxHistory>
           <totalSizeCap>${totalSizeCap}</totalSizeCap>
@@ -240,15 +240,15 @@
           <pattern>${debugPattern}</pattern>
         </encoder>
       </appender>
-      <appender name="dmaapAAIEventConsumerInfo" class="ch.qos.logback.core.rolling.RollingFileAppender">
+      <appender name="kafkaAAIEventConsumerInfo" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
           <level>INFO</level>
           <onMatch>ACCEPT</onMatch>
           <onMismatch>DENY</onMismatch>
         </filter>
-        <File>${logDirectory}/dmaapAAIEventConsumer/dmaap-transaction.log</File>
+        <File>${logDirectory}/kafkaAAIEventConsumer/kafka-transaction.log</File>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-          <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/dmaap-transaction.log.%d{yyyy-MM-dd}
+          <fileNamePattern>${logDirectory}/kafkaAAIEventConsumer/kafka-transaction.log.%d{yyyy-MM-dd}
           </fileNamePattern>
           <maxHistory>${maxHistory}</maxHistory>
           <totalSizeCap>${totalSizeCap}</totalSizeCap>
@@ -257,15 +257,15 @@
           <pattern>${auditPattern}</pattern>
         </encoder>
       </appender>
-      <appender name="dmaapAAIEventConsumerMetric" class="ch.qos.logback.core.rolling.RollingFileAppender">
+      <appender name="kafkaAAIEventConsumerMetric" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
           <level>INFO</level>
           <onMatch>ACCEPT</onMatch>
           <onMismatch>DENY</onMismatch>
         </filter>
-        <File>${logDirectory}/dmaapAAIEventConsumer/metrics.log</File>
+        <File>${logDirectory}/kafkaAAIEventConsumer/metrics.log</File>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-          <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/metrics.log.%d{yyyy-MM-dd}
+          <fileNamePattern>${logDirectory}/kafkaAAIEventConsumer/metrics.log.%d{yyyy-MM-dd}
           </fileNamePattern>
           <maxHistory>${maxHistory}</maxHistory>
           <totalSizeCap>${totalSizeCap}</totalSizeCap>
@@ -381,7 +381,7 @@
   <logger name="org.onap.aai.aailog.logs.AaiDmaapMetricLog" level="INFO" additivity="false">
     <if condition='property("logToFileEnabled").contains("true")'>
       <then>
-        <appender-ref ref="dmaapAAIEventConsumerMetric" />
+        <appender-ref ref="kafkaAAIEventConsumerMetric" />
       </then>
     </if>
     <appender-ref ref="STDOUT" />
@@ -405,11 +405,11 @@
     <appender-ref ref="STDOUT" />
   </logger>
 
-  <logger name="org.onap.aai.dmaap" level="DEBUG" additivity="false">
+  <logger name="org.onap.aai.kafka" level="DEBUG" additivity="false">
     <if condition='property("logToFileEnabled").contains("true")'>
       <then>
-        <appender-ref ref="dmaapAAIEventConsumer" />
-        <appender-ref ref="dmaapAAIEventConsumerDebug" />
+        <appender-ref ref="kafkaAAIEventConsumer" />
+        <appender-ref ref="kafkaAAIEventConsumerDebug" />
       </then>
     </if>
     <appender-ref ref="STDOUT" />
@@ -418,7 +418,7 @@
   <logger name="com.att.nsa.mr" level="INFO">
     <if condition='property("logToFileEnabled").contains("true")'>
       <then>
-        <appender-ref ref="dmaapAAIEventConsumerInfo" />
+        <appender-ref ref="kafkaAAIEventConsumerInfo" />
       </then>
     </if>
     <appender-ref ref="STDOUT" />