mirror of
https://github.com/hansjone/netx.git
synced 2026-10-09 05:30:46 +08:00
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:
parent
3728e4db71
commit
edad7b24fa
3 changed files with 32 additions and 20 deletions
|
|
@ -23,7 +23,7 @@ export function UmePage() {
|
|||
|
||||
const [curSeverity, setCurSeverity] = useState("");
|
||||
const [curCleared, setCurCleared] = useState("");
|
||||
const [curNeId, setCurNeId] = useState("");
|
||||
const [curHostName, setCurHostName] = useState("");
|
||||
const [curKeyword, setCurKeyword] = useState("");
|
||||
const [curPage, setCurPage] = useState(1);
|
||||
const [curPageSize, setCurPageSize] = useState(50);
|
||||
|
|
@ -92,12 +92,12 @@ export function UmePage() {
|
|||
staleTime: 5000,
|
||||
});
|
||||
const currentQuery = useQuery({
|
||||
queryKey: ["umeCurrentAlarms", curSeverity, curCleared, curNeId, curKeyword, curPage, curPageSize],
|
||||
queryKey: ["umeCurrentAlarms", curSeverity, curCleared, curHostName, curKeyword, curPage, curPageSize],
|
||||
queryFn: () =>
|
||||
fetchUmeCurrentAlarms({
|
||||
severity: curSeverity,
|
||||
isCleared: curCleared,
|
||||
neId: curNeId,
|
||||
hostName: curHostName,
|
||||
keyword: curKeyword,
|
||||
page: curPage,
|
||||
pageSize: curPageSize,
|
||||
|
|
@ -419,7 +419,7 @@ export function UmePage() {
|
|||
placeholder="keyword(告警键/原因/ne_name/host_name/ip 等)"
|
||||
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)}>
|
||||
<option value="">全部级别</option>
|
||||
<option value="critical">critical</option>
|
||||
|
|
@ -435,15 +435,15 @@ export function UmePage() {
|
|||
</select>
|
||||
<button
|
||||
type="button"
|
||||
title="清空 keyword、ne_id、级别、is_cleared,回到第 1 页"
|
||||
title="清空 keyword、host_name、级别、is_cleared,回到第 1 页"
|
||||
onClick={() => {
|
||||
setCurKeyword("");
|
||||
setCurNeId("");
|
||||
setCurHostName("");
|
||||
setCurSeverity("");
|
||||
setCurCleared("");
|
||||
setCurPage(1);
|
||||
}}
|
||||
disabled={!curKeyword.trim() && !curNeId.trim() && !curSeverity && !curCleared}
|
||||
disabled={!curKeyword.trim() && !curHostName.trim() && !curSeverity && !curCleared}
|
||||
>
|
||||
清除筛选
|
||||
</button>
|
||||
|
|
@ -464,19 +464,27 @@ export function UmePage() {
|
|||
<tr key={x.alarm_key}>
|
||||
<td>{x.time_created}</td>
|
||||
<td>{x.perceived_severity}</td>
|
||||
<td>{x.ne_id}</td>
|
||||
<td>
|
||||
<button
|
||||
className="link-btn"
|
||||
onClick={() => {
|
||||
setCurNeId(x.ne_id || "");
|
||||
setCurKeyword(x.ne_name || x.host_name || x.native_probable_cause || "");
|
||||
setCurPage(1);
|
||||
}}
|
||||
>
|
||||
{x.ne_id}
|
||||
</button>
|
||||
{(x.host_name || "").trim() ? (
|
||||
<button
|
||||
className="link-btn"
|
||||
type="button"
|
||||
onClick={() => {
|
||||
setCurHostName(x.host_name || "");
|
||||
setCurKeyword("");
|
||||
setCurPage(1);
|
||||
}}
|
||||
title="按该主机名筛选"
|
||||
>
|
||||
{x.host_name}
|
||||
</button>
|
||||
) : (
|
||||
<span className="muted" title="无 host_name(需先同步网元)">
|
||||
-
|
||||
</span>
|
||||
)}
|
||||
</td>
|
||||
<td>{x.host_name ?? ""}</td>
|
||||
<td>{x.ne_type ?? ""}</td>
|
||||
<td>{x.native_probable_cause}</td>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ export const fetchUmeNe = (params: { keyword: string; page: number; pageSize: nu
|
|||
export const fetchUmeCurrentAlarms = (params: {
|
||||
severity: string;
|
||||
isCleared: string;
|
||||
neId: string;
|
||||
hostName: string;
|
||||
keyword: string;
|
||||
page: number;
|
||||
pageSize: number;
|
||||
|
|
@ -129,7 +129,7 @@ export const fetchUmeCurrentAlarms = (params: {
|
|||
const p = new URLSearchParams();
|
||||
if (params.severity) p.set("severity", params.severity);
|
||||
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);
|
||||
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)))));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue