[client] Align playbook and metric log / add util function in logger (#521)

Author: richard-julien

pycti/api/opencti_api_playbook.py

@@ -5,7 +5,9 @@ def __init__(self, api):
         self.api = api
 
     def playbook_step_execution(self, playbook: dict, bundle: str):
-        self.api.app_logger.info("Executing playbook step", playbook["playbook_id"])
+        self.api.app_logger.info(
+            "Executing playbook step", {"playbook_id": playbook["playbook_id"]}
+        )
         query = """
             mutation PlaybookStepExecution($execution_id: ID!, $execution_start: DateTime!, $data_instance_id: ID!, $playbook_id: ID!, $previous_step_id: ID!, $step_id: ID!, $previous_bundle: String!, $bundle: String!) {
                 playbookStepExecution(execution_id: $execution_id, execution_start: $execution_start, data_instance_id: $data_instance_id, playbook_id: $playbook_id, previous_step_id: $previous_step_id, step_id: $step_id, previous_bundle: $previous_bundle, bundle: $bundle)

pycti/connector/opencti_metric_handler.py

@@ -4,7 +4,7 @@
 
 
 class OpenCTIMetricHandler:
-    def __init__(self, logger, activated: bool = False, port: int = 9095):
+    def __init__(self, connector_logger, activated: bool = False, port: int = 9095):
         """
         Init of OpenCTIMetricHandler class.
 
@@ -16,9 +16,9 @@ def __init__(self, logger, activated: bool = False, port: int = 9095):
             Port for prometheus server.
         """
         self.activated = activated
-        self.logger = logger
+        self.connector_logger = connector_logger
         if self.activated:
-            logger.info(f"Exposing metrics on port {port}")
+            self.connector_logger.info("Exposing metrics on port", {"port": port})
             start_http_server(port)
             self._metrics = {
                 "bundle_send": Counter(
@@ -75,10 +75,10 @@ def _metric_exists(
             True if the metric exists and is of the correct type else False.
         """
         if name not in self._metrics:
-            self.logger.error("Metric does not exist.", {"name": name})
+            self.connector_logger.error("Metric does not exist.", {"name": name})
             return False
         if not isinstance(self._metrics[name], expected_type):
-            self.logger.error(
+            self.connector_logger.error(
                 "Metric not of expected type",
                 {"name": name, "expected_type": expected_type},
             )

pycti/utils/opencti_logger.py

@@ -18,8 +18,10 @@ def add_fields(self, log_record, record, message_dict):
 
 
 def logger(level, json_logging=True):
+    # Exceptions
     logging.getLogger("urllib3").setLevel(logging.WARNING)
     logging.getLogger("pika").setLevel(logging.ERROR)
+    # Exceptions
     if json_logging:
         log_handler = logging.StreamHandler()
         log_handler.setLevel(level)
@@ -37,6 +39,10 @@ def __init__(self, name):
         def prepare_meta(meta=None):
             return None if meta is None else {"attributes": meta}
 
+        @staticmethod
+        def setup_logger_level(lib, log_level):
+            logging.getLogger(lib).setLevel(log_level)
+
         def debug(self, message, meta=None):
             self.local_logger.debug(message, extra=AppLogger.prepare_meta(meta))