public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v11.3.x] Alerting: Fix getSimpleConditionFromExpressions (#94584)

Browse Source 
Alerting: Fix getSimpleConditionFromExpressions (#94516)

fix getSimpleConditionFromExpressions

(cherry picked from commit 419598c745)

Co-authored-by: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
This commit is contained in:
grafana-delivery-bot[bot]
2024-10-11 11:07:16 +03:00
committed by GitHub
co-authored by Sonia Aguilar
parent 5f7e46f886
commit f24f59225d
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/SimpleCondition.tsx
+9 -3
View File
@@ -218,11 +218,17 @@ export function getSimpleConditionFromExpressions(expressions: Array<AlertQuery<
(query) => query.model.type === ExpressionQueryType.threshold && query.refId === SIMPLE_CONDITION_THRESHOLD_ID
);
const conditionsFromThreshold = thresholdExpression?.model.conditions ?? [];
const whenField = reduceExpression?.model.reducer ?? ReducerID.last;
const params = conditionsFromThreshold[0]?.evaluator?.params
? [...conditionsFromThreshold[0]?.evaluator?.params]
: [0];
const type = conditionsFromThreshold[0]?.evaluator?.type ?? EvalFunction.IsAbove;
return {
whenField: reduceExpression?.model.reducer ?? ReducerID.last,
whenField: whenField,
evaluator: {
params: [...conditionsFromThreshold[0]?.evaluator?.params] ?? [0],
type: conditionsFromThreshold[0]?.evaluator?.type ?? EvalFunction.IsAbove,
params: params,
type: type,
},
};
}