From 1ee517bedb7c1634e37c1124676f001b95840985 Mon Sep 17 00:00:00 2001 From: sunil unnava Date: Wed, 20 Jun 2018 17:08:42 -0400 Subject: changes for kafka upgrade Issue-ID: DMAAP-513 Change-Id: I614ff2919e28c3194eab6bb731d076d9c91be1d7 Signed-off-by: sunil unnava --- src/main/config/consumer.properties | 43 ++++------ src/main/config/kafka_client_jaas.conf | 5 ++ src/main/config/mmagent.config | 7 -- src/main/config/mmagent.config_old | 5 -- src/main/config/producer.properties | 50 ++++++----- src/main/config/template.lrm.xml | 142 -------------------------------- src/main/config/template.mmagent.config | 6 ++ 7 files changed, 51 insertions(+), 207 deletions(-) create mode 100644 src/main/config/kafka_client_jaas.conf delete mode 100644 src/main/config/mmagent.config delete mode 100644 src/main/config/mmagent.config_old delete mode 100644 src/main/config/template.lrm.xml create mode 100644 src/main/config/template.mmagent.config (limited to 'src/main/config') 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://:3904 -topicname=com.att.agenttest -mechid= -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 @@ - - - - - - - __SOA_CLOUD_NAMESPACE__.${artifactId} - - __MAJOR_VERSION__ - __MINOR_VERSION__ - __PATCH_VERSION__ - - - - Java - - ATT - /opt/app/dmaap/mmagent - - process.path - /usr/bin:/usr/sbin:${PATH} - - - process.workdir - /opt/app/dmaap/mmagent - - - process.libpath - ${LD_LIBRARY_PATH} - - - - - - - - jmx.port - __JMX_PORT_MRAGENT__ - - - - - - - jvm.version - __JAVA_VERSION__ - - - jvm.classpath - :.:${CLASSPATH}:/opt/app/dmaap/mmagent/etc:/opt/app/dmaap/mmagent/lib/*: - - - jvm.args.pre - __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 - - - - jvm.heap.min - __MIN_HEAP_SIZE__ - - - jvm.heap.max - __MAX_HEAP_SIZE__ - - - start.class - com.att.nsa.dmaapMMAgent.MirrorMakerAgent - - - stdout.redirect - log/stdout.log - - - stderr.redirect - log/stdout.log - - - validatePID.waitime.seconds - __LRM_VALIDATEPID_WAITTIME_SECONDS__ - - - mbean.name - - JmxInterface:type=DME2 - - msgrtr - __LRM_RESOURCE_START_TYPE__ - __LRM_START_PRIORITY__ - __LRM_START_TIMEOUT__ - __RESOURCE_MIN_COUNT__ - __RESOURCE_MAX_COUNT__ - __LRM_RESOURCE_MAX_RESTART__ - __LRM_RESOURCE_HEARTBEAT__ - __LRM_RESOURCE_HEARTBEAT_FAILED_LIMIT__ - __LRM_RESOURCE_HEARTBEAT_TIMEOUT__ - __RESOURCE_MANAGER_WAIT_TIME_IN_SECONDS__ - __LRM_RESOURCE_REGISTRATION__ - dmaap - - - WARNING - __CLDLRM_WARNING_NOTIFY__ - - - SEVERE - __CLDLRM_SEVERE_NOTIFY__ - - - - 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 -- cgit 1.2.3-korg