changes for kafka upgrade

Issue-ID: DMAAP-513
Change-Id: I614ff2919e28c3194eab6bb731d076d9c91be1d7
Signed-off-by: sunil unnava <su622b@att.com>

7 files changed, 51 insertions, 207 deletions

diff --git a/src/main/config/consumer.properties b/src/main/config/consumer.properties
index 08d29af..5ec6df2 100644
--- a/src/main/config/consumer.properties
+++ b/src/main/config/consumer.properties
@@ -1,33 +1,12 @@
-###############################################################################
-#  ============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.
 # The ASF licenses this file to You 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.
@@ -38,13 +17,25 @@
 # Zookeeper connection string
 # comma separated host:port pairs, each corresponding to a zk
 # server. e.g. "127.0.0.1:3000,127.0.0.1:3001,127.0.0.1:3002"
-zookeeper.connect=172.18.0.1:2181
+#zookeeper.connect=127.0.0.1:2181
 
 # timeout in ms for connecting to zookeeper
-zookeeper.connection.timeout.ms=6000
+#zookeeper.connection.timeout.ms=6000
 
 #consumer group id
 group.id=test-consumer-group
 
-#consumer timeout
+#New MirrorMaker properties for Kafka 0.11 version
+#Kafka 0.11 uses Kafka to manage consumers instead of ZK.
+bootstrap.servers=127.0.0.1:9092
+client.id=mirror_maker_consumer
+
+#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";
+
+
+#consumer timeout:
 #consumer.timeout.ms=5000
