maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Metric Alerts] Add backend support for multiple expressions per alert (#58672)

Browse source 
* Add support for multiple alert expressions

* Rename expressions to criteria

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
This commit is contained in:
Zacqary Adam Xeper 2020-02-28 13:11:50 -06:00 committed by GitHub
parent b658baf012
commit 06ebbb3fe0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
x-pack/plugins/infra/server/lib/alerting/metric_threshold/register_metric_threshold_alert_type.ts
View file

@ -8,7 +8,7 @@ import { i18n } from '@kbn/i18n';
import { schema } from '@kbn/config-schema';
import { networkTraffic } from '../../../../common/inventory_models/shared/metrics/snapshot/network_traffic';
import {
MetricThresholdAlertTypeParams,
MetricExpressionParams,
Comparator,
AlertStates,
METRIC_THRESHOLD_ALERT_TYPE_ID,
@ -24,7 +24,7 @@ const FIRED_ACTIONS = {
async function getMetric(
{ callCluster }: AlertServices,
{ metric, aggType, timeUnit, timeSize, indexPattern }: MetricThresholdAlertTypeParams
{ metric, aggType, timeUnit, timeSize, indexPattern }: MetricExpressionParams
) {
const interval = `${timeSize}${timeUnit}`;
const aggregations =
@ -101,37 +101,49 @@ export async function registerMetricThresholdAlertType(alertingPlugin: PluginSet
name: 'Metric Alert - Threshold',
validate: {
params: schema.object({
threshold: schema.arrayOf(schema.number()),
comparator: schema.string(),
aggType: schema.string(),
metric: schema.string(),
timeUnit: schema.string(),
timeSize: schema.number(),
indexPattern: schema.string(),
criteria: schema.arrayOf(
schema.object({
threshold: schema.arrayOf(schema.number()),
comparator: schema.string(),
aggType: schema.string(),
metric: schema.string(),
timeUnit: schema.string(),
timeSize: schema.number(),
indexPattern: schema.string(),
})
),
}),
},
defaultActionGroupId: FIRED_ACTIONS.id,
actionGroups: [FIRED_ACTIONS],
async executor({ services, params }) {
const { threshold, comparator } = params as MetricThresholdAlertTypeParams;
const { criteria } = params as { criteria: MetricExpressionParams[] };
const alertInstance = services.alertInstanceFactory(alertUUID);
const currentValue = await getMetric(services, params as MetricThresholdAlertTypeParams);
if (typeof currentValue === 'undefined')
throw new Error('Could not get current value of metric');
const comparisonFunction = comparatorMap[comparator];
const alertResults = await Promise.all(
criteria.map(({ threshold, comparator }) =>
(async () => {
const currentValue = await getMetric(services, params as MetricExpressionParams);
if (typeof currentValue === 'undefined')
throw new Error('Could not get current value of metric');
const isValueInAlertState = comparisonFunction(currentValue, threshold);
const comparisonFunction = comparatorMap[comparator];
return { shouldFire: comparisonFunction(currentValue, threshold), currentValue };
})()
)
);
if (isValueInAlertState) {
const shouldAlertFire = alertResults.every(({ shouldFire }) => shouldFire);
if (shouldAlertFire) {
alertInstance.scheduleActions(FIRED_ACTIONS.id, {
value: currentValue,
value: alertResults.map(({ currentValue }) => currentValue),
});
}
// Future use: ability to fetch display current alert state
alertInstance.replaceState({
alertState: isValueInAlertState ? AlertStates.ALERT : AlertStates.OK,
alertState: shouldAlertFire ? AlertStates.ALERT : AlertStates.OK,
});
},
});

2
x-pack/plugins/infra/server/lib/alerting/metric_threshold/types.ts
View file

@ -23,7 +23,7 @@ export enum AlertStates {
export type TimeUnit = 's' | 'm' | 'h' | 'd';
export interface MetricThresholdAlertTypeParams {
export interface MetricExpressionParams {
aggType: MetricsExplorerAggregation;
metric: string;
timeSize: number;