From b73ae4e5fb24a88d3761f91cc4c9362424210c9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Murat=20=C3=96ZDEM=C4=B0R?= Date: Fri, 26 Jun 2026 21:55:42 +0300 Subject: [PATCH] revert(health-agent): revert ping monitors back to PING type --- health-agent/scripts/setup_uptime_kuma.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/health-agent/scripts/setup_uptime_kuma.py b/health-agent/scripts/setup_uptime_kuma.py index 41b0486..376abbf 100644 --- a/health-agent/scripts/setup_uptime_kuma.py +++ b/health-agent/scripts/setup_uptime_kuma.py @@ -246,11 +246,10 @@ def setup_uptime_kuma(dry_run=False, only=None): except Exception as e: logger.warning(f"Failed to create DNS monitor {m_name}: {e}") - # 5. TCP Port Monitors (generated from nodes config; ICMP is blocked from Docker, use TCP SSH port) + # 5. Ping Monitors (generated from nodes config) ping_cfg = config.get("ping_monitors", {}) ping_interval = ping_cfg.get("interval", 60) ping_retries = ping_cfg.get("max_retries", 1) - ping_port = ping_cfg.get("port", 22) env_nodes = config.get("nodes", {}).get(env_name, {}) for i, node in enumerate(env_nodes.get("service", []), 1): @@ -261,17 +260,16 @@ def setup_uptime_kuma(dry_run=False, only=None): parent_group_id = find_parent_group(m_name, config.get("groups", []), group_map) notif_ids = find_group_notifications(m_name, config.get("groups", []), notification_map) - logger.info(f"Processing TCP port monitor: {m_name} -> {ip}:{ping_port}") + logger.info(f"Processing Ping monitor: {m_name} -> {ip}") if not dry_run: if m_name in existing_monitors: logger.info(f"Monitor {m_name} already exists.") else: try: kwargs = { - "type": MonitorType.PORT, + "type": MonitorType.PING, "name": m_name, "hostname": ip, - "port": ping_port, "interval": ping_interval, "maxretries": ping_retries, } @@ -280,9 +278,9 @@ def setup_uptime_kuma(dry_run=False, only=None): if notif_ids: kwargs["notificationIDList"] = notif_ids api.add_monitor(**kwargs) - logger.info(f"Created TCP port monitor: {m_name}") + logger.info(f"Created Ping monitor: {m_name}") except Exception as e: - logger.warning(f"Failed to create TCP port monitor {m_name}: {e}") + logger.warning(f"Failed to create Ping monitor {m_name}: {e}") for i, node in enumerate(env_nodes.get("db", []), 1): m_name = f"Ext Ping Db{i:02d}" @@ -292,17 +290,16 @@ def setup_uptime_kuma(dry_run=False, only=None): parent_group_id = find_parent_group(m_name, config.get("groups", []), group_map) notif_ids = find_group_notifications(m_name, config.get("groups", []), notification_map) - logger.info(f"Processing TCP port monitor: {m_name} -> {ip}:{ping_port}") + logger.info(f"Processing Ping monitor: {m_name} -> {ip}") if not dry_run: if m_name in existing_monitors: logger.info(f"Monitor {m_name} already exists.") else: try: kwargs = { - "type": MonitorType.PORT, + "type": MonitorType.PING, "name": m_name, "hostname": ip, - "port": ping_port, "interval": ping_interval, "maxretries": ping_retries, } @@ -311,9 +308,9 @@ def setup_uptime_kuma(dry_run=False, only=None): if notif_ids: kwargs["notificationIDList"] = notif_ids api.add_monitor(**kwargs) - logger.info(f"Created TCP port monitor: {m_name}") + logger.info(f"Created Ping monitor: {m_name}") except Exception as e: - logger.warning(f"Failed to create TCP port monitor {m_name}: {e}") + logger.warning(f"Failed to create Ping monitor {m_name}: {e}") # 6. Status Pages if api: