brynq-sdk-elastic 2.2.0__tar.gz → 2.2.2__tar.gz

{brynq_sdk_elastic-2.2.0 → brynq_sdk_elastic-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq_sdk_elastic
-Version: 2.2.0
+Version: 2.2.2
 Summary: elastic wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_elastic-2.2.0 → brynq_sdk_elastic-2.2.2}/brynq_sdk/elastic/elastic.py

@@ -17,6 +17,7 @@ class Elastic:
         try:
             self.verify = False
             self.disabled = disabled
+            self.timeout = 60 # seconds before request to elastic fails
             elasticsearch_host = os.getenv("ELASTIC_HOST")
             elasticsearch_port = os.getenv("ELASTIC_PORT")
             kibana_port = os.getenv("KIBANA_PORT")
@@ -75,7 +76,7 @@ class Elastic:
             return 'Healthy connection established with elasticsearch!'
 
         try:
-            health = requests.get(url=f'{self.elasticsearch_host}/_cat/health?', headers=self.elastic_headers, verify=self.verify).status_code
+            health = requests.get(url=f'{self.elasticsearch_host}/_cat/health?', headers=self.elastic_headers, verify=self.verify, timeout=self.timeout).status_code
             if health != 200:
                 raise ConnectionError(f"Elasticsearch cluster health check failed with status code: {health}")
             else:
@@ -96,29 +97,34 @@ class Elastic:
         :param space_name: The name of the space
         :return: The status of the creation of the space
         """
-        if self.disabled:
-            return 'Space creation disabled'
-
-        url = f'{self.kibana_host}/api/spaces/space'
-        data = {
-            "id": space_name,
-            "name": space_name,
-            "description": f"This is the space for {space_name}",
-            "color": "#aabbcc",
-            "initials": space_name[0:2].upper(),
-            "disabledFeatures": [],
-        }
+        try:
+            if self.disabled:
+                return 'Space creation disabled'
+
+            url = f'{self.kibana_host}/api/spaces/space'
+            data = {
+                "id": space_name,
+                "name": space_name,
+                "description": f"This is the space for {space_name}",
+                "color": "#aabbcc",
+                "initials": space_name[0:2].upper(),
+                "disabledFeatures": [],
+            }
 
-        response = requests.head(url=url + fr'/{space_name}', headers=self.kibana_headers, verify=self.verify)
+            response = requests.head(url=url + fr'/{space_name}', headers=self.kibana_headers, verify=self.verify)
 
-        if response.status_code == 200:
-            return f'Index \'{space_name}\' already exists'
-        else:
-            response = requests.post(url=url, headers=self.kibana_headers, data=json.dumps(data), verify=self.verify)
             if response.status_code == 200:
-                return f'space {space_name} created'
+                return f'Index \'{space_name}\' already exists'
             else:
-                raise ConnectionError(f'Could not create space {space_name} with status code: {response.status_code}. Response: {response.text}')
+                response = requests.post(url=url, headers=self.kibana_headers, data=json.dumps(data), verify=self.verify)
+                if response.status_code == 200:
+                    return f'space {space_name} created'
+                else:
+                    raise ConnectionError(f'Could not create space {space_name} with status code: {response.status_code}. Response: {response.text}')
+        except:
+            message = "Could not create space, since this is not strictly necessary to write logs, continue without it"
+            print(message)
+            return message
 
     def create_data_view(self, space_name: str, view_name: str, name: str, time_field: str) -> str:
         """
@@ -128,29 +134,34 @@ class Elastic:
         :param time_field: The name of the time field
         :return: The status of the creation of the data view
         """
-        if self.disabled:
-            return 'Data view creation disabled'
-
-        url = f'{self.kibana_host}/s/{space_name}/api/data_views/data_view'
-        data = {
-            "data_view": {
-                "title": f'{view_name}*',
-                "id": f'{view_name}',
-                "name": f'{name}',
-                "timeFieldName": time_field
+        try:
+            if self.disabled:
+                return 'Data view creation disabled'
+
+            url = f'{self.kibana_host}/s/{space_name}/api/data_views/data_view'
+            data = {
+                "data_view": {
+                    "title": f'{view_name}*',
+                    "id": f'{view_name}',
+                    "name": f'{name}',
+                    "timeFieldName": time_field
+                }
             }
-        }
 
-        response = requests.head(url=url + fr'/{view_name}', headers=self.kibana_headers, verify=self.verify)
+            response = requests.head(url=url + fr'/{view_name}', headers=self.kibana_headers, verify=self.verify)
 
-        if response.status_code == 200:
-            return f'Data view \'{view_name}\' already exists'
-        else:
-            response = requests.post(url=url, headers=self.kibana_headers, data=json.dumps(data), verify=self.verify)
             if response.status_code == 200:
-                return f'data view {view_name} created'
+                return f'Data view \'{view_name}\' already exists'
             else:
-                raise ConnectionError(f'Could not create data view {view_name} with status code: {response.status_code}. Response: {response.text}')
+                response = requests.post(url=url, headers=self.kibana_headers, data=json.dumps(data), verify=self.verify)
+                if response.status_code == 200:
+                    return f'data view {view_name} created'
+                else:
+                    raise ConnectionError(f'Could not create data view {view_name} with status code: {response.status_code}. Response: {response.text}')
+        except:
+            message = "Could not create data view, since this is not strictly necessary to write logs, continue without it"
+            print(message)
+            return message
 
     def get_all_docs_from_index(self, index: str) -> pd.DataFrame:
         """
