Skip to content

[7.15] [RAC] Update alert status column in alerts table (#108695) #109406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weltenwort merged 1 commit into from
Aug 20, 2021
Merged

[7.15] [RAC] Update alert status column in alerts table (#108695) #109406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions x-pack/plugins/observability/public/pages/alerts/alerts_table_t_grid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,10 @@ export const columns: Array<
{
columnHeaderType: 'not-filtered',
displayAsText: i18n.translate('xpack.observability.alertsTGrid.statusColumnDescription', {
defaultMessage: 'Status',
defaultMessage: 'Alert Status',
}),
id: ALERT_STATUS,
initialWidth: 79,
initialWidth: 110,
},
{
columnHeaderType: 'not-filtered',
Expand Down
44 changes: 27 additions & 17 deletions x-pack/plugins/observability/public/pages/alerts/render_cell_value.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
import { EuiIconTip, EuiLink } from '@elastic/eui';
import { EuiLink, EuiHealth, EuiText } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import React, { useEffect } from 'react';
/**
Expand Down Expand Up @@ -34,6 +34,7 @@ import { SeverityBadge } from './severity_badge';
import { TopAlert } from '.';
import { parseAlert } from './parse_alert';
import { usePluginContext } from '../../hooks/use_plugin_context';
import { useTheme } from '../../hooks/use_theme';

const ALERT_DURATION: typeof ALERT_DURATION_TYPED = ALERT_DURATION_NON_TYPED;
const ALERT_SEVERITY: typeof ALERT_SEVERITY_TYPED = ALERT_SEVERITY_NON_TYPED;
Expand Down Expand Up @@ -86,24 +87,33 @@ export const getRenderCellValue = ({
}
}, [columnId, setCellProps]);

const theme = useTheme();

switch (columnId) {
case ALERT_STATUS:
return value !== 'closed' ? (
<EuiIconTip
content={i18n.translate('xpack.observability.alertsTGrid.statusOpenDescription', {
defaultMessage: 'Open',
})}
color="danger"
type="alert"
/>
) : (
<EuiIconTip
content={i18n.translate('xpack.observability.alertsTGrid.statusClosedDescription', {
defaultMessage: 'Closed',
})}
type="check"
/>
);
switch (value) {
case 'open':
return (
<EuiHealth color="primary" textSize="xs">
{i18n.translate('xpack.observability.alertsTGrid.statusActiveDescription', {
defaultMessage: 'Active',
})}
</EuiHealth>
);
case 'closed':
return (
<EuiHealth color={theme.eui.euiColorLightShade} textSize="xs">
<EuiText color={theme.eui.euiColorLightShade} size="relative">
{i18n.translate('xpack.observability.alertsTGrid.statusRecoveredDescription', {
defaultMessage: 'Recovered',
})}
</EuiText>
</EuiHealth>
);
default:
// NOTE: This fallback shouldn't be needed. Status should be either "active" or "recovered".
return null;
}
case TIMESTAMP:
return <TimestampTooltip time={new Date(value ?? '').getTime()} timeUnit="milliseconds" />;
case ALERT_DURATION:
Expand Down