Skip to content

[9.1] Add consecutiveMatches to action context (#244997) #245166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 9.1
Choose a base branch
from
+18 −2
Open

[9.1] Add consecutiveMatches to action context (#244997) #245166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 17 additions & 2 deletions ...lerting/server/task_runner/action_scheduler/schedulers/per_alert_action_scheduler.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { Alert } from '../../../alert';
import type { AlertInstanceContext, AlertInstanceState } from '@kbn/alerting-state-types';
import { ActionsCompletion } from '@kbn/alerting-state-types';
import { TaskPriority } from '@kbn/task-manager-plugin/server';
import { transformActionParams } from '../../transform_action_params';

const alertingEventLogger = alertingEventLoggerMock.create();
const actionsClient = actionsClientMock.create();
Expand Down Expand Up @@ -112,6 +113,10 @@ const getResult = (
actionToLog: { alertGroup: 'default', alertId, id: actionId, uuid: actionUuid, typeId: 'test' },
});

jest.mock('../../transform_action_params', () => ({
transformActionParams: jest.fn(),
}));

let clock: sinon.SinonFakeTimers;

describe('Per-Alert Action Scheduler', () => {
Expand Down Expand Up @@ -211,8 +216,8 @@ describe('Per-Alert Action Scheduler', () => {
>;

beforeEach(() => {
newAlert1 = generateAlert({ id: 1 });
newAlert2 = generateAlert({ id: 2 });
newAlert1 = generateAlert({ id: 1, activeCount: 3 });
newAlert2 = generateAlert({ id: 2, activeCount: 5 });
alerts = { ...newAlert1, ...newAlert2 };
});

Expand Down Expand Up @@ -240,6 +245,16 @@ describe('Per-Alert Action Scheduler', () => {
getResult('action-2', '1', '222-222'),
getResult('action-2', '2', '222-222'),
]);

expect(transformActionParams).toHaveBeenCalledTimes(4);
expect(transformActionParams).toHaveBeenCalledWith(
expect.objectContaining({
actionId: 'action-1',
alertId: 'rule-id-1',
consecutiveMatches: 3,
alertUuid: expect.any(String),
})
);
});

test('test should create action to schedule with priority if specified for each alert and each action', async () => {
Expand Down
1 change: 1 addition & 0 deletions ...red/alerting/server/task_runner/action_scheduler/schedulers/per_alert_action_scheduler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ export class PerAlertActionScheduler<
actionParams: action.params,
flapping: alert.getFlapping(),
ruleUrl: ruleUrl?.absoluteUrl,
consecutiveMatches: alert.getActiveCount(),
};

if (alert.isAlertAsData()) {
Expand Down