UME current alarms: filter by host_name instead of ne_id in UI

GET /v1/ume/alarms accepts host_name (contains on inventory); ne_id query kept for API clients. Web uses host_name field and link on host column.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-05-11 19:11:55 +08:00
parent 3728e4db71
commit edad7b24fa
3 changed files with 32 additions and 20 deletions

View file

@ -653,6 +653,7 @@ def ume_list_alarms(
severity: str | None = Query(default=None), severity: str | None = Query(default=None),
is_cleared: str | None = Query(default=None), is_cleared: str | None = Query(default=None),
ne_id: str | None = Query(default=None), ne_id: str | None = Query(default=None),
host_name: str | None = Query(default=None),
keyword: str | None = Query(default=None), keyword: str | None = Query(default=None),
page: int = Query(default=1, ge=1), page: int = Query(default=1, ge=1),
page_size: int = Query(default=50, ge=1, le=500), page_size: int = Query(default=50, ge=1, le=500),
@ -667,6 +668,9 @@ def ume_list_alarms(
stmt = stmt.filter(UmeAlarmCurrent.is_cleared == str(is_cleared).strip()) stmt = stmt.filter(UmeAlarmCurrent.is_cleared == str(is_cleared).strip())
if ne_id and str(ne_id).strip(): if ne_id and str(ne_id).strip():
stmt = stmt.filter(UmeAlarmCurrent.ne_id == str(ne_id).strip()) stmt = stmt.filter(UmeAlarmCurrent.ne_id == str(ne_id).strip())
hn = str(host_name or "").strip()
if hn:
stmt = stmt.filter(UmeInventoryNE.host_name.contains(hn))
kw = str(keyword or "").strip() kw = str(keyword or "").strip()
if kw: if kw:
stmt = stmt.filter( stmt = stmt.filter(

View file

@ -23,7 +23,7 @@ export function UmePage() {
const [curSeverity, setCurSeverity] = useState(""); const [curSeverity, setCurSeverity] = useState("");
const [curCleared, setCurCleared] = useState(""); const [curCleared, setCurCleared] = useState("");
const [curNeId, setCurNeId] = useState(""); const [curHostName, setCurHostName] = useState("");
const [curKeyword, setCurKeyword] = useState(""); const [curKeyword, setCurKeyword] = useState("");
const [curPage, setCurPage] = useState(1); const [curPage, setCurPage] = useState(1);
const [curPageSize, setCurPageSize] = useState(50); const [curPageSize, setCurPageSize] = useState(50);
@ -92,12 +92,12 @@ export function UmePage() {
staleTime: 5000, staleTime: 5000,
}); });
const currentQuery = useQuery({ const currentQuery = useQuery({
queryKey: ["umeCurrentAlarms", curSeverity, curCleared, curNeId, curKeyword, curPage, curPageSize], queryKey: ["umeCurrentAlarms", curSeverity, curCleared, curHostName, curKeyword, curPage, curPageSize],
queryFn: () => queryFn: () =>
fetchUmeCurrentAlarms({ fetchUmeCurrentAlarms({
severity: curSeverity, severity: curSeverity,
isCleared: curCleared, isCleared: curCleared,
neId: curNeId, hostName: curHostName,
keyword: curKeyword, keyword: curKeyword,
page: curPage, page: curPage,
pageSize: curPageSize, pageSize: curPageSize,
@ -419,7 +419,7 @@ export function UmePage() {
placeholder="keyword(告警键/原因/ne_name/host_name/ip 等)" placeholder="keyword(告警键/原因/ne_name/host_name/ip 等)"
onChange={(e) => setCurKeyword(e.target.value)} onChange={(e) => setCurKeyword(e.target.value)}
/> />
<input value={curNeId} placeholder="ne_id" onChange={(e) => setCurNeId(e.target.value)} /> <input value={curHostName} placeholder="host_name(含匹配)" onChange={(e) => setCurHostName(e.target.value)} />
<select value={curSeverity} onChange={(e) => setCurSeverity(e.target.value)}> <select value={curSeverity} onChange={(e) => setCurSeverity(e.target.value)}>
<option value="">全部级别</option> <option value="">全部级别</option>
<option value="critical">critical</option> <option value="critical">critical</option>
@ -435,15 +435,15 @@ export function UmePage() {
</select> </select>
<button <button
type="button" type="button"
title="清空 keyword、ne_id、级别、is_cleared,回到第 1 页" title="清空 keyword、host_name、级别、is_cleared,回到第 1 页"
onClick={() => { onClick={() => {
setCurKeyword(""); setCurKeyword("");
setCurNeId(""); setCurHostName("");
setCurSeverity(""); setCurSeverity("");
setCurCleared(""); setCurCleared("");
setCurPage(1); setCurPage(1);
}} }}
disabled={!curKeyword.trim() && !curNeId.trim() && !curSeverity && !curCleared} disabled={!curKeyword.trim() && !curHostName.trim() && !curSeverity && !curCleared}
> >
清除筛选 清除筛选
</button> </button>
@ -464,19 +464,27 @@ export function UmePage() {
<tr key={x.alarm_key}> <tr key={x.alarm_key}>
<td>{x.time_created}</td> <td>{x.time_created}</td>
<td>{x.perceived_severity}</td> <td>{x.perceived_severity}</td>
<td>{x.ne_id}</td>
<td> <td>
<button {(x.host_name || "").trim() ? (
className="link-btn" <button
onClick={() => { className="link-btn"
setCurNeId(x.ne_id || ""); type="button"
setCurKeyword(x.ne_name || x.host_name || x.native_probable_cause || ""); onClick={() => {
setCurPage(1); setCurHostName(x.host_name || "");
}} setCurKeyword("");
> setCurPage(1);
{x.ne_id} }}
</button> title="按该主机名筛选"
>
{x.host_name}
</button>
) : (
<span className="muted" title="无 host_name(需先同步网元)">
-
</span>
)}
</td> </td>
<td>{x.host_name ?? ""}</td>
<td>{x.ne_type ?? ""}</td> <td>{x.ne_type ?? ""}</td>
<td>{x.native_probable_cause}</td> <td>{x.native_probable_cause}</td>
</tr> </tr>

View file

@ -121,7 +121,7 @@ export const fetchUmeNe = (params: { keyword: string; page: number; pageSize: nu
export const fetchUmeCurrentAlarms = (params: { export const fetchUmeCurrentAlarms = (params: {
severity: string; severity: string;
isCleared: string; isCleared: string;
neId: string; hostName: string;
keyword: string; keyword: string;
page: number; page: number;
pageSize: number; pageSize: number;
@ -129,7 +129,7 @@ export const fetchUmeCurrentAlarms = (params: {
const p = new URLSearchParams(); const p = new URLSearchParams();
if (params.severity) p.set("severity", params.severity); if (params.severity) p.set("severity", params.severity);
if (params.isCleared) p.set("is_cleared", params.isCleared); if (params.isCleared) p.set("is_cleared", params.isCleared);
if (params.neId) p.set("ne_id", params.neId); if (params.hostName) p.set("host_name", params.hostName);
if (params.keyword) p.set("keyword", params.keyword); if (params.keyword) p.set("keyword", params.keyword);
p.set("page", String(Math.max(1, Number(params.page || 1)))); p.set("page", String(Math.max(1, Number(params.page || 1))));
p.set("page_size", String(Math.max(1, Math.min(500, Number(params.pageSize || 50))))); p.set("page_size", String(Math.max(1, Math.min(500, Number(params.pageSize || 50)))));