From 61ef5615e9b553da882d4bbda98d11ca4fe7a45e Mon Sep 17 00:00:00 2001 From: Roman Tomjak Date: Wed, 20 Jan 2016 01:33:53 +0000 Subject: [PATCH 1/7] fix logstash example --- README.rst | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index e637785..c4e95b8 100644 --- a/README.rst +++ b/README.rst @@ -125,14 +125,14 @@ Modify your ``settings.py`` to integrate ``python-logstash`` with Django's loggi ... } -Note -==== +Example Logstash Configuration +============================== Example Logstash Configuration (``logstash.conf``) for Receiving Events from python-logstash is:: input { - tcp { - port => 5000 + udp { + port => 5959 codec => json } } @@ -141,3 +141,5 @@ Example Logstash Configuration (``logstash.conf``) for Receiving Events from pyt codec => rubydebug } } + +> For TCP input you need to change the logstash's input to `tcp` and modify django log handler's class to `logstash.TCPLogstashHandler` From 9b877cdbbc8b27e8cbdba62341f713ba4285fafc Mon Sep 17 00:00:00 2001 From: Roman Tomjak Date: Wed, 20 Jan 2016 01:38:17 +0000 Subject: [PATCH 2/7] change markdown format to rst --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index c4e95b8..0140086 100644 --- a/README.rst +++ b/README.rst @@ -142,4 +142,4 @@ Example Logstash Configuration (``logstash.conf``) for Receiving Events from pyt } } -> For TCP input you need to change the logstash's input to `tcp` and modify django log handler's class to `logstash.TCPLogstashHandler` + For TCP input you need to change the logstash's input to ``tcp`` and modify django log handler's class to ``logstash.TCPLogstashHandler`` From 9c433162563766f9e3024be209d9e8ba358f7e23 Mon Sep 17 00:00:00 2001 From: Roman Tomjak Date: Wed, 20 Jan 2016 01:41:07 +0000 Subject: [PATCH 3/7] logstash's example footnote should not be a part of example config --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 0140086..7bccf49 100644 --- a/README.rst +++ b/README.rst @@ -142,4 +142,4 @@ Example Logstash Configuration (``logstash.conf``) for Receiving Events from pyt } } - For TCP input you need to change the logstash's input to ``tcp`` and modify django log handler's class to ``logstash.TCPLogstashHandler`` +For TCP input you need to change the logstash's input to ``tcp`` and modify django log handler's class to ``logstash.TCPLogstashHandler`` From 17d96ad3c0e8155dabe6cfbdd6b0d049a12ac283 Mon Sep 17 00:00:00 2001 From: Venkat Sundaram Date: Fri, 1 Apr 2016 11:00:44 -0600 Subject: [PATCH 4/7] Adding sensitive OpenStack log fields to skip_list --- README.rst | 2 ++ logstash/formatter.py | 3 ++- setup.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index e637785..7f166bd 100644 --- a/README.rst +++ b/README.rst @@ -6,6 +6,8 @@ http://logstash.net/ Changelog ========= +0.4.7 + - Add couple of sensitive fields to the skip_list 0.4.6 - Updated field names to match java counterparts supported by logstash crew 0.4.5 diff --git a/logstash/formatter.py b/logstash/formatter.py index 6d0887a..f5c4424 100644 --- a/logstash/formatter.py +++ b/logstash/formatter.py @@ -27,7 +27,8 @@ def get_extra_fields(self, record): 'args', 'asctime', 'created', 'exc_info', 'exc_text', 'filename', 'funcName', 'id', 'levelname', 'levelno', 'lineno', 'module', 'msecs', 'msecs', 'message', 'msg', 'name', 'pathname', 'process', - 'processName', 'relativeCreated', 'thread', 'threadName', 'extra') + 'processName', 'relativeCreated', 'thread', 'threadName', 'extra', + 'auth_token', 'password') if sys.version_info < (3, 0): easy_types = (basestring, bool, dict, float, int, long, list, type(None)) diff --git a/setup.py b/setup.py index bcf4eb8..e49045c 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='python-logstash', packages=['logstash'], - version='0.4.6', + version='0.4.7', description='Python logging handler for Logstash.', long_description=open('README.rst').read(), author='Volodymyr Klochan', From a8f55083153cfedf5ffd49d6809111d1abeb953f Mon Sep 17 00:00:00 2001 From: Alex Zarnitsa Date: Tue, 25 Feb 2020 13:44:48 -0500 Subject: [PATCH 5/7] Added 'stack_info' to the skip_list --- logstash/formatter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logstash/formatter.py b/logstash/formatter.py index f5c4424..246139b 100644 --- a/logstash/formatter.py +++ b/logstash/formatter.py @@ -28,7 +28,7 @@ def get_extra_fields(self, record): 'funcName', 'id', 'levelname', 'levelno', 'lineno', 'module', 'msecs', 'msecs', 'message', 'msg', 'name', 'pathname', 'process', 'processName', 'relativeCreated', 'thread', 'threadName', 'extra', - 'auth_token', 'password') + 'auth_token', 'password', 'stack_info') if sys.version_info < (3, 0): easy_types = (basestring, bool, dict, float, int, long, list, type(None)) From 108310c311404464b98168b7f04247c2522da968 Mon Sep 17 00:00:00 2001 From: Alex Zarnitsa Date: Fri, 25 Mar 2022 15:38:50 -0400 Subject: [PATCH 6/7] Object of type 'datetime' is not JSON serializable --- logstash/formatter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logstash/formatter.py b/logstash/formatter.py index 246139b..2b5d618 100644 --- a/logstash/formatter.py +++ b/logstash/formatter.py @@ -82,7 +82,7 @@ def serialize(cls, message): if sys.version_info < (3, 0): return json.dumps(message) else: - return bytes(json.dumps(message), 'utf-8') + return bytes(json.dumps(message, default=str), 'utf-8') class LogstashFormatterVersion0(LogstashFormatterBase): version = 0 From 5d8ec9e7a7ae05d38ad69ddfda0ecfb52dc65b2c Mon Sep 17 00:00:00 2001 From: Alex Zarnitsa Date: Mon, 28 Mar 2022 15:55:07 -0400 Subject: [PATCH 7/7] Object of type 'datetime' is not JSON serializable - DEV --- README.rst | 2 ++ setup.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index aec1c3a..9b19ed9 100644 --- a/README.rst +++ b/README.rst @@ -6,6 +6,8 @@ http://logstash.net/ Changelog ========= +0.4.8 + - Fixed Python 3 issues with JSON serialization. 0.4.7 - Add couple of sensitive fields to the skip_list 0.4.6 diff --git a/setup.py b/setup.py index 3329e91..a7be6bf 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='python-logstash', packages=['logstash'], - version='0.4.7', + version='0.4.8', description='Python logging handler for Logstash.', long_description=open('README.rst').read(), license='MIT',