From 6569b1e944c92713dec312bbe7ac0369a1b28d44 Mon Sep 17 00:00:00 2001 From: Martin Chacon Piza Date: Fri, 23 Oct 2020 13:25:41 +0200 Subject: [PATCH] Set legacy_kafka_client_enabled = False on default for Docker We change the default value of kafka.legacy_kafka_client_enabled from True to False. The use of new Confluent Kafka client is recommended. Change-Id: I9c685dc3cfa4c6795c441ea37f86af9ad7451ee2 Story: 2006436 Task: 41151 --- docker/Dockerfile | 2 +- docker/README.rst | 2 +- docker/monasca-persister.conf.j2 | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 4cd04838..146c5584 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -27,7 +27,7 @@ ENV \ KAFKA_ALARM_HISTORY_PROCESSORS=1 \ KAFKA_ALARM_HISTORY_WAIT_TIME=15 \ KAFKA_EVENTS_ENABLE="false" \ - KAFKA_LEGACY_CLIENT_ENABLED=true \ + KAFKA_LEGACY_CLIENT_ENABLED=false \ KAFKA_METRICS_BATCH_SIZE=1000 \ KAFKA_METRICS_GROUP_ID=1_metrics \ KAFKA_METRICS_PROCESSORS=1 \ diff --git a/docker/README.rst b/docker/README.rst index f4b049d6..9fb93dc2 100644 --- a/docker/README.rst +++ b/docker/README.rst @@ -33,7 +33,7 @@ KAFKA_ALARM_HISTORY_GROUP_ID 1_events Kafka Group from which persist KAFKA_ALARM_HISTORY_PROCESSORS 1 Number of processes for alarm history topic KAFKA_ALARM_HISTORY_WAIT_TIME 15 Seconds to wait if the batch size is not reached KAFKA_EVENTS_ENABLE false Enable events persister -KAFKA_LEGACY_CLIENT_ENABLED true Enable legacy Kafka client +KAFKA_LEGACY_CLIENT_ENABLED false Enable legacy Kafka client KAFKA_METRICS_BATCH_SIZE 1000 Kafka consumer takes messages in a batch KAFKA_METRICS_GROUP_ID 1_metrics Kafka Group from which persister get metrics KAFKA_METRICS_PROCESSORS 1 Number of processes for metrics topic diff --git a/docker/monasca-persister.conf.j2 b/docker/monasca-persister.conf.j2 index 20503f1a..ced04ca3 100644 --- a/docker/monasca-persister.conf.j2 +++ b/docker/monasca-persister.conf.j2 @@ -47,7 +47,7 @@ max_buffer_size = 32768 # Path in zookeeper for kafka consumer group partitioning algo zookeeper_path = /persister_partitions/alarm-state-transitions num_processors = {{ KAFKA_ALARM_HISTORY_PROCESSORS | default(1) }} -legacy_kafka_client_enabled= {{ KAFKA_LEGACY_CLIENT_ENABLED | default(true) }} +legacy_kafka_client_enabled= {{ KAFKA_LEGACY_CLIENT_ENABLED | default(false) }} [kafka_events] # Comma separated list of Kafka broker host:port. @@ -74,7 +74,7 @@ max_buffer_size = 32768 # Path in zookeeper for kafka consumer group partitioning algo zookeeper_path = /persister_partitions/metrics num_processors = {{ KAFKA_METRICS_PROCESSORS | default(1) }} -legacy_kafka_client_enabled= {{ KAFKA_LEGACY_CLIENT_ENABLED | default(true) }} +legacy_kafka_client_enabled= {{ KAFKA_LEGACY_CLIENT_ENABLED | default(false) }} {% if DATABASE_BACKEND | lower == 'cassandra' %} [cassandra]