Exec script dialog
This commit is contained in:
13
src/components/ExecScriptButton/ExecScriptButton.tsx
Normal file
13
src/components/ExecScriptButton/ExecScriptButton.tsx
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
import React, { FC } from 'react';
|
||||||
|
import { ActionButton } from '../ActionButton/ActionButton';
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
className?: string;
|
||||||
|
onClick(): void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const ExecScriptButton: FC<Props> = ({ className, onClick }) => {
|
||||||
|
return (
|
||||||
|
<ActionButton className={className} icon="terminal" tooltip="Execute script" onClick={onClick} />
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -2,5 +2,6 @@ export { GFHeartIcon } from './GFHeartIcon/GFHeartIcon';
|
|||||||
export { FAIcon } from './FAIcon/FAIcon';
|
export { FAIcon } from './FAIcon/FAIcon';
|
||||||
export { AckButton } from './AckButton/AckButton';
|
export { AckButton } from './AckButton/AckButton';
|
||||||
export { ExploreButton } from './ExploreButton/ExploreButton';
|
export { ExploreButton } from './ExploreButton/ExploreButton';
|
||||||
|
export { ExecScriptButton } from './ExecScriptButton/ExecScriptButton';
|
||||||
export { Tooltip } from './Tooltip/Tooltip';
|
export { Tooltip } from './Tooltip/Tooltip';
|
||||||
export { ModalController } from './Modal/ModalController';
|
export { ModalController } from './Modal/ModalController';
|
||||||
|
|||||||
233
src/panel-triggers/components/ExecScriptModal.tsx
Normal file
233
src/panel-triggers/components/ExecScriptModal.tsx
Normal file
@@ -0,0 +1,233 @@
|
|||||||
|
import React, { PureComponent } from 'react';
|
||||||
|
import { cx, css } from 'emotion';
|
||||||
|
import { ZBX_ACK_ACTION_ADD_MESSAGE, ZBX_ACK_ACTION_ACK, ZBX_ACK_ACTION_CHANGE_SEVERITY, ZBX_ACK_ACTION_CLOSE } from '../../datasource-zabbix/constants';
|
||||||
|
import { APIScriptGetResponse, ZBXScript } from '../../datasource-zabbix/zabbix/connectors/zabbix_api/types';
|
||||||
|
import { Button, VerticalGroup, Spinner, Modal, Select, Forms, stylesFactory, withTheme, Themeable } from '@grafana/ui';
|
||||||
|
import { FAIcon } from '../../components';
|
||||||
|
|
||||||
|
import * as grafanaUi from '@grafana/ui';
|
||||||
|
import { GrafanaTheme, SelectableValue } from '@grafana/data';
|
||||||
|
const Checkbox: any = Forms?.Checkbox || (grafanaUi as any).Checkbox;
|
||||||
|
const RadioButtonGroup: any = Forms?.RadioButtonGroup || (grafanaUi as any).RadioButtonGroup;
|
||||||
|
|
||||||
|
const KEYBOARD_ENTER_KEY = 13;
|
||||||
|
const KEYBOARD_ESCAPE_KEY = 27;
|
||||||
|
|
||||||
|
interface Props extends Themeable {
|
||||||
|
getScripts(): Promise<APIScriptGetResponse>;
|
||||||
|
onSubmit(data?: AckProblemData): Promise<any> | any;
|
||||||
|
onDismiss?(): void;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface State {
|
||||||
|
selectedScript: SelectableValue<string>;
|
||||||
|
scriptOptions: Array<SelectableValue<string>>;
|
||||||
|
script: ZBXScript;
|
||||||
|
error: boolean;
|
||||||
|
errorMessage: string;
|
||||||
|
selectError: string;
|
||||||
|
result: string;
|
||||||
|
loading: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AckProblemData {
|
||||||
|
message: string;
|
||||||
|
closeProblem?: boolean;
|
||||||
|
action?: number;
|
||||||
|
severity?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class ExecScriptModalUnthemed extends PureComponent<Props, State> {
|
||||||
|
scripts: ZBXScript[];
|
||||||
|
|
||||||
|
constructor(props) {
|
||||||
|
super(props);
|
||||||
|
this.state = {
|
||||||
|
error: false,
|
||||||
|
errorMessage: '',
|
||||||
|
selectError: '',
|
||||||
|
selectedScript: null,
|
||||||
|
result: '',
|
||||||
|
loading: false,
|
||||||
|
scriptOptions: [],
|
||||||
|
script: null,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async componentDidMount() {
|
||||||
|
const scripts = await this.props.getScripts();
|
||||||
|
this.scripts = scripts;
|
||||||
|
const scriptOptions: Array<SelectableValue<string>> = scripts.map(s => {
|
||||||
|
return {
|
||||||
|
value: s.scriptid,
|
||||||
|
label: s.name,
|
||||||
|
description: s.description || s.command,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
const selectedScript = scriptOptions?.length ? scriptOptions[0] : null;
|
||||||
|
const script = scripts.find(s => selectedScript.value === s.scriptid);
|
||||||
|
|
||||||
|
this.setState({ scriptOptions, selectedScript, script });
|
||||||
|
}
|
||||||
|
|
||||||
|
handleKeyUp = (event: React.KeyboardEvent<HTMLInputElement>) => {
|
||||||
|
if (event.which === KEYBOARD_ENTER_KEY || event.key === 'Enter') {
|
||||||
|
this.submit();
|
||||||
|
} else if (event.which === KEYBOARD_ESCAPE_KEY || event.key === 'Escape') {
|
||||||
|
this.dismiss();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
handleBackdropClick = () => {
|
||||||
|
this.dismiss();
|
||||||
|
}
|
||||||
|
|
||||||
|
onChangeSelectedScript = (v: SelectableValue<string>) => {
|
||||||
|
const script = this.scripts.find(s => v.value === s.scriptid);
|
||||||
|
this.setState({ selectedScript: v, script });
|
||||||
|
};
|
||||||
|
|
||||||
|
dismiss = () => {
|
||||||
|
this.setState({ selectedScript: null, error: false, errorMessage: '', selectError: '', loading: false });
|
||||||
|
this.props.onDismiss();
|
||||||
|
}
|
||||||
|
|
||||||
|
submit = () => {
|
||||||
|
// const { acknowledge, changeSeverity, closeProblem } = this.state;
|
||||||
|
|
||||||
|
// const actionSelected = acknowledge || changeSeverity || closeProblem;
|
||||||
|
// if (!this.state.value && !actionSelected) {
|
||||||
|
// return this.setState({
|
||||||
|
// error: true,
|
||||||
|
// errorMessage: 'Enter message text or select an action'
|
||||||
|
// });
|
||||||
|
// }
|
||||||
|
|
||||||
|
// this.setState({ ackError: '', loading: true });
|
||||||
|
|
||||||
|
// const ackData: AckProblemData = {
|
||||||
|
// message: this.state.value,
|
||||||
|
// };
|
||||||
|
|
||||||
|
// let action = ZBX_ACK_ACTION_ADD_MESSAGE;
|
||||||
|
// if (this.state.acknowledge) {
|
||||||
|
// action += ZBX_ACK_ACTION_ACK;
|
||||||
|
// }
|
||||||
|
// if (this.state.changeSeverity) {
|
||||||
|
// action += ZBX_ACK_ACTION_CHANGE_SEVERITY;
|
||||||
|
// ackData.severity = this.state.selectedSeverity;
|
||||||
|
// }
|
||||||
|
// if (this.state.closeProblem) {
|
||||||
|
// action += ZBX_ACK_ACTION_CLOSE;
|
||||||
|
// }
|
||||||
|
// ackData.action = action;
|
||||||
|
|
||||||
|
// this.props.onSubmit(ackData).then(() => {
|
||||||
|
// this.dismiss();
|
||||||
|
// }).catch(err => {
|
||||||
|
// this.setState({
|
||||||
|
// ackError: err.message || err.data,
|
||||||
|
// loading: false,
|
||||||
|
// });
|
||||||
|
// });
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
const { theme } = this.props;
|
||||||
|
const { scriptOptions, selectedScript, script, selectError, errorMessage } = this.state;
|
||||||
|
|
||||||
|
const styles = getStyles(theme);
|
||||||
|
const modalClass = cx(styles.modal);
|
||||||
|
const modalTitleClass = cx(styles.modalHeaderTitle);
|
||||||
|
const inputGroupClass = cx('gf-form', styles.inputGroup);
|
||||||
|
const inputHintClass = cx('gf-form-hint-text', styles.inputHint);
|
||||||
|
const inputErrorClass = cx('gf-form-hint-text', styles.inputError);
|
||||||
|
const scriptCommandClass = cx('gf-form-hint-text', styles.scriptCommand);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Modal
|
||||||
|
isOpen={true}
|
||||||
|
onDismiss={this.dismiss}
|
||||||
|
className={modalClass}
|
||||||
|
title={
|
||||||
|
<div className={modalTitleClass}>
|
||||||
|
{this.state.loading ? <Spinner size={18} /> : <FAIcon icon="terminal" />}
|
||||||
|
<span className="p-l-1">Execute script</span>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<div className={inputGroupClass}>
|
||||||
|
<label className="gf-form-hint">
|
||||||
|
<Select
|
||||||
|
options={scriptOptions}
|
||||||
|
value={selectedScript}
|
||||||
|
onChange={this.onChangeSelectedScript}
|
||||||
|
/>
|
||||||
|
<small className={inputHintClass}>Press Enter to execute</small>
|
||||||
|
{selectError &&
|
||||||
|
<small className={inputErrorClass}>{selectError}</small>
|
||||||
|
}
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div className="gf-form">
|
||||||
|
{script && <small className={scriptCommandClass}>{script.command}</small>}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{this.state.error &&
|
||||||
|
<div className="gf-form ack-request-error">
|
||||||
|
<span className={styles.execError}>{errorMessage}</span>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
<div className="gf-form-button-row text-center">
|
||||||
|
<Button variant="primary" onClick={this.submit}>Execute</Button>
|
||||||
|
<Button variant="secondary" onClick={this.dismiss}>Cancel</Button>
|
||||||
|
</div>
|
||||||
|
</Modal>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const getStyles = stylesFactory((theme: GrafanaTheme) => {
|
||||||
|
const red = theme.colors.red || (theme as any).palette.red;
|
||||||
|
return {
|
||||||
|
modal: css`
|
||||||
|
width: 500px;
|
||||||
|
`,
|
||||||
|
modalHeaderTitle: css`
|
||||||
|
font-size: ${theme.typography.heading.h3};
|
||||||
|
padding-top: ${theme.spacing.sm};
|
||||||
|
margin: 0 ${theme.spacing.md};
|
||||||
|
display: flex;
|
||||||
|
`,
|
||||||
|
inputGroup: css`
|
||||||
|
`,
|
||||||
|
input: css`
|
||||||
|
border-color: ${red};
|
||||||
|
border-radius: 2px;
|
||||||
|
outline-offset: 2px;
|
||||||
|
box-shadow: 0 0 0 2px ${theme.colors.pageBg || (theme as any).colors.bg1}, 0 0 0px 4px ${red};
|
||||||
|
`,
|
||||||
|
scriptCommand: css`
|
||||||
|
float: left;
|
||||||
|
color: ${theme.colors.textWeak};
|
||||||
|
text-align: left;
|
||||||
|
font-family: ${theme.typography.fontFamily.monospace};
|
||||||
|
`,
|
||||||
|
inputHint: css`
|
||||||
|
display: inherit;
|
||||||
|
float: right;
|
||||||
|
color: ${theme.colors.textWeak};
|
||||||
|
`,
|
||||||
|
inputError: css`
|
||||||
|
float: left;
|
||||||
|
color: ${red};
|
||||||
|
`,
|
||||||
|
execError: css`
|
||||||
|
color: ${red};
|
||||||
|
`,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
export const ExecScriptModal = withTheme(ExecScriptModalUnthemed);
|
||||||
@@ -2,13 +2,15 @@ import React, { PureComponent } from 'react';
|
|||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
import * as utils from '../../../datasource-zabbix/utils';
|
import * as utils from '../../../datasource-zabbix/utils';
|
||||||
import { ProblemDTO, ZBXHost, ZBXGroup, ZBXEvent, ZBXTag, ZBXAlert } from '../../../datasource-zabbix/types';
|
import { ProblemDTO, ZBXHost, ZBXGroup, ZBXEvent, ZBXTag, ZBXAlert } from '../../../datasource-zabbix/types';
|
||||||
|
import { ZBXScript } from '../../../datasource-zabbix/zabbix/connectors/zabbix_api/types';
|
||||||
import { ZBXItem, GFTimeRange, RTRow } from '../../types';
|
import { ZBXItem, GFTimeRange, RTRow } from '../../types';
|
||||||
import { AckModal, AckProblemData } from '../AckModal';
|
import { AckModal, AckProblemData } from '../AckModal';
|
||||||
import EventTag from '../EventTag';
|
import EventTag from '../EventTag';
|
||||||
import ProblemStatusBar from './ProblemStatusBar';
|
import ProblemStatusBar from './ProblemStatusBar';
|
||||||
import AcknowledgesList from './AcknowledgesList';
|
import AcknowledgesList from './AcknowledgesList';
|
||||||
import ProblemTimeline from './ProblemTimeline';
|
import ProblemTimeline from './ProblemTimeline';
|
||||||
import { FAIcon, ExploreButton, AckButton, Tooltip, ModalController } from '../../../components';
|
import { FAIcon, ExploreButton, AckButton, Tooltip, ModalController, ExecScriptButton } from '../../../components';
|
||||||
|
import { ExecScriptModal } from '../ExecScriptModal';
|
||||||
|
|
||||||
interface ProblemDetailsProps extends RTRow<ProblemDTO> {
|
interface ProblemDetailsProps extends RTRow<ProblemDTO> {
|
||||||
rootWidth: number;
|
rootWidth: number;
|
||||||
@@ -17,6 +19,7 @@ interface ProblemDetailsProps extends RTRow<ProblemDTO> {
|
|||||||
panelId?: number;
|
panelId?: number;
|
||||||
getProblemEvents: (problem: ProblemDTO) => Promise<ZBXEvent[]>;
|
getProblemEvents: (problem: ProblemDTO) => Promise<ZBXEvent[]>;
|
||||||
getProblemAlerts: (problem: ProblemDTO) => Promise<ZBXAlert[]>;
|
getProblemAlerts: (problem: ProblemDTO) => Promise<ZBXAlert[]>;
|
||||||
|
getScripts: (problem: ProblemDTO) => Promise<ZBXScript[]>;
|
||||||
onProblemAck?: (problem: ProblemDTO, data: AckProblemData) => Promise<any> | any;
|
onProblemAck?: (problem: ProblemDTO, data: AckProblemData) => Promise<any> | any;
|
||||||
onTagClick?: (tag: ZBXTag, datasource: string, ctrlKey?: boolean, shiftKey?: boolean) => void;
|
onTagClick?: (tag: ZBXTag, datasource: string, ctrlKey?: boolean, shiftKey?: boolean) => void;
|
||||||
}
|
}
|
||||||
@@ -74,6 +77,11 @@ export class ProblemDetails extends PureComponent<ProblemDetailsProps, ProblemDe
|
|||||||
return this.props.onProblemAck(problem, data);
|
return this.props.onProblemAck(problem, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getScripts = () => {
|
||||||
|
const problem = this.props.original as ProblemDTO;
|
||||||
|
return this.props.getScripts(problem);
|
||||||
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const problem = this.props.original as ProblemDTO;
|
const problem = this.props.original as ProblemDTO;
|
||||||
const alerts = this.state.alerts;
|
const alerts = this.state.alerts;
|
||||||
@@ -102,6 +110,20 @@ export class ProblemDetails extends PureComponent<ProblemDetailsProps, ProblemDe
|
|||||||
<ProblemStatusBar problem={problem} alerts={alerts} className={compactStatusBar && 'compact'} />
|
<ProblemStatusBar problem={problem} alerts={alerts} className={compactStatusBar && 'compact'} />
|
||||||
{problem.showAckButton &&
|
{problem.showAckButton &&
|
||||||
<div className="problem-actions">
|
<div className="problem-actions">
|
||||||
|
<ModalController>
|
||||||
|
{({ showModal, hideModal }) => (
|
||||||
|
<ExecScriptButton
|
||||||
|
className="navbar-button navbar-button--settings"
|
||||||
|
onClick={() => {
|
||||||
|
showModal(ExecScriptModal, {
|
||||||
|
getScripts: this.getScripts,
|
||||||
|
onSubmit: this.ackProblem,
|
||||||
|
onDismiss: hideModal,
|
||||||
|
});
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</ModalController>
|
||||||
<ModalController>
|
<ModalController>
|
||||||
{({ showModal, hideModal }) => (
|
{({ showModal, hideModal }) => (
|
||||||
<AckButton
|
<AckButton
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import { AckProblemData } from '../AckModal';
|
|||||||
import { GFHeartIcon, FAIcon } from '../../../components';
|
import { GFHeartIcon, FAIcon } from '../../../components';
|
||||||
import { ProblemsPanelOptions, GFTimeRange, RTCell, TriggerSeverity, RTResized } from '../../types';
|
import { ProblemsPanelOptions, GFTimeRange, RTCell, TriggerSeverity, RTResized } from '../../types';
|
||||||
import { ProblemDTO, ZBXEvent, ZBXTag, ZBXAlert } from '../../../datasource-zabbix/types';
|
import { ProblemDTO, ZBXEvent, ZBXTag, ZBXAlert } from '../../../datasource-zabbix/types';
|
||||||
|
import { ZBXScript } from '../../../datasource-zabbix/zabbix/connectors/zabbix_api/types';
|
||||||
import { AckCell } from './AckCell';
|
import { AckCell } from './AckCell';
|
||||||
|
|
||||||
export interface ProblemListProps {
|
export interface ProblemListProps {
|
||||||
@@ -22,6 +23,7 @@ export interface ProblemListProps {
|
|||||||
panelId?: number;
|
panelId?: number;
|
||||||
getProblemEvents: (problem: ProblemDTO) => Promise<ZBXEvent[]>;
|
getProblemEvents: (problem: ProblemDTO) => Promise<ZBXEvent[]>;
|
||||||
getProblemAlerts: (problem: ProblemDTO) => Promise<ZBXAlert[]>;
|
getProblemAlerts: (problem: ProblemDTO) => Promise<ZBXAlert[]>;
|
||||||
|
getScripts: (problem: ProblemDTO) => Promise<ZBXScript[]>;
|
||||||
onProblemAck?: (problem: ProblemDTO, data: AckProblemData) => void;
|
onProblemAck?: (problem: ProblemDTO, data: AckProblemData) => void;
|
||||||
onTagClick?: (tag: ZBXTag, datasource: string, ctrlKey?: boolean, shiftKey?: boolean) => void;
|
onTagClick?: (tag: ZBXTag, datasource: string, ctrlKey?: boolean, shiftKey?: boolean) => void;
|
||||||
onPageSizeChange?: (pageSize: number, pageIndex: number) => void;
|
onPageSizeChange?: (pageSize: number, pageIndex: number) => void;
|
||||||
@@ -170,6 +172,7 @@ export default class ProblemList extends PureComponent<ProblemListProps, Problem
|
|||||||
panelId={this.props.panelId}
|
panelId={this.props.panelId}
|
||||||
getProblemEvents={this.props.getProblemEvents}
|
getProblemEvents={this.props.getProblemEvents}
|
||||||
getProblemAlerts={this.props.getProblemAlerts}
|
getProblemAlerts={this.props.getProblemAlerts}
|
||||||
|
getScripts={this.props.getScripts}
|
||||||
onProblemAck={this.handleProblemAck}
|
onProblemAck={this.handleProblemAck}
|
||||||
onTagClick={this.handleTagClick}
|
onTagClick={this.handleTagClick}
|
||||||
subRows={false}
|
subRows={false}
|
||||||
|
|||||||
@@ -316,6 +316,15 @@ export class TriggerPanelCtrl extends MetricsPanelCtrl {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getProblemScripts(problem: ProblemDTO) {
|
||||||
|
const hostIds = problem.hosts?.map(h => h.hostid);
|
||||||
|
|
||||||
|
return getDataSourceSrv().get(problem.datasource)
|
||||||
|
.then((datasource: any) => {
|
||||||
|
return datasource.zabbix.getScripts(hostIds);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
getAlertIconClassBySeverity(triggerSeverity) {
|
getAlertIconClassBySeverity(triggerSeverity) {
|
||||||
let iconClass = 'icon-gf-online';
|
let iconClass = 'icon-gf-online';
|
||||||
if (triggerSeverity.priority >= 2) {
|
if (triggerSeverity.priority >= 2) {
|
||||||
@@ -399,6 +408,7 @@ export class TriggerPanelCtrl extends MetricsPanelCtrl {
|
|||||||
panelId: ctrl.panel.id,
|
panelId: ctrl.panel.id,
|
||||||
getProblemEvents: ctrl.getProblemEvents.bind(ctrl),
|
getProblemEvents: ctrl.getProblemEvents.bind(ctrl),
|
||||||
getProblemAlerts: ctrl.getProblemAlerts.bind(ctrl),
|
getProblemAlerts: ctrl.getProblemAlerts.bind(ctrl),
|
||||||
|
getScripts: ctrl.getProblemScripts.bind(ctrl),
|
||||||
onPageSizeChange: ctrl.handlePageSizeChange.bind(ctrl),
|
onPageSizeChange: ctrl.handlePageSizeChange.bind(ctrl),
|
||||||
onColumnResize: ctrl.handleColumnResize.bind(ctrl),
|
onColumnResize: ctrl.handleColumnResize.bind(ctrl),
|
||||||
onProblemAck: (trigger, data) => {
|
onProblemAck: (trigger, data) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user