hy/hy-app-monitor
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support dashboard cdc mysql credentials

Browse Source
This commit is contained in:
zhx 2026-05-22 14:23:10 +08:00
parent 39603715be
commit 5a99fa46fd
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
monitors/yumi/service_release.py
View File

@ -1364,19 +1364,25 @@ def render_dashboard_cdc_env() -> str:
from .nacos import current_namespace, get_config_content from .nacos import current_namespace, get_config_content
namespace_id, _ = current_namespace() namespace_id, _ = current_namespace()
content = get_config_content(namespace_id, "common", "rds-config.yml") rds_content = get_config_content(namespace_id, "common", "rds-config.yml")
try:
cdc_content = get_config_content(namespace_id, "common", "dashboard-cdc-worker.yml")
except Exception: # noqa: BLE001
cdc_content = ""
def yaml_value(key: str) -> str: def yaml_value(content: str, key: str, *, required: bool = True) -> str:
match = re.search(rf"(?im)^\s*{re.escape(key)}\s*:\s*(.*?)\s*$", content) match = re.search(rf"(?im)^\s*{re.escape(key)}\s*:\s*(.*?)\s*$", content)
if not match: if not match:
raise RuntimeError(f"missing {key} in common/rds-config.yml") if required:
raise RuntimeError(f"missing {key} in nacos mysql config")
return ""
value = match.group(1).strip() value = match.group(1).strip()
if (value.startswith('"') and value.endswith('"')) or (value.startswith("'") and value.endswith("'")): if (value.startswith('"') and value.endswith('"')) or (value.startswith("'") and value.endswith("'")):
value = value[1:-1] value = value[1:-1]
return value return value
jdbc_url = ( jdbc_url = (
yaml_value("url") yaml_value(rds_content, "url")
.replace("jdbc:p6spy:mysql://", "mysql://", 1) .replace("jdbc:p6spy:mysql://", "mysql://", 1)
.replace("jdbc:mysql://", "mysql://", 1) .replace("jdbc:mysql://", "mysql://", 1)
) )
@ -1384,8 +1390,8 @@ def render_dashboard_cdc_env() -> str:
if not parsed.hostname: if not parsed.hostname:
raise RuntimeError("invalid rds-config url for dashboard cdc worker") raise RuntimeError("invalid rds-config url for dashboard cdc worker")
username = yaml_value("username") username = yaml_value(cdc_content, "username", required=False) or yaml_value(rds_content, "username")
password = yaml_value("password") password = yaml_value(cdc_content, "password", required=False) or yaml_value(rds_content, "password")
database = parsed.path.lstrip("/") or "likei" database = parsed.path.lstrip("/") or "likei"
addr = f"{parsed.hostname}:{parsed.port or 3306}" addr = f"{parsed.hostname}:{parsed.port or 3306}"
dsn = ( dsn = (