From ecf0009608d2cf8cff951583d90a20ae9b146a1f Mon Sep 17 00:00:00 2001
From: Doug Szumski <doug@stackhpc.com>
Date: Thu, 14 Feb 2019 16:16:20 +0000
Subject: [PATCH] Automate Monasca documentation for configuring Kafka
Until the Monasca Kafka client fork is removed it is currently required
to run Kafka in compatibility mode. It is also necessary to disable
an optimisation in the Kafka brokers to clean up idle connections. This
is because the optimisation was added after the Monasca Kafka client was
forked, and the client hasn't been updated since. These settings are now
applied automatically when Monasca is enabled.
Change-Id: I6935f1fb29f4f731cf3c9a70a0adf4d5812ca55e
---
ansible/roles/kafka/templates/kafka.server.properties.j2 | 4 ++++
.../reference/logging-and-monitoring/monasca-guide.rst | 8 --------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/ansible/roles/kafka/templates/kafka.server.properties.j2 b/ansible/roles/kafka/templates/kafka.server.properties.j2
index 8743f6f587..6e6058b70f 100644
--- a/ansible/roles/kafka/templates/kafka.server.properties.j2
+++ b/ansible/roles/kafka/templates/kafka.server.properties.j2
@@ -16,3 +16,7 @@ log.segment.bytes=1073741824
log.retention.check.interval.ms=300000
zookeeper.connect={{ kafka_zookeeper }}
zookeeper.connection.timeout.ms=6000
+{% if enable_monasca | bool %}
+log.message.format.version=0.9.0.0
+connections.max.idle.ms=31540000000
+{% endif %}
diff --git a/doc/source/reference/logging-and-monitoring/monasca-guide.rst b/doc/source/reference/logging-and-monitoring/monasca-guide.rst
index 3af3399464..43fe30bdb4 100644
--- a/doc/source/reference/logging-and-monitoring/monasca-guide.rst
+++ b/doc/source/reference/logging-and-monitoring/monasca-guide.rst
@@ -46,14 +46,6 @@ following override in ``/etc/kolla/globals.yml``:
monasca_install_type: "source"
-Until the Monasca Kafka client is upgraded it is currently required
-to run Kafka in compatibility mode. This can be achieved by adding some
-custom Kafka configuration:
-
-.. code-block:: console
-
- echo "log.message.format.version=0.9.0.0" >> /etc/kolla/config/kafka.server.properties
-
Stand-alone configuration (optional)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--
GitLab