Skip to content

Commit

Permalink
Merge pull request #216 from napalm-automation/develop
Browse files Browse the repository at this point in the history
Release 0.4.2
  • Loading branch information
mirceaulinic authored Feb 15, 2018
2 parents 66c41c4 + 04a20e0 commit 59f7cff
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 2 deletions.
17 changes: 17 additions & 0 deletions docs/publisher/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,23 @@ Configuration example:
error_blacklist:
- UNKNOWN
.. _publisher-opts-no-encrypt:

``no_encrypt``: ``False``
------------------------

.. versionadded:: 0.4.2

Do not encrypt messages for this over this publisher

Configuration example:

.. code-block:: yaml
publisher:
- kafka:
no_encrypt: True
.. _publisher-opts-only-raw:

``only_raw``: ``False``
Expand Down
14 changes: 14 additions & 0 deletions docs/releases/0.4.2.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
.. _release-0.4.2:

=============
Release 0.4.2
=============

This is a minor release for :ref:`release-0.4.0`.

New Publisher Option
--------------------

Add publisher option `no_encrypt`

:ref:`publisher-opts-no-encrypt`
3 changes: 2 additions & 1 deletion docs/releases/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ Release Notes
Latest Release
^^^^^^^^^^^^^^

- :ref:`release-0.4.1`
- :ref:`release-0.4.2`

Previous Releases
^^^^^^^^^^^^^^^^^

- :ref:`release-0.4.1`
- :ref:`release-0.4.0`
- :ref:`release-0.3.0`
- :ref:`release-0.2.0`
Expand Down
2 changes: 2 additions & 0 deletions napalm_logs/transport/kafka.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ def __init__(self, address, port, **kwargs):
address = kwargs['address']
if kwargs.get('port'):
address = kwargs['port']
if kwargs.get('no_encrypt'):
self.NO_ENCRYPT = kwargs['no_encrypt']
if kwargs.get('bootstrap_servers'):
self.bootstrap_servers = kwargs['bootstrap_servers']
else:
Expand Down
2 changes: 2 additions & 0 deletions napalm_logs/transport/zeromq.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ def __init__(self, address, port, **kwargs):
self.port = kwargs['port']
else:
self.port = port
if kwargs.get('no_encrypt'):
self.NO_ENCRYPT = kwargs['no_encrypt']

def start(self):
self.context = zmq.Context()
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

setup(
name='napalm-logs',
version='0.4.1',
version='0.4.2',
packages=find_packages(),
author='Mircea Ulinic',
author_email='[email protected]',
Expand Down

0 comments on commit 59f7cff

Please sign in to comment.