Commit aaace6c5 authored by Joel Hamill's avatar Joel Hamill
Browse files

Manual merge 5.0.x into master

parents 43376860 7d250b8a
Loading
Loading
Loading
Loading

docs/Makefile

deleted100644 → 0
+0 −181
Original line number Diff line number Diff line
# Makefile for Sphinx documentation
#

# You can set these variables from the command line.
SPHINXOPTS    =
SPHINXBUILD   = sphinx-build
PAPER         =
BUILDDIR      = _build

# User-friendly check for sphinx-build
ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
endif

# Internal variables.
PAPEROPT_a4     = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter
ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
# the i18n builder cannot share the environment and doctrees with the others
I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .

.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext livehtml

help:
	@echo "Please use \`make <target>' where <target> is one of"
	@echo "  html       to make standalone HTML files"
	@echo "  livehtml   to make standalone HTML files automatically watching for changes"
	@echo "  dirhtml    to make HTML files named index.html in directories"
	@echo "  singlehtml to make a single large HTML file"
	@echo "  pickle     to make pickle files"
	@echo "  json       to make JSON files"
	@echo "  htmlhelp   to make HTML files and a HTML help project"
	@echo "  qthelp     to make HTML files and a qthelp project"
	@echo "  devhelp    to make HTML files and a Devhelp project"
	@echo "  epub       to make an epub"
	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
	@echo "  text       to make text files"
	@echo "  man        to make manual pages"
	@echo "  texinfo    to make Texinfo files"
	@echo "  info       to make Texinfo files and run them through makeinfo"
	@echo "  gettext    to make PO message catalogs"
	@echo "  changes    to make an overview of all changed/added/deprecated items"
	@echo "  xml        to make Docutils-native XML files"
	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
	@echo "  linkcheck  to check all external links for integrity"
	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"

