Skip to content
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

Feature/charts should show the entire time range selected in the filter #258 #265

Merged
merged 10 commits into from
Dec 29, 2022
Merged

Feature/charts should show the entire time range selected in the filter #258 #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4d9db71
[FEATURE] Set default time range to 24 hrs and share the same setting…
jovancvetkovic3006 Dec 24, 2022
b2ba85a
[FEATURE] Set default time range to 24 hrs and share the same setting…
jovancvetkovic3006 Dec 27, 2022
2ef0f45
Merge branch 'main' of https://github.com/opensearch-project/security…
jovancvetkovic3006 Dec 27, 2022
b7a13e7
[FEATURE] Set default time range to 24 hrs and share the same setting…
jovancvetkovic3006 Dec 27, 2022
4311506
[FEATURE] Set default time range to 24 hrs and share the same setting…
jovancvetkovic3006 Dec 27, 2022
9abd700
[FEATURE] Set default time range to 24 hrs and share the same setting…
jovancvetkovic3006 Dec 27, 2022
a49e84e
[FEATURE] Set default time range to 24 hrs and share the same setting…
jovancvetkovic3006 Dec 27, 2022
f094961
[FEATURE] Set default time range to 24 hrs and share the same setting…
jovancvetkovic3006 Dec 28, 2022
ce9702c
PR 265 Code review
jovancvetkovic3006 Dec 28, 2022
317fc99
PR 265 Code review
jovancvetkovic3006 Dec 29, 2022
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
92 changes: 67 additions & 25 deletions public/pages/Alerts/containers/Alerts/Alerts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ import { ContentPanel } from '../../../../components/ContentPanel';
import {
getAlertsVisualizationSpec,
getChartTimeUnit,
getDateFormatByTimeUnit,
getDomainRange,
TimeUnit,
} from '../../../Overview/utils/helpers';
import moment from 'moment';
import {
Expand Down Expand Up @@ -54,6 +55,8 @@ import {
} from '../../../../utils/helpers';
import { NotificationsStart } from 'opensearch-dashboards/public';
import { match, withRouter } from 'react-router-dom';
import { DateTimeFilter } from '../../../Overview/models/interfaces';
import { ChartContainer } from '../../../../components/Charts/ChartContainer';

export interface AlertsProps {
alertService: AlertsService;
Expand All @@ -63,12 +66,12 @@ export interface AlertsProps {
opensearchService: OpenSearchService;
notifications: NotificationsStart;
match: match;
dateTimeFilter?: DateTimeFilter;
setDateTimeFilter?: Function;
}

export interface AlertsState {
groupBy: string;
startTime: string;
endTime: string;
recentlyUsedRanges: DurationRange[];
selectedItems: AlertItem[];
alerts: AlertItem[];
Expand All @@ -77,7 +80,8 @@ export interface AlertsState {
filteredAlerts: AlertItem[];
detectors: { [key: string]: Detector };
loading: boolean;
timeUnit: string;
timeUnit: TimeUnit;
dateFormat: string;
}

const groupByOptions = [
Expand All @@ -90,25 +94,38 @@ class Alerts extends Component<AlertsProps, AlertsState> {

constructor(props: AlertsProps) {
super(props);

const {
dateTimeFilter = {
startTime: DEFAULT_DATE_RANGE.start,
endTime: DEFAULT_DATE_RANGE.end,
},
} = props;
const timeUnits = getChartTimeUnit(dateTimeFilter.startTime, dateTimeFilter.endTime);
this.state = {
loading: true,
groupBy: 'status',
startTime: DEFAULT_DATE_RANGE.start,
endTime: DEFAULT_DATE_RANGE.end,
recentlyUsedRanges: [DEFAULT_DATE_RANGE],
selectedItems: [],
alerts: [],
alertsFiltered: false,
filteredAlerts: [],
detectors: {},
loading: false,
timeUnit: 'yearmonthdatehoursminutes',
timeUnit: timeUnits.timeUnit,
dateFormat: timeUnits.dateFormat,
};
}

componentDidUpdate(prevProps: Readonly<AlertsProps>, prevState: Readonly<AlertsState>) {
const {
dateTimeFilter = {
startTime: DEFAULT_DATE_RANGE.start,
endTime: DEFAULT_DATE_RANGE.end,
},
} = this.props;
const alertsChanged =
prevState.startTime !== this.state.startTime ||
prevState.endTime !== this.state.endTime ||
prevProps.dateTimeFilter?.startTime !== dateTimeFilter.startTime ||
prevProps.dateTimeFilter?.endTime !== dateTimeFilter.endTime ||
prevState.alerts !== this.state.alerts ||
prevState.alerts.length !== this.state.alerts.length;

Expand All @@ -120,9 +137,15 @@ class Alerts extends Component<AlertsProps, AlertsState> {
}

filterAlerts = () => {
const { alerts, startTime, endTime } = this.state;
const startMoment = dateMath.parse(startTime);
const endMoment = dateMath.parse(endTime);
const { alerts } = this.state;
const {
dateTimeFilter = {
startTime: DEFAULT_DATE_RANGE.start,
endTime: DEFAULT_DATE_RANGE.end,
},
} = this.props;
const startMoment = dateMath.parse(dateTimeFilter.startTime);
const endMoment = dateMath.parse(dateTimeFilter.endTime);
const filteredAlerts = alerts.filter((alert) =>
moment(alert.last_notification_time).isBetween(moment(startMoment), moment(endMoment))
);
Expand Down Expand Up @@ -226,10 +249,20 @@ class Alerts extends Component<AlertsProps, AlertsState> {
severity: parseAlertSeverityToOption(alert.severity)?.label || alert.severity,
};
});

const {
dateTimeFilter = {
startTime: DEFAULT_DATE_RANGE.start,
endTime: DEFAULT_DATE_RANGE.end,
},
} = this.props;
const chartTimeUnits = getChartTimeUnit(dateTimeFilter.startTime, dateTimeFilter.endTime);
return getAlertsVisualizationSpec(visData, this.state.groupBy, {
timeUnit: this.state.timeUnit,
dateFormat: getDateFormatByTimeUnit(this.state.startTime, this.state.endTime),
timeUnit: chartTimeUnits.timeUnit,
dateFormat: chartTimeUnits.dateFormat,
domain: getDomainRange(
[dateTimeFilter.startTime, dateTimeFilter.endTime],
chartTimeUnits.timeUnit.unit
),
});
}

Expand Down Expand Up @@ -313,13 +346,17 @@ class Alerts extends Component<AlertsProps, AlertsState> {
recentlyUsedRanges = recentlyUsedRanges.slice(0, MAX_RECENTLY_USED_TIME_RANGES);
const endTime = start === end ? DEFAULT_DATE_RANGE.end : end;

const timeUnit = getChartTimeUnit(start, endTime);
const timeUnits = getChartTimeUnit(start, endTime);
this.setState({
startTime: start,
endTime: endTime,
recentlyUsedRanges: recentlyUsedRanges,
timeUnit,
...timeUnits,
});

this.props.setDateTimeFilter &&
this.props.setDateTimeFilter({
startTime: start,
endTime: endTime,
});
};

onRefresh = async () => {
Expand Down Expand Up @@ -375,11 +412,15 @@ class Alerts extends Component<AlertsProps, AlertsState> {
filteredAlerts,
flyoutData,
loading,
startTime,
endTime,
recentlyUsedRanges,
} = this.state;

const {
dateTimeFilter = {
startTime: DEFAULT_DATE_RANGE.start,
endTime: DEFAULT_DATE_RANGE.end,
},
} = this.props;
const severities = new Set();
const statuses = new Set();
filteredAlerts.forEach((alert) => {
Expand Down Expand Up @@ -455,8 +496,8 @@ class Alerts extends Component<AlertsProps, AlertsState> {
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiSuperDatePicker
start={startTime}
end={endTime}
start={dateTimeFilter.startTime}
end={dateTimeFilter.endTime}
recentlyUsedRanges={recentlyUsedRanges}
isLoading={loading}
onTimeChange={this.onTimeChange}
Expand All @@ -474,7 +515,7 @@ class Alerts extends Component<AlertsProps, AlertsState> {
{this.createGroupByControl()}
</EuiFlexItem>
<EuiFlexItem>
<div id="alerts-view"></div>
<ChartContainer chartViewId={'alerts-view'} loading={loading} />
</EuiFlexItem>
</EuiFlexGroup>
</EuiPanel>
Expand All @@ -491,6 +532,7 @@ class Alerts extends Component<AlertsProps, AlertsState> {
search={search}
sorting={sorting}
selection={selection}
loading={loading}
/>
</ContentPanel>
</EuiFlexItem>
Expand Down
82 changes: 52 additions & 30 deletions public/pages/Findings/containers/Findings/Findings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ import {
DEFAULT_DATE_RANGE,
MAX_RECENTLY_USED_TIME_RANGES,
OS_NOTIFICATION_PLUGIN,
ROUTES,
} from '../../../../utils/constants';
import {
getChartTimeUnit,
getDateFormatByTimeUnit,
getDomainRange,
getFindingsVisualizationSpec,
TimeUnit,
} from '../../../Overview/utils/helpers';
import { CoreServicesContext } from '../../../../components/core_services';
import { Finding } from '../../models/interfaces';
Expand All @@ -51,7 +51,8 @@ import {
} from '../../../../utils/helpers';
import { DetectorHit, RuleSource } from '../../../../../server/models/interfaces';
import { NotificationsStart } from 'opensearch-dashboards/public';
import { ruleSeverity } from '../../../Rules/utils/constants';
import { DateTimeFilter } from '../../../Overview/models/interfaces';
import { ChartContainer } from '../../../../components/Charts/ChartContainer';

interface FindingsProps extends RouteComponentProps {
detectorService: DetectorsService;
Expand All @@ -61,6 +62,8 @@ interface FindingsProps extends RouteComponentProps {
ruleService: RuleService;
notifications: NotificationsStart;
match: match;
dateTimeFilter?: DateTimeFilter;
setDateTimeFilter?: Function;
}

interface FindingsState {
Expand All @@ -69,13 +72,12 @@ interface FindingsState {
findings: FindingItemType[];
notificationChannels: FeatureChannelList[];
rules: { [id: string]: RuleSource };
startTime: string;
endTime: string;
recentlyUsedRanges: DurationRange[];
groupBy: FindingsGroupByType;
filteredFindings: FindingItemType[];
plugins: string[];
timeUnit: string;
timeUnit: TimeUnit;
dateFormat: string;
}

interface FindingVisualizationData {
Expand All @@ -99,19 +101,26 @@ class Findings extends Component<FindingsProps, FindingsState> {

constructor(props: FindingsProps) {
super(props);

const {
dateTimeFilter = {
startTime: DEFAULT_DATE_RANGE.start,
endTime: DEFAULT_DATE_RANGE.end,
},
} = props;
const timeUnits = getChartTimeUnit(dateTimeFilter.startTime, dateTimeFilter.endTime);
this.state = {
loading: false,
loading: true,
detectors: [],
findings: [],
notificationChannels: [],
rules: {},
startTime: DEFAULT_DATE_RANGE.start,
endTime: DEFAULT_DATE_RANGE.end,
recentlyUsedRanges: [DEFAULT_DATE_RANGE],
groupBy: 'logType',
filteredFindings: [],
plugins: [],
timeUnit: 'yearmonthdatehoursminutes',
timeUnit: timeUnits.timeUnit,
dateFormat: timeUnits.dateFormat,
};
}

Expand Down Expand Up @@ -246,13 +255,17 @@ class Findings extends Component<FindingsProps, FindingsState> {
if (recentlyUsedRanges.length > MAX_RECENTLY_USED_TIME_RANGES)
recentlyUsedRanges = recentlyUsedRanges.slice(0, MAX_RECENTLY_USED_TIME_RANGES);
const endTime = start === end ? DEFAULT_DATE_RANGE.end : end;
const timeUnit = getChartTimeUnit(start, endTime);
const timeUnits = getChartTimeUnit(start, endTime);
this.setState({
startTime: start,
endTime: endTime,
recentlyUsedRanges: recentlyUsedRanges,
timeUnit,
...timeUnits,
});

this.props.setDateTimeFilter &&
this.props.setDateTimeFilter({
startTime: start,
endTime: endTime,
});
};

generateVisualizationSpec() {
Expand All @@ -269,10 +282,20 @@ class Findings extends Component<FindingsProps, FindingsState> {
ruleSeverity: this.state.rules[finding.queries[0].id].level,
});
});

const {
dateTimeFilter = {
startTime: DEFAULT_DATE_RANGE.start,
endTime: DEFAULT_DATE_RANGE.end,
},
} = this.props;
const chartTimeUnits = getChartTimeUnit(dateTimeFilter.startTime, dateTimeFilter.endTime);
return getFindingsVisualizationSpec(visData, this.state.groupBy, {
timeUnit: this.state.timeUnit,
dateFormat: getDateFormatByTimeUnit(this.state.startTime, this.state.endTime),
timeUnit: chartTimeUnits.timeUnit,
dateFormat: chartTimeUnits.dateFormat,
domain: getDomainRange(
[dateTimeFilter.startTime, dateTimeFilter.endTime],
chartTimeUnits.timeUnit.unit
),
});
}

Expand All @@ -293,16 +316,15 @@ class Findings extends Component<FindingsProps, FindingsState> {
};

render() {
const {
loading,
notificationChannels,
rules,
startTime,
endTime,
recentlyUsedRanges,
} = this.state;
const { loading, notificationChannels, rules, recentlyUsedRanges } = this.state;
let { findings } = this.state;

const {
dateTimeFilter = {
startTime: DEFAULT_DATE_RANGE.start,
endTime: DEFAULT_DATE_RANGE.end,
},
} = this.props;
if (Object.keys(rules).length > 0) {
findings = findings.map((finding) => {
const rule = rules[finding.queries[0].id];
Expand All @@ -325,8 +347,8 @@ class Findings extends Component<FindingsProps, FindingsState> {
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiSuperDatePicker
start={startTime}
end={endTime}
start={dateTimeFilter.startTime}
end={dateTimeFilter.endTime}
recentlyUsedRanges={recentlyUsedRanges}
isLoading={loading}
onTimeChange={this.onTimeChange}
Expand All @@ -344,7 +366,7 @@ class Findings extends Component<FindingsProps, FindingsState> {
{this.createGroupByControl()}
</EuiFlexItem>
<EuiFlexItem>
<div id="findings-view" style={{ width: '100%' }}></div>
<ChartContainer chartViewId={'findings-view'} loading={loading} />
</EuiFlexItem>
</EuiFlexGroup>
</EuiPanel>
Expand All @@ -359,8 +381,8 @@ class Findings extends Component<FindingsProps, FindingsState> {
findings={findings}
loading={loading}
rules={rules}
startTime={startTime}
endTime={endTime}
startTime={dateTimeFilter.startTime}
endTime={dateTimeFilter.endTime}
onRefresh={this.onRefresh}
notificationChannels={parseNotificationChannelsToOptions(notificationChannels)}
refreshNotificationChannels={this.getNotificationChannels}
Expand Down
Loading