add deboucne and more trigger debug

Author: elasticroentgen

service_monitor.py

@@ -2,6 +2,8 @@
 
 import os
 import logging
+import time
+from typing import Dict
 from kubernetes import client, config, watch
 from github import Github
 
@@ -19,39 +21,96 @@
 TENANT = os.environ.get('TENANT')
 PROJECT = os.environ.get('PROJECT')
 
-def trigger_github_workflow(gh_token, event_type):
+# Store the last trigger time for each service
+_last_trigger_times: Dict[str, float] = {}
+DEBOUNCE_INTERVAL = 180  # 3 minutes in seconds
+
+def trigger_github_workflow(gh_token: str, event_type: str, service_key: str) -> bool:
     """
-    Trigger GitHub Actions workflow with the specified parameters
+    Trigger GitHub Actions workflow with debouncing and detailed error logging
+    
+    Args:
+        gh_token: GitHub authentication token
+        event_type: Type of the Kubernetes event
+        service_key: Unique identifier for the service (namespace/name)
+        
+    Returns:
+        bool: True if workflow was triggered, False otherwise
     """
+    if not GITHUB_REPO:
+        logger.error("GITHUB_REPO environment variable not set")
+        return False
+    
+    if not WORKFLOW_FILE:
+        logger.error("WORKFLOW_FILE environment variable not set")
+        return False
+
+    current_time = time.time()
+    last_trigger_time = _last_trigger_times.get(service_key, 0)
+    
+    # Check if enough time has passed since the last trigger
+    if current_time - last_trigger_time < DEBOUNCE_INTERVAL:
+        logger.info(f"Skipping workflow trigger for {service_key} due to debouncing (last trigger was {int(current_time - last_trigger_time)} seconds ago)")
+        return False
+
     try:
+        logger.info(f"Connecting to GitHub repo: {GITHUB_REPO}")
         g = Github(gh_token)
         repo = g.get_repo(GITHUB_REPO)
 
+        # Get all workflows and log them for debugging
+        workflows = list(repo.get_workflows())
+        logger.info(f"Found {len(workflows)} workflows in repository")
+        for wf in workflows:
+            logger.info(f"Available workflow: {wf.path} (ID: {wf.id})")
+        
         # Get the workflow by filename
         workflow = None
-        for wf in repo.get_workflows():
+        for wf in workflows:
             if wf.path.endswith(WORKFLOW_FILE):
                 workflow = wf
+                logger.info(f"Found matching workflow: {wf.path} (ID: {wf.id})")
                 break
 
         if workflow is None:
-            logger.error(f"Workflow {WORKFLOW_FILE} not found")
+            logger.error(f"Workflow {WORKFLOW_FILE} not found in repository {GITHUB_REPO}")
             return False
 
-        # Create workflow dispatch event with inputs
-        workflow.create_dispatch(
-            ref="main",  # You might want to make this configurable
-            inputs={
-                "tenant": TENANT,
-                "project": PROJECT
-            }
-        )
+        # Prepare inputs
+        inputs = {
+            "tenant": TENANT or "",
+            "project": PROJECT or ""
+        }
+        
+        logger.info(f"Triggering workflow dispatch for {workflow.path} with inputs: {inputs}")
 
-        logger.info(f"Successfully triggered workflow for event: {event_type}")
-        return True
+        # Create workflow dispatch event with inputs
+        try:
+            workflow.create_dispatch(
+                ref="main",  # You might want to make this configurable
+                inputs=inputs
+            )
+            # Update the last trigger time only on successful dispatch
+            _last_trigger_times[service_key] = current_time
+            logger.info(f"Successfully triggered workflow {workflow.path} for event: {event_type} (service: {service_key})")
+            return True
+            
+        except Exception as dispatch_error:
+            logger.error(f"Failed to dispatch workflow: {str(dispatch_error)}")
+            # Try to get more details about the error
+            if hasattr(dispatch_error, 'response'):
+                response = getattr(dispatch_error, 'response')
+                if response:
+                    logger.error(f"GitHub API Response: {response.status_code} - {response.text}")
+            return False
 
     except Exception as e:
         logger.error(f"Failed to trigger workflow: {str(e)}")
+        # Try to get more details about the error
+        if hasattr(e, 'response'):
+            response = getattr(e, 'response')
+            if response:
+                logger.error(f"GitHub API Response: {response.status_code} - {response.text}")
         return False
 
 def watch_services():
@@ -81,7 +140,8 @@ def watch_services():
                 # Trigger workflow for relevant events
                 if event_type in ['ADDED', 'MODIFIED', 'DELETED']:
                     if GITHUB_TOKEN:
-                        trigger_github_workflow(GITHUB_TOKEN, event_type)
+                        service_key = f"{service.metadata.namespace}/{service.metadata.name}"
+                        trigger_github_workflow(GITHUB_TOKEN, event_type, service_key)
                     else:
                         logger.error("GITHUB_TOKEN environment variable not set")
 
@@ -103,7 +163,6 @@ def main():
         except Exception as e:
             logger.error(f"Error in main loop: {str(e)}")
             # Wait a bit before retrying
-            import time
             time.sleep(5)
 
 if __name__ == "__main__":