Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ export const mapRuleParamsWithFlyout = (alert: TopAlert): FlyoutThresholdData[]
switch (ruleId) {
case OBSERVABILITY_THRESHOLD_RULE_TYPE_ID:
return observedValues.map((observedValue, metricIndex) => {
const criteria = ruleCriteria[metricIndex] as CustomMetricExpressionParams;
const criteria = Array.isArray(ruleCriteria)
? (ruleCriteria[metricIndex] as CustomMetricExpressionParams)
: (ruleCriteria as CustomMetricExpressionParams);
const fields = criteria.metrics.map((metric) => metric.field || 'COUNT_AGG');
const comparator = criteria.comparator;
const threshold = criteria.threshold;
Expand Down Expand Up @@ -118,12 +120,20 @@ export const mapRuleParamsWithFlyout = (alert: TopAlert): FlyoutThresholdData[]

case METRIC_THRESHOLD_ALERT_TYPE_ID:
return observedValues.map((observedValue, metricIndex) => {
const criteria = ruleCriteria[metricIndex] as BaseMetricExpressionParams & {
metric: string;
customMetrics: Array<{
field?: string;
}>;
};
const criteria = Array.isArray(ruleCriteria)
? (ruleCriteria[metricIndex] as BaseMetricExpressionParams & {
metric: string;
customMetrics: Array<{
field?: string;
}>;
})
: (ruleCriteria as BaseMetricExpressionParams & {
metric: string;
customMetrics: Array<{
field?: string;
}>;
});

let fields: string[] = [];
const metric = criteria.metric;
const customMetric = criteria.customMetrics;
Expand Down Expand Up @@ -157,14 +167,21 @@ export const mapRuleParamsWithFlyout = (alert: TopAlert): FlyoutThresholdData[]

case METRIC_INVENTORY_THRESHOLD_ALERT_TYPE_ID:
return observedValues.map((observedValue, metricIndex) => {
const { threshold, customMetric, metric, comparator } = ruleCriteria[
metricIndex
] as BaseMetricExpressionParams & {
metric: string;
customMetric: {
field: string;
};
};
const criteria = Array.isArray(ruleCriteria)
? (ruleCriteria[metricIndex] as BaseMetricExpressionParams & {
metric: string;
customMetric: {
field: string;
};
})
: (ruleCriteria as BaseMetricExpressionParams & {
metric: string;
customMetric: {
field: string;
};
});

const { threshold, customMetric, metric, comparator } = criteria;
const metricField = customMetric?.field || metric;
const thresholdFormatted = threshold.map((thresholdToFormat) => {
if (
Expand Down