mirror of
https://github.com/hansjone/netx.git
synced 2026-10-09 05:30:46 +08:00
feat(UME): 增加后台任务监控并启用5分钟告警自动同步
新增当前告警自动同步后台线程(默认300s一次)并提供开关配置;在 /v1/ume/sync/status 返回 runtime_tasks,前端“当前任务”面板展示保活与自动同步运行状态;同时隐藏历史告警UI但保留后端能力。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
parent
d0994f6e53
commit
84cf70cde3
5 changed files with 155 additions and 138 deletions
|
|
@ -4,7 +4,6 @@ import {
|
|||
apiPost,
|
||||
disconnectUmeToken,
|
||||
fetchUmeCurrentAlarms,
|
||||
fetchUmeHistoryAlarms,
|
||||
fetchUmeNe,
|
||||
fetchUmeSyncStatus,
|
||||
fetchUmeTokenStatus,
|
||||
|
|
@ -12,10 +11,6 @@ import {
|
|||
} from "../services/api";
|
||||
import { formatSystemTime } from "../utils/time";
|
||||
|
||||
function toIsoNoMs(d: Date): string {
|
||||
return d.toISOString().replace(/\.\d{3}Z$/, "Z");
|
||||
}
|
||||
|
||||
export function UmePage() {
|
||||
const queryClient = useQueryClient();
|
||||
const [tokenOpError, setTokenOpError] = useState("");
|
||||
|
|
@ -33,29 +28,12 @@ export function UmePage() {
|
|||
const [curPage, setCurPage] = useState(1);
|
||||
const [curPageSize, setCurPageSize] = useState(50);
|
||||
|
||||
const [hisSeverity, setHisSeverity] = useState("");
|
||||
const [hisNeId, setHisNeId] = useState("");
|
||||
const [hisKeyword, setHisKeyword] = useState("");
|
||||
const [hisTimeFrom, setHisTimeFrom] = useState("");
|
||||
const [hisTimeTo, setHisTimeTo] = useState("");
|
||||
const [hisPage, setHisPage] = useState(1);
|
||||
const [hisPageSize, setHisPageSize] = useState(50);
|
||||
|
||||
const applyQuickRange = (hours: number) => {
|
||||
const now = new Date();
|
||||
const from = new Date(now.getTime() - hours * 3600 * 1000);
|
||||
setHisTimeFrom(toIsoNoMs(from));
|
||||
setHisTimeTo(toIsoNoMs(now));
|
||||
setHisPage(1);
|
||||
};
|
||||
|
||||
const syncMutation = useMutation({
|
||||
mutationFn: async (domains: string[]) => apiPost<{ ok: boolean; jobs: unknown[] }>("/v1/ume/sync", { domains }),
|
||||
onSuccess: async () => {
|
||||
await queryClient.invalidateQueries({ queryKey: ["umeSyncStatus"] });
|
||||
await queryClient.invalidateQueries({ queryKey: ["umeNE"] });
|
||||
await queryClient.invalidateQueries({ queryKey: ["umeCurrentAlarms"] });
|
||||
await queryClient.invalidateQueries({ queryKey: ["umeHistoryAlarms"] });
|
||||
},
|
||||
});
|
||||
|
||||
|
|
@ -63,6 +41,7 @@ export function UmePage() {
|
|||
queryKey: ["umeSyncStatus", syncPage, syncPageSize],
|
||||
queryFn: () => fetchUmeSyncStatus({ page: syncPage, pageSize: syncPageSize }),
|
||||
staleTime: 5000,
|
||||
refetchInterval: 5000,
|
||||
});
|
||||
const tokenStatusQuery = useQuery({
|
||||
queryKey: ["umeTokenStatus"],
|
||||
|
|
@ -125,20 +104,8 @@ export function UmePage() {
|
|||
}),
|
||||
staleTime: 5000,
|
||||
});
|
||||
const historyQuery = useQuery({
|
||||
queryKey: ["umeHistoryAlarms", hisSeverity, hisNeId, hisKeyword, hisTimeFrom, hisTimeTo, hisPage, hisPageSize],
|
||||
queryFn: () =>
|
||||
fetchUmeHistoryAlarms({
|
||||
severity: hisSeverity,
|
||||
neId: hisNeId,
|
||||
keyword: hisKeyword,
|
||||
timeFrom: hisTimeFrom,
|
||||
timeTo: hisTimeTo,
|
||||
page: hisPage,
|
||||
pageSize: hisPageSize,
|
||||
}),
|
||||
staleTime: 5000,
|
||||
});
|
||||
const runningTasks = (syncStatusQuery.data?.items || []).filter((x) => String(x.status || "").toLowerCase() === "running");
|
||||
const runtimeTasks = syncStatusQuery.data?.runtime_tasks || [];
|
||||
|
||||
return (
|
||||
<>
|
||||
|
|
@ -183,10 +150,7 @@ export function UmePage() {
|
|||
<button onClick={() => syncMutation.mutate(["alarms_current"])} disabled={syncMutation.isPending}>
|
||||
同步当前告警
|
||||
</button>
|
||||
<button onClick={() => syncMutation.mutate(["alarms_history"])} disabled={syncMutation.isPending}>
|
||||
同步历史告警
|
||||
</button>
|
||||
<button onClick={() => syncMutation.mutate(["inventory", "alarms_current", "alarms_history"])} disabled={syncMutation.isPending}>
|
||||
<button onClick={() => syncMutation.mutate(["inventory", "alarms_current"])} disabled={syncMutation.isPending}>
|
||||
全量同步
|
||||
</button>
|
||||
</div>
|
||||
|
|
@ -194,6 +158,73 @@ export function UmePage() {
|
|||
</article>
|
||||
</section>
|
||||
|
||||
<section className="panel">
|
||||
<h2>当前任务</h2>
|
||||
<div className="actions-row actions-row--inline">
|
||||
<span className={`conn-pill conn-pill--${runningTasks.length > 0 ? "unknown" : "up"}`}>
|
||||
running: {runningTasks.length}
|
||||
</span>
|
||||
<button onClick={() => queryClient.invalidateQueries({ queryKey: ["umeSyncStatus"] })} disabled={syncStatusQuery.isFetching}>
|
||||
刷新
|
||||
</button>
|
||||
</div>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>ID</th>
|
||||
<th>domain</th>
|
||||
<th>trigger_mode</th>
|
||||
<th>status</th>
|
||||
<th>started_at</th>
|
||||
<th>error</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{runningTasks.map((x) => (
|
||||
<tr key={`running-${x.id}`}>
|
||||
<td>{x.id}</td>
|
||||
<td>{x.domain}</td>
|
||||
<td>{x.trigger_mode}</td>
|
||||
<td>{x.status}</td>
|
||||
<td>{formatSystemTime(x.started_at)}</td>
|
||||
<td>{x.error_message || "-"}</td>
|
||||
</tr>
|
||||
))}
|
||||
{!syncStatusQuery.isLoading && runningTasks.length === 0 && (
|
||||
<tr>
|
||||
<td colSpan={6}>当前无运行中的任务</td>
|
||||
</tr>
|
||||
)}
|
||||
</tbody>
|
||||
</table>
|
||||
<h3 style={{ marginTop: 12 }}>后台任务</h3>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>task</th>
|
||||
<th>status</th>
|
||||
<th>last_run_at</th>
|
||||
<th>last_error</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{runtimeTasks.map((x) => (
|
||||
<tr key={`runtime-${x.task}`}>
|
||||
<td>{x.task}</td>
|
||||
<td>{x.status}</td>
|
||||
<td>{x.last_run_at ? formatSystemTime(x.last_run_at) : "-"}</td>
|
||||
<td>{x.last_error || "-"}</td>
|
||||
</tr>
|
||||
))}
|
||||
{!syncStatusQuery.isLoading && runtimeTasks.length === 0 && (
|
||||
<tr>
|
||||
<td colSpan={4}>暂无后台任务状态</td>
|
||||
</tr>
|
||||
)}
|
||||
</tbody>
|
||||
</table>
|
||||
</section>
|
||||
|
||||
<section className="panel">
|
||||
<h2>同步状态</h2>
|
||||
<div className="actions-row actions-row--inline">
|
||||
|
|
@ -453,102 +484,6 @@ export function UmePage() {
|
|||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section className="panel">
|
||||
<h2>历史告警</h2>
|
||||
<div className="filter-inline">
|
||||
<input value={hisKeyword} placeholder="keyword" onChange={(e) => setHisKeyword(e.target.value)} />
|
||||
<input value={hisNeId} placeholder="ne_id" onChange={(e) => setHisNeId(e.target.value)} />
|
||||
<input value={hisTimeFrom} placeholder="time_from(ISO8601)" onChange={(e) => setHisTimeFrom(e.target.value)} />
|
||||
<input value={hisTimeTo} placeholder="time_to(ISO8601)" onChange={(e) => setHisTimeTo(e.target.value)} />
|
||||
<select value={hisSeverity} onChange={(e) => setHisSeverity(e.target.value)}>
|
||||
<option value="">全部级别</option>
|
||||
<option value="critical">critical</option>
|
||||
<option value="major">major</option>
|
||||
<option value="minor">minor</option>
|
||||
<option value="warning">warning</option>
|
||||
<option value="info">info</option>
|
||||
</select>
|
||||
</div>
|
||||
<div className="actions-row actions-row--inline">
|
||||
<button onClick={() => applyQuickRange(1)}>最近1小时</button>
|
||||
<button onClick={() => applyQuickRange(24)}>最近24小时</button>
|
||||
<button onClick={() => applyQuickRange(24 * 7)}>最近7天</button>
|
||||
<button
|
||||
onClick={() => {
|
||||
setHisTimeFrom("");
|
||||
setHisTimeTo("");
|
||||
setHisPage(1);
|
||||
}}
|
||||
>
|
||||
清空时间
|
||||
</button>
|
||||
</div>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>time_created</th>
|
||||
<th>severity</th>
|
||||
<th>user_label</th>
|
||||
<th>object_name</th>
|
||||
<th>cause</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{(historyQuery.data?.items || []).map((x) => (
|
||||
<tr key={x.alarm_key}>
|
||||
<td>{x.time_created}</td>
|
||||
<td>{x.perceived_severity}</td>
|
||||
<td>
|
||||
<button
|
||||
className="link-btn"
|
||||
onClick={() => {
|
||||
setCurNeId(x.ne_id || "");
|
||||
setCurKeyword(x.user_label || x.ne_name || x.ne_id || "");
|
||||
setCurPage(1);
|
||||
}}
|
||||
>
|
||||
{x.user_label || x.ne_name || x.ne_id}
|
||||
</button>
|
||||
</td>
|
||||
<td>{x.object_name}</td>
|
||||
<td>{x.native_probable_cause}</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
<div className="pager">
|
||||
<div className="pager__meta">
|
||||
共 {historyQuery.data?.total || 0} 条 · 第 {hisPage}/
|
||||
{Math.max(1, Math.ceil(Math.max(0, Number(historyQuery.data?.total || 0)) / Math.max(1, hisPageSize)))} 页
|
||||
</div>
|
||||
<div className="pager__controls">
|
||||
<button className="pager__btn" onClick={() => setHisPage(Math.max(1, hisPage - 1))} disabled={hisPage <= 1}>
|
||||
上一页
|
||||
</button>
|
||||
<button
|
||||
className="pager__btn"
|
||||
onClick={() => setHisPage(hisPage + 1)}
|
||||
disabled={hisPage >= Math.max(1, Math.ceil(Math.max(0, Number(historyQuery.data?.total || 0)) / Math.max(1, hisPageSize)))}
|
||||
>
|
||||
下一页
|
||||
</button>
|
||||
<select
|
||||
className="pager__size"
|
||||
value={String(hisPageSize)}
|
||||
onChange={(e) => {
|
||||
setHisPageSize(Number(e.target.value) || 50);
|
||||
setHisPage(1);
|
||||
}}
|
||||
>
|
||||
<option value="50">50/页</option>
|
||||
<option value="100">100/页</option>
|
||||
<option value="200">200/页</option>
|
||||
<option value="500">500/页</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -93,6 +93,12 @@ export type UmeSyncStatusResponse = {
|
|||
page_size?: number;
|
||||
items: UmeSyncJobItem[];
|
||||
latest_by_domain?: Record<string, UmeSyncJobItem>;
|
||||
runtime_tasks?: Array<{
|
||||
task: string;
|
||||
status: string;
|
||||
last_run_at?: string | null;
|
||||
last_error?: string;
|
||||
}>;
|
||||
};
|
||||
|
||||
export type UmeNeItem = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue