forked from elastic/kibana
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Stack Monitoring] ES Overview fix completed recoveries section (elas…
…tic#114179) (elastic#114629) * fix completed recoveries section * fix type * fix type Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Sandra G <neptunian@users.noreply.github.com>
- Loading branch information
1 parent
5707a2b
commit c5a0aaa
Showing
7 changed files
with
240 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
x-pack/plugins/monitoring/public/components/elasticsearch/overview/overview_react.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License | ||
* 2.0; you may not use this file except in compliance with the Elastic License | ||
* 2.0. | ||
*/ | ||
|
||
import React from 'react'; | ||
import { ClusterStatus } from '../cluster_status'; | ||
import { ShardActivityReact } from '../shard_activity'; | ||
import { MonitoringTimeseriesContainer } from '../../chart'; | ||
import { | ||
EuiPage, | ||
EuiFlexGrid, | ||
EuiFlexItem, | ||
EuiPanel, | ||
EuiSpacer, | ||
EuiPageBody, | ||
EuiPageContent, | ||
} from '@elastic/eui'; | ||
import { Logs } from '../../logs/logs'; | ||
|
||
export function ElasticsearchOverviewReact({ | ||
clusterStatus, | ||
metrics, | ||
logs, | ||
cluster, | ||
shardActivity, | ||
...props | ||
}) { | ||
const metricsToShow = [ | ||
metrics.cluster_search_request_rate, | ||
metrics.cluster_query_latency, | ||
metrics.cluster_index_request_rate, | ||
metrics.cluster_index_latency, | ||
]; | ||
|
||
return ( | ||
<EuiPage> | ||
<EuiPageBody> | ||
<EuiPanel> | ||
<ClusterStatus stats={clusterStatus} /> | ||
</EuiPanel> | ||
<EuiSpacer size="m" /> | ||
<EuiPageContent> | ||
<EuiFlexGrid columns={2} gutterSize="s"> | ||
{metricsToShow.map((metric, index) => ( | ||
<EuiFlexItem key={index}> | ||
<MonitoringTimeseriesContainer series={metric} {...props} /> | ||
<EuiSpacer /> | ||
</EuiFlexItem> | ||
))} | ||
</EuiFlexGrid> | ||
</EuiPageContent> | ||
<EuiSpacer size="m" /> | ||
<EuiPanel> | ||
<Logs logs={logs} clusterUuid={cluster.cluster_uuid} /> | ||
</EuiPanel> | ||
<EuiSpacer size="m" /> | ||
<EuiPanel> | ||
<ShardActivityReact data={shardActivity} {...props} /> | ||
</EuiPanel> | ||
</EuiPageBody> | ||
</EuiPage> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,3 +6,4 @@ | |
*/ | ||
|
||
export { ShardActivity } from './shard_activity'; | ||
export { ShardActivityReact } from './shard_activity_react'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
156 changes: 156 additions & 0 deletions
156
...plugins/monitoring/public/components/elasticsearch/shard_activity/shard_activity_react.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,156 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License | ||
* 2.0; you may not use this file except in compliance with the Elastic License | ||
* 2.0. | ||
*/ | ||
|
||
import React, { Fragment } from 'react'; | ||
import { EuiText, EuiTitle, EuiLink, EuiSpacer, EuiSwitch } from '@elastic/eui'; | ||
import { EuiMonitoringTable } from '../../table'; | ||
import { RecoveryIndex } from './recovery_index'; | ||
import { TotalTime } from './total_time'; | ||
import { SourceDestination } from './source_destination'; | ||
import { FilesProgress, BytesProgress, TranslogProgress } from './progress'; | ||
import { parseProps } from './parse_props'; | ||
import { i18n } from '@kbn/i18n'; | ||
import { FormattedMessage } from '@kbn/i18n/react'; | ||
import { useKibana } from '../../../../../../../src/plugins/kibana_react/public'; | ||
|
||
const columns = [ | ||
{ | ||
name: i18n.translate('xpack.monitoring.kibana.shardActivity.indexTitle', { | ||
defaultMessage: 'Index', | ||
}), | ||
field: 'name', | ||
render: (_name, shard) => <RecoveryIndex {...shard} />, | ||
}, | ||
{ | ||
name: i18n.translate('xpack.monitoring.kibana.shardActivity.stageTitle', { | ||
defaultMessage: 'Stage', | ||
}), | ||
field: 'stage', | ||
}, | ||
{ | ||
name: i18n.translate('xpack.monitoring.kibana.shardActivity.totalTimeTitle', { | ||
defaultMessage: 'Total Time', | ||
}), | ||
field: null, | ||
render: (shard) => <TotalTime {...shard} />, | ||
}, | ||
{ | ||
name: i18n.translate('xpack.monitoring.kibana.shardActivity.sourceDestinationTitle', { | ||
defaultMessage: 'Source / Destination', | ||
}), | ||
field: null, | ||
render: (shard) => <SourceDestination {...shard} />, | ||
}, | ||
{ | ||
name: i18n.translate('xpack.monitoring.kibana.shardActivity.filesTitle', { | ||
defaultMessage: 'Files', | ||
}), | ||
field: null, | ||
render: (shard) => <FilesProgress {...shard} />, | ||
}, | ||
{ | ||
name: i18n.translate('xpack.monitoring.kibana.shardActivity.bytesTitle', { | ||
defaultMessage: 'Bytes', | ||
}), | ||
field: null, | ||
render: (shard) => <BytesProgress {...shard} />, | ||
}, | ||
{ | ||
name: i18n.translate('xpack.monitoring.kibana.shardActivity.translogTitle', { | ||
defaultMessage: 'Translog', | ||
}), | ||
field: null, | ||
render: (shard) => <TranslogProgress {...shard} />, | ||
}, | ||
]; | ||
|
||
export const ShardActivityReact = (props) => { | ||
const { | ||
data: rawData, | ||
sorting, | ||
pagination, | ||
onTableChange, | ||
toggleShardActivityHistory, | ||
showShardActivityHistory, | ||
} = props; | ||
const { services } = useKibana(); | ||
const timezone = services.uiSettings?.get('dateFormat:tz'); | ||
const getNoDataMessage = () => { | ||
if (showShardActivityHistory) { | ||
return i18n.translate('xpack.monitoring.elasticsearch.shardActivity.noDataMessage', { | ||
defaultMessage: | ||
'There are no historical shard activity records for the selected time range.', | ||
}); | ||
} | ||
return ( | ||
<Fragment> | ||
<FormattedMessage | ||
id="xpack.monitoring.elasticsearch.shardActivity.noActiveShardRecoveriesMessage.completedRecoveriesLinkTextProblem" | ||
defaultMessage="There are no active shard recoveries for this cluster." | ||
/> | ||
<br /> | ||
<FormattedMessage | ||
id="xpack.monitoring.elasticsearch.shardActivity.noActiveShardRecoveriesMessage.completedRecoveriesLinkTextSolution" | ||
defaultMessage="Try viewing {shardActivityHistoryLink}." | ||
values={{ | ||
shardActivityHistoryLink: ( | ||
<EuiLink onClick={toggleShardActivityHistory}> | ||
<FormattedMessage | ||
id="xpack.monitoring.elasticsearch.shardActivity.noActiveShardRecoveriesMessage.completedRecoveriesLinkText" | ||
defaultMessage="completed recoveries" | ||
/> | ||
</EuiLink> | ||
), | ||
}} | ||
/> | ||
</Fragment> | ||
); | ||
}; | ||
|
||
const rows = rawData.map((data) => parseProps({ ...data, timezone })); | ||
|
||
return ( | ||
<Fragment> | ||
<EuiText> | ||
<EuiTitle size="s"> | ||
<h2> | ||
<FormattedMessage | ||
id="xpack.monitoring.elasticsearch.shardActivityTitle" | ||
defaultMessage="Shard Activity" | ||
/> | ||
</h2> | ||
</EuiTitle> | ||
</EuiText> | ||
<EuiSpacer /> | ||
<EuiSwitch | ||
id="monitoring_completed_recoveries" | ||
label={ | ||
<FormattedMessage | ||
id="xpack.monitoring.elasticsearch.shardActivity.completedRecoveriesLabel" | ||
defaultMessage="Completed recoveries" | ||
/> | ||
} | ||
onChange={toggleShardActivityHistory} | ||
checked={showShardActivityHistory} | ||
/> | ||
<EuiSpacer /> | ||
<EuiMonitoringTable | ||
className="esShardActivityTable" | ||
rows={rows} | ||
columns={columns} | ||
message={getNoDataMessage()} | ||
sorting={sorting} | ||
search={false} | ||
pagination={pagination} | ||
onTableChange={onTableChange} | ||
executeQueryOptions={{ | ||
defaultFields: ['name'], | ||
}} | ||
/> | ||
</Fragment> | ||
); | ||
}; |