[AAI] Helm changes for DMaaP deprecation

- Helm changes for DMaaP deprecation in A&AI

Issue-ID: OOM-3297
Change-Id: I6a601c4c9958fb6817872520c259525eb650d0c9
Signed-off-by: Kv <vani.kv@accenture.com>

2 files changed, 26 insertions, 19 deletions

diff --git a/kubernetes/aai/components/aai-resources/resources/config/application.properties b/kubernetes/aai/components/aai-resources/resources/config/application.properties
index 1b7bdf8ff6..5762460a02 100644
--- a/kubernetes/aai/components/aai-resources/resources/config/application.properties
+++ b/kubernetes/aai/components/aai-resources/resources/config/application.properties
@@ -58,8 +58,15 @@ server.ssl.enabled=false
 
 # JMS bind address host port
 jms.bind.address=tcp://localhost:61647
-dmaap.ribbon.listOfServers=message-router.{{ include "common.namespace" . }}:3904
-dmaap.ribbon.transportType=http
+
+# dmaap is deprecated now kafka is used
+spring.kafka.producer.bootstrap-servers=${BOOTSTRAP_SERVERS}
+spring.kafka.producer.properties.security.protocol=SASL_PLAINTEXT
+spring.kafka.producer.properties.sasl.mechanism=SCRAM-SHA-512
+spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
+spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer
+spring.kafka.producer.properties.sasl.jaas.config=${JAAS_CONFIG}
+spring.kafka.producer.retries=3
 
 # Schema related attributes for the oxm and edges
 # Any additional schema related attributes should start with prefix schema
diff --git a/kubernetes/aai/components/aai-resources/resources/config/logback.xml b/kubernetes/aai/components/aai-resources/resources/config/logback.xml
index b52318500d..54b352a4ea 100644
--- a/kubernetes/aai/components/aai-resources/resources/config/logback.xml
+++ b/kubernetes/aai/components/aai-resources/resources/config/logback.xml
@@ -196,14 +196,14 @@
         <appender-ref ref="translog"/>
       </appender>
 
-      <appender name="dmaapAAIEventConsumer"
+      <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}.zip
+          <fileNamePattern>${logDirectory}/kafkaAAIEventConsumer/error.log.%d{yyyy-MM-dd}.zip
           </fileNamePattern>
           <maxHistory>${maxHistory}</maxHistory>
           <totalSizeCap>${totalSizeCap}</totalSizeCap>
@@ -214,16 +214,16 @@
 
       </appender>
 
-      <appender name="dmaapAAIEventConsumerDebug"
+      <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}.zip
+          <fileNamePattern>${logDirectory}/kafkaAAIEventConsumer/debug.log.%d{yyyy-MM-dd}.zip
           </fileNamePattern>
           <maxHistory>${maxHistory}</maxHistory>
           <totalSizeCap>${totalSizeCap}</totalSizeCap>
@@ -232,16 +232,16 @@
           <pattern>${debugPattern}</pattern>
         </encoder>
       </appender>
-      <appender name="dmaapAAIEventConsumerInfo"
+      <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}.zip
+          <fileNamePattern>${logDirectory}/kafkaAAIEventConsumer/kafka-transaction.log.%d{yyyy-MM-dd}.zip
           </fileNamePattern>
           <maxHistory>${maxHistory}</maxHistory>
           <totalSizeCap>${totalSizeCap}</totalSizeCap>
@@ -250,16 +250,16 @@
           <pattern>${auditPattern}</pattern>
         </encoder>
       </appender>
-      <appender name="dmaapAAIEventConsumerMetric"
+      <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}.zip
+          <fileNamePattern>${logDirectory}/kafkaAAIEventConsumer/metrics.log.%d{yyyy-MM-dd}.zip
           </fileNamePattern>
           <maxHistory>${maxHistory}</maxHistory>
           <totalSizeCap>${totalSizeCap}</totalSizeCap>
@@ -395,13 +395,13 @@
         <appender-ref ref="asyncMETRIC"/>
       </logger>
       <logger name="org.onap.aai.aailog.logs.AaiDmaapMetricLog" level="INFO">
-        <appender-ref ref="dmaapAAIEventConsumerMetric"/>
+        <appender-ref ref="kafkaAAIEventConsumerMetric"/>
       </logger>
       <logger name="org.onap.aai.logging.ErrorLogHelper" level="WARN">
         <appender-ref ref="asyncERROR"/>
       </logger>
       <logger name="com.att.nsa.mr" level="INFO">
-        <appender-ref ref="dmaapAAIEventConsumerInfo"/>
+        <appender-ref ref="kafkaAAIEventConsumerInfo"/>
       </logger>
     </then>
   </if>
@@ -415,11 +415,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"/>