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

Jump to bottom

Monitoring: Add duration dropdown to silence form #5008

Merged
merged 1 commit into from
Apr 13, 2020
Merged

Monitoring: Add duration dropdown to silence form #5008

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
45 changes: 34 additions & 11 deletions frontend/public/components/monitoring.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import { CheckBoxes } from './row-filter';
import { AlertmanagerYAMLEditorWrapper } from './monitoring/alert-manager-yaml-editor';
import { AlertmanagerConfigWrapper } from './monitoring/alert-manager-config';
import { refreshNotificationPollers } from './notification-drawer';
import { ActionsMenu } from './utils/dropdown';
import { ActionsMenu, Dropdown } from './utils/dropdown';
import { ButtonBar } from './utils/button-bar';
import { ExternalLink, getURLSearchParams } from './utils/link';
import { Firehose } from './utils/firehose';
Expand All @@ -50,7 +50,7 @@ import { Kebab } from './utils/kebab';
import { LoadingInline, StatusBox } from './utils/status-box';
import { SectionHeading, ActionButtons } from './utils/headings';
import { Timestamp } from './utils/timestamp';
import { formatPrometheusDuration } from './utils/datetime';
import { formatPrometheusDuration, parsePrometheusDuration } from './utils/datetime';
import {
BlueInfoCircleIcon,
GreenCheckCircleIcon,
Expand Down Expand Up @@ -1183,6 +1183,10 @@ const Datetime = (props) => {
);
};

const durationOffText = '-';
const durations = [durationOffText, '30m', '1h', '2h', '6h', '12h', '1d', '2d', '1w'];
const durationItems = _.zipObject(durations, durations);

class SilenceForm_ extends React.Component<SilenceFormProps, SilenceFormState> {
constructor(props) {
super(props);
Expand All @@ -1200,7 +1204,7 @@ class SilenceForm_ extends React.Component<SilenceFormProps, SilenceFormState> {
if (_.isEmpty(data.matchers)) {
data.matchers.push({ name: '', value: '', isRegex: false });
}
this.state = { data, error: undefined, inProgress: false };
this.state = { data, duration: '2h', error: undefined, inProgress: false };
}

setField = (path: string, v: any): void => {
Expand All @@ -1213,6 +1217,19 @@ class SilenceForm_ extends React.Component<SilenceFormProps, SilenceFormState> {
return (e) => this.setField(path, e.target.value);
};

onDurationChange = (duration: string): void => {
this.setState({ duration });
if (duration !== durationOffText) {
const startsAt = Date.parse(this.state.data.startsAt);
this.setField('endsAt', formatDate(new Date(startsAt + parsePrometheusDuration(duration))));
}
};

onEndsAtChange: React.ReactEventHandler<HTMLInputElement> = (e) => {
this.setField('endsAt', e.currentTarget.value);
this.setState({ duration: durationOffText });
};

onIsRegexChange = (e, i: number): void => {
this.setField(`matchers[${i}].isRegex`, e.target.checked);
};
Expand Down Expand Up @@ -1265,7 +1282,7 @@ class SilenceForm_ extends React.Component<SilenceFormProps, SilenceFormState> {

render() {
const { Info, title } = this.props;
const { data, error, inProgress } = this.state;
const { data, duration, error, inProgress } = this.state;

return (
<>
Expand All @@ -1290,22 +1307,27 @@ class SilenceForm_ extends React.Component<SilenceFormProps, SilenceFormState> {
<div className="col-xs-9">
<SectionHeading text="Duration" />
<div className="row">
<div className="col-xs-6">
<div className="col-xs-5">
<label>Silence alert from...</label>
<Datetime
onChange={this.onFieldChange('startsAt')}
value={data.startsAt}
required
/>
</div>
<div className="col-xs-6">
<label>Until...</label>
<Datetime
onChange={this.onFieldChange('endsAt')}
value={data.endsAt}
required
<div className="col-xs-2">
<label>For...</label>
<Dropdown
dropDownClassName="dropdown--full-width"
items={durationItems}
onChange={this.onDurationChange}
selectedKey={duration}
/>
</div>
<div className="col-xs-5">
<label>Until...</label>
<Datetime onChange={this.onEndsAtChange} value={data.endsAt} required />
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -1743,6 +1765,7 @@ export type SilenceFormProps = {

export type SilenceFormState = {
data: Silence;
duration: string;
error: string;
inProgress: boolean;
};
Expand Down