openstack/kolla-ansible
Code Issues Proposed changes

Merge "Automate Monasca documentation for configuring Kafka"

Browse Source
This commit is contained in:
Zuul 2019-02-18 13:31:52 +00:00 committed by Gerrit Code Review
commit 23c439db0a
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/kafka/templates/kafka.server.properties.j2
View File

@ -16,3 +16,7 @@ log.segment.bytes=1073741824
log.retention.check.interval.ms=300000 log.retention.check.interval.ms=300000
zookeeper.connect={{ kafka_zookeeper }} zookeeper.connect={{ kafka_zookeeper }}
zookeeper.connection.timeout.ms=6000 zookeeper.connection.timeout.ms=6000
{% if enable_monasca | bool %}
log.message.format.version=0.9.0.0
connections.max.idle.ms=31540000000
{% endif %}

8
doc/source/reference/logging-and-monitoring/monasca-guide.rst
View File

@ -46,14 +46,6 @@ following override in ``/etc/kolla/globals.yml``:
monasca_install_type: "source" 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) Stand-alone configuration (optional)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~