Commit e3658781 authored by Robert Yokota's avatar Robert Yokota
Browse files

Merge remote-tracking branch 'upstream/master'

parents 3913d8ae 9503eb51

docs/changelog.rst

+21 −0
Original line number Diff line number Diff line
@@ -3,6 +3,27 @@ 
Changelog

=========



Version 4.1.0

-------------



* `PR-182 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/182>`_ - Add 2.x to supported versions

* `PR-177 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/177>`_ - CC-1550: Clarify ES 6 compatibility

* `PR-148 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/148>`_ - Add config that allows Elasticsearch mapper parsing errors to be ignored

* `PR-174 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/174>`_ - CC-1491: Remove note about unsupported ES6 from ES quick start

* `PR-169 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/169>`_ - CC-1385:  Enhance connector to use text type with ES 5+

* `PR-165 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/165>`_ - CC-350, CC-1097: Added support for delete and null handling

* `PR-158 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/158>`_ - CC-1372: Add configuration options for read and connect timeouts

* `PR-151 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/151>`_ - CC-190: Deprecate the topic.index.map configuration option



Version 4.0.1

-------------



* `PR-182 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/182>`_ - Add ES 2.x to supported versions

* `PR-169 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/169>`_ - CC-1385:  Enhance connector to use text type with ES 5+

* `PR-165 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/165>`_ - CC-350, CC-1097: Added support for delete and null handling

* `PR-158 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/158>`_ - CC-1372: Add configuration options for read and connect timeouts





Version 4.0.0

-------------

docs/configuration_options.rst

+6 −0
Original line number Diff line number Diff line 
Configuration Options

=====================



.. contents::

    :local:



Connector

^^^^^^^^^

docs/elasticsearch_connector.rst

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ producer to Elasticsearch. 
**Prerequisites:**



- :ref:`Confluent Platform <installation>` is installed and services are running by using the Confluent CLI. This quick start assumes that you are using the Confluent CLI, but standalone installations are also supported. By default ZooKeeper, Kafka, Schema Registry, Kafka Connect REST API, and Kafka Connect are started with the ``confluent start`` command. For more information, see :ref:`installation_archive`.

- Elasticsearch 5.x or 6.x is installed and running.

- Elasticsearch 2.x, 5.x, or 6.x is installed and running.



----------------------------

Add a Record to the Consumer
@@ -292,7 +292,7 @@ Increasing the maximum number of retries adds more backoff: 
     6         0.0                     16.0                             31.5

     7         0.0                     32.0                             63.5

     8         0.0                     64.0                            127.5

     9         0.0                    128.0                            256.5

     9         0.0                    128.0                            255.5

    10         0.0                    256.0                            511.5

    11         0.0                    512.0                           1023.5

    12         0.0                   1024.0                           2047.5

docs/index.rst

+3 −0
Original line number Diff line number Diff line
@@ -11,3 +11,6 @@ Contents: 
   elasticsearch_connector

   configuration_options

   changelog



To see a working example of the Confluent Elasticsearch Connector, check out :ref:`Confluent Platform demo<cp-demo>`. The demo shows you how to deploy a Kafka streaming ETL, including Elasticsearch, using KSQL for stream processing.

logos/confluent.png

0 → 100644
+3.08 KiB
Loading image diff...