clean:
	rm -rf $(BUILDDIR)/*

html:
	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
	@echo
	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."

livehtml:
	python autoreload.py

dirhtml:
	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
	@echo
	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."

singlehtml:
	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
	@echo
	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."

pickle:
	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
	@echo
	@echo "Build finished; now you can process the pickle files."

json:
	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
	@echo
	@echo "Build finished; now you can process the JSON files."

htmlhelp:
	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
	@echo
	@echo "Build finished; now you can run HTML Help Workshop with the" \
	      ".hhp project file in $(BUILDDIR)/htmlhelp."

qthelp:
	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
	@echo
	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/KafkaRESTProxy.qhcp"
	@echo "To view the help file:"
	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/KafkaRESTProxy.qhc"

devhelp:
	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
	@echo
	@echo "Build finished."
	@echo "To view the help file:"
	@echo "# mkdir -p $$HOME/.local/share/devhelp/KafkaRESTProxy"
	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/KafkaRESTProxy"
	@echo "# devhelp"

epub:
	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
	@echo
	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."

latex:
	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
	@echo
	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
	@echo "Run \`make' in that directory to run these through (pdf)latex" \
	      "(use \`make latexpdf' here to do that automatically)."

latexpdf:
	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
	@echo "Running LaTeX files through pdflatex..."
	$(MAKE) -C $(BUILDDIR)/latex all-pdf
	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."

latexpdfja:
	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
	@echo "Running LaTeX files through platex and dvipdfmx..."
	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."

text:
	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
	@echo
	@echo "Build finished. The text files are in $(BUILDDIR)/text."

man:
	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
	@echo
	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."

texinfo:
	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
	@echo
	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
	@echo "Run \`make' in that directory to run these through makeinfo" \
	      "(use \`make info' here to do that automatically)."

info:
	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
	@echo "Running Texinfo files through makeinfo..."
	make -C $(BUILDDIR)/texinfo info
	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."

gettext:
	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
	@echo
	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."

changes:
	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
	@echo
	@echo "The overview file is in $(BUILDDIR)/changes."

linkcheck:
	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
	@echo
	@echo "Link check complete; look for any errors in the above output " \
	      "or in $(BUILDDIR)/linkcheck/output.txt."

doctest:
	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
	@echo "Testing of doctests in the sources finished, look at the " \
	      "results in $(BUILDDIR)/doctest/output.txt."

xml:
	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
	@echo
	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."

pseudoxml:
	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
	@echo
	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."

docs/README.md

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line
This documentation is built using [Sphinx](http://sphinx-doc.org). It also uses some extensions for theming and REST API
documentation support.

Start by installing the requirements:

    pip install -r requirements.txt

Then you can generate the HTML version of the docs:

    make html

The root of the documentation will be at `_build/html/index.html`

While editing the documentation, you can get a live preview using python-livepreview. Install the Python library:

    pip install livereload

Then run the monitoring script in the background:

    python autoreload.py &

If you install the [browser extensions](http://livereload.com/) then everything should update every time any files are
saved without any manual steps on your part.
 No newline at end of file

docs/autoreload.py

deleted100755 → 0
+0 −6
Original line number Diff line number Diff line
#!/usr/bin/env python
from livereload import Server, shell

server = Server()
server.watch('*.rst', shell('make html'))
server.serve()

docs/changelog.rst

deleted100644 → 0
+0 −84
Original line number Diff line number Diff line
.. _elasticsearch_connector_changelog:

Changelog
=========

Version 5.0.0
-------------

* `PR-217 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/217>`_ - MINOR: Use correct config type for recently added password field
* `PR-215 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/215>`_ - CC-374 Support basic auth with secure Elasticsearch
* `PR-216 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/216>`_ - CC-2037 Support keyword subfields for text types
* `PR-194 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/194>`_ - Fixed typo in retry delays example.

Version 4.1.2
-------------

No changes

Version 4.1.1
-------------

* `PR-191 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/191>`_ - CC-918 Add |kconnect| Maven plugin to build

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
-------------

* `PR-122 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/122>`_ - Add argLine to surefire override configuration so we maintain the Jenkins features of the common pom.
* `PR-91 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/91>`_ - Drop invalid messages if needed
* `PR-88 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/88>`_ - Inherit from common pom

Version 3.3.1
-------------

* `PR-126 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/126>`_ - CC-1191: Added feature flag to control string-keyed map entry JSON serialization
* `PR-120 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/120>`_ - Add upstream project so build are triggered automatically
* `PR-117 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/117>`_ - CC-1096 Added ES error message when unable to create an index
* `PR-116 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/116>`_ - CC-1059 Changed ES connector to use exponential backoff with jitter
* `PR-105 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/105>`_ - Update quickstart to use Confluent CLI.

Version 3.3.0
-------------

* `PR-69 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/69>`_ - Fix map output for String keyed maps.
* `PR-83 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/83>`_ - ST-336: Move slf4j-simple into test scope so it is not pulled into the packaged version.

Version 3.2.2
-------------

* `PR-89 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/89>`_ - Increase flush timeout in BulkProcessorTest to make the test more reliable when the test server has other CPU load.

Version 3.2.1
-------------

No changes

Version 3.2.0
-------------

* `PR-34 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/34>`_ - CC-331: update config options docs
* `PR-47 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/47>`_ - Allow for multiple Elasticsearch HTTP URLs
* `PR-53 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/53>`_ - CC-392: Fix mapping existence check
* `PR-54 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/54>`_ - CC-393: don't use offset as document version when key.ignore=true
* `PR-49 <https://github.com/confluentinc/kafka-connect-elasticsearch/pull/49>`_ - Schema.Type.BYTES should map to 'binary' ES datatype

docs/conf.py

deleted100644 → 0
+0 −267
Original line number Diff line number Diff line
# -*- coding: utf-8 -*-
#
# Kafka Connect JDBC documentation build configuration file, created by
# sphinx-quickstart on Wed Dec 17 14:17:15 2014.
#
# This file is execfile()d with the current directory set to its
# containing dir.
#
# Note that not all possible configuration values are present in this
# autogenerated file.
#
# All configuration values have a default; values that are commented out
# serve to show the default.

import sys
import os

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
#sys.path.insert(0, os.path.abspath('.'))

# -- General configuration ------------------------------------------------

# If your documentation needs a minimal Sphinx version, state it here.
#needs_sphinx = '1.0'

# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = ['sphinx.ext.ifconfig', 'sphinxcontrib.httpdomain']

def setup(app):
    app.add_config_value('platform_docs', True, 'env')

# Even if it has a default, these options need to be specified
platform_docs = False

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']

# The suffix of source filenames.
source_suffix = '.rst'

# The encoding of source files.
#source_encoding = 'utf-8-sig'

# The master toctree document.
master_doc = 'index'

# General information about the project.
project = u'Kafka Connect Elasticsearch'
copyright = u'2016, Confluent, Inc.'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = '5.1'
# The full version, including alpha/beta/rc tags.
release = '5.1.0-SNAPSHOT'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
#language = None

# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
#today = ''
# Else, today_fmt is used as the format for a strftime call.
#today_fmt = '%B %d, %Y'

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
exclude_patterns = ['_build']

# The reST default role (used for this markup: `text`) to use for all
# documents.
#default_role = None

# If true, '()' will be appended to :func: etc. cross-reference text.
#add_function_parentheses = True

# If true, the current module name will be prepended to all description
# unit titles (such as .. function::).
#add_module_names = True

# If true, sectionauthor and moduleauthor directives will be shown in the
# output. They are ignored by default.
#show_authors = False

# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'

# A list of ignored prefixes for module index sorting.
#modindex_common_prefix = []

# If true, keep warnings as "system message" paragraphs in the built documents.
#keep_warnings = False


# -- Options for HTML output ----------------------------------------------

import sphinx_rtd_theme

# The theme to use for HTML and HTML Help pages.  See the documentation for
# a list of builtin themes.
html_theme = 'sphinx_rtd_theme'

# Theme options are theme-specific and customize the look and feel of a theme
# further.  For a list of options available for each theme, see the
# documentation.
#html_theme_options = {}

# Add any paths that contain custom themes here, relative to this directory.
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]

# The name for this set of Sphinx documents.  If None, it defaults to
# "<project> v<release> documentation".
#html_title = None

# A shorter title for the navigation bar.  Default is the same as html_title.
#html_short_title = None

# The name of an image file (relative to this directory) to place at the top
# of the sidebar.
#html_logo = None

# The name of an image file (within the static path) to use as favicon of the
# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
# pixels large.
#html_favicon = None

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']

# Add any extra paths that contain custom files (such as robots.txt or
# .htaccess) here, relative to this directory. These files are copied
# directly to the root of the documentation.
#html_extra_path = []

# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
#html_last_updated_fmt = '%b %d, %Y'

# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.
#html_use_smartypants = True

# Custom sidebar templates, maps document names to template names.
#html_sidebars = {}

# Additional templates that should be rendered to pages, maps page names to
# template names.
#html_additional_pages = {}

# If false, no module index is generated.
#html_domain_indices = True

# If false, no index is generated.
#html_use_index = True

# If true, the index is split into individual pages for each letter.
#html_split_index = False

# If true, links to the reST sources are added to the pages.
#html_show_sourcelink = True

# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
#html_show_sphinx = True

# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
#html_show_copyright = True

# If true, an OpenSearch description file will be output, and all pages will
# contain a <link> tag referring to it.  The value of this option must be the
# base URL from which the finished HTML is served.
#html_use_opensearch = ''

# This is the file name suffix for HTML files (e.g. ".xhtml").
#html_file_suffix = None

# Output file base name for HTML help builder.
htmlhelp_basename = 'KafkaConnectElasticsearchDoc'


# -- Options for LaTeX output ---------------------------------------------

latex_elements = {
# The paper size ('letterpaper' or 'a4paper').
#'papersize': 'letterpaper',

# The font size ('10pt', '11pt' or '12pt').
#'pointsize': '10pt',

# Additional stuff for the LaTeX preamble.
#'preamble': '',
}

# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title,
#  author, documentclass [howto, manual, or own class]).
latex_documents = [
  ('index', 'KafkaConnectElasticserch.tex', u'Kafka Connect Elasticsearch Documentation',
   u'Confluent, Inc.', 'manual'),
]

# The name of an image file (relative to this directory) to place at the top of
# the title page.
#latex_logo = None

# For "manual" documents, if this is true, then toplevel headings are parts,
# not chapters.
#latex_use_parts = False

# If true, show page references after internal links.
#latex_show_pagerefs = False

# If true, show URL addresses after external links.
#latex_show_urls = False

# Documents to append as an appendix to all manuals.
#latex_appendices = []

# If false, no module index is generated.
#latex_domain_indices = True


# -- Options for manual page output ---------------------------------------

# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
    ('index', 'kafkaconnectelasticsearch', u'Kafka Connect Elasticsearch',
     [u'Confluent, Inc.'], 1)
]

# If true, show URL addresses after external links.
#man_show_urls = False


# -- Options for Texinfo output -------------------------------------------

# Grouping the document tree into Texinfo files. List of tuples
# (source start file, target name, title, author,
#  dir menu entry, description, category)
texinfo_documents = [
  ('index', 'KafkaConnectElasticsearch', u'Kafka Connect Elasticsearch Documentation',
   u'Confluent, Inc.', 'KafkaConnectElasticsearch',
   'Kafka Connector for Elasticsearch sink',
   'Miscellaneous'),
]

# Documents to append as an appendix to all manuals.
#texinfo_appendices = []

# If false, no module index is generated.
#texinfo_domain_indices = True

# How to display URL addresses: 'footnote', 'no', or 'inline'.
#texinfo_show_urls = 'footnote'

# If true, do not generate a @detailmenu in the "Top" node's menu.
#texinfo_no_detailmenu = False
Loading