@@ -175,7 +186,7 @@ class Elastic:
 
         # initial request
         params = {"size": size, "scroll": "10m"}
-        response = requests.get(url=url, headers=self.elastic_headers, params=params, verify=self.verify).json()
+        response = requests.get(url=url, headers=self.elastic_headers, params=params, verify=self.verify, timeout=self.timeout).json()
 
         # next requests until finished
         scroll_id = response['_scroll_id']
@@ -248,44 +259,49 @@ class Elastic:
         :param index: one or more index names in a list.
         :return: The response of the request to elasticsearch
         """
-        if self.disabled:
-            return 'Role creation disabled'
-
-        url = f'{self.kibana_host}/api/security/role/{role_name}'
-        # Set the body
-        body = {
-            'elasticsearch': {
-                'cluster': ['transport_client'],
-                'indices': [
-                    {
-                        'names': [index],
-                        'privileges': ['read', 'write', 'read_cross_cluster', 'view_index_metadata', 'index']
-                    }
-                ]
-            },
-            'kibana': [{
-                'feature': {
-                    'dashboard': ['read'],
-                    'discover': ['read']
+        try:
+            if self.disabled:
+                return 'Role creation disabled'
+
+            url = f'{self.kibana_host}/api/security/role/{role_name}'
+            # Set the body
+            body = {
+                'elasticsearch': {
+                    'cluster': ['transport_client'],
+                    'indices': [
+                        {
+                            'names': [index],
+                            'privileges': ['read', 'write', 'read_cross_cluster', 'view_index_metadata', 'index']
+                        }
+                    ]
                 },
-                'spaces': [role_name],
-            }],
-            'metadata': {
-                'version': 1
+                'kibana': [{
+                    'feature': {
+                        'dashboard': ['read'],
+                        'discover': ['read']
+                    },
+                    'spaces': [role_name],
+                }],
+                'metadata': {
+                    'version': 1
+                }
             }
-        }
-        body = json.dumps(body)
+            body = json.dumps(body)
 
-        response = requests.head(url=url, headers=self.kibana_headers, verify=self.verify)
+            response = requests.head(url=url, headers=self.kibana_headers, verify=self.verify)
 
-        if response.status_code == 200:
-            return f'Role \'{role_name}\' already exists'
-        else:
-            response = requests.put(url=url, data=body, headers=self.kibana_headers, verify=self.verify)
-            if response.status_code == 204:
-                return f'Role {role_name} created'
+            if response.status_code == 200:
+                return f'Role \'{role_name}\' already exists'
             else:
-                raise ConnectionError(f'Could not create role {role_name} with status code: {response.status_code}. Response: {response.text}')
+                response = requests.put(url=url, data=body, headers=self.kibana_headers, verify=self.verify)
+                if response.status_code == 204:
+                    return f'Role {role_name} created'
+                else:
+                    raise ConnectionError(f'Could not create role {role_name} with status code: {response.status_code}. Response: {response.text}')
+        except:
+            message = "Could not create role, since this is not strictly necessary to write logs, continue without it"
+            print(message)
+            return message
 
     def get_indices(self) -> dict:
         """
@@ -341,7 +357,7 @@ class Elastic:
 
         url = f'{self.elasticsearch_host}/{index_name}/_doc/'
         body = json.dumps(document)
-        response = requests.post(url=url, data=body, headers=self.elastic_headers, verify=self.verify)
+        response = requests.post(url=url, data=body, headers=self.elastic_headers, verify=self.verify, timeout=self.timeout)
         return response
 
     def get_document(self, index_name: str, document_id: str) -> requests.Response:
@@ -355,7 +371,7 @@ class Elastic:
             return None
 
         url = f'{self.elasticsearch_host}/{index_name}/_doc/{document_id}'
-        response = requests.get(url=url, headers=self.elastic_headers, verify=self.verify)
+        response = requests.get(url=url, headers=self.elastic_headers, verify=self.verify, timeout=self.timeout)
         return response
 
     def delete_document(self, index_name: str, document_id: str) -> requests.Response:
@@ -369,7 +385,7 @@ class Elastic:
             return None
 
         url = f'{self.elasticsearch_host}/{index_name}/_doc/{document_id}'
-        response = requests.delete(url=url, headers=self.elastic_headers, verify=self.verify)
+        response = requests.delete(url=url, headers=self.elastic_headers, verify=self.verify, timeout=self.timeout)
         return response
 
     def task_execution_log(self, information: dict) -> requests.Response:
@@ -384,7 +400,7 @@ class Elastic:
         # Add new document
         url = f'{self.elasticsearch_host}/task_execution_log_{self.client_user}/_doc/'
         body = json.dumps(information)
-        response = requests.post(url=url, data=body, headers=self.elastic_headers, verify=self.verify)
+        response = requests.post(url=url, data=body, headers=self.elastic_headers, verify=self.verify, timeout=self.timeout)
         return response
 
     @staticmethod

{brynq_sdk_elastic-2.2.0 → brynq_sdk_elastic-2.2.2}/brynq_sdk_elastic.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq-sdk-elastic
-Version: 2.2.0
+Version: 2.2.2
 Summary: elastic wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_elastic-2.2.0 → brynq_sdk_elastic-2.2.2}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup
 
 setup(
     name='brynq_sdk_elastic',
-    version='2.2.0',
+    version='2.2.2',
     description='elastic wrapper from BrynQ',
     long_description='elastic wrapper from BrynQ',
     author='BrynQ',