From 7157ed9409d5e5206804a78e00ea4b92bce8b447 Mon Sep 17 00:00:00 2001 From: yaojiping Date: Thu, 13 Feb 2025 11:40:17 +0800 Subject: [PATCH 1/2] chore: add `Copy request` to alerting chart --- .../View/Widget/WidgetBody/Chart.jsx | 16 +++- .../DataManagement/View/Widget/index.jsx | 6 +- .../DataManagement/View/WidgetLoader.jsx | 75 ++++++++++++------- .../DataManagement/View/WidgetLoader.less | 49 +++++++++++- web/src/pages/System/Cluster/Form.js | 7 +- .../pages/System/Cluster/models/cluster.js | 2 +- 6 files changed, 118 insertions(+), 37 deletions(-) diff --git a/web/src/pages/DataManagement/View/Widget/WidgetBody/Chart.jsx b/web/src/pages/DataManagement/View/Widget/WidgetBody/Chart.jsx index f652094e..49ae4a3e 100644 --- a/web/src/pages/DataManagement/View/Widget/WidgetBody/Chart.jsx +++ b/web/src/pages/DataManagement/View/Widget/WidgetBody/Chart.jsx @@ -54,7 +54,8 @@ export default (props) => { isEdit, fetchParamsCache, handleContextMenu, - isFullScreen + isFullScreen, + onResultChange } = props; const { series = [] } = record; @@ -99,6 +100,7 @@ export default (props) => { if (!refresh) { setLoading(true) setData() + onResultChange && onResultChange() } if (isTimeSeries && !range) { @@ -189,8 +191,10 @@ export default (props) => { } res.hits.hits = res.hits.hits || []; setData(res.hits) + onResultChange && onResultChange(res) } } else { + const index_pattern = indices.join(',') const bodys = metrics.map((item) => { const { groups = [] } = item; let newGroups = cloneDeep(groups); @@ -204,7 +208,7 @@ export default (props) => { return { cluster_id, filter, - index_pattern: indices.join(','), + index_pattern, time_field: time_field, ...item, items: item.items || [], @@ -219,6 +223,7 @@ export default (props) => { if (res) { if (res.some((item) => item.status === 403)) { setData({ error: 403 }) + onResultChange && onResultChange() setLoading(false); return; } @@ -269,8 +274,15 @@ export default (props) => { } } setData(newData) + onResultChange && onResultChange(res.map((item) => ( + { + ...item, + request: item.request ? `GET ${index_pattern}/_search\n${item.request}` : undefined + } + ))) } else { setData([]) + onResultChange && onResultChange() } } setLoading(false); diff --git a/web/src/pages/DataManagement/View/Widget/index.jsx b/web/src/pages/DataManagement/View/Widget/index.jsx index 2f1c225a..63d0175b 100644 --- a/web/src/pages/DataManagement/View/Widget/index.jsx +++ b/web/src/pages/DataManagement/View/Widget/index.jsx @@ -41,7 +41,8 @@ export default (props) => { queriesBarParams, isFullScreen, hideHeader, - displayOptions={} + displayOptions={}, + onResultChange, } = props; const [cacheRecord, setCacheRecord] = useState(record) @@ -251,7 +252,8 @@ export default (props) => { fetchParamsCache={fetchParamsCacheRef} queriesBarParams={queriesBarParams} handleContextMenu={handleContextMenu} - isFullScreen={isFullScreen} + isFullScreen={isFullScreen} + onResultChange={onResultChange} /> { - const { widget, range, query, queryParams = {}, highlightRange = {}, refresh } = props; + const { widget, range, query, queryParams = {}, highlightRange = {}, refresh, showCopy = true } = props; const [globalRangeCache, setGlobalRangeCache] = useState() + const [requests, setRequests] = useState([]) const filters = useMemo(() => { const newFilters = [] @@ -41,32 +44,48 @@ export const WidgetRender = (props) => { return ( widget ? ( - {}} - onClone={() => {}} - onRemove={() => {}} - onSave={() => {}} - onFullElement={() => {}} - clusterList={[]} - highlightRange={highlightRange} - onHighlightRangeChange={() => {}} - /> +
+ { + showCopy && requests.length > 0 && ( + + +
message.success(formatMessage({id: "cluster.metrics.request.copy.success"}))}> + +
+ + + ) + } + {}} + onClone={() => {}} + onRemove={() => {}} + onSave={() => {}} + onFullElement={() => {}} + clusterList={[]} + highlightRange={highlightRange} + onHighlightRangeChange={() => {}} + onResultChange={(res) => { + setRequests(Array.isArray(res) ? res.filter((item) => !!item.request).map((item) => item.request) : []) + }} + /> +
) : ) } diff --git a/web/src/pages/DataManagement/View/WidgetLoader.less b/web/src/pages/DataManagement/View/WidgetLoader.less index 5a95f919..111b457c 100644 --- a/web/src/pages/DataManagement/View/WidgetLoader.less +++ b/web/src/pages/DataManagement/View/WidgetLoader.less @@ -10,4 +10,51 @@ height: 100%; } } -} \ No newline at end of file +} + +.content { + width: 100%; + height: 100%; + position: relative; + .copy { + position: absolute; + display: none; + right: 0px; + top: 0px; + width: 24px; + height: 24px; + border-radius: 4px; + line-height: 24px; + text-align: center; + font-size: 16px; + box-shadow: rgba(0, 0, 0, 0.16) 0px 0px 5px 0px; + background: #fff; + z-index: 11; + cursor: pointer; + color: rgba(0, 0, 0, 0.45); + transition: all 0.3s ease; + + &:hover { + color: #1890ff; + box-shadow: rgba(0, 0, 0, 0.3) 0px 0px 5px 0px; + } + } + + &:hover { + .copy { + display: block; + } + } +} + +.copyTooltip { + :global { + .ant-tooltip-inner { + width: 100px; + } + } +} + + + + diff --git a/web/src/pages/System/Cluster/Form.js b/web/src/pages/System/Cluster/Form.js index dfca1ded..cef881e1 100644 --- a/web/src/pages/System/Cluster/Form.js +++ b/web/src/pages/System/Cluster/Form.js @@ -179,11 +179,11 @@ class ClusterForm extends React.Component { agent_credential_id: values.agent_credential_id !== MANUAL_VALUE && isAgentMode ? values.agent_credential_id - : agent_credential_id, - agent_basic_auth: isAgentMode ? { + : undefined, + agent_basic_auth: { username: values.agent_username, password: values.agent_password, - } : agent_basic_auth, + }, metric_collection_mode: values.metric_collection_mode || 'agentless', description: values.description, @@ -204,6 +204,7 @@ class ClusterForm extends React.Component { if (this.clusterUUID) { newVals.cluster_uuid = this.clusterUUID; } + if (clusterConfig.editMode === "NEW") { dispatch({ type: "clusterConfig/addCluster", diff --git a/web/src/pages/System/Cluster/models/cluster.js b/web/src/pages/System/Cluster/models/cluster.js index c31bbdd9..0e1d87fc 100644 --- a/web/src/pages/System/Cluster/models/cluster.js +++ b/web/src/pages/System/Cluster/models/cluster.js @@ -90,7 +90,7 @@ export default { }, *updateCluster({ payload }, { call, put, select }) { let res = yield call(updateClusterConfig, payload); - if (res.error) { + if (res?.error) { return false; } let { data } = yield select((state) => state.clusterConfig); From 13fbb7625695c842c8c90bb0bb484a0ca06dcbca Mon Sep 17 00:00:00 2001 From: yaojiping Date: Thu, 13 Feb 2025 11:44:42 +0800 Subject: [PATCH 2/2] chore: update release notes --- docs/content.en/docs/release-notes/_index.md | 4 +++- docs/content.zh/docs/release-notes/_index.md | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/content.en/docs/release-notes/_index.md b/docs/content.en/docs/release-notes/_index.md index f341a52a..cff427e7 100644 --- a/docs/content.en/docs/release-notes/_index.md +++ b/docs/content.en/docs/release-notes/_index.md @@ -18,7 +18,9 @@ Information about release notes of INFINI Console is provided here. ### Improvements -- add Buckets Diff to alerting rule +- add Copy request to alerting chart +- add credential settings for agent in enrolling agent +- add collection mode to cluster editing ## 1.28.1 (2025-01-24) diff --git a/docs/content.zh/docs/release-notes/_index.md b/docs/content.zh/docs/release-notes/_index.md index b1647f61..3aa547c4 100644 --- a/docs/content.zh/docs/release-notes/_index.md +++ b/docs/content.zh/docs/release-notes/_index.md @@ -17,7 +17,7 @@ title: "版本历史" ### Improvements -- 告警规则新增分桶对比 +- 告警图表新增复制请求 - 在注册 Agent 中新增 Agent 凭据设置 - 在集群编辑中新增采集模式