Skip to content

Commit fa8af6f

Browse files
author
yaojiping
committed
feat: add logs to node's monitor
1 parent f592efa commit fa8af6f

File tree

6 files changed

+43
-36
lines changed

6 files changed

+43
-36
lines changed

web/src/components/Overview/Monitor/index.jsx

+6-2
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,10 @@ const Monitor = (props) => {
119119
setParam({ ...param, timeRange: state.timeRange, timeInterval: state.timeInterval, timeout: state.timeout });
120120
}, [state.timeRange, state.timeInterval, state.timeout]);
121121

122-
const handleTimeChange = useCallback(({ start, end, timeInterval, timeout, refresh }) => {
122+
const handleTimeChange = ({ start, end, timeInterval, timeout, refresh }) => {
123123
setState(initState({
124124
...state,
125+
param,
125126
timeRange: {
126127
min: start,
127128
max: end,
@@ -130,11 +131,12 @@ const Monitor = (props) => {
130131
timeout: timeout || state.timeout,
131132
refresh
132133
}));
133-
}, [state])
134+
}
134135

135136
const onInfoChange = (info) => {
136137
setState({
137138
...state,
139+
param,
138140
info,
139141
});
140142
};
@@ -194,6 +196,7 @@ const Monitor = (props) => {
194196
})
195197
setState({
196198
...state,
199+
param,
197200
timeInterval: timeSetting.timeInterval,
198201
timeout: timeSetting.timeout
199202
});
@@ -249,6 +252,7 @@ const Monitor = (props) => {
249252
})
250253
setState({
251254
...state,
255+
param,
252256
timeInterval,
253257
});
254258
}}

web/src/pages/Platform/Overview/Cluster/Monitor/Logs.jsx

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { Empty, Input, Spin, Table } from "antd";
2-
import styles from "./Logs.less"
32
import { formatMessage } from "umi/locale";
43
import { Link } from "umi";
54
import Logs from "../../components/Logs";
@@ -11,7 +10,7 @@ const AGGS = {
1110
}
1211

1312
export default (props) => {
14-
const { clusterID } = props;
13+
const { clusterID, param = {} } = props;
1514

1615
return (
1716
<Logs
@@ -31,6 +30,14 @@ export default (props) => {
3130
dataIndex: "metadata.labels.node_name",
3231
width: 88,
3332
ellipsis: true,
33+
render: (value, record) => {
34+
if (!record.metadata?.labels?.node_uuid) return value
35+
return (
36+
<Link to={`/cluster/monitor/${clusterID}/nodes/${record.metadata.labels.node_uuid}?_g=${encodeURIComponent(JSON.stringify(param))}`}>
37+
{value}
38+
</Link>
39+
)
40+
}
3441
},
3542
]}
3643
/>

web/src/pages/Platform/Overview/Cluster/Monitor/Logs.less

-29
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import { Empty, Input, Spin, Table } from "antd";
2+
import { formatMessage } from "umi/locale";
3+
import Logs from "../../components/Logs";
4+
5+
const AGGS = {
6+
"Type":{"terms":{"field":"metadata.name", "size": 1000 }},
7+
"Level":{"terms":{"field":"payload.level", "size": 1000 }},
8+
}
9+
10+
export default (props) => {
11+
const { nodeID } = props;
12+
13+
return (
14+
<Logs
15+
{...props}
16+
aggs={AGGS}
17+
queryFilters={[
18+
{
19+
"term": {
20+
"metadata.labels.node_uuid": nodeID
21+
}
22+
}
23+
]}
24+
/>
25+
);
26+
}

web/src/pages/Platform/Overview/Node/Monitor/index.jsx

+2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ import { formatMessage } from "umi/locale";
66
import Monitor from "@/components/Overview/Monitor";
77
import StatisticBar from "./statistic_bar";
88
import { connect } from "dva";
9+
import Logs from "./Logs";
910

1011
const panes = [
1112
{ title: "Overview", component: Overview, key: "overview" },
1213
{ title: "Advanced", component: Advanced, key: "advanced" },
14+
{ title: "Logs", component: Logs, key: "logs" },
1315
{ title: "Shards", component: Shards, key: "shards" },
1416
];
1517
const Page = (props) => {

web/src/pages/Platform/Overview/components/Logs/index.less

-3
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,5 @@
2222
border-radius: 2px;
2323
margin-bottom: 16px;
2424
}
25-
26-
.table {
27-
}
2825
}
2926
}

0 commit comments

Comments
 (0)