hansjone/netx
1
0
Fork 0
mirror of https://github.com/hansjone/netx.git synced 2026-10-12 01:50:46 +08:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions

fix(oclaw-bridge): share alarm WSS auth with analyze token

Browse source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-06-22 11:22:38 +08:00
parent 1f1b42e8bf
commit 99e7b1557f
5 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.env.example
View file

@ -13,8 +13,7 @@ NETX_OCLAW_ANALYZE_TOKEN=
NETX_OCLAW_HEALTH_URL=http://127.0.0.1:8787/admin/api/ops-ai/health NETX_OCLAW_HEALTH_URL=http://127.0.0.1:8787/admin/api/ops-ai/health
NETX_OCLAW_ALARM_WS_ENABLED=false NETX_OCLAW_ALARM_WS_ENABLED=false
NETX_OCLAW_ALARM_WS_URL=ws://127.0.0.1:8787/ws/netx-bridge NETX_OCLAW_ALARM_WS_URL=ws://127.0.0.1:8787/ws/netx-bridge
# 告警 WSS 独立 token（对应 OClaw 的 OCLAW_NETX_BRIDGE_TOKEN，与 ANALYZE_TOKEN 分开） # 告警 WSS 鉴权与 NETX_OCLAW_ANALYZE_TOKEN 共用（OClaw 侧 OCLAW_OPS_AI_SHARED_TOKEN）
NETX_OCLAW_ALARM_WS_TOKEN=
NETX_UME_BASE_URL=https://10.227.157.143:18014 NETX_UME_BASE_URL=https://10.227.157.143:18014
NETX_UME_USERNAME= NETX_UME_USERNAME=
NETX_UME_PASSWORD= NETX_UME_PASSWORD=

1
netx_api/config.py
View file

@ -22,7 +22,6 @@ class Settings(BaseSettings):
oclaw_health_timeout_sec: float = 8.0 oclaw_health_timeout_sec: float = 8.0
oclaw_alarm_ws_enabled: bool = False oclaw_alarm_ws_enabled: bool = False
oclaw_alarm_ws_url: str = "ws://127.0.0.1:8787/ws/netx-bridge" oclaw_alarm_ws_url: str = "ws://127.0.0.1:8787/ws/netx-bridge"
oclaw_alarm_ws_token: str = ""
# UME RESTCONF integration # UME RESTCONF integration
ume_base_url: str = "" ume_base_url: str = ""
ume_username: str = "" ume_username: str = ""

2
netx_api/oclaw_alarm_forwarder.py
View file

@ -33,7 +33,7 @@ def _utc_now_iso() -> str:
def _bridge_token() -> str: def _bridge_token() -> str:
return str(getattr(settings, "oclaw_alarm_ws_token", "") or "").strip() return str(getattr(settings, "oclaw_analyze_token", "") or "").strip()
def _bridge_url() -> str: def _bridge_url() -> str:

2
web/src/i18n/en.ts
View file

@ -337,7 +337,7 @@ const en = {
}, },
keyAlert: { keyAlert: {
title: "AI alarm monitor (OClaw WhatsApp)", title: "AI alarm monitor (OClaw WhatsApp)",
help: "Match UME key alarms by notificationId and push via OClaw WebSocket. Uses NETX_OCLAW_ALARM_WS_URL + NETX_OCLAW_ALARM_WS_TOKEN (OClaw OCLAW_NETX_BRIDGE_TOKEN), separate from analyze token.", help: "Match UME key alarms by notificationId and push via OClaw WebSocket. Auth shares NETX_OCLAW_ANALYZE_TOKEN / OCLAW_OPS_AI_SHARED_TOKEN; set NETX_OCLAW_ALARM_WS_URL separately.",
ws: "OClaw WSS", ws: "OClaw WSS",
wsConnected: "connected", wsConnected: "connected",
wsDisconnected: "disconnected", wsDisconnected: "disconnected",

2
web/src/i18n/zh.ts
View file

@ -335,7 +335,7 @@ const zh = {
}, },
keyAlert: { keyAlert: {
title: "AI 告警监控（OClaw WhatsApp）", title: "AI 告警监控（OClaw WhatsApp）",
help: "按 notificationId 匹配 UME 关键告警，经 OClaw WebSocket 推送到 WhatsApp 群。使用独立配置：NETX_OCLAW_ALARM_WS_URL + NETX_OCLAW_ALARM_WS_TOKEN（对应 OClaw OCLAW_NETX_BRIDGE_TOKEN）。", help: "按 notificationId 匹配 UME 关键告警，经 OClaw WebSocket 推送到 WhatsApp 群。鉴权与 NETX_OCLAW_ANALYZE_TOKEN / OCLAW_OPS_AI_SHARED_TOKEN 共用；另需配置 NETX_OCLAW_ALARM_WS_URL。",
ws: "OClaw WSS", ws: "OClaw WSS",
wsConnected: "已连接", wsConnected: "已连接",
wsDisconnected: "未连接", wsDisconnected: "未连接",