gsadmin/haproxy-openmanager
1
0
Fork 0
mirror of https://github.com/taylanbakircioglu/haproxy-openmanager.git synced 2026-09-21 18:13:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Include pool_id from cluster_id in placeholder-token agent registration path

Browse Source 
- Modified auto-registration when using placeholder token to query pool_id from cluster_id in heartbeat
- Previously pool_id was copied from placeholder agent (which was NULL)
- Now correctly fetches pool_id from haproxy_clusters table using cluster_id
- Added extensive debug logging for troubleshooting
- Fixes issue where agents were registered with NULL pool_id and not appearing in UI
This commit is contained in:
Taylan Bakırcıoğlu
2025-11-18 19:56:30 +03:00
committed by taylanbakircioglu
parent 761e7fae55
commit ba09eb70b9
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/routers/agent.py
+19 -3
View File
@@ -1232,6 +1232,21 @@ async def agent_heartbeat_by_name(
if placeholder_agent:
# Create new agent instead of updating placeholder (allows multiple agents per token)
logger.info(f"Creating new agent '{agent_name}' using token '{placeholder_agent['name']}'")
# Get pool_id from cluster_id if provided in heartbeat
pool_id_from_cluster = None
if heartbeat_dict.get('cluster_id'):
logger.info(f"AUTO-REGISTER DEBUG: Querying cluster_id {heartbeat_dict['cluster_id']} for pool_id")
cluster_pool = await conn.fetchrow("""
SELECT pool_id FROM haproxy_clusters WHERE id = $1
""", heartbeat_dict['cluster_id'])
logger.info(f"AUTO-REGISTER DEBUG: Cluster query result: {cluster_pool}")
if cluster_pool:
pool_id_from_cluster = cluster_pool['pool_id']
logger.info(f"Auto-register: Got pool_id {pool_id_from_cluster} from cluster_id {heartbeat_dict['cluster_id']}")
else:
logger.warning(f"AUTO-REGISTER DEBUG: No cluster_id in heartbeat for agent '{agent_name}'")
agent_id = await conn.fetchval("""
INSERT INTO agents (
name, api_key, api_key_name, api_key_created_at,
@@ -1240,11 +1255,12 @@ async def agent_heartbeat_by_name(
)
SELECT $1, api_key, api_key_name, api_key_created_at,
api_key_expires_at, api_key_created_by, 'online',
TRUE, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, pool_id
TRUE, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, $3
FROM agents WHERE id = $2
RETURNING id
""", agent_name, placeholder_agent['id'])
agent = {'id': agent_id, 'pool_id': placeholder_agent['pool_id']}
""", agent_name, placeholder_agent['id'], pool_id_from_cluster)
logger.info(f"Auto-registered new agent '{agent_name}' with ID {agent_id} and pool_id {pool_id_from_cluster}")
agent = {'id': agent_id, 'pool_id': pool_id_from_cluster}
else:
# Auto-register new agent
logger.info(f"Agent '{agent_name}' not found. Auto-registering...")