Commit 015ab370 by Ryan McKinley Committed by GitHub

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

parent 85e128fe
...@@ -15,6 +15,12 @@ function getIconFromSeverity(severity: AppNotificationSeverity): string { ...@@ -15,6 +15,12 @@ function getIconFromSeverity(severity: AppNotificationSeverity): string {
case AppNotificationSeverity.Error: { case AppNotificationSeverity.Error: {
return 'fa fa-exclamation-triangle'; return 'fa fa-exclamation-triangle';
} }
case AppNotificationSeverity.Warning: {
return 'fa fa-exclamation-triangle';
}
case AppNotificationSeverity.Info: {
return 'fa fa-info-circle';
}
case AppNotificationSeverity.Success: { case AppNotificationSeverity.Success: {
return 'fa fa-check'; return 'fa fa-check';
} }
......
...@@ -15,6 +15,8 @@ import 'app/features/alerting/AlertTabCtrl'; ...@@ -15,6 +15,8 @@ import 'app/features/alerting/AlertTabCtrl';
import { DashboardModel } from '../dashboard/state/DashboardModel'; import { DashboardModel } from '../dashboard/state/DashboardModel';
import { PanelModel } from '../dashboard/state/PanelModel'; import { PanelModel } from '../dashboard/state/PanelModel';
import { TestRuleResult } from './TestRuleResult'; import { TestRuleResult } from './TestRuleResult';
import { AlertBox } from 'app/core/components/AlertBox/AlertBox';
import { AppNotificationSeverity } from 'app/types';
interface Props { interface Props {
angularPanel?: AngularComponent; angularPanel?: AngularComponent;
...@@ -127,7 +129,16 @@ export class AlertTab extends PureComponent<Props> { ...@@ -127,7 +129,16 @@ export class AlertTab extends PureComponent<Props> {
}; };
render() { 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()] : []; const toolbarItems = alert ? [this.stateHistory(), this.testRule(), this.deleteAlert()] : [];
...@@ -141,6 +152,13 @@ export class AlertTab extends PureComponent<Props> { ...@@ -141,6 +152,13 @@ export class AlertTab extends PureComponent<Props> {
return ( return (
<EditorTabBody heading="Alert" toolbarItems={toolbarItems}> <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)} /> <div ref={element => (this.element = element)} />
{!alert && <EmptyListCTA {...model} />} {!alert && <EmptyListCTA {...model} />}
</> </>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment