diff --git a/docker/Dockerfile b/docker/Dockerfile index 2a7c93bf..95ad1096 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -23,10 +23,12 @@ ENV \ ZOOKEEPER_URI=zookeeper:2181 \ KAFKA_URI=kafka:9092 \ KAFKA_ALARM_HISTORY_BATCH_SIZE=1000 \ + KAFKA_ALARM_HISTORY_GROUP_ID=1_events \ KAFKA_ALARM_HISTORY_PROCESSORS=1 \ KAFKA_ALARM_HISTORY_WAIT_TIME=15 \ KAFKA_LEGACY_CLIENT_ENABLED=true \ KAFKA_METRICS_BATCH_SIZE=1000 \ + KAFKA_METRICS_GROUP_ID=1_metrics \ KAFKA_METRICS_PROCESSORS=1 \ KAFKA_METRICS_WAIT_TIME=15 \ KAFKA_WAIT_FOR_TOPICS=alarm-state-transitions,metrics \ diff --git a/docker/README.rst b/docker/README.rst index 26c385b9..f4b049d6 100644 --- a/docker/README.rst +++ b/docker/README.rst @@ -29,11 +29,13 @@ VERBOSE true If true, enable info logging ZOOKEEPER_URI zookeeper:2181 The host and port for zookeeper KAFKA_URI kafka:9092 The host and port for kafka KAFKA_ALARM_HISTORY_BATCH_SIZE 1000 Kafka consumer takes messages in a batch +KAFKA_ALARM_HISTORY_GROUP_ID 1_events Kafka Group from which persister get alarm history 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_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 KAFKA_METRICS_WAIT_TIME 15 Seconds to wait if the batch size is not reached DATABASE_BACKEND influxdb Select for backend database diff --git a/docker/monasca-persister.conf.j2 b/docker/monasca-persister.conf.j2 index 6c77b28c..b8139c85 100644 --- a/docker/monasca-persister.conf.j2 +++ b/docker/monasca-persister.conf.j2 @@ -33,7 +33,7 @@ partition_interval_recheck_seconds = 15 [kafka_alarm_history] # Comma separated list of Kafka broker host:port. uri = {{ KAFKA_URI }} -group_id = 1_alarm-state-transitions +group_id = {{ KAFKA_ALARM_HISTORY_GROUP_ID }} topic = alarm-state-transitions consumer_id = 1 client_id = 1 @@ -60,7 +60,7 @@ batch_size = 1 [kafka_metrics] # Comma separated list of Kafka broker host:port uri = {{ KAFKA_URI }} -group_id = 1_metrics +group_id = {{ KAFKA_METRICS_GROUP_ID }} topic = metrics consumer_id = 1 client_id = 1