wf work

server/workflows/conditions.py

@@ -57,9 +57,7 @@ class ConditionGroup:
 
     def __init__(self, group_json):
 
-        mylog('none', ["[WF] json.dumps(group_json)"])
-        mylog('none', [json.dumps(group_json)])
-        mylog('none', [group_json])
+        mylog('verbose', [f"[WF] ConditionGroup json.dumps(group_json): {json.dumps(group_json)}"])
 
         self.logic = group_json.get("logic", "AND").upper()
         self.conditions = []
@@ -78,6 +76,6 @@ class ConditionGroup:
         elif self.logic == "OR":
             return any(results)
         else:
-            m = f"[WF] Unsupported logic: {self.logic}"
-            mylog('none', [m])
+            m = f"[WF] ConditionGroup unsupported logic: {self.logic}"
+            mylog('verbose', [m])
             raise ValueError(m)

server/workflows/manager.py

@@ -57,6 +57,8 @@ class WorkflowManager:
 
             # Ensure workflow is enabled before proceeding
             if workflow.get("enabled", "No").lower() == "yes":
+
+                mylog('debug', [f"[WF] Checking if '{event["GUID"]}' triggers the workflow '{workflow["name"]}'"])
                
                 # construct trigger object which also evaluates if the current event triggers it
                 trigger = Trigger(workflow["trigger"], event, self.db)

server/workflows/triggers.py

@@ -1,4 +1,5 @@
 import sys
+import json
 
 # Register NetAlertX directories
 INSTALL_PATH="/app"
@@ -7,6 +8,7 @@ sys.path.extend([f"{INSTALL_PATH}/server"])
 import conf
 from logger import mylog, Logger
 from helper import get_setting_value, timeNowTZ
+from database import get_array_from_sql_rows
 
 # Make sure log level is initialized correctly
 Logger(get_setting_value('LOG_LEVEL'))
@@ -27,7 +29,8 @@ class Trigger:
         self.event = event  # Store the triggered event context, if provided
         self.triggered = self.object_type == event["ObjectType"] and self.event_type == event["AppEventType"]
 
-        mylog('verbose', [f"[WF] self.triggered '{self.triggered}'"])
+        mylog('debug', [f"""[WF] self.triggered '{self.triggered}' for event '{get_array_from_sql_rows(event)} and trigger {json.dumps(triggerJson)}' """])
+
 
         if self.triggered:
             # object type corresponds with the DB table name