IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerts: show a warning/error if transformations are configured (#19027)

Browse Source
This commit is contained in:
Ryan McKinley 2019-09-16 20:59:22 -07:00 committed by GitHub
parent 85e128fede
commit 015ab370b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/core/components/AlertBox/AlertBox.tsx
View File

@ -15,6 +15,12 @@ function getIconFromSeverity(severity: AppNotificationSeverity): string {
case AppNotificationSeverity.Error: {
return 'fa fa-exclamation-triangle';
}
case AppNotificationSeverity.Warning: {
return 'fa fa-exclamation-triangle';
}
case AppNotificationSeverity.Info: {
return 'fa fa-info-circle';
}
case AppNotificationSeverity.Success: {
return 'fa fa-check';
}

20
public/app/features/alerting/AlertTab.tsx
View File

@ -15,6 +15,8 @@ import 'app/features/alerting/AlertTabCtrl';
import { DashboardModel } from '../dashboard/state/DashboardModel';
import { PanelModel } from '../dashboard/state/PanelModel';
import { TestRuleResult } from './TestRuleResult';
import { AlertBox } from 'app/core/components/AlertBox/AlertBox';
import { AppNotificationSeverity } from 'app/types';
interface Props {
angularPanel?: AngularComponent;
@ -127,7 +129,16 @@ export class AlertTab extends PureComponent<Props> {
};
render() {
const { alert } = this.props.panel;
const { alert, transformations } = this.props.panel;
const hasTransformations = transformations && transformations.length;
if (!alert && hasTransformations) {
return (
<EditorTabBody heading="Alert">
<AlertBox severity={AppNotificationSeverity.Warning} title="Transformations are not supported in alert queries" />
</EditorTabBody>
);
}
const toolbarItems = alert ? [this.stateHistory(), this.testRule(), this.deleteAlert()] : [];
@ -141,6 +152,13 @@ export class AlertTab extends PureComponent<Props> {
return (
<EditorTabBody heading="Alert" toolbarItems={toolbarItems}>
<>
{alert && hasTransformations && (
<AlertBox
severity={AppNotificationSeverity.Error}
title="Transformations are not supported in alert queries"
/>
)}
<div ref={element => (this.element = element)} />
{!alert && <EmptyListCTA {...model} />}
</>