floraachy
/
console
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modify alert bug

This commit is contained in:
silenceqi 2021-09-07 10:03:40 +08:00
parent 13ce75d197
commit e01c081ed1
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/components/kibana/console/components/request_status_bar/request_status_bar.tsx
View File

@ -68,7 +68,7 @@ export const RequestStatusBar: FunctionComponent<Props> = ({
let content: React.ReactNode = null; let content: React.ReactNode = null;
const clusterContent = (<EuiFlexItem grow={false} style={{marginRight:'auto'}}> const clusterContent = (<EuiFlexItem grow={false} style={{marginRight:'auto'}}>
<EuiBadge> <EuiBadge>
{selectedCluster.endpoint}&nbsp;-&nbsp;{selectedCluster.version} {selectedCluster.host}&nbsp;-&nbsp;{selectedCluster.version}
</EuiBadge> </EuiBadge>
</EuiFlexItem>); </EuiFlexItem>);

5
web/src/models/global.js
View File

@ -58,6 +58,7 @@ export default {
name: item.name, name: item.name,
id: item.id, id: item.id,
endpoint: item.endpoint, endpoint: item.endpoint,
host: item.host,
version: item.version, version: item.version,
}; };
}) })
@ -131,10 +132,10 @@ export default {
if(pathname && global.selectedClusterID){ if(pathname && global.selectedClusterID){
const newPart = `/elasticsearch/${global.selectedClusterID}/`; const newPart = `/elasticsearch/${global.selectedClusterID}/`;
if(!pathname.includes('elasticsearch')){ if(!pathname.includes('elasticsearch')){
history.replace(pathname+newPart+search) history.replace(pathname+newPart+ (search || ''))
}else{ }else{
const newPath = pathname.replace(/\/elasticsearch\/(\w+)\/?/, newPart); const newPath = pathname.replace(/\/elasticsearch\/(\w+)\/?/, newPart);
history.replace(newPath+search) history.replace(newPath+(search || ''))
} }
} }
}, },

4
web/src/pages/System/Cluster/Index.js
View File

@ -93,8 +93,8 @@ class Index extends React.Component {
} }
},{ },{
title: '集群地址', title: '集群地址',
dataIndex: 'endpoint', dataIndex: 'host',
key: 'endpoint', key: 'host',
}, },
{ {
title: '监控启用状态', title: '监控启用状态',