Skip to content

Commit

Permalink
Merge pull request #105 from aiven/jlprat-patch-1
Browse files Browse the repository at this point in the history
Update readme to comply with trademark rules
  • Loading branch information
Maksim Novikov authored Jan 20, 2022
2 parents 9415c3a + 02347ab commit 86e4c6d
Showing 1 changed file with 15 additions and 6 deletions.
21 changes: 15 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ journalpump |BuildStatus|_
.. _BuildStatus: https://github.com/aiven/journalpump/actions

journalpump is a daemon that takes log messages from journald and pumps them
to a given output. Currently supported outputs are Elasticsearch, Kafka,
to a given output. Currently supported outputs are Elasticsearch, Apache Kafka®,
logplex, rsyslog, websocket and AWS CloudWatch. It reads messages from
journald and optionally checks if they match a config rule and forwards them
as JSON messages to the desired output.
Expand Down Expand Up @@ -329,21 +329,21 @@ Fully qualified elasticsearch url of the form
Required when using output_type ``elasticsearch``.


Kafka Sender Configuration
Apache Kafka Sender Configuration
--------------------------
``ca`` (default ``null``)

Kafka Certificate Authority path, needed when you're using Kafka with SSL
Apache Kafka Certificate Authority path, needed when you're using Kafka with SSL
authentication.

``certfile`` (default ``null``)

Kafka client certificate path, needed when you're using Kafka with SSL
Apache Kafka client certificate path, needed when you're using Kafka with SSL
authentication.

``kafka_api_version`` (default ``0.9``)

Which Kafka server API version to use.
Which Apache Kafka server API version to use.

``kafka_topic`` (default ``null``)

Expand All @@ -365,7 +365,7 @@ The mapping must have these values::

``kafka_address`` (default ``null``)

The address of the kafka server which to write to.
The address of the Kafka server which to write to.
Required when using output_type ``kafka``.

``kafka_msg_key`` (default ``null``)
Expand Down Expand Up @@ -555,6 +555,15 @@ Recent contributors are listed on the project's GitHub `contributors page`_.

.. _`contributors page`: https://github.com/aiven/journalpump/graphs/contributors

Trademark
=========

Apache Kafka is either registered trademark or trademark of the Apache Software
Foundation in the United States and/or other countries. Elasticsearch,
AWS CloudWatch, logplex and rsyslog are trademarks and property of their respective
owners. All product and service names used in this website are for identification
purposes only and do not imply endorsement.


Contact
=======
Expand Down

0 comments on commit 86e4c6d

Please sign in to comment.