Skip to content

Commit 9366d48

Browse files
authored
fix(log-alerts): Log alerts need event type to determine alert type (#95241)
Field state change should take event type into account when determining alert type for log alerts.
1 parent 874ed3d commit 9366d48

File tree

1 file changed

+28
-21
lines changed

1 file changed

+28
-21
lines changed

static/app/views/alerts/rules/metric/ruleForm.tsx

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -611,38 +611,45 @@ class RuleFormContainer extends DeprecatedAsyncComponent<Props, State> {
611611
'alertType',
612612
].includes(name)
613613
) {
614-
this.setState(({dataset: _dataset, aggregate, alertType}) => {
615-
const dataset = this.checkOnDemandMetricsDataset(
616-
name === 'dataset' ? (value as Dataset) : _dataset,
617-
this.state.query
618-
);
614+
this.setState(
615+
({dataset: _dataset, aggregate, alertType, eventTypes: _eventTypes}) => {
616+
const dataset = this.checkOnDemandMetricsDataset(
617+
name === 'dataset' ? (value as Dataset) : _dataset,
618+
this.state.query
619+
);
620+
621+
const eventTypes =
622+
name === 'eventTypes' ? (value as EventTypes[]) : _eventTypes;
623+
624+
if (deprecateTransactionAlerts(organization)) {
625+
const newAlertType = getAlertTypeFromAggregateDataset({
626+
aggregate: name === 'aggregate' ? (value as string) : aggregate,
627+
dataset,
628+
organization,
629+
eventTypes,
630+
});
631+
632+
return {
633+
[name]: value,
634+
alertType: newAlertType,
635+
dataset,
636+
};
637+
}
619638

620-
if (deprecateTransactionAlerts(organization)) {
621639
const newAlertType = getAlertTypeFromAggregateDataset({
622-
aggregate: name === 'aggregate' ? (value as string) : aggregate,
640+
aggregate,
623641
dataset,
642+
eventTypes,
624643
organization,
625644
});
626645

627646
return {
628647
[name]: value,
629-
alertType: newAlertType,
648+
alertType: alertType === newAlertType ? alertType : 'custom_transactions',
630649
dataset,
631650
};
632651
}
633-
634-
const newAlertType = getAlertTypeFromAggregateDataset({
635-
aggregate,
636-
dataset,
637-
organization,
638-
});
639-
640-
return {
641-
[name]: value,
642-
alertType: alertType === newAlertType ? alertType : 'custom_transactions',
643-
dataset,
644-
};
645-
});
652+
);
646653
}
647654
};
648655

0 commit comments

Comments
 (0)