Merge "changes for kafka upgrade"

1 files changed, 23 insertions, 27 deletions

diff --git a/src/main/config/producer.properties b/src/main/config/producer.properties
index 30df665..78ff7c7 100644
--- a/src/main/config/producer.properties
+++ b/src/main/config/producer.properties
@@ -1,24 +1,3 @@
-###############################################################################
-#  ============LICENSE_START=======================================================
-#  org.onap.dmaap
-#  ================================================================================
-#  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-#  ================================================================================
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#        http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#  ============LICENSE_END=========================================================
-#
-#  ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#  
-###############################################################################
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -39,7 +18,7 @@
 
 # list of brokers used for bootstrapping knowledge about the rest of the cluster
 # format: host1:port1,host2:port2 ...
-metadata.broker.list=104.130.132.211:9092
+#metadata.broker.list=172.16.96.14:9092
 
 # name of the partitioner class for partitioning events; default partition spreads data randomly
 #partitioner.class=
@@ -49,19 +28,36 @@ producer.type=sync
 
 # specify the compression codec for all data generated: none, gzip, snappy, lz4.
 # the old config values work as well: 0, 1, 2, 3 for none, gzip, snappy, lz4, respectively
-compression.codec=none
+#compression.codec=none
 
 # message encoder
-serializer.class=kafka.serializer.DefaultEncoder
+#serializer.class=kafka.serializer.DefaultEncoder
 
 # allow topic level compression
 #compressed.topics=
 
+#New MirrorMaker properties for Kafka 0.11 version
+#list of brokers used for bootstrapping knowledge about the rest of the cluster
+# format: host1:port1,host2:port2 ...
+bootstrap.servers=172.16.96.14:9092
+
+#Following properties are required as MR 1.2 will use Kafka 0.11 with AAF Auth wrapper.
+security.protocol=SASL_PLAINTEXT
+sasl.mechanism=PLAIN
+#java.security.auth.login.config=/opt/app/dmaap/mmagent/etc/kafka_client_jaas.conf
+sasl.jaas.config=org.apache.kafka.common.security.plain.PlainLoginModule required username="admin" password="admin_secret";
+
+#Producer
+compression.type=none
+#serializer.class=kafka.serializer.DefaultEncoder
+batch.size=100
+client.id=mirror_maker_producer
+
 ############################# Async Producer #############################
-# maximum time, in milliseconds, for buffering data on the producer queue 
+# maximum time, in milliseconds, for buffering data on the producer queue
 #queue.buffering.max.ms=
 
-# the maximum size of the blocking queue for buffering on the producer 
+# the maximum size of the blocking queue for buffering on the producer
 #queue.buffering.max.messages=
 
 # Timeout for event enqueue:
@@ -70,5 +66,5 @@ serializer.class=kafka.serializer.DefaultEncoder
 # +ve: enqueue will block up to this many milliseconds if the queue is full
 #queue.enqueue.timeout.ms=
 
-# the number of messages batched at the producer 
+# the number of messages batched at the producer
 #batch.num.messages=