diff --git a/msa_sdk/elk.py b/msa_sdk/elk.py index 82fac7bd..02e4035f 100644 --- a/msa_sdk/elk.py +++ b/msa_sdk/elk.py @@ -8,33 +8,10 @@ from threading import Timer from elasticsearch import Elasticsearch -from elasticsearch import RequestsHttpConnection from elasticsearch import helpers as eshelpers -from elasticsearch.serializer import JSONSerializer # Have a look at https://github.com/cmanaha/python-elasticsearch-logger -class EsSerializer(JSONSerializer): - """ - JSON serializer inherited from the elastic search JSON serializer. - - Allows to serialize logs for a elasticsearch use. - Manage the record.exc_info containing an exception type. - """ - - def default(self, data): - """ - Override the elasticsearch default method. - - Allows to transform unknown types into strings. - - :params data: The data to serialize before sending it to elastic search - """ - try: - return super(EsSerializer, self).default(data) - except TypeError: - return str(data) - class EsHandler(logging.Handler): """Elastic search handler.""" @@ -116,7 +93,6 @@ def __init__(self, }) self.raise_on_indexing_exceptions = raise_on_indexing_exceptions self.default_timestamp_field_name = default_timestamp_field_name - self.serializer = EsSerializer() self._client = None self._buffer = [] self._buffer_lock = Lock() @@ -134,7 +110,6 @@ def __get_es_client(self): http_auth=self.auth_details, use_ssl=False, verify_certs=False, - connection_class=RequestsHttpConnection, serializer=self.serializer) def test_es_source(self): """ @@ -223,4 +198,4 @@ def emit(self, record): if len(self._buffer) >= self.buffer_size: self.flush() else: - self.__schedule_flush() \ No newline at end of file + self.__schedule_flush() diff --git a/requirements.txt b/requirements.txt index bcb36647..c051de62 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ requests -elasticsearch==7.14.2 +elasticsearch==8.16.0