diff --git a/src/main/config/kafka_client_jaas.conf b/src/main/config/kafka_client_jaas.conf
new file mode 100644
index 0000000..8b6ba3a
--- /dev/null
+++ b/src/main/config/kafka_client_jaas.conf
@@ -0,0 +1,5 @@
+KafkaClient {
+   org.apache.kafka.common.security.plain.PlainLoginModule required
+  username="m98745@mr.dmaap.att.com"
+  password="ZkPiQ9tz5eUj6f8d9me5VXKCNohu/4qd";
+};
\ No newline at end of file
diff --git a/src/main/config/mmagent.config b/src/main/config/mmagent.config
deleted file mode 100644
index 1d978c1..0000000
--- a/src/main/config/mmagent.config
+++ /dev/null
@@ -1,7 +0,0 @@
-#kafkahome=C:/dev/att/kafka_2.10-0.8.2.1
-kafkahome=/opt/
-topicURL=http://172.18.0.1:3904
-#topicname=com.att.agenttest
-topicname=org.openecomp.dmaapBC.mmatopic
-mechid=dgl@openecomp.org
-password=ecomp_admin
\ No newline at end of file
diff --git a/src/main/config/mmagent.config_old b/src/main/config/mmagent.config_old
deleted file mode 100644
index 840ecca..0000000
--- a/src/main/config/mmagent.config_old
+++ /dev/null
@@ -1,5 +0,0 @@
-kafkahome=/opt/app/dmaap/msgrtr/kafka
-topicURL=http://<mr_host>:3904
-topicname=com.att.agenttest
-mechid=<aaf_id>
-password=<aaf_password>
\ No newline at end of file
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=
diff --git a/src/main/config/template.lrm.xml b/src/main/config/template.lrm.xml
deleted file mode 100644
index 5b7403c..0000000
--- a/src/main/config/template.lrm.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-     ============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.
-     
- -->
-
-<ns2:ManagedResourceList xmlns="http://scld.att.com/lrm/commontypes"
-	xmlns:ns2="http://scld.att.com/lrm/util" xmlns:ns3="http://scld.att.com/lrm/types">
-	<ns2:ManagedResource>
-		<ResourceDescriptor>
-			<ResourceName>__SOA_CLOUD_NAMESPACE__.${artifactId}</ResourceName>
-			<ResourceVersion>
-				<Major>__MAJOR_VERSION__</Major>
-				<Minor>__MINOR_VERSION__</Minor>
-				<Patch>__PATCH_VERSION__</Patch>
-			</ResourceVersion>
-			
-		</ResourceDescriptor>
-		<ResourceType>Java</ResourceType>
-		<ResourceContainerType></ResourceContainerType>
-		<ResourceContainerTypeVendor>ATT</ResourceContainerTypeVendor>
-		<ResourcePath>/opt/app/dmaap/mmagent</ResourcePath>
-		<ResourceProps>
-			<Tag>process.path</Tag>
-			<Value>/usr/bin:/usr/sbin:${PATH}</Value>
-		</ResourceProps>
-		<ResourceProps>
-			<Tag>process.workdir</Tag>
-			<Value>/opt/app/dmaap/mmagent</Value>
-		</ResourceProps>
-		<ResourceProps>
-			<Tag>process.libpath</Tag>
-			<Value>${LD_LIBRARY_PATH}</Value>
-		</ResourceProps>
-
-		<!-- The following process.args are for your context, port, and sslport. 
-			NOTE: The "context" argument will set your context. context=/ will run your service under a "root" context. 
-			Port selection is NOT necessary and should NOT be hardcoded if you are choosing to utilize ephemeral ports.
-			If NO port values are given, the AJSC will default to running on ephemeral ports (for both your http port 
-			AND your https port), and your port will be selected for you. -->
-		
-		<!-- Add JMX port -->
-		
-		<ResourceProps>
-			<Tag>jmx.port</Tag>
-			<Value>__JMX_PORT_MRAGENT__</Value>
-		</ResourceProps>
-		
-		
-		<!-- End -->
-		
-		<ResourceProps>
-			<Tag>jvm.version</Tag>
-			<Value>__JAVA_VERSION__</Value>
-		</ResourceProps>
-		<ResourceProps>
-			<Tag>jvm.classpath</Tag>
-			<Value>:.:${CLASSPATH}:/opt/app/dmaap/mmagent/etc:/opt/app/dmaap/mmagent/lib/*:</Value>
-		</ResourceProps>
-		<ResourceProps>
-			<Tag>jvm.args.pre</Tag>
-			<Value>__PRE_JVM_ARGS__ -XX:MaxPermSize=__MAX_PERM_SIZE__
-				-XX:PermSize=__PERM_SIZE__
-				__INTROSCOPE_VARS__
-				-Djava.net.preferIPv4Stack=true 
-				-DMMAGENTHOME=/opt/app/dmaap/mmagent
-				__POST_JVM_ARGS__
-				__SCLD_OPTIONAL_PLATFORM_FLAG__
-				 -DMMAGENTHOME=/opt/app/dmaap/mmagent
-			</Value>
-		</ResourceProps>
-		<ResourceProps>
-			<Tag>jvm.heap.min</Tag>
-			<Value>__MIN_HEAP_SIZE__</Value>
-		</ResourceProps>
-		<ResourceProps>
-			<Tag>jvm.heap.max</Tag>
-			<Value>__MAX_HEAP_SIZE__</Value>
-		</ResourceProps>
-		<ResourceProps>
-			<Tag>start.class</Tag>
-			<Value>com.att.nsa.dmaapMMAgent.MirrorMakerAgent</Value>
-		</ResourceProps>
-		<ResourceProps>
-			<Tag>stdout.redirect</Tag>
-			<Value>log/stdout.log</Value>
-		</ResourceProps>
-		<ResourceProps>
-			<Tag>stderr.redirect</Tag>
-			<Value>log/stdout.log</Value>
-		</ResourceProps>
-		<ResourceProps>
-			<Tag>validatePID.waitime.seconds</Tag>
-			<Value>__LRM_VALIDATEPID_WAITTIME_SECONDS__</Value>
-		</ResourceProps>
-		<ResourceProps>
-			<Tag>mbean.name</Tag>
-			
-			<Value>JmxInterface:type=DME2</Value>
-		</ResourceProps>
-		<ResourceOSID>msgrtr</ResourceOSID>
-		<ResourceStartType>__LRM_RESOURCE_START_TYPE__</ResourceStartType>
-		<ResourceStartPriority>__LRM_START_PRIORITY__</ResourceStartPriority>
-		<ResourceStartTimeout>__LRM_START_TIMEOUT__</ResourceStartTimeout>
-		<ResourceMinCount>__RESOURCE_MIN_COUNT__</ResourceMinCount>
-		<ResourceMaxCount>__RESOURCE_MAX_COUNT__</ResourceMaxCount>
-		<ResourceMaxRestart>__LRM_RESOURCE_MAX_RESTART__</ResourceMaxRestart>
-		<ResourceHeartBeat>__LRM_RESOURCE_HEARTBEAT__</ResourceHeartBeat>
-		<ResourceHeartBeatFailedLimit>__LRM_RESOURCE_HEARTBEAT_FAILED_LIMIT__</ResourceHeartBeatFailedLimit>
-		<ResourceHeartBeatTimeout>__LRM_RESOURCE_HEARTBEAT_TIMEOUT__</ResourceHeartBeatTimeout>
-		<ResourceShutdownWaitTimeInSecs>__RESOURCE_MANAGER_WAIT_TIME_IN_SECONDS__</ResourceShutdownWaitTimeInSecs>
-		<ResourceRegistration>__LRM_RESOURCE_REGISTRATION__</ResourceRegistration>
-		<GroupName>dmaap</GroupName>
-		<ResourceErrorNotify>
-			<NotifyListEntry>
-				<Loglevel>WARNING</Loglevel>
-				<EmailList>__CLDLRM_WARNING_NOTIFY__</EmailList>
-			</NotifyListEntry>
-			<NotifyListEntry>
-				<Loglevel>SEVERE</Loglevel>
-				<EmailList>__CLDLRM_SEVERE_NOTIFY__</EmailList>
-			</NotifyListEntry>
-		</ResourceErrorNotify>
-	</ns2:ManagedResource>
-</ns2:ManagedResourceList>
diff --git a/src/main/config/template.mmagent.config b/src/main/config/template.mmagent.config
new file mode 100644
index 0000000..0ce4afd
--- /dev/null
+++ b/src/main/config/template.mmagent.config
@@ -0,0 +1,6 @@
+kafkahome=__MMA_KAFKA_HOME__
+topicURL=__MMA_TOPIC_URL__
+topicname=__MMA_AGENT_TOPIC__
+mechid=__MMA_MECHID__
+password=__MMA_MECHID_PWD__
+grepLog=grep -e ERROR -e Issue
\ No newline at